Add calculate-utilities-2.2.25.

atratsevskiy
Mike Hiretsky 13 years ago
parent 188e729f84
commit 30023e5e57

@ -2,6 +2,12 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-install-gui-2.2.25 (18 Oct 2011)
18 Oct 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
-calculate-install-gui-2.2.24.ebuild, +calculate-install-gui-2.2.25.ebuild:
Version bump. Remove old.
11 Oct 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
calculate-install-gui-2.2.9999.ebuild:
Update live

@ -1,7 +1,8 @@
AUX calculate-install-gui-2.2.24-r1.patch 585 RMD160 b51b70c3093cf74f3e16c1a928b25db292183cd3 SHA1 e0a075361295b9e681dfb782260bb7f6cebeaf9f SHA256 5cbc4e5224a17385e780e64709af8feeed5102a9885230767333bf21b7142ea6
DIST calculate-install-gui-2.2.24.tar.bz2 153936 RMD160 f95d49f0e256b09eb63ced5a439f5083e065161d SHA1 01e18ae3e7b4b4f9b274b007e05fed16b7cb0381 SHA256 0e8588943d7bd7539ec42fe8a2db1a403b9084acb6b79e9a556ecbf76ff6d633
DIST calculate-install-gui-2.2.25.tar.bz2 154081 RMD160 331d79f8959c07e0e75c4b86794080301f99fd62 SHA1 d3a1044c014580580dfbbaaf145596a45f5394ef SHA256 90dcb66f5e34dd4b4279e5dcd630689a657ba0ab1227ab87e4a9e0a3367bd3ab
EBUILD calculate-install-gui-2.2.24-r1.ebuild 845 RMD160 2553b689b61c8238cd3bad6093022d57055380e5 SHA1 75ebf62525879221c431984f4d8681aa8476ac4a SHA256 fe36921491688b52916aac765dd93f1938d3341a01f9159ea9b31f2b2fa6ae10
EBUILD calculate-install-gui-2.2.24.ebuild 711 RMD160 f76dd4adbb58163a4e5b981538d4444b44b5eb93 SHA1 7dd3338e783ee7a3509af539908c49193ab73141 SHA256 8e8b833747a0e9eadf4cd3b63750817c2b62f5e68e62c48b5e87ce0fea7f75b5
EBUILD calculate-install-gui-2.2.25.ebuild 711 RMD160 637bde3f272cfa8d6299a4720eaf74b030dbd426 SHA1 da3046bee8e7406873b7ef53e029a3e35fffc4ee SHA256 31d3d2727463b832d053ee2ed4c392ab3a47d56c7bb52d9870812080612ea929
EBUILD calculate-install-gui-2.2.9999.ebuild 716 RMD160 d1499e15a751f1a8d8686164aebaf63e6f65fe1d SHA1 23ddadce3617e606cb3ef52287ec6bb335a82bae SHA256 15a5546342b63281430b70a4b419fbd81933643fbd27b56231fbae209371ef75
MISC ChangeLog 15458 RMD160 1891befcef04fd669b3f806c8fd7edbc2cff64e3 SHA1 a4d3ba45f1b1acc624d633fbf53bada6c55a4c01 SHA256 95a47884575c6216c80e603966ca85b42b38205e855fd906cc2730b16ac91214
MISC ChangeLog 15670 RMD160 f62a231436b02a48cdfb42a58833f9dafd88ad60 SHA1 433585a701bec4ea81c3651c2b30103cfef70562 SHA256 767619a8546757e6dda2486082f45e790b8c63480ad2ce1a0a731fa3556fc5b3
MISC metadata.xml 319 RMD160 c12d856d94a4bbba48275f44c4e9a0eae1ac6f21 SHA1 cddfe781ee5b88c7f5c94d7c5f03a07e61ae3336 SHA256 2a18634b4a257808c269e8c986462b316780c4f8b9a19c7c8b733fa3310a4147

@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-install-2.2.24
DEPEND="~sys-apps/calculate-install-2.2.25
x11-libs/qtermwidget
x11-libs/qt-core"

@ -2,6 +2,12 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-assemble-2.2.25 (18 Oct 2011)
18 Oct 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
-calculate-assemble-2.2.24.ebuild, +calculate-assemble-2.2.25.ebuild:
Version bump. Remove old.
11 Oct 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
calculate-assemble-2.2.9999.ebuild:
Update live

@ -1,7 +1,8 @@
AUX calculate-assemble-2.2.24-r1.patch 1168 RMD160 4e12f441e3b1dec84fe1c9c6fef0405850a70b29 SHA1 3c6d387025bb2d607b8cc4cd357f6ec600a93f60 SHA256 4d99ffca85ac1305c6be3cb5fe60c68e38174098579a2c005ef475996691441c
DIST calculate-assemble-2.2.24.tar.bz2 25474 RMD160 23e96efd45458af4529bec3e99bda53dccbdefb2 SHA1 04d143480458094f86e44c12d37b9f2fe77de769 SHA256 d0bf55d2132c083447a4014a8466ce2ed10b72ed23072481d66bebd696f928ad
DIST calculate-assemble-2.2.25.tar.bz2 25488 RMD160 66890bf3a369073954ac54ea1683a9bb4a6bdd1e SHA1 1865513524d743262ce4573eefb8224bf1f95034 SHA256 0ff115cf922cca6c5c199aaff32580c0094e1aabbb05bdab4d49efbcc80ee4d6
EBUILD calculate-assemble-2.2.24-r1.ebuild 608 RMD160 0362f72ec2fdfb67ee46d8c3406205ebb90afe82 SHA1 eb78cfd00a1e2848d966a7917ca1d028d39b205d SHA256 975c987256fda6bb574565218b3dbee0479a521901ac4e9ea960d34d33c607e6
EBUILD calculate-assemble-2.2.24.ebuild 482 RMD160 af9f45c1bb240d0b1ce056cabef3da1da64f0e6f SHA1 727683764f08fb082f421ad743db286a0ce67387 SHA256 9487334ee1908d20b95c007c6b0cfdbeb6c5f40a349b25f95ac77c4080e376c3
EBUILD calculate-assemble-2.2.25.ebuild 481 RMD160 a2e03a987886e7a92a943195b29c4ee812f16355 SHA1 7db7a4d199c5b8c257b4e06c62cf4f2478b8f546 SHA256 ef11d509aeab97ecfe4137289950a78bee8de89511b32945dc58ede1be56ee5a
EBUILD calculate-assemble-2.2.9999.ebuild 498 RMD160 2c78ad8ec93daa2714f37760bf62f1071160ba4b SHA1 31812083d2ac1e171b95e02519888690a747a706 SHA256 0371109c66629a5895716c2e5c867a3bb15437d9bbec95b9c5fe387de8bea62e
MISC ChangeLog 14082 RMD160 45dd8590df09167da35028e07f99e559f7920e60 SHA1 d1315356055ea9975a950b1a33acd446d597fa58 SHA256 2238ac678f7e3523be7ef86013a85d7cc1b06456bee39026be342108d0cb2b10
MISC ChangeLog 14285 RMD160 ab907de2b3449019259e6e800792589559fe4855 SHA1 03f73de09a9f881a861de36d01a1031312d121f1 SHA256 9cd017df5598a3f3665725e366cf2ee0e13c1e57c8b2fa54c442d4b57eb0aa02
MISC metadata.xml 273 RMD160 7d99331acd3ba20fc7ae361cb845f33f73d994ee SHA1 92e19e1e4c24527654168ac0cf9fe58ba78aeb4d SHA256 4e25d45ba43b2ab7f7ae8ab4cfc05c406566cfb143a87166de77fbd8d9f8a943

@ -14,7 +14,6 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-builder-2.2.24"
DEPEND="~sys-apps/calculate-builder-2.2.25"
RDEPEND="${DEPEND}"

@ -2,6 +2,16 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-builder-2.2.25 (18 Oct 2011)
18 Oct 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
-calculate-builder-2.2.24.ebuild, -calculate-builder-2.2.24-r1.ebuild,
-calculate-builder-2.2.24-r2.ebuild, -calculate-builder-2.2.24-r3.ebuild,
-files/calculate-builder-2.2.24-r1.patch,
-files/calculate-builder-2.2.24-r2.patch,
-files/calculate-builder-2.2.24-r3.patch, +calculate-builder-2.2.25.ebuild:
Version bump. Remove old.
11 Oct 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
calculate-builder-2.2.9999.ebuild:
Update live

@ -1,13 +1,8 @@
AUX calculate-builder-2.2.24-r1.patch 2551 RMD160 3d01601506bc6178ee5a0ecef3772ceaf41f8f1d SHA1 cdd27e6e4ae567e2bf88023f3cc2e8db0236df38 SHA256 846e60fa3255abad18666bb74f1f9bd253c35224bb4b227abf0640d7477e037c
AUX calculate-builder-2.2.24-r2.patch 1058 RMD160 0d0eeaac3ea4d5ebc2cc8e5a54daa11001007d53 SHA1 aefdcd72e494c0b97d4fe0c3891f4a7a60bc452b SHA256 d29c7eb2dd3bdd6ab14add61f4d40ff17a01e5365873a3e63ae5db80d18d8ce2
AUX calculate-builder-2.2.24-r3.patch 2530 RMD160 9ae77c0eff7821b14526497c61b101acd8e654d2 SHA1 d96952b30d2b2a94dc94fc28641394b41c1c80b6 SHA256 e2c61e5440632c398d9f5395b225e3ed3fc848dc26093e2d21d95c3569717b03
AUX calculate-builder-2.2.24-r4.patch 2924 RMD160 767fe1d3416c27820da427fdb15f1c71525c7c91 SHA1 91854f98a855c5bb67a9f5edc15ad6fed70909af SHA256 eccbf5d5fcbfbdd436ae14ae01063d5d0934a2cf7e0b53a985a1d86fb21672b6
DIST calculate-builder-2.2.24.tar.bz2 26996 RMD160 b5cdfe057ccb0496ed4c1470570575086c2d58fd SHA1 1b68631826c8499be03b0e3ad1062ccc2c4d9d0f SHA256 8b995b5dbe5a1d9e98178f68720e7a30dfb02829ddf2f63b131786d962bf1c12
EBUILD calculate-builder-2.2.24-r1.ebuild 710 RMD160 45008dff24e10002966838c4d48f10ea4d159565 SHA1 598e97ad47e60393795bb27039deae44e0c2b85f SHA256 05569d35ff6efbed09eb8a93ddd2ef774506823fb99806f8efd4a4e23de1057e
EBUILD calculate-builder-2.2.24-r2.ebuild 714 RMD160 ab7ba19ba5cb38d2d4fa0bcf45b00a360539cbce SHA1 058b1007d0c28a1f276e1c91e9e536e16b1691e6 SHA256 3f3041eb22eb4637b4b5d1faa275215580219b8a369fcfa2c036d71d7a4a0e30
EBUILD calculate-builder-2.2.24-r3.ebuild 766 RMD160 d7f12a1adbce5d176e17b5db07221c80f818b389 SHA1 e993fcc667fbb0028c5ff80c770cc6546ba1790c SHA256 f35f4f8aff03b9d93a89f394a867c4f8970c95fe1b7faf4cea28b0fa8c31f5d4
DIST calculate-builder-2.2.25.tar.bz2 27120 RMD160 1640be4f5e2ac4971a26f575d85a28c694a88c1d SHA1 c92c128bf5f3ef83a731ae086432aecda06a6ffd SHA256 09d1493afb699113abb55e3646280b72424e5a4c48e83d9a180ef56e4d630c95
EBUILD calculate-builder-2.2.24-r4.ebuild 802 RMD160 29cb4abf312190806c36dd6ed8aeb6cab9d939c0 SHA1 84f26f980d4d4a7eb1e5249be43b2dfa650269a8 SHA256 c7097cff6366d2e4df5f108436c8692f3343c3aaf30eb04509e66cf3563dea10
EBUILD calculate-builder-2.2.24.ebuild 588 RMD160 4ab4eb3ba650bf43594b70b68d9e3c9844d14bcf SHA1 f754e4af234393852b58ffbbbc8aff3d18408007 SHA256 1f138c0c6dca0195f43c4aca60a87632980ee9c2f7dcc3c8658d487c97b45ec4
EBUILD calculate-builder-2.2.25.ebuild 587 RMD160 c38399cd061403ee737f9a48d4745616d1316462 SHA1 21203db1197e07e301629171a2aacb4e380e3248 SHA256 a9e1686b3265d283e374cf16297d3e9ef8ea7f1b7fd16e7817f1f0a776d015a8
EBUILD calculate-builder-2.2.9999.ebuild 571 RMD160 9342f8bb6fee2525ea214551f177a21170c8f320 SHA1 640d9424326321e45c59241384d3bdec58ff0a22 SHA256 829ecb63e72f27ae5f1cab9a22b3fad06addd81e7cf0f73fb99926dfe1d52102
MISC ChangeLog 18311 RMD160 627c52237834c6265b6ffa029558b17386c35e76 SHA1 971782e0036ca54c702fdf6b266b73f65beac680 SHA256 3b334db9fac309fd5963341ef730c451635714fd85d569fb0152340d11d19d3a
MISC ChangeLog 18756 RMD160 151c6129be70475817fbf2713f1bd489fff33811 SHA1 bf5e3d72955a15e9fa62f62733271864fe6fffc5 SHA256 eabd7735d62d863a8cea9db192efa86e5604368c31856944da699443287a5ae1
MISC metadata.xml 270 RMD160 b5ff308a82cd6e594c2f04731cdbe9f80a945042 SHA1 58dbf7eb15bb2e6c6c8514f483e51dfacd1c62e9 SHA256 b65e150429ecbf36cf03d094f4e3e7518f536c61289cecff6b817326703d58a0

@ -1,31 +0,0 @@
# Copyright 1999-2011 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/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The utilities for builder tasks of Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND=">=sys-kernel/calckernel-3.4.18
~sys-apps/calculate-install-2.2.24
!<sys-apps/calculate-1.4.0_p20100921
app-cdr/cdrkit
sys-fs/squashfs-tools"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# add creating cache
epatch "${FILESDIR}/calculate-builder-2.2.24-r1.patch"
}

@ -1,31 +0,0 @@
# Copyright 1999-2011 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/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The utilities for builder tasks of Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND=">=sys-kernel/calckernel-3.4.18
~sys-apps/calculate-install-2.2.24
!<sys-apps/calculate-1.4.0_p20100921
app-cdr/cdrkit
sys-fs/squashfs-tools"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# fix run chroot command
epatch "${FILESDIR}/calculate-builder-2.2.24-r2.patch"
}

@ -1,32 +0,0 @@
# Copyright 1999-2011 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/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The utilities for builder tasks of Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND=">=sys-kernel/calckernel-3.4.18
~sys-apps/calculate-install-2.2.24
!<sys-apps/calculate-1.4.0_p20100921
app-cdr/cdrkit
sys-fs/squashfs-tools"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# fix run chroot command, add ability use kernel config
# by profile suffix
epatch "${FILESDIR}/calculate-builder-2.2.24-r3.patch"
}

@ -15,10 +15,9 @@ SLOT="0"
KEYWORDS="amd64 x86"
DEPEND=">=sys-kernel/calckernel-3.4.18
~sys-apps/calculate-install-2.2.24
~sys-apps/calculate-install-2.2.25
!<sys-apps/calculate-1.4.0_p20100921
app-cdr/cdrkit
sys-fs/squashfs-tools"
RDEPEND="${DEPEND}"

@ -1,60 +0,0 @@
diff --git pym/cl_builder.py pym/cl_builder.py
index 4745b47..86b23da 100644
--- pym/cl_builder.py
+++ pym/cl_builder.py
@@ -188,7 +188,11 @@ class cl_builder(color_print):
envdict.update(os.environ)
commandLine = ["chroot",chroot,
"/bin/bash","-c",command]
- chrootCommand = process(*commandLine,stderr=PIPE,
+ if self.clVars.Get('os_builder_arch_machine') != \
+ self.clVars.Get('os_arch_machine') and \
+ self.clVars.Get('os_arch_machine') == 'x86_64':
+ commandLine = ["linux32"]+commandLine
+ chrootCommand = process(*commandLine,stderr=STDOUT,
stdout=PIPE,envdict=envdict)
except KeyboardInterrupt:
chrootCommand.kill()
@@ -240,7 +244,34 @@ class cl_builder(color_print):
def prepareSourceDistributive(self,distr):
"""Unmount all bind,proc mount points from source distribute"""
+ cacheUser = "guest"
mp = self.clVars.Get('cl_builder_path')
+ self.printByResult(True)
+ self.printMessageForTest(_("Create cache for %s home directory")%
+ cacheUser)
+ cmdAddUser = self.runChroot(mp, "useradd %s -u 1000"%cacheUser)
+ cmdFail = None
+ if cmdAddUser.success():
+ cmdDesktopCache = self.runChroot(mp,
+ "cl-desktop %s --cache"%cacheUser)
+ if cmdDesktopCache.success():
+ cmdUserDel = self.runChroot(mp,
+ "userdel %s"%cacheUser)
+ if cmdUserDel.success():
+ self.printByResult(True)
+ else:
+ cmdFail = cmdUserDel
+ else:
+ self.runChroot(mp, "userdel %s"%cacheUser).success()
+ cmdFail = cmdDesktopCache
+ else:
+ cmdFail = cmdAddUser
+ if cmdFail:
+ self.printByResult(False)
+ for line in cmdFail.readlines():
+ if line:
+ self.printERROR(line)
+
mps = filter(lambda x:x!=mp,map(lambda x:x[1],childMounts(mp)))
for target in sorted(mps, reverse=True):
self.printMessageForTest(_("Unmounting %s")%(target[len(mp):]))
@@ -275,7 +306,6 @@ class cl_builder(color_print):
os.unlink(curProfileFile)
os.symlink(newProfile,curProfileFile)
-
def restoreProfile(self):
"""Restore profile"""
if not self.curProfile:

@ -1,25 +0,0 @@
diff --git pym/cl_builder.py pym/cl_builder.py
index 4745b47..bece647 100644
--- pym/cl_builder.py
+++ pym/cl_builder.py
@@ -188,7 +188,11 @@ class cl_builder(color_print):
envdict.update(os.environ)
commandLine = ["chroot",chroot,
"/bin/bash","-c",command]
- chrootCommand = process(*commandLine,stderr=PIPE,
+ if self.clVars.Get('os_builder_arch_machine') != \
+ self.clVars.Get('os_arch_machine') and \
+ self.clVars.Get('os_arch_machine') == 'x86_64':
+ commandLine = ["linux32"]+commandLine
+ chrootCommand = process(*commandLine,stderr=STDOUT,
stdout=PIPE,envdict=envdict)
except KeyboardInterrupt:
chrootCommand.kill()
@@ -275,7 +279,6 @@ class cl_builder(color_print):
os.unlink(curProfileFile)
os.symlink(newProfile,curProfileFile)
-
def restoreProfile(self):
"""Restore profile"""
if not self.curProfile:

@ -1,57 +0,0 @@
diff --git pym/cl_builder.py pym/cl_builder.py
index 4745b47..bece647 100644
--- pym/cl_builder.py
+++ pym/cl_builder.py
@@ -188,7 +188,11 @@ class cl_builder(color_print):
envdict.update(os.environ)
commandLine = ["chroot",chroot,
"/bin/bash","-c",command]
- chrootCommand = process(*commandLine,stderr=PIPE,
+ if self.clVars.Get('os_builder_arch_machine') != \
+ self.clVars.Get('os_arch_machine') and \
+ self.clVars.Get('os_arch_machine') == 'x86_64':
+ commandLine = ["linux32"]+commandLine
+ chrootCommand = process(*commandLine,stderr=STDOUT,
stdout=PIPE,envdict=envdict)
except KeyboardInterrupt:
chrootCommand.kill()
@@ -275,7 +279,6 @@ class cl_builder(color_print):
os.unlink(curProfileFile)
os.symlink(newProfile,curProfileFile)
-
def restoreProfile(self):
"""Restore profile"""
if not self.curProfile:
diff --git pym/cl_fill_builder.py pym/cl_fill_builder.py
index cb6744d..841b387 100644
--- pym/cl_fill_builder.py
+++ pym/cl_fill_builder.py
@@ -121,11 +121,26 @@ class fillVars(object, varsShare):
shortVer = shortVerSearch.group()
else:
return ""
+ # find best config
+ makeProfile = '/etc/make.profile'
+ profileSpec = ''
+ if path.islink(makeProfile):
+ linkTarget = os.readlink('/etc/make.profile')
+ parentDir, profileSpecification = path.split(linkTarget)
+ if parentDir.endswith('x86') or parentDir.endswith('amd64'):
+ profileSpec = profileSpecification
configName = "config-%(system)s-%(march)s-%(ver)s" % \
{'system':self.Get('os_linux_system'),
'march':self.Get('os_arch_machine'),
'ver':shortVer}
- if path.exists(path.join(kernelDirs,configName)):
+ configNameSpec = "config-%(system)s-%(march)s-%(ver)s-%(spec)s" % \
+ {'system':self.Get('os_linux_system'),
+ 'march':self.Get('os_arch_machine'),
+ 'ver':shortVer,
+ 'spec':profileSpec}
+ if profileSpec and path.exists(path.join(kernelDirs,configNameSpec)):
+ return path.join(kernelDirs,configNameSpec)
+ elif path.exists(path.join(kernelDirs,configName)):
return path.join(kernelDirs,configName)
return ""

@ -2,6 +2,12 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-client-2.2.25 (18 Oct 2011)
18 Oct 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
-calculate-client-2.2.24.ebuild, +calculate-client-2.2.25.ebuild:
Version bump. Remove old.
11 Oct 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
calculate-client-2.2.9999.ebuild:
Update live

@ -1,7 +1,8 @@
AUX calculate-client-2.2.24-r1.patch 1511 RMD160 2e67f23a965e33c790fc3085b948dea054b9cc45 SHA1 cb0a528b30b9adcb5bc3859fc21cbf24f1785e39 SHA256 2133f8b483900972f0bb5a759407a980982a1d202f8cda0f16a46bfa58e25de4
DIST calculate-client-2.2.24.tar.bz2 31457 RMD160 c946e6a1fb27b420149ba3aa0e31ee28b2a02014 SHA1 de98f67bc3d10ad8c9b870961458cbd24e510ee1 SHA256 19a1eb817782d52a168d93a47bba86d03fbc1d3a9bea16e3ea6e8e18f765e056
DIST calculate-client-2.2.25.tar.bz2 31601 RMD160 378303fdcc5df494ca29a076db6dcc630fea9324 SHA1 1f01e833157164d04fa297db172dee027c300f0b SHA256 06dbad8227b1c461d274e8ec69122a13f5f48bc155515f8d6b50d5876b970419
EBUILD calculate-client-2.2.24-r1.ebuild 985 RMD160 cf52e58cc2540c7492936811ae3787cd39812b9b SHA1 204cc72c589768f5607bb8232f257fff9b9e5a05 SHA256 42965241ee3fccd34c51d732410286d8d1de024bf965e1580ddded5a94eb76b0
EBUILD calculate-client-2.2.24.ebuild 857 RMD160 20cd53346f0db753b78d72f4fbf28b7a44b1fad6 SHA1 32f9a70ea31fa00dc476944fe159bf841278025c SHA256 18ca2f2c38cea3499b69c06810fc0b9d9e616e5dbbcc6f05aeb30e1712b25156
EBUILD calculate-client-2.2.25.ebuild 857 RMD160 db1af9871573bedbc8d5d0cf3d9810e6044f8dc4 SHA1 c61ec99243e2e2b0c3244b90500174744d9c372b SHA256 2519eef49072797fdb255a5b3f9747e0de07e907413647cb7882395289a3ed75
EBUILD calculate-client-2.2.9999.ebuild 791 RMD160 73e0f75a7b40f92980e59fdffe83f7264e8f31e2 SHA1 51ae8009e155004e2a08372514368fba19839a5b SHA256 0e4dcd0d5ed00646bd90c30b9c13349a49dc6749e099e6f3e55c7118ed892f58
MISC ChangeLog 20584 RMD160 0522824d85b23652356816a3e85842ee1e1d44c9 SHA1 0e3f18851c7de3ceaa6891c41129e5df3d6adec1 SHA256 410f8f6f60591bcc715cef33d39d24c11245b63790f038884a588adbe4fc94f0
MISC ChangeLog 20781 RMD160 367a6c43995afdbe70cf0db5333127e241d5f6f9 SHA1 dedbc74b2e7334c59b4d4f6f7a76387e4ca2cd7d SHA256 cc835e1228b46a070c4f05d569e4f05835fecd2d97b0c8b3a894528c897c4f5d
MISC metadata.xml 310 RMD160 ed986dbc43c958bd57e0fb73749ee09167ee0221 SHA1 4007f716df1aa85ec65d926f246663effc382384 SHA256 5023605d36dcbb5d5fe1b1ac54f7125a4087479b5168601075a8050ed51c38c2

@ -15,7 +15,7 @@ SLOT="0"
KEYWORDS="amd64 x86"
IUSE="kde xfce gnome"
DEPEND="~sys-apps/calculate-desktop-2.2.24
DEPEND="~sys-apps/calculate-desktop-2.2.25
>=dev-python/python-ldap-2.0[ssl]
>=sys-auth/pam_ldap-180[ssl]
>=sys-auth/nss_ldap-239

@ -2,6 +2,13 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-desktop-2.2.25 (18 Oct 2011)
18 Oct 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
-calculate-desktop-2.2.24.ebuild, -calculate-desktop-2.2.24-r1.ebuild,
-files/calculate-desktop-2.2.24-r1.patch, +calculate-desktop-2.2.25.ebuild:
Version bump. Remove old.
*calculate-desktop-3.0.9999 (11 Oct 2011)
11 Oct 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

@ -1,9 +1,8 @@
AUX calculate-desktop-2.2.24-r1.patch 6519 RMD160 b0e088b347c24432d7aa8392910d8798c128dae8 SHA1 54f5db9c8b430b34815606d32037738e42c4b087 SHA256 4831f75d6de1bf304ef9cde084ec4a88aa90fc94d92fca613b552cb35a19f6a0
AUX calculate-desktop-2.2.24-r2.patch 6320 RMD160 3ef0c97c203d51970a096d131742c844c4c64623 SHA1 380f81829c6536016a1d338f62cce9207b6ed461 SHA256 227e4d9dcbf079aa23c52b00829e95ab4bc52be16a324ed41123fffc1bf85c13
DIST calculate-desktop-2.2.24.tar.bz2 15024 RMD160 fc11b4acc070de36fc3ddf9886da9d6157422dbe SHA1 b449ee1f49b90fc349296dfd48bed1b1bfbeb2a2 SHA256 92c67c60563dddded6da7d62dda777bbd4e008a9fa081236001f13c29b31b003
EBUILD calculate-desktop-2.2.24-r1.ebuild 998 RMD160 0365733e347061a42d6ce5d59021bf56c79be994 SHA1 b1cc6b50749b92b48b56ca9d625662d772cbc2bc SHA256 f730537575086c6092c7226bea1ecd73b5c5a28b44c915fc0b846939ec549b13
DIST calculate-desktop-2.2.25.tar.bz2 14833 RMD160 0678f27d782a879b08f1aec7241eb5d9d78a5168 SHA1 81bf1b26517da678e8dae6b56f7dbd9ca44fdd0d SHA256 4b548d7b75176586bffddb39918b15aac00d1112db41049eb8b14387d2bf5eaf
EBUILD calculate-desktop-2.2.24-r2.ebuild 1001 RMD160 227e3407b83892064329024c23b5bb4901bb0af0 SHA1 f37e783ab676cf48a21a581d793ae6ae415ac521 SHA256 eb95416f4881ab2c641e4a4e866fe193b4649dc81f22075e294364fdb2f2d9fe
EBUILD calculate-desktop-2.2.24.ebuild 875 RMD160 7c55bc31eb2ff1c66b520056959ee2e907ac6660 SHA1 4f5fe5d78e66b9b0b73a92dfe368d874238b3237 SHA256 d71248dd870c930de0d3e035130c0fff9bff9b8defbe63c2048f86e5f447cf9e
EBUILD calculate-desktop-2.2.25.ebuild 875 RMD160 ab3aa90c10df93f6c26bf54f5e82c264486e6235 SHA1 d76251dd8f0ade53544e475789100b601b8ab2a0 SHA256 d32de8d9ed311d2660279575811a3e7c3eb8c767897be6f46b57b0c4d38a38a5
EBUILD calculate-desktop-2.2.9999.ebuild 903 RMD160 c95039fb364e3a6e1cf57db69699aa7f43f3b344 SHA1 92817530d8bce919b2008217daa565ab6398030e SHA256 fc3d6b3a573bfff6cc5998c5a6d638e71c52102637433bf95511edade70a64ff
MISC ChangeLog 15547 RMD160 467ca8f6347976deaad75b12d0e9e015b4cf7f25 SHA1 3595c688089cc2a8a2059295344f911a0404832e SHA256 069ddca5d00a3500a2ae14c50d2b066af783af2540b7c28af0339a98604a53b1
MISC ChangeLog 15828 RMD160 f72ea3ce87ca94ebf43d2ca9eb517271077d83eb SHA1 61edc3809cc0426d7bbfc766a92ab9b7a7325b76 SHA256 48a9ca9f7626d877be06c891d40343adf5437051ea1fd2af95e0aa825832fc4f
MISC metadata.xml 315 RMD160 36a1a8d03aed0a483def83e076f484a64d452a8b SHA1 f6e70641eab777d2417d8a7600e8d3f09f53f96f SHA256 67fea0b1af7d10c0f86e72ab40f527e99c6f81f7aace4716344bdfb97c769a18

@ -1,42 +0,0 @@
# Copyright 1999-2011 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/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The program of the desktop configuration Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="kde xfce gnome"
DEPEND="~sys-apps/calculate-templates-2.2.24
>=dev-python/python-ldap-2.0[ssl]
xfce? ( x11-misc/xdialog )
gnome? ( x11-misc/xdialog )
kde? ( kde-base/kdialog )"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# add creating cache
epatch "${FILESDIR}/calculate-desktop-2.2.24-r1.patch"
}
pkg_postinst() {
#${EROOT}/usr/lib/calculate-2.2/calculate-desktop/bin/install
einfo "For configure calculate-desktop perform:"
einfo " cl-desktop --install"
if use kde || use xfce || use gnome
then
einfo " /etc/init.d/xdm restart"
fi
}

@ -15,7 +15,7 @@ SLOT="0"
KEYWORDS="amd64 x86"
IUSE="kde xfce gnome"
DEPEND="~sys-apps/calculate-templates-2.2.24
DEPEND="~sys-apps/calculate-templates-2.2.25
>=dev-python/python-ldap-2.0[ssl]
xfce? ( x11-misc/xdialog )
gnome? ( x11-misc/xdialog )

@ -1,143 +0,0 @@
diff --git pym/cl_desktop.py pym/cl_desktop.py
index 321f90a..a7945a1 100644
--- pym/cl_desktop.py
+++ pym/cl_desktop.py
@@ -29,7 +29,7 @@ from cl_datavars import DataVars
from cl_print import color_print
from client.progressbar import ProgressBar
from cl_utils import runOsCommand, getpathenv, appendProgramToEnvFile,\
- removeProgramToEnvFile
+ removeProgramToEnvFile,process, makeDirectory
lang().setLanguage(sys.modules[__name__])
@@ -196,7 +196,7 @@ class desktop(share):
self.displayTemplatesApplied(dirsFiles)
return dirsFiles
- def createHome(self, progress=False, live=False, verbose=False):
+ def createHome(self, progress=False, live=False, verbose=False,cache=False):
"""Создание профиля пользователя (пользовательской директории)"""
# Имя пользователя
self.verbose = verbose
@@ -236,10 +236,21 @@ class desktop(share):
homeDir = os.path.join(rootPath, homeDir[1:])
# Домашняя директория существует
flagHomeExists = True
+ # if operation is create cache then discard chroot status
+ if cache:
+ self.clVars.Set('cl_chroot_status','off',True)
+ # get user home directory from cache
+ if not os.path.exists(homeDir) and not cache:
+ if self.getUserDirFromCache(userName,uid,gid,homeDir):
+ live = True
# Создаем домашнюю директорию если ее нет
if not os.path.exists(homeDir):
flagHomeExists = False
self.createUserDir(uid, gid, homeDir)
+ elif cache:
+ self.printERROR(_("Can not create cache for user %s")%userName+
+ ", " + _("because home directory exists"))
+ return False
# if live action then action update mutable params of profile (live)
# else action is update user profile
if live:
@@ -253,11 +264,76 @@ class desktop(share):
self.printERROR(_("Can not apply user profile"))
self.umountUserRes(homeDir)
return False
+ if cache:
+ if not self.createCache(userName,uid,gid,homeDir):
+ self.printERROR(_("Can not create cache"))
+ return False
+ self.printSUCCESS(_("Cache for user %s home directory is created")%
+ userName)
+ return True
if not flagHomeExists:
self.printSUCCESS(_("Created home dir %s")%homeDir + " ...")
self.printSUCCESS(_("User account %s is configured")%userName + " ...")
return True
+ def _cacheFileName(self,userName,uid,gid):
+ """Get cache user home directory file full path"""
+ return "/var/cache/calculate/{username}-{uid}-{gid}.tar.gz".format(
+ username=userName,
+ uid=uid,gid=gid)
+
+ def getUserDirFromCache(self,userName,uid,gid,homeDir):
+ """Get user home directory from cache"""
+ cacheFile = self._cacheFileName(userName,uid,gid)
+ if os.path.exists(cacheFile):
+ tarProcess = process("tar","xf",cacheFile,"-C",
+ os.path.dirname(homeDir))
+ if tarProcess.failed():
+ self.printERROR(
+ _("Can not create user home directory from cache"))
+ self._removeUserHomeDirectory(homeDir)
+ return False
+ self.printSUCCESS(_("Created home dir %s from cache")%
+ homeDir + " ...")
+ return True
+ return False
+
+ def _removeUserHomeDirectory(self,homeDir):
+ """Remove user home directory by rm with options --preserve-root
+
+ and --one-file-system for keep mount directories"""
+ rmProcess = process("rm","--one-file-system","--preserve-root",
+ "-rf", homeDir)
+ if rmProcess.failed():
+ self.printERROR(_("Can not remove user home directory %s")%homeDir)
+ return False
+ return True
+
+ def createCache(self,userName,uid,gid,homeDir):
+ """Create cache file for user home directory"""
+ cacheFile = self._cacheFileName(userName,uid,gid)
+ cacheDir = os.path.dirname(cacheFile)
+ if os.path.exists(cacheFile):
+ try:
+ os.unlink(cacheFile)
+ except:
+ self.printERROR(_("Can not remove cache file %s")%cacheFile)
+ return False
+ elif not os.path.exists(cacheDir):
+ if not makeDirectory(cacheDir):
+ self.printERROR(_("Can not create %s directory")%cacheDir)
+ return False
+ if not os.access(cacheDir,os.W_OK):
+ self.printERROR(_("Write permission denied for %s directory")%
+ cacheDir)
+ return False
+ tarProcess = process("tar","cf",cacheFile,"-C",
+ os.path.dirname(homeDir),os.path.basename(homeDir),
+ "--one-file-system")
+ if tarProcess.failed():
+ self.printERROR(_("Can not create %s cache archive")%cacheFile)
+ return False
+ return self._removeUserHomeDirectory(homeDir)
def getMountUserPaths(self, homeDir=False):
"""Находит пользовательские примонтированные пути"""
diff --git pym/cl_desktop_cmd.py pym/cl_desktop_cmd.py
index 0dab534..6b97724 100644
--- pym/cl_desktop_cmd.py
+++ pym/cl_desktop_cmd.py
@@ -37,6 +37,8 @@ DESCRIPTION = _("Create home directory for the new user account")
# Опции командной строки
CMD_OPTIONS = [{'longOption':"live",
'help':_("update only mutable parameters of user profile")},
+ {'longOption':"cache",
+ 'help':_("create cache of user home directory")},
{'longOption':"verbose",
'help':_("display the template is applied")},
{'longOption':"set"},
@@ -146,7 +148,7 @@ class desktop_cmd(share_cmd):
def createHome(self, optObj):
"""Создание домашней директории"""
return self.logicObj.createHome(optObj.progress,optObj.live,
- optObj.verbose)
+ optObj.verbose,optObj.cache)
def install(self):
"""Инсталяция программы"""

@ -2,6 +2,12 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-i18n-2.2.25 (18 Oct 2011)
18 Oct 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
-calculate-i18n-2.2.24.ebuild, +calculate-i18n-2.2.25.ebuild:
Version bump. Remove old.
*calculate-i18n-2.2.24-r1 (28 Sep 2011)
28 Sep 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

@ -1,8 +1,9 @@
AUX calculate-i18n-2.2.24-r1.patch 3467 RMD160 f734c02924e76acd06fe09e73f11e6e414b40567 SHA1 416337fb499d776218fe5fdf63c5f16df0d0fac4 SHA256 b9a0de23951d00523ac211b32459d58bcf36bab572a8befe3476dcd6af471493
DIST calculate-i18n-2.2.24.tar.bz2 28639 RMD160 f7c640fb100e6bf570fff9b9208eb9dadfe94881 SHA1 6499e206a08499b75df3ac6d9e9e076e3a3ad596 SHA256 12d5b49d6d782203b6c9b6b6dd484d252825e1508ca323255f55ec636eb926be
DIST calculate-i18n-2.2.25.tar.bz2 32247 RMD160 966de678163fca5df8fd32dfa7747d6127f0445a SHA1 f1caf0d19c5eaef66eacbb31870fd9298eeb58d5 SHA256 bb3c6a4e117d676bf0cb4d86d9551fea940fb15c8eaa44ac91e2aad0a068b620
EBUILD calculate-i18n-2.2.24-r1.ebuild 800 RMD160 89d96f934ef06219fd68a6b0f35f182b3e021d38 SHA1 4d9dcf70446b0a330760733bf8c7ac8c984cd347 SHA256 30572a616bbcfc227fb4172d71b979b85fd5e0890deb0abf7e6f447b9de6de00
EBUILD calculate-i18n-2.2.24.ebuild 683 RMD160 ae6e3866c548be5b270f2815d32af79184918659 SHA1 4fc7dbacb72f031b19abf5db470e7190acc30f2f SHA256 87a1cc42fac1abdc8a62abe0adbd835e4afb98cfe2f088a2f5dc4236a6919b48
EBUILD calculate-i18n-2.2.25.ebuild 682 RMD160 7a2199cd34b4c2314f779996dca0c18266fa7d9e SHA1 0ee44fa15e2e8eb3bef1d6d6edbbfde6e9bbc47e SHA256 f3b974ca4aa43b0c9f470ac4bde5415dd273cedf202368383d8ea949321cbb30
EBUILD calculate-i18n-2.2.9999.ebuild 696 RMD160 007ea0a554c07b84b94599f0880cf0962a87a2a3 SHA1 c0d70603a39251f7f170d5bf8416d08ed0c0f66a SHA256 39985a22b3cc1a342ce42a96d90b9076b6f29dc7afe404fb379cc82ce6a56554
EBUILD calculate-i18n-3.0.9999.ebuild 511 RMD160 0df9256b3cf07656c4d8667567374d590e5cbb58 SHA1 670c99099e7ad5c451e8e0f90d900e122b4ea388 SHA256 06107127410a9fff9008d17ce376a92343bed5648d0f6584386801a2682146cc
MISC ChangeLog 4719 RMD160 bb51b9303e89b6b688334d0f0d2dd211d53dcc8d SHA1 42319071550f24239598b62e748dbe73e024fa1d SHA256 73e3a008a637acba741d02e16d55bc055aa5a789712b48b4d2e0cd70a4794b3a
MISC ChangeLog 4910 RMD160 6d98b8c8bca9c76f80c66d9f2a9936a324bb1bce SHA1 67bd3f04b72541ea08844c38a4e054b74a8b5cfa SHA256 a59b931e22877cd4d32531ea6c6c76db742c595a17b29e97f4063338e912372f
MISC metadata.xml 276 RMD160 d9730825fc3ad1b5ea7ba45704121ebd29e38b11 SHA1 c4c1576efbc38119efca43cfa273cb9f433f1de1 SHA256 a2312171d1cbfac41a263c0be692d3d12cfa3aab51979af64487824ae674bc2c

@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
RDEPEND=">=sys-apps/calculate-lib-2.2.19
RDEPEND=">=sys-apps/calculate-lib-2.2.25
!<sys-apps/calculate-install-2.2.19
!<sys-apps/calculate-client-2.2.19
!<sys-apps/calculate-desktop-2.2.19
@ -23,4 +23,3 @@ RDEPEND=">=sys-apps/calculate-lib-2.2.19
DEPEND="sys-devel/gettext
${DEPEND}"

@ -2,6 +2,22 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-install-2.2.25 (18 Oct 2011)
18 Oct 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
-calculate-install-2.2.24.ebuild, -calculate-install-2.2.24-r1.ebuild,
-calculate-install-2.2.24-r2.ebuild, -calculate-install-2.2.24-r3.ebuild,
-calculate-install-2.2.24-r4.ebuild, -calculate-install-2.2.24-r5.ebuild,
-calculate-install-2.2.24-r6.ebuild, -calculate-install-2.2.24-r7.ebuild,
-files/calculate-install-2.2.24-r1.patch,
-files/calculate-install-2.2.24-r2.patch,
-files/calculate-install-2.2.24-r3.patch,
-files/calculate-install-2.2.24-r4.patch,
-files/calculate-install-2.2.24-r5.patch,
-files/calculate-install-2.2.24-r6.patch,
-files/calculate-install-2.2.24-r7.patch, +calculate-install-2.2.25.ebuild:
Version bump. Remove old.
*calculate-install-2.2.24-r8 (10 Oct 2011)
10 Oct 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

@ -1,22 +1,9 @@
AUX calculate-install-2.2.24-r1.patch 2887 RMD160 081aaf2ac8d65f300e503c8b543f46d1e122dbc8 SHA1 a32ced7cfa312e82c8d64f786985beff0ace8f9c SHA256 ad961a894ddd39231084cbabb40e864063b8d8e6f242a7c92204d797e04aef11
AUX calculate-install-2.2.24-r2.patch 6792 RMD160 33e7dd43fbf2078ad3310ee1e4734f4f58689c77 SHA1 a3655b5e3a1547877870cee81e4ec055f72777c8 SHA256 d08237249388a9e909be51035aa73f819fbd5d8eeb24f21f00f2a57fbd359c72
AUX calculate-install-2.2.24-r3.patch 6766 RMD160 20514ef40cd0108815d339ae84d00078788255b8 SHA1 d84ccdd9d09cc22f9f6f0d720ddca921425499c0 SHA256 c2ea11ee12c9d9ff6902472a9da473f5e86af45da1c268f6eb25bbb28937e50f
AUX calculate-install-2.2.24-r4.patch 22276 RMD160 e236f13fe07500aa77c29e677c90d8ca6ab86788 SHA1 b7db9fe50fb08aa167835323c89b8b5767fc0fb1 SHA256 40cca842397d9349ced585ab9e0a50f63525df31e1a6239c1cc7820313af85d6
AUX calculate-install-2.2.24-r5.patch 22100 RMD160 e35af7d4259e3fb5b3c7cd6bc3df60ebf1ec0d8c SHA1 0bb7cd930ed5879083116f1023ca8d6974879090 SHA256 00629e097dbe546932074a7ed4be1814290b979d90f6ad3a3da33f4481f1ec94
AUX calculate-install-2.2.24-r6.patch 22335 RMD160 18c948e532f21e7958d83d3f3d12adef201b94b7 SHA1 2e879363d33873e96ab0dfe2f68982f63d54584e SHA256 773a15661df4ccf6d4d7df52eff93b3c0b3979b9d64cbf753eb9f8a4e1f2d951
AUX calculate-install-2.2.24-r7.patch 22916 RMD160 e209936cfdb91b106e695bb625e045e2e1da965d SHA1 5b8d22d03e1472bdefa7b435185107214eea901a SHA256 2a8c2d8f7172fec8a19e0122ef518350d8ee861583ac301cb4ef689be6c029b2
AUX calculate-install-2.2.24-r8.patch 24102 RMD160 773f84eb37e90a4c1c246a2c2b2040ea9d5642dd SHA1 8194e70ac276d06b1883773f8dbb2b082bb79ff4 SHA256 e4ae1f9905ab23aa77aa6995ff1b5f20783df473ea1339ef493917bff1b56e62
DIST calculate-install-2.2.24.tar.bz2 74207 RMD160 0e76e106863c8f7ae8f715ff600cbf34af53d44f SHA1 156b8438d4be79f897dcb83218152b4efcb3bfe1 SHA256 3fd7a542d484e2bd2da7b7f03685a90e5711a14190e5e53818001c54356c61b5
EBUILD calculate-install-2.2.24-r1.ebuild 932 RMD160 3816f9b8ccac79597a2ad67ac08f323aed855af0 SHA1 5119b9b5e09704e3f20ec8e465e3d2bb6cd426af SHA256 8a07bbb2443b7e22f1a67a4b37baaff69803b02422cd047639a4fc8afa2c733d
EBUILD calculate-install-2.2.24-r2.ebuild 955 RMD160 3efe77eec499e2bacc9aab2dd99719d2f119daee SHA1 0ee20eeb4143d1c1ec4eb5a3b5f11aea18821204 SHA256 8c80c00c0daa52cafdd176bbea51a87d7b01c9d23c9b85c750674a8ff916a1fa
EBUILD calculate-install-2.2.24-r3.ebuild 958 RMD160 ffd065d3a68f3a3ba22cec51b1c5eb5fdcede1cf SHA1 7a8efeca41cc00e88ba03facab582d70cab8c05b SHA256 67363517582ea6d4db7740686172bd799dc1ba488ce5889caceb353a12965b0d
EBUILD calculate-install-2.2.24-r4.ebuild 996 RMD160 3f9b55ebe414b7354b771b9d860b2de9805370d9 SHA1 44e9e8f75029c6d6b218582728f6f539b131a18f SHA256 d42e8305e18dc654d893855f50366a0f81ee303a435e85db75f2ccfac0790b29
EBUILD calculate-install-2.2.24-r5.ebuild 972 RMD160 82247641e636cf2fee3a1ff0cb46d1ae4d475efb SHA1 06edb3e59095d0d5e204570bfa5b0916c83719c0 SHA256 904010943b8890618e6a098adaf11f8921604f97492e99dadce4766fa6dadfdd
EBUILD calculate-install-2.2.24-r6.ebuild 997 RMD160 e3f8718d3a1c86c96ca35f42788e46fab041447b SHA1 931ddd9e81c5b433517461413b8c63b57d8e6c5c SHA256 f0172bcc4e9fc400f611f6d04237d07bf42746e42c2a209bf2a85fdbace39761
EBUILD calculate-install-2.2.24-r7.ebuild 997 RMD160 32538176d58e62dddbd54a920f87ec46940dc68c SHA1 30296c5fdaef79e68de8cf8ecb4e49ef2b70955b SHA256 020e938d711a1641a4e1a91f09be37e4cfd35a370540b5038797b4817f02e722
DIST calculate-install-2.2.25.tar.bz2 74546 RMD160 2b2d99d46392d0f1745aeb6ac9cac4bb9f7bb9e2 SHA1 1964438679458921e4f3548b88fa834bc3c4a7df SHA256 3242489b990ec4533c5f03c5c9292a0b65568a495043f5728a770abee8124b0d
EBUILD calculate-install-2.2.24-r8.ebuild 1023 RMD160 06260431895d9b8aafdf41909d19b199d1656127 SHA1 dfa0897704b9815cd078373664a51c587b9fc8d3 SHA256 a74102fcf6bf67cf0a7cbf5a5ab7f6d06b65a5046879b2febaf1ff76453a3928
EBUILD calculate-install-2.2.24.ebuild 805 RMD160 03a686ea79b138f2c91e9b7e0ec2282ad28f5f78 SHA1 7cb0dc07aa7eaec1ba6d8d722c08b0936a4b12a9 SHA256 f425da4dbc0ccac4b126517d4770a273add08f26f147d599b6261662561eb2ab
EBUILD calculate-install-2.2.25.ebuild 804 RMD160 314f552718fc78389ca6b17987c4d74225bee1b5 SHA1 5b255a89f5dd2ee418ea127ec0f1b107f4e71af8 SHA256 b87a5c223250ba51eba0085bcaf79f7aec7d562fa23c411a683ade5d4ffe868d
EBUILD calculate-install-2.2.9999.ebuild 611 RMD160 f90528448a4ab5c0c7ca0bfeb48bf301e303e9e0 SHA1 6273678653d87c58eeb3a0545804d7e8cf56e3bd SHA256 ab95c392853331769aabe6b26089f95238a1dd5a7d027c46483e5855d97d0c20
EBUILD calculate-install-3.0.9999.ebuild 609 RMD160 b1a02262dbab9319b6b916460646b526aa43a9a3 SHA1 0c64a92b658890fe5b4a5ee22f35eb143da377dc SHA256 d4cead60af00c67ddcb1aa01e2095437fb1bfe2ca7f717456048ad3e8f039a23
MISC ChangeLog 31971 RMD160 8a5ce9e2643b14b51396f77d77712290428f5c90 SHA1 42273b258537b0e76d4dd97468644a6fccb1fc1f SHA256 3165bc36835e693516186374b26996c55d7c7fabada1a9fb0a5a631792a25e72
MISC ChangeLog 32744 RMD160 1b63f4b4bf2650cb3587395a1606e6b0755a3dbb SHA1 26504077404e6ae95dc93dd8339c32d7d71de1fd SHA256 71c735972931711adfabb84f083081cfabc42e745c0f4b73a9a29f3fce63bef7
MISC metadata.xml 310 RMD160 769e4f17a9354da6b168b72a5d65d978f65bf6dd SHA1 83aaae376052d69c7327e880cf028ebc0dea608b SHA256 c29d3efc676d8308872920db5223c78469db86ac236b5d45c3ee98ceb8fca846

@ -1,42 +0,0 @@
# Copyright 1999-2011 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/calculate2/${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="0"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="~sys-apps/calculate-templates-2.2.24
~sys-apps/calculate-lib-2.2.24
app-portage/layman
!app-misc/livecd-tools
!minimal? ( sys-boot/grub
sys-apps/gptfdisk
>=sys-apps/util-linux-2.19.1
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# Fix get current version
epatch "${FILESDIR}/calculate-install-2.2.24-r1.patch"
}
pkg_postinst() {
einfo "For configure calculate-install perform:"
einfo " cl-install --install"
}

@ -1,42 +0,0 @@
# Copyright 1999-2011 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/calculate2/${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="0"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="~sys-apps/calculate-templates-2.2.24
~sys-apps/calculate-lib-2.2.24
app-portage/layman
!app-misc/livecd-tools
!minimal? ( sys-boot/grub
sys-apps/gptfdisk
>=sys-apps/util-linux-2.19.1
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# support auto march, fix detect current version
epatch "${FILESDIR}/calculate-install-2.2.24-r2.patch"
}
pkg_postinst() {
einfo "For configure calculate-install perform:"
einfo " cl-install --install"
}

@ -1,42 +0,0 @@
# Copyright 1999-2011 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/calculate2/${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="0"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="~sys-apps/calculate-templates-2.2.24
~sys-apps/calculate-lib-2.2.24
app-portage/layman
!app-misc/livecd-tools
!minimal? ( sys-boot/grub
sys-apps/gptfdisk
>=sys-apps/util-linux-2.19.1
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# support auto march, re-fix detect current version
epatch "${FILESDIR}/calculate-install-2.2.24-r3.patch"
}
pkg_postinst() {
einfo "For configure calculate-install perform:"
einfo " cl-install --install"
}

@ -1,43 +0,0 @@
# Copyright 1999-2011 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/calculate2/${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="0"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="~sys-apps/calculate-templates-2.2.24
~sys-apps/calculate-lib-2.2.24
app-portage/layman
!app-misc/livecd-tools
!minimal? ( sys-boot/grub
sys-apps/gptfdisk
>=sys-apps/util-linux-2.19.1
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# support auto march, re-fix detect current version
# remove cache home dirs, some fixes
epatch "${FILESDIR}/calculate-install-2.2.24-r4.patch"
}
pkg_postinst() {
einfo "For configure calculate-install perform:"
einfo " cl-install --install"
}

@ -1,43 +0,0 @@
# Copyright 1999-2011 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/calculate2/${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="0"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="~sys-apps/calculate-templates-2.2.24
~sys-apps/calculate-lib-2.2.24
app-portage/layman
!app-misc/livecd-tools
!minimal? ( sys-boot/grub
sys-apps/gptfdisk
>=sys-apps/util-linux-2.19.1
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# support auto march, re-fix detect current version
# some fixes
epatch "${FILESDIR}/calculate-install-2.2.24-r5.patch"
}
pkg_postinst() {
einfo "For configure calculate-install perform:"
einfo " cl-install --install"
}

@ -1,43 +0,0 @@
# Copyright 1999-2011 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/calculate2/${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="0"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="~sys-apps/calculate-templates-2.2.24
~sys-apps/calculate-lib-2.2.24
app-portage/layman
!app-misc/livecd-tools
!minimal? ( sys-boot/grub
sys-apps/gptfdisk
>=sys-apps/util-linux-2.19.1
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# support auto march, re-fix detect current version
# some fixes, fix sleep in xautologin
epatch "${FILESDIR}/calculate-install-2.2.24-r6.patch"
}
pkg_postinst() {
einfo "For configure calculate-install perform:"
einfo " cl-install --install"
}

@ -1,43 +0,0 @@
# Copyright 1999-2011 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/calculate2/${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="0"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="~sys-apps/calculate-templates-2.2.24
~sys-apps/calculate-lib-2.2.24
app-portage/layman
!app-misc/livecd-tools
!minimal? ( sys-boot/grub
sys-apps/gptfdisk
>=sys-apps/util-linux-2.19.1
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# support auto march, re-fix detect current version
# some fixes, fix sleep in xautologin
epatch "${FILESDIR}/calculate-install-2.2.24-r7.patch"
}
pkg_postinst() {
einfo "For configure calculate-install perform:"
einfo " cl-install --install"
}

@ -15,8 +15,8 @@ SLOT="0"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="~sys-apps/calculate-templates-2.2.24
~sys-apps/calculate-lib-2.2.24
DEPEND="~sys-apps/calculate-templates-2.2.25
~sys-apps/calculate-lib-2.2.25
app-portage/layman
!app-misc/livecd-tools
!minimal? ( sys-boot/grub
@ -28,7 +28,6 @@ DEPEND="~sys-apps/calculate-templates-2.2.24
RDEPEND="${DEPEND}"
pkg_postinst() {
einfo "For configure calculate-install perform:"
einfo " cl-install --install"

@ -1,80 +0,0 @@
diff --git data/bashlogin data/bashlogin
index ea9493a..4152a1c 100644
--- data/bashlogin
+++ data/bashlogin
@@ -1,7 +1,26 @@
#!/bin/bash
+# Copyright 2011 Calculate Ltd. http://www.calculate-linux.org
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
export HOME=/root
cat /etc/motd 2>/dev/null
-cd /root
-[[ -e .bash_profile ]] && source .bash_profile
-exec -l /bin/bash -i
+cd $HOME
+if [[ -f .bashrc ]]
+then
+ source .bashrc
+elif [[ -f .bash_profile ]]
+then
+ source .bash_profile
+fi
+exec -l -a bash /bin/bash
diff --git data/calculate data/calculate
index f213a07..b320228 100644
--- data/calculate
+++ data/calculate
@@ -1,4 +1,17 @@
#!/sbin/runscript
+# Copyright 2011 Calculate Ltd. http://www.calculate-linux.org
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
depend() {
need localmount root fsck modules
diff --git data/xautologin data/xautologin
index c33a1bf..8604572 100644
--- data/xautologin
+++ data/xautologin
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2010 Calculate Ltd. http://www.calculate-linux.org
+# Copyright 2011 Calculate Ltd. http://www.calculate-linux.org
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git pym/cl_fill_install.py pym/cl_fill_install.py
index f7e861c..ed47357 100644
--- pym/cl_fill_install.py
+++ pym/cl_fill_install.py
@@ -845,6 +845,8 @@ class fillVars(object, glob_attr):
self.Get('os_install_linux_shortname'))
if not imagename and self.Get('cl_action') != 'merge':
return ""
+ if self.Get('cl_action') != "system":
+ return self.Get('os_linux_ver')
d = DistributiveRepository()._getfromcontent(imagename)
if "linuxver" in d and d['linuxver'] != "0":
return d['linuxver']

@ -1,156 +0,0 @@
diff --git data/bashlogin data/bashlogin
index ea9493a..4152a1c 100644
--- data/bashlogin
+++ data/bashlogin
@@ -1,7 +1,26 @@
#!/bin/bash
+# Copyright 2011 Calculate Ltd. http://www.calculate-linux.org
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
export HOME=/root
cat /etc/motd 2>/dev/null
-cd /root
-[[ -e .bash_profile ]] && source .bash_profile
-exec -l /bin/bash -i
+cd $HOME
+if [[ -f .bashrc ]]
+then
+ source .bashrc
+elif [[ -f .bash_profile ]]
+then
+ source .bash_profile
+fi
+exec -l -a bash /bin/bash
diff --git data/calculate data/calculate
index f213a07..b320228 100644
--- data/calculate
+++ data/calculate
@@ -1,4 +1,17 @@
#!/sbin/runscript
+# Copyright 2011 Calculate Ltd. http://www.calculate-linux.org
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
depend() {
need localmount root fsck modules
diff --git data/xautologin data/xautologin
index c33a1bf..8604572 100644
--- data/xautologin
+++ data/xautologin
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2010 Calculate Ltd. http://www.calculate-linux.org
+# Copyright 2011 Calculate Ltd. http://www.calculate-linux.org
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git man/cl-install.1 man/cl-install.1
index 8e64242..f2ddcee 100644
--- man/cl-install.1
+++ man/cl-install.1
@@ -52,7 +52,7 @@ Lets you choose your distribution. Valid values are "CDS", "CLD", "CLDG", "CLD
.PP
\fB\-\-march\fR \fIarchitecture\fR
.RS 4
-Lets you choose your CPU's architecture. Valid values are "i686" and "x86_64". If specified, the required distro will be searched for in '/var/calculate/linux' and '/var/calculate/remote/linux'.
+Lets you choose your CPU's architecture. Valid values are "i686", "x86_64" and "auto". If specified, the required distro will be searched for in '/var/calculate/linux' and '/var/calculate/remote/linux'.
.RE
.PP
\fB\-\-build\fR
diff --git man/ru/cl-install.1 man/ru/cl-install.1
index 94c5cdd..6aeb790 100644
--- man/ru/cl-install.1
+++ man/ru/cl-install.1
@@ -52,7 +52,7 @@ DISK - раздел для установки или директория, в с
.PP
\fB\-\-march\fR \fIархитектура\fR
.RS 4
-Выбор архитектуры процессора, допустимые значения "i686", "x86_64". В случае использования параметра будет выполнен поиск необходимого дистрибутива из исходных директорий.
+Выбор архитектуры процессора, допустимые значения "i686", "x86_64", "auto". В случае использования параметра будет выполнен поиск необходимого дистрибутива из исходных директорий.
.RE
.PP
\fB\-\-build\fR
diff --git pym/cl_fill_install.py pym/cl_fill_install.py
index f7e861c..ed47357 100644
--- pym/cl_fill_install.py
+++ pym/cl_fill_install.py
@@ -845,6 +845,8 @@ class fillVars(object, glob_attr):
self.Get('os_install_linux_shortname'))
if not imagename and self.Get('cl_action') != 'merge':
return ""
+ if self.Get('cl_action') != "system":
+ return self.Get('os_linux_ver')
d = DistributiveRepository()._getfromcontent(imagename)
if "linuxver" in d and d['linuxver'] != "0":
return d['linuxver']
diff --git pym/cl_install.py pym/cl_install.py
index 1d68c9b..a9e0c45 100644
--- pym/cl_install.py
+++ pym/cl_install.py
@@ -27,7 +27,8 @@ from cl_utils import runOsCommand,appendProgramToEnvFile, \
scanDirectory,process,getTupleVersion, \
detectDeviceForPartition,listDirectory, \
cmpVersion,STDOUT,getUdevDeviceInfo, \
- getLvmPartitions,getInstalledVideo
+ getLvmPartitions,getInstalledVideo, \
+ getSupportArch
from cl_vars_share import varsShare
from cl_kernel_utils import KernelConfig,InitRamFs
@@ -2693,3 +2694,9 @@ the system") + " (yes/no)"
else:
self.clVars.Set('os_install_clock_timezone',timezone,force=True)
return True
+
+ def setArchitecture(self,march):
+ """Set architecture by march (support auto keyword)"""
+ if march == "auto":
+ march = getSupportArch()[-1]
+ self.clVars.Set('os_install_arch_machine', march, True)
diff --git pym/cl_install_cmd.py pym/cl_install_cmd.py
index 570ecbe..6f5e7ec 100644
--- pym/cl_install_cmd.py
+++ pym/cl_install_cmd.py
@@ -70,8 +70,9 @@ CMD_OPTIONS = [{'shortOption':"d",
{'longOption':"march",
'optVal':"ARCH",
'type':'choice',
- 'choices':['i686','x86_64'],
- 'help':_("select processor architecture")
+ 'choices':['i686','x86_64','auto'],
+ 'help':_("select processor architecture")+ \
+ " (i686,x86_64 or auto)"
},
{'longOption':"build",
'help':_("installation for assembling")
@@ -446,8 +447,7 @@ class install_cmd(share_cmd):
if self.optobj.values.s:
self.logicObj.setLinuxName(self.optobj.values.s.upper())
if self.optobj.values.march:
- self.logicObj.clVars.Set('os_install_arch_machine',
- self.optobj.values.march,True)
+ self.logicObj.setArchitecture(self.optobj.values.march)
if self.optobj.values.nouuid:
self.logicObj.clVars.Set('cl_uuid_set','off',True)
if self.optobj.values.build:

@ -1,156 +0,0 @@
diff --git data/bashlogin data/bashlogin
index ea9493a..4152a1c 100644
--- data/bashlogin
+++ data/bashlogin
@@ -1,7 +1,26 @@
#!/bin/bash
+# Copyright 2011 Calculate Ltd. http://www.calculate-linux.org
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
export HOME=/root
cat /etc/motd 2>/dev/null
-cd /root
-[[ -e .bash_profile ]] && source .bash_profile
-exec -l /bin/bash -i
+cd $HOME
+if [[ -f .bashrc ]]
+then
+ source .bashrc
+elif [[ -f .bash_profile ]]
+then
+ source .bash_profile
+fi
+exec -l -a bash /bin/bash
diff --git data/calculate data/calculate
index f213a07..b320228 100644
--- data/calculate
+++ data/calculate
@@ -1,4 +1,17 @@
#!/sbin/runscript
+# Copyright 2011 Calculate Ltd. http://www.calculate-linux.org
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
depend() {
need localmount root fsck modules
diff --git data/xautologin data/xautologin
index c33a1bf..8604572 100644
--- data/xautologin
+++ data/xautologin
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2010 Calculate Ltd. http://www.calculate-linux.org
+# Copyright 2011 Calculate Ltd. http://www.calculate-linux.org
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git man/cl-install.1 man/cl-install.1
index 8e64242..f2ddcee 100644
--- man/cl-install.1
+++ man/cl-install.1
@@ -52,7 +52,7 @@ Lets you choose your distribution. Valid values are "CDS", "CLD", "CLDG", "CLD
.PP
\fB\-\-march\fR \fIarchitecture\fR
.RS 4
-Lets you choose your CPU's architecture. Valid values are "i686" and "x86_64". If specified, the required distro will be searched for in '/var/calculate/linux' and '/var/calculate/remote/linux'.
+Lets you choose your CPU's architecture. Valid values are "i686", "x86_64" and "auto". If specified, the required distro will be searched for in '/var/calculate/linux' and '/var/calculate/remote/linux'.
.RE
.PP
\fB\-\-build\fR
diff --git man/ru/cl-install.1 man/ru/cl-install.1
index 94c5cdd..6aeb790 100644
--- man/ru/cl-install.1
+++ man/ru/cl-install.1
@@ -52,7 +52,7 @@ DISK - раздел для установки или директория, в с
.PP
\fB\-\-march\fR \fIархитектура\fR
.RS 4
-Выбор архитектуры процессора, допустимые значения "i686", "x86_64". В случае использования параметра будет выполнен поиск необходимого дистрибутива из исходных директорий.
+Выбор архитектуры процессора, допустимые значения "i686", "x86_64", "auto". В случае использования параметра будет выполнен поиск необходимого дистрибутива из исходных директорий.
.RE
.PP
\fB\-\-build\fR
diff --git pym/cl_fill_install.py pym/cl_fill_install.py
index f7e861c..e877401 100644
--- pym/cl_fill_install.py
+++ pym/cl_fill_install.py
@@ -838,6 +838,8 @@ class fillVars(object, glob_attr):
def get_os_install_linux_ver(self):
"""Linux version of installation os"""
+ if self.Get('cl_action') != "system":
+ return self.Get('os_linux_ver')
imagename = self.getImage(self.Get('os_install_scratch'),
self.Get('os_install_root_type'),
self.Get('cl_image_path'),
diff --git pym/cl_install.py pym/cl_install.py
index 1d68c9b..a9e0c45 100644
--- pym/cl_install.py
+++ pym/cl_install.py
@@ -27,7 +27,8 @@ from cl_utils import runOsCommand,appendProgramToEnvFile, \
scanDirectory,process,getTupleVersion, \
detectDeviceForPartition,listDirectory, \
cmpVersion,STDOUT,getUdevDeviceInfo, \
- getLvmPartitions,getInstalledVideo
+ getLvmPartitions,getInstalledVideo, \
+ getSupportArch
from cl_vars_share import varsShare
from cl_kernel_utils import KernelConfig,InitRamFs
@@ -2693,3 +2694,9 @@ the system") + " (yes/no)"
else:
self.clVars.Set('os_install_clock_timezone',timezone,force=True)
return True
+
+ def setArchitecture(self,march):
+ """Set architecture by march (support auto keyword)"""
+ if march == "auto":
+ march = getSupportArch()[-1]
+ self.clVars.Set('os_install_arch_machine', march, True)
diff --git pym/cl_install_cmd.py pym/cl_install_cmd.py
index 570ecbe..6f5e7ec 100644
--- pym/cl_install_cmd.py
+++ pym/cl_install_cmd.py
@@ -70,8 +70,9 @@ CMD_OPTIONS = [{'shortOption':"d",
{'longOption':"march",
'optVal':"ARCH",
'type':'choice',
- 'choices':['i686','x86_64'],
- 'help':_("select processor architecture")
+ 'choices':['i686','x86_64','auto'],
+ 'help':_("select processor architecture")+ \
+ " (i686,x86_64 or auto)"
},
{'longOption':"build",
'help':_("installation for assembling")
@@ -446,8 +447,7 @@ class install_cmd(share_cmd):
if self.optobj.values.s:
self.logicObj.setLinuxName(self.optobj.values.s.upper())
if self.optobj.values.march:
- self.logicObj.clVars.Set('os_install_arch_machine',
- self.optobj.values.march,True)
+ self.logicObj.setArchitecture(self.optobj.values.march)
if self.optobj.values.nouuid:
self.logicObj.clVars.Set('cl_uuid_set','off',True)
if self.optobj.values.build:

@ -1,360 +0,0 @@
diff --git data/bashlogin data/bashlogin
index ea9493a..4152a1c 100644
--- data/bashlogin
+++ data/bashlogin
@@ -1,7 +1,26 @@
#!/bin/bash
+# Copyright 2011 Calculate Ltd. http://www.calculate-linux.org
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
export HOME=/root
cat /etc/motd 2>/dev/null
-cd /root
-[[ -e .bash_profile ]] && source .bash_profile
-exec -l /bin/bash -i
+cd $HOME
+if [[ -f .bashrc ]]
+then
+ source .bashrc
+elif [[ -f .bash_profile ]]
+then
+ source .bash_profile
+fi
+exec -l -a bash /bin/bash
diff --git data/calculate data/calculate
index f213a07..4f350a8 100644
--- data/calculate
+++ data/calculate
@@ -1,4 +1,17 @@
#!/sbin/runscript
+# Copyright 2011 Calculate Ltd. http://www.calculate-linux.org
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
depend() {
need localmount root fsck modules
@@ -112,7 +125,12 @@ stop() {
if [[ $roottype == "hdd" ]] && rc-config list boot | grep -q calculate
then
rc-update del calculate boot
+ # remove needless files (videodrivers dist archives, user caches)
local distdir="/usr/portage/distfiles"
- [[ -d "${distdir}" ]] && [[ -n "`ls ${distdir}`" ]] && rm ${distdir}/*
+ local cachedir="/var/cache/calculate"
+ for removedir in $distdir $cachedir
+ do
+ [[ -d "${removedir}" ]] && [[ -n "`ls ${removedir}`" ]] && rm ${removedir}/*
+ done
fi
}
diff --git data/handbook-en.html data/handbook-en.html
index 971fb57..baf868f 100644
--- data/handbook-en.html
+++ data/handbook-en.html
@@ -23,10 +23,10 @@ pre {font-size:133% }
<h2 id="Thank-you-for-using-Calculate-Linux">Thank you for using Calculate Linux!<a href="#Thank-you-for-using-Calculate-Linux" class="wiki-anchor">&para;</a></h2>
- <p>We have tried to do for you the most convenient system for work, using the original installer, redesigned user interface, templates, Calculate utilities and Gentoo Portages. The system distributed as installation image, which contains best software. Most of software have an free license, which allows you to install, distribute and modify the source code.</p>
+ <p>We do our best to offer you a most convenient system for work, using the original installer, redesigned user interface, templates, Calculate utilities and Gentoo Portages. The system is distributed as an installation image, which contains chosen software. Most of the software we have included come under the free license, thus allowing you to install, distribute and modify the source code.</p>
- <p>In the description you may see the following abbreviations for distributions:</p>
+ <p>Below is the complete list of our distributions with their abbreviations:</p>
<ul>
@@ -40,16 +40,16 @@ pre {font-size:133% }
</ul>
- <p>To obtain administrator rights in system running from livecd use login root with password <strong>root</strong>. Access to the desktop CLD, CLDG and CLDX obtains by the user guest with password <strong>guest</strong>.</p>
+ <p>To obtain administrator rights in the system running from livecd use login root with password <strong>root</strong>. Access to the desktop CLD, CLDG and CLDX can be obtained by the user guest with password <strong>guest</strong>.</p>
<h2 id="Network-configuration">Network configuration<a href="#Network-configuration" class="wiki-anchor">&para;</a></h2>
- <p>In CLD, CLDG and CLDX Network Setup performs Networkmanager. The program has a graphical interface with which you can customize both wired and wireless networks. When you load the program, it tries to bring up a network interface and obtain an IP address from a DHCP server. Start the program using the icon in the upper right corner of the screen.</p>
+ <p>Network Setup in CLD, CLDG and CLDX is performed with the Networkmanager. The program has a graphical interface with which you can configure both wired and wireless networks. When you load the program, it tries to bring up a network interface and obtain an IP address from a DHCP server. Start the program using the icon in the upper right corner of the screen.</p>
- <p>Network Configuration of CLS, CDS and CSS is performed through a configuration file <em>/etc/conf.d/net</em>, help on setting up a network can be found in the file <em>/usr/share/doc/openrc/net.example</em>. After changing the settings, restart the network interface:</p>
+ <p>Network Configuration of CLS, CDS and CSS is performed through a configuration file <em>/etc/conf.d/net</em>, help on setting up a network can be found in <em>/usr/share/doc/openrc/net.example</em>. After changing the settings, restart the network interface:</p>
<pre>
@@ -59,10 +59,10 @@ pre {font-size:133% }
<h2 id="Partition-management">Partition management<a href="#Partition-management" class="wiki-anchor">&para;</a></h2>
- <p>Before installing, you may need to change the partitions on your hard disk. To set the CLD, CLDG and CLDX we recommend that you use the partition at least 10 GB. More detailed hardware requirements can be found <a href="http://www.calculate-linux.org/main/en/hardware_requirements" class="external">here</a>. The swap partition (swap) usually released in two large size of RAM. If the swap partition already exists, the system will use it. It is useful to have a separate partition for personal files (/home). Our recommendations on partitioning described <a href="http://www.calculate-linux.org/main/en/disk_partitioning" class="external">here</a>.</p>
+ <p>Before installing, you may need to change the partitions on your hard disk. To set the CLD, CLDG and CLDX, we recommend that you use the partition of at least 10 GB. More detailed hardware requirements can be found <a href="http://www.calculate-linux.org/main/en/hardware_requirements" class="external">here</a>. The swap partition (swap) will normally be twice the size of RAM. If the swap partition already exists, the system will use it. It is wise to have a separate partition for personal files (/home). See more detailed recommendations on partitioning <a href="http://www.calculate-linux.org/main/en/disk_partitioning" class="external">here</a>.</p>
- <p>In the CLD to change the disk partition included the program <em>Partitionmanager</em>, for CLDG and CLDX - <em>Gparted</em>. You can also perform disk partitioning in the graphical installer, that uses utilities <em>cfdisk</em>. CLS and CDS contains only the command line utilities: <em>fdisk</em> or <em>cfdisk</em>.</p>
+ <p>The CLD distro uses <em>Partitionmanager</em> to change the disk partitioning, while CLDG and CLDX use <em>Gparted</em>. You can also partition the disk in the graphical installer, using <em>cfdisk</em> utilities. Note that CLS and CDS contain only the command line utilities: <em>fdisk</em> or <em>cfdisk</em>.</p>
<p>To view a list of existing partitions, open a console as user <em>root</em> and type:<br /><pre>
@@ -70,16 +70,16 @@ fdisk -l
</pre></p>
- <p>Note: To obtain <em>root</em> permissions in the console, use su or sudo.</p>
+ <p>Note: To obtain <em>root</em> permissions in console, use su or sudo.</p>
- <p>If you never used Linux, you will need a bit of time trying to get used to the other headings.<br />In Linux, partitions are referred to as <em>sda1, sda2, ...</em> instead of the usual C:\, D:\, ...</p>
+ <p>If you are new to Linux, you will need a bit of time getting used to the headings differences.<br />In Linux, partitions are referred to as <em>sda1, sda2, ...</em> instead of the usual C:\, D:\, ...</p>
- <p>You can also use already prepared partition or create it from <em>Windows</em>. To determine the selected partition in Linux, remember the sequence of its location and size. Usualy, drive, C:\ corresponds sda1, disk D:\ - sda2.</p>
+ <p>You can also use the existing partition or create it from <em>Windows</em>. To determine the selected partition in Linux, remember the sequence of its location and size. Usually, drive C:\ corresponds to sda1, disk D:\, to sda2.</p>
- <h2 id="Installation">Installation<a href="#Installation" class="wiki-anchor">&para;</a></h2>
+ <p><h2 id="Installation">Installation<a href="#Installation" class="wiki-anchor">&para;</a></h2>
<p>Installing Calculate Linux 10.9 or higher performs by program <code>cl-install</code>. CLD, CLDG, CLDX and CLS distros have a graphical front-end <code>cl-install-gui</code>. The program can be run by clicking on the icon "Calculate Linux Install" on the desktop.</p>
@@ -98,21 +98,21 @@ List of most commonly used parameters:
</ul>
- <p>During installation, the program will extract <em>stage4</em> - the image of the system - and performs the initial configuration using templates.</p>
+ <p>During installation, the program will extract <em>stage4</em> - the image of the system - and performs the initial configuration using templates.</p></p>
<h2 id="Installing-on-USB-Flash">Installing on USB-Flash<a href="#Installing-on-USB-Flash" class="wiki-anchor">&para;</a></h2>
- <p><em>Before you begin, make a backup of your data on a flash drive.</em></p>
+ <p><em>Before you begin, we highly recommend that you make a backup of your data on a flash drive.</em></p>
- <p>To install the system on the USB-Flash uses a command line utility <code>cl-install</code>. Plug the flash drive to your computer. To determine the device name of your stick, run following command in console with the rights <em>root</em>:<br /><pre>
+ <p>To install the system on the USB-Flash uses a command line utility <code>cl-install</code>. Plug the flash drive to your computer. If you don't know the device name of your stick, run the following in console with the rights <em>root</em>:<br /><pre>
fdisk -l
</pre></p>
- <p>If your flash drive was defined as device /dev/sdb, to make installation of the system to it, type in console:<br /><pre>
+ <p>If your flash drive was defined as device /dev/sdb, type in console to install the system on it:<br /><pre>
cl-install -d /dev/sdb1
</pre></p>
@@ -120,24 +120,24 @@ cl-install -d /dev/sdb1
<h2 id="The-first-launch">The first launch<a href="#The-first-launch" class="wiki-anchor">&para;</a></h2>
- <p>After installing the CLD, CLDX and CLSG in the system are two users: <em>root</em> and <em>guest</em> (if you do not specify other users). Access to the graphical session can get the user <em>guest</em>. Use the username <em>guest</em> with password <strong>guest</strong> to login.</p>
+ <p>After installing the CLD, CLDX and CLSG you get two users: <em>root</em> and <em>guest</em> (if you have not specified other user accounts). The user <em>guest</em> can get access to the graphical environment: use the username <em>guest</em> with password <strong>guest</strong> to login.</p>
- <p>In CLS by default have no graphical invitation to enter the password. After installation you can login as root and launch window manager with command:<br /><pre>
+ <p>CLS has by default no graphical invitation to enter the password. After installation you can login as root and launch window manager typing:<br /><pre>
startx
</pre></p>
- <p>For <em>root</em> user, use the command "su". Create users described in detail <a href="http://www.calculate-linux.org/main/en/create_system_users" class="external">here</a>.</p>
+ <p>To become the <em>root</em> user, use the command "su". More details on creating user accounts can be found <a href="http://www.calculate-linux.org/main/en/create_system_users" class="external">here</a>.</p>
- <p>By default, you can log into the system remotely using ssh only by root. You can add a space to other users or to replace the root user edit the options AllowUsers file <em>/etc/ssh/sshd_config</em>. We recommend to remove the right to remotely access the system for the user <em>root</em>.</p>
+ <p>By default, you can log into the system remotely using ssh only by root. To add a space for other users or to replace the root user edit the options AllowUsers in <em>/etc/ssh/sshd_config</em>. We recommend to deny the remote access for the <em>root</em> user.</p>
<h2 id="Update">Update<a href="#Update" class="wiki-anchor">&para;</a></h2>
- <p>Calculate Linux uses a rolling-release model updates. You can update the system virtually unlimited number of times, using manager software installation "emerge". To update the packages in the distribution, execute:<br /><pre>
+ <p>Calculate Linux is a rolling-release distribution. You can update the system virtually unlimited number of times, using the "emerge" software manager. To update all of the installed packages, execute:<br /><pre>
layman -s calculate
eix-update
emerge -uD world
@@ -149,13 +149,13 @@ eix-sync
</pre></p>
- <p>After that, you can upgrade existing or install new versions of programs, using the program "emerge". Quick reference shows the <a href="http://www.calculate-linux.org/main/en/add_and_remove_programs" class="external">here</a>. Read also the <a href="http://www.calculate-linux.org/main/en/system_update_guide" class="external">System Update Guide</a>.</p>
+ <p>After that, you can upgrade existing or install new versions of programs with "emerge". A quick reference can be found <a href="http://www.calculate-linux.org/main/en/add_and_remove_programs" class="external">here</a>. Read also the <a href="http://www.calculate-linux.org/main/en/system_update_guide" class="external">System Update Guide</a>.</p>
<h2 id="Help">Help<a href="#Help" class="wiki-anchor">&para;</a></h2>
- <p>If your installation has any difficulties, or you want to share your impressions, visit the IRC channel <em>#calculate</em> (server FreeNode) user community Calculate Linux. It's enough to use Xchat icon on your desktop.</p>
+ <p>If you have any difficulties installing Calculate Linux, or if you want to share your impressions, visit the IRC channel <em>#calculate</em> (server FreeNode) of our user community. You just have to click on the Xchat icon on your desktop.</p>
<p>Website: <a class="external" href="http://www.calculate-linux.org">http://www.calculate-linux.org</a><br />Newsletter: <a class="external" href="http://www.calculate-linux.org/main/en/maillist">http://www.calculate-linux.org/main/en/maillist</a><br />IRC chat: <a class="external" href="http://www.calculate-linux.org/irc">http://www.calculate-linux.org/irc</a></p>
diff --git data/xautologin data/xautologin
index c33a1bf..8604572 100644
--- data/xautologin
+++ data/xautologin
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2010 Calculate Ltd. http://www.calculate-linux.org
+# Copyright 2011 Calculate Ltd. http://www.calculate-linux.org
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git man/cl-install.1 man/cl-install.1
index 8e64242..f2ddcee 100644
--- man/cl-install.1
+++ man/cl-install.1
@@ -52,7 +52,7 @@ Lets you choose your distribution. Valid values are "CDS", "CLD", "CLDG", "CLD
.PP
\fB\-\-march\fR \fIarchitecture\fR
.RS 4
-Lets you choose your CPU's architecture. Valid values are "i686" and "x86_64". If specified, the required distro will be searched for in '/var/calculate/linux' and '/var/calculate/remote/linux'.
+Lets you choose your CPU's architecture. Valid values are "i686", "x86_64" and "auto". If specified, the required distro will be searched for in '/var/calculate/linux' and '/var/calculate/remote/linux'.
.RE
.PP
\fB\-\-build\fR
diff --git man/ru/cl-install.1 man/ru/cl-install.1
index 94c5cdd..6aeb790 100644
--- man/ru/cl-install.1
+++ man/ru/cl-install.1
@@ -52,7 +52,7 @@ DISK - раздел для установки или директория, в с
.PP
\fB\-\-march\fR \fIархитектура\fR
.RS 4
-Выбор архитектуры процессора, допустимые значения "i686", "x86_64". В случае использования параметра будет выполнен поиск необходимого дистрибутива из исходных директорий.
+Выбор архитектуры процессора, допустимые значения "i686", "x86_64", "auto". В случае использования параметра будет выполнен поиск необходимого дистрибутива из исходных директорий.
.RE
.PP
\fB\-\-build\fR
diff --git pym/cl_fill_install.py pym/cl_fill_install.py
index f7e861c..27b0881 100644
--- pym/cl_fill_install.py
+++ pym/cl_fill_install.py
@@ -29,7 +29,7 @@ from cl_utils import isMount,typeFile,getTupleVersion,pathJoin,isFstabMount,\
FStab, lspci, getInstalledVideo,getDeviceType, \
getPartitionType, getOsProberHash, getProgPath, \
getRaidPartitions, getLvmPartitions, getLvmGroups, \
- refreshLVM, refreshUdev, getPasswdUsers
+ getPasswdUsers
from cl_distr import DistributiveRepository,PartitionDistributive
from cl_fill import clLocale
from operator import itemgetter
@@ -325,11 +325,6 @@ class fillVars(object, glob_attr):
else:
return devpath
- # refresh information about LVM
- refreshLVM()
- # refresh information about device in udevadm info
- refreshUdev()
-
devicesHash = self.Get('os_device_hash')
sysBlockPath = '/sys/block'
# get disks from sys block which not contains partitions
@@ -838,6 +833,8 @@ class fillVars(object, glob_attr):
def get_os_install_linux_ver(self):
"""Linux version of installation os"""
+ if self.Get('cl_action') != "system":
+ return self.Get('os_linux_ver')
imagename = self.getImage(self.Get('os_install_scratch'),
self.Get('os_install_root_type'),
self.Get('cl_image_path'),
diff --git pym/cl_install.py pym/cl_install.py
index 1d68c9b..c723dc5 100644
--- pym/cl_install.py
+++ pym/cl_install.py
@@ -27,7 +27,8 @@ from cl_utils import runOsCommand,appendProgramToEnvFile, \
scanDirectory,process,getTupleVersion, \
detectDeviceForPartition,listDirectory, \
cmpVersion,STDOUT,getUdevDeviceInfo, \
- getLvmPartitions,getInstalledVideo
+ getLvmPartitions,getInstalledVideo, \
+ getSupportArch, refreshLVM, refreshUdev
from cl_vars_share import varsShare
from cl_kernel_utils import KernelConfig,InitRamFs
@@ -800,6 +801,11 @@ class cl_install(color_print, SignalInterrupt):
Spinner().setWriteFunc(self.defaultPrint)
cl_overriding.exit = installExit
cl_overriding.printERROR = overprintERROR
+ # refresh information about LVM
+ refreshLVM()
+ # refresh information about device in udevadm info
+ refreshUdev()
+
def setNoColor(self):
self.color = False
@@ -2403,10 +2409,12 @@ class cl_install(color_print, SignalInterrupt):
def checkCorrectBootRecordDisk(self):
"""Check boot record disk"""
mbr = self.clVars.Get('os_install_mbr')
+ if mbr == "off" or mbr == "":
+ return True
tableOnBootDisk = self.varSelect('os_device_table',
where="os_device_dev",eq=mbr)
if not tableOnBootDisk:
- self.printERROR(_("Disk '%s' without partition table cann't "
+ self.printERROR(_("Disk '%s' without partition table can't "
"contains boot record")%mbr)
return False
return True
@@ -2693,3 +2701,9 @@ the system") + " (yes/no)"
else:
self.clVars.Set('os_install_clock_timezone',timezone,force=True)
return True
+
+ def setArchitecture(self,march):
+ """Set architecture by march (support auto keyword)"""
+ if march == "auto":
+ march = getSupportArch()[-1]
+ self.clVars.Set('os_install_arch_machine', march, True)
diff --git pym/cl_install_cmd.py pym/cl_install_cmd.py
index 570ecbe..6f5e7ec 100644
--- pym/cl_install_cmd.py
+++ pym/cl_install_cmd.py
@@ -70,8 +70,9 @@ CMD_OPTIONS = [{'shortOption':"d",
{'longOption':"march",
'optVal':"ARCH",
'type':'choice',
- 'choices':['i686','x86_64'],
- 'help':_("select processor architecture")
+ 'choices':['i686','x86_64','auto'],
+ 'help':_("select processor architecture")+ \
+ " (i686,x86_64 or auto)"
},
{'longOption':"build",
'help':_("installation for assembling")
@@ -446,8 +447,7 @@ class install_cmd(share_cmd):
if self.optobj.values.s:
self.logicObj.setLinuxName(self.optobj.values.s.upper())
if self.optobj.values.march:
- self.logicObj.clVars.Set('os_install_arch_machine',
- self.optobj.values.march,True)
+ self.logicObj.setArchitecture(self.optobj.values.march)
if self.optobj.values.nouuid:
self.logicObj.clVars.Set('cl_uuid_set','off',True)
if self.optobj.values.build:

@ -1,359 +0,0 @@
diff --git data/bashlogin data/bashlogin
index ea9493a..4152a1c 100644
--- data/bashlogin
+++ data/bashlogin
@@ -1,7 +1,26 @@
#!/bin/bash
+# Copyright 2011 Calculate Ltd. http://www.calculate-linux.org
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
export HOME=/root
cat /etc/motd 2>/dev/null
-cd /root
-[[ -e .bash_profile ]] && source .bash_profile
-exec -l /bin/bash -i
+cd $HOME
+if [[ -f .bashrc ]]
+then
+ source .bashrc
+elif [[ -f .bash_profile ]]
+then
+ source .bash_profile
+fi
+exec -l -a bash /bin/bash
diff --git data/calculate data/calculate
index f213a07..7339b32 100644
--- data/calculate
+++ data/calculate
@@ -1,4 +1,17 @@
#!/sbin/runscript
+# Copyright 2011 Calculate Ltd. http://www.calculate-linux.org
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
depend() {
need localmount root fsck modules
@@ -88,7 +101,11 @@ configure_users() {
then
for user in $(variable_value cl_migrate_user | sed -r "s/[][,']//g")
do
- cl-desktop $user
+ HOME_DIR=`getent passwd $user | awk -F: '{ print( $6 ); }'`
+ if [[ $user == "root" ]] || [[ -f $HOME_DIR/.calculate/ini.env ]]
+ then
+ cl-desktop $user
+ fi
done
fi
}
diff --git data/handbook-en.html data/handbook-en.html
index 971fb57..baf868f 100644
--- data/handbook-en.html
+++ data/handbook-en.html
@@ -23,10 +23,10 @@ pre {font-size:133% }
<h2 id="Thank-you-for-using-Calculate-Linux">Thank you for using Calculate Linux!<a href="#Thank-you-for-using-Calculate-Linux" class="wiki-anchor">&para;</a></h2>
- <p>We have tried to do for you the most convenient system for work, using the original installer, redesigned user interface, templates, Calculate utilities and Gentoo Portages. The system distributed as installation image, which contains best software. Most of software have an free license, which allows you to install, distribute and modify the source code.</p>
+ <p>We do our best to offer you a most convenient system for work, using the original installer, redesigned user interface, templates, Calculate utilities and Gentoo Portages. The system is distributed as an installation image, which contains chosen software. Most of the software we have included come under the free license, thus allowing you to install, distribute and modify the source code.</p>
- <p>In the description you may see the following abbreviations for distributions:</p>
+ <p>Below is the complete list of our distributions with their abbreviations:</p>
<ul>
@@ -40,16 +40,16 @@ pre {font-size:133% }
</ul>
- <p>To obtain administrator rights in system running from livecd use login root with password <strong>root</strong>. Access to the desktop CLD, CLDG and CLDX obtains by the user guest with password <strong>guest</strong>.</p>
+ <p>To obtain administrator rights in the system running from livecd use login root with password <strong>root</strong>. Access to the desktop CLD, CLDG and CLDX can be obtained by the user guest with password <strong>guest</strong>.</p>
<h2 id="Network-configuration">Network configuration<a href="#Network-configuration" class="wiki-anchor">&para;</a></h2>
- <p>In CLD, CLDG and CLDX Network Setup performs Networkmanager. The program has a graphical interface with which you can customize both wired and wireless networks. When you load the program, it tries to bring up a network interface and obtain an IP address from a DHCP server. Start the program using the icon in the upper right corner of the screen.</p>
+ <p>Network Setup in CLD, CLDG and CLDX is performed with the Networkmanager. The program has a graphical interface with which you can configure both wired and wireless networks. When you load the program, it tries to bring up a network interface and obtain an IP address from a DHCP server. Start the program using the icon in the upper right corner of the screen.</p>
- <p>Network Configuration of CLS, CDS and CSS is performed through a configuration file <em>/etc/conf.d/net</em>, help on setting up a network can be found in the file <em>/usr/share/doc/openrc/net.example</em>. After changing the settings, restart the network interface:</p>
+ <p>Network Configuration of CLS, CDS and CSS is performed through a configuration file <em>/etc/conf.d/net</em>, help on setting up a network can be found in <em>/usr/share/doc/openrc/net.example</em>. After changing the settings, restart the network interface:</p>
<pre>
@@ -59,10 +59,10 @@ pre {font-size:133% }
<h2 id="Partition-management">Partition management<a href="#Partition-management" class="wiki-anchor">&para;</a></h2>
- <p>Before installing, you may need to change the partitions on your hard disk. To set the CLD, CLDG and CLDX we recommend that you use the partition at least 10 GB. More detailed hardware requirements can be found <a href="http://www.calculate-linux.org/main/en/hardware_requirements" class="external">here</a>. The swap partition (swap) usually released in two large size of RAM. If the swap partition already exists, the system will use it. It is useful to have a separate partition for personal files (/home). Our recommendations on partitioning described <a href="http://www.calculate-linux.org/main/en/disk_partitioning" class="external">here</a>.</p>
+ <p>Before installing, you may need to change the partitions on your hard disk. To set the CLD, CLDG and CLDX, we recommend that you use the partition of at least 10 GB. More detailed hardware requirements can be found <a href="http://www.calculate-linux.org/main/en/hardware_requirements" class="external">here</a>. The swap partition (swap) will normally be twice the size of RAM. If the swap partition already exists, the system will use it. It is wise to have a separate partition for personal files (/home). See more detailed recommendations on partitioning <a href="http://www.calculate-linux.org/main/en/disk_partitioning" class="external">here</a>.</p>
- <p>In the CLD to change the disk partition included the program <em>Partitionmanager</em>, for CLDG and CLDX - <em>Gparted</em>. You can also perform disk partitioning in the graphical installer, that uses utilities <em>cfdisk</em>. CLS and CDS contains only the command line utilities: <em>fdisk</em> or <em>cfdisk</em>.</p>
+ <p>The CLD distro uses <em>Partitionmanager</em> to change the disk partitioning, while CLDG and CLDX use <em>Gparted</em>. You can also partition the disk in the graphical installer, using <em>cfdisk</em> utilities. Note that CLS and CDS contain only the command line utilities: <em>fdisk</em> or <em>cfdisk</em>.</p>
<p>To view a list of existing partitions, open a console as user <em>root</em> and type:<br /><pre>
@@ -70,16 +70,16 @@ fdisk -l
</pre></p>
- <p>Note: To obtain <em>root</em> permissions in the console, use su or sudo.</p>
+ <p>Note: To obtain <em>root</em> permissions in console, use su or sudo.</p>
- <p>If you never used Linux, you will need a bit of time trying to get used to the other headings.<br />In Linux, partitions are referred to as <em>sda1, sda2, ...</em> instead of the usual C:\, D:\, ...</p>
+ <p>If you are new to Linux, you will need a bit of time getting used to the headings differences.<br />In Linux, partitions are referred to as <em>sda1, sda2, ...</em> instead of the usual C:\, D:\, ...</p>
- <p>You can also use already prepared partition or create it from <em>Windows</em>. To determine the selected partition in Linux, remember the sequence of its location and size. Usualy, drive, C:\ corresponds sda1, disk D:\ - sda2.</p>
+ <p>You can also use the existing partition or create it from <em>Windows</em>. To determine the selected partition in Linux, remember the sequence of its location and size. Usually, drive C:\ corresponds to sda1, disk D:\, to sda2.</p>
- <h2 id="Installation">Installation<a href="#Installation" class="wiki-anchor">&para;</a></h2>
+ <p><h2 id="Installation">Installation<a href="#Installation" class="wiki-anchor">&para;</a></h2>
<p>Installing Calculate Linux 10.9 or higher performs by program <code>cl-install</code>. CLD, CLDG, CLDX and CLS distros have a graphical front-end <code>cl-install-gui</code>. The program can be run by clicking on the icon "Calculate Linux Install" on the desktop.</p>
@@ -98,21 +98,21 @@ List of most commonly used parameters:
</ul>
- <p>During installation, the program will extract <em>stage4</em> - the image of the system - and performs the initial configuration using templates.</p>
+ <p>During installation, the program will extract <em>stage4</em> - the image of the system - and performs the initial configuration using templates.</p></p>
<h2 id="Installing-on-USB-Flash">Installing on USB-Flash<a href="#Installing-on-USB-Flash" class="wiki-anchor">&para;</a></h2>
- <p><em>Before you begin, make a backup of your data on a flash drive.</em></p>
+ <p><em>Before you begin, we highly recommend that you make a backup of your data on a flash drive.</em></p>
- <p>To install the system on the USB-Flash uses a command line utility <code>cl-install</code>. Plug the flash drive to your computer. To determine the device name of your stick, run following command in console with the rights <em>root</em>:<br /><pre>
+ <p>To install the system on the USB-Flash uses a command line utility <code>cl-install</code>. Plug the flash drive to your computer. If you don't know the device name of your stick, run the following in console with the rights <em>root</em>:<br /><pre>
fdisk -l
</pre></p>
- <p>If your flash drive was defined as device /dev/sdb, to make installation of the system to it, type in console:<br /><pre>
+ <p>If your flash drive was defined as device /dev/sdb, type in console to install the system on it:<br /><pre>
cl-install -d /dev/sdb1
</pre></p>
@@ -120,24 +120,24 @@ cl-install -d /dev/sdb1
<h2 id="The-first-launch">The first launch<a href="#The-first-launch" class="wiki-anchor">&para;</a></h2>
- <p>After installing the CLD, CLDX and CLSG in the system are two users: <em>root</em> and <em>guest</em> (if you do not specify other users). Access to the graphical session can get the user <em>guest</em>. Use the username <em>guest</em> with password <strong>guest</strong> to login.</p>
+ <p>After installing the CLD, CLDX and CLSG you get two users: <em>root</em> and <em>guest</em> (if you have not specified other user accounts). The user <em>guest</em> can get access to the graphical environment: use the username <em>guest</em> with password <strong>guest</strong> to login.</p>
- <p>In CLS by default have no graphical invitation to enter the password. After installation you can login as root and launch window manager with command:<br /><pre>
+ <p>CLS has by default no graphical invitation to enter the password. After installation you can login as root and launch window manager typing:<br /><pre>
startx
</pre></p>
- <p>For <em>root</em> user, use the command "su". Create users described in detail <a href="http://www.calculate-linux.org/main/en/create_system_users" class="external">here</a>.</p>
+ <p>To become the <em>root</em> user, use the command "su". More details on creating user accounts can be found <a href="http://www.calculate-linux.org/main/en/create_system_users" class="external">here</a>.</p>
- <p>By default, you can log into the system remotely using ssh only by root. You can add a space to other users or to replace the root user edit the options AllowUsers file <em>/etc/ssh/sshd_config</em>. We recommend to remove the right to remotely access the system for the user <em>root</em>.</p>
+ <p>By default, you can log into the system remotely using ssh only by root. To add a space for other users or to replace the root user edit the options AllowUsers in <em>/etc/ssh/sshd_config</em>. We recommend to deny the remote access for the <em>root</em> user.</p>
<h2 id="Update">Update<a href="#Update" class="wiki-anchor">&para;</a></h2>
- <p>Calculate Linux uses a rolling-release model updates. You can update the system virtually unlimited number of times, using manager software installation "emerge". To update the packages in the distribution, execute:<br /><pre>
+ <p>Calculate Linux is a rolling-release distribution. You can update the system virtually unlimited number of times, using the "emerge" software manager. To update all of the installed packages, execute:<br /><pre>
layman -s calculate
eix-update
emerge -uD world
@@ -149,13 +149,13 @@ eix-sync
</pre></p>
- <p>After that, you can upgrade existing or install new versions of programs, using the program "emerge". Quick reference shows the <a href="http://www.calculate-linux.org/main/en/add_and_remove_programs" class="external">here</a>. Read also the <a href="http://www.calculate-linux.org/main/en/system_update_guide" class="external">System Update Guide</a>.</p>
+ <p>After that, you can upgrade existing or install new versions of programs with "emerge". A quick reference can be found <a href="http://www.calculate-linux.org/main/en/add_and_remove_programs" class="external">here</a>. Read also the <a href="http://www.calculate-linux.org/main/en/system_update_guide" class="external">System Update Guide</a>.</p>
<h2 id="Help">Help<a href="#Help" class="wiki-anchor">&para;</a></h2>
- <p>If your installation has any difficulties, or you want to share your impressions, visit the IRC channel <em>#calculate</em> (server FreeNode) user community Calculate Linux. It's enough to use Xchat icon on your desktop.</p>
+ <p>If you have any difficulties installing Calculate Linux, or if you want to share your impressions, visit the IRC channel <em>#calculate</em> (server FreeNode) of our user community. You just have to click on the Xchat icon on your desktop.</p>
<p>Website: <a class="external" href="http://www.calculate-linux.org">http://www.calculate-linux.org</a><br />Newsletter: <a class="external" href="http://www.calculate-linux.org/main/en/maillist">http://www.calculate-linux.org/main/en/maillist</a><br />IRC chat: <a class="external" href="http://www.calculate-linux.org/irc">http://www.calculate-linux.org/irc</a></p>
diff --git data/xautologin data/xautologin
index c33a1bf..8604572 100644
--- data/xautologin
+++ data/xautologin
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2010 Calculate Ltd. http://www.calculate-linux.org
+# Copyright 2011 Calculate Ltd. http://www.calculate-linux.org
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git man/cl-install.1 man/cl-install.1
index 8e64242..f2ddcee 100644
--- man/cl-install.1
+++ man/cl-install.1
@@ -52,7 +52,7 @@ Lets you choose your distribution. Valid values are "CDS", "CLD", "CLDG", "CLD
.PP
\fB\-\-march\fR \fIarchitecture\fR
.RS 4
-Lets you choose your CPU's architecture. Valid values are "i686" and "x86_64". If specified, the required distro will be searched for in '/var/calculate/linux' and '/var/calculate/remote/linux'.
+Lets you choose your CPU's architecture. Valid values are "i686", "x86_64" and "auto". If specified, the required distro will be searched for in '/var/calculate/linux' and '/var/calculate/remote/linux'.
.RE
.PP
\fB\-\-build\fR
diff --git man/ru/cl-install.1 man/ru/cl-install.1
index 94c5cdd..6aeb790 100644
--- man/ru/cl-install.1
+++ man/ru/cl-install.1
@@ -52,7 +52,7 @@ DISK - раздел для установки или директория, в с
.PP
\fB\-\-march\fR \fIархитектура\fR
.RS 4
-Выбор архитектуры процессора, допустимые значения "i686", "x86_64". В случае использования параметра будет выполнен поиск необходимого дистрибутива из исходных директорий.
+Выбор архитектуры процессора, допустимые значения "i686", "x86_64", "auto". В случае использования параметра будет выполнен поиск необходимого дистрибутива из исходных директорий.
.RE
.PP
\fB\-\-build\fR
diff --git pym/cl_fill_install.py pym/cl_fill_install.py
index f7e861c..27b0881 100644
--- pym/cl_fill_install.py
+++ pym/cl_fill_install.py
@@ -29,7 +29,7 @@ from cl_utils import isMount,typeFile,getTupleVersion,pathJoin,isFstabMount,\
FStab, lspci, getInstalledVideo,getDeviceType, \
getPartitionType, getOsProberHash, getProgPath, \
getRaidPartitions, getLvmPartitions, getLvmGroups, \
- refreshLVM, refreshUdev, getPasswdUsers
+ getPasswdUsers
from cl_distr import DistributiveRepository,PartitionDistributive
from cl_fill import clLocale
from operator import itemgetter
@@ -325,11 +325,6 @@ class fillVars(object, glob_attr):
else:
return devpath
- # refresh information about LVM
- refreshLVM()
- # refresh information about device in udevadm info
- refreshUdev()
-
devicesHash = self.Get('os_device_hash')
sysBlockPath = '/sys/block'
# get disks from sys block which not contains partitions
@@ -838,6 +833,8 @@ class fillVars(object, glob_attr):
def get_os_install_linux_ver(self):
"""Linux version of installation os"""
+ if self.Get('cl_action') != "system":
+ return self.Get('os_linux_ver')
imagename = self.getImage(self.Get('os_install_scratch'),
self.Get('os_install_root_type'),
self.Get('cl_image_path'),
diff --git pym/cl_install.py pym/cl_install.py
index 1d68c9b..c723dc5 100644
--- pym/cl_install.py
+++ pym/cl_install.py
@@ -27,7 +27,8 @@ from cl_utils import runOsCommand,appendProgramToEnvFile, \
scanDirectory,process,getTupleVersion, \
detectDeviceForPartition,listDirectory, \
cmpVersion,STDOUT,getUdevDeviceInfo, \
- getLvmPartitions,getInstalledVideo
+ getLvmPartitions,getInstalledVideo, \
+ getSupportArch, refreshLVM, refreshUdev
from cl_vars_share import varsShare
from cl_kernel_utils import KernelConfig,InitRamFs
@@ -800,6 +801,11 @@ class cl_install(color_print, SignalInterrupt):
Spinner().setWriteFunc(self.defaultPrint)
cl_overriding.exit = installExit
cl_overriding.printERROR = overprintERROR
+ # refresh information about LVM
+ refreshLVM()
+ # refresh information about device in udevadm info
+ refreshUdev()
+
def setNoColor(self):
self.color = False
@@ -2403,10 +2409,12 @@ class cl_install(color_print, SignalInterrupt):
def checkCorrectBootRecordDisk(self):
"""Check boot record disk"""
mbr = self.clVars.Get('os_install_mbr')
+ if mbr == "off" or mbr == "":
+ return True
tableOnBootDisk = self.varSelect('os_device_table',
where="os_device_dev",eq=mbr)
if not tableOnBootDisk:
- self.printERROR(_("Disk '%s' without partition table cann't "
+ self.printERROR(_("Disk '%s' without partition table can't "
"contains boot record")%mbr)
return False
return True
@@ -2693,3 +2701,9 @@ the system") + " (yes/no)"
else:
self.clVars.Set('os_install_clock_timezone',timezone,force=True)
return True
+
+ def setArchitecture(self,march):
+ """Set architecture by march (support auto keyword)"""
+ if march == "auto":
+ march = getSupportArch()[-1]
+ self.clVars.Set('os_install_arch_machine', march, True)
diff --git pym/cl_install_cmd.py pym/cl_install_cmd.py
index 570ecbe..6f5e7ec 100644
--- pym/cl_install_cmd.py
+++ pym/cl_install_cmd.py
@@ -70,8 +70,9 @@ CMD_OPTIONS = [{'shortOption':"d",
{'longOption':"march",
'optVal':"ARCH",
'type':'choice',
- 'choices':['i686','x86_64'],
- 'help':_("select processor architecture")
+ 'choices':['i686','x86_64','auto'],
+ 'help':_("select processor architecture")+ \
+ " (i686,x86_64 or auto)"
},
{'longOption':"build",
'help':_("installation for assembling")
@@ -446,8 +447,7 @@ class install_cmd(share_cmd):
if self.optobj.values.s:
self.logicObj.setLinuxName(self.optobj.values.s.upper())
if self.optobj.values.march:
- self.logicObj.clVars.Set('os_install_arch_machine',
- self.optobj.values.march,True)
+ self.logicObj.setArchitecture(self.optobj.values.march)
if self.optobj.values.nouuid:
self.logicObj.clVars.Set('cl_uuid_set','off',True)
if self.optobj.values.build:

@ -1,367 +0,0 @@
diff --git data/bashlogin data/bashlogin
index ea9493a..4152a1c 100644
--- data/bashlogin
+++ data/bashlogin
@@ -1,7 +1,26 @@
#!/bin/bash
+# Copyright 2011 Calculate Ltd. http://www.calculate-linux.org
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
export HOME=/root
cat /etc/motd 2>/dev/null
-cd /root
-[[ -e .bash_profile ]] && source .bash_profile
-exec -l /bin/bash -i
+cd $HOME
+if [[ -f .bashrc ]]
+then
+ source .bashrc
+elif [[ -f .bash_profile ]]
+then
+ source .bash_profile
+fi
+exec -l -a bash /bin/bash
diff --git data/calculate data/calculate
index f213a07..7339b32 100644
--- data/calculate
+++ data/calculate
@@ -1,4 +1,17 @@
#!/sbin/runscript
+# Copyright 2011 Calculate Ltd. http://www.calculate-linux.org
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
depend() {
need localmount root fsck modules
@@ -88,7 +101,11 @@ configure_users() {
then
for user in $(variable_value cl_migrate_user | sed -r "s/[][,']//g")
do
- cl-desktop $user
+ HOME_DIR=`getent passwd $user | awk -F: '{ print( $6 ); }'`
+ if [[ $user == "root" ]] || [[ -f $HOME_DIR/.calculate/ini.env ]]
+ then
+ cl-desktop $user
+ fi
done
fi
}
diff --git data/handbook-en.html data/handbook-en.html
index 971fb57..baf868f 100644
--- data/handbook-en.html
+++ data/handbook-en.html
@@ -23,10 +23,10 @@ pre {font-size:133% }
<h2 id="Thank-you-for-using-Calculate-Linux">Thank you for using Calculate Linux!<a href="#Thank-you-for-using-Calculate-Linux" class="wiki-anchor">&para;</a></h2>
- <p>We have tried to do for you the most convenient system for work, using the original installer, redesigned user interface, templates, Calculate utilities and Gentoo Portages. The system distributed as installation image, which contains best software. Most of software have an free license, which allows you to install, distribute and modify the source code.</p>
+ <p>We do our best to offer you a most convenient system for work, using the original installer, redesigned user interface, templates, Calculate utilities and Gentoo Portages. The system is distributed as an installation image, which contains chosen software. Most of the software we have included come under the free license, thus allowing you to install, distribute and modify the source code.</p>
- <p>In the description you may see the following abbreviations for distributions:</p>
+ <p>Below is the complete list of our distributions with their abbreviations:</p>
<ul>
@@ -40,16 +40,16 @@ pre {font-size:133% }
</ul>
- <p>To obtain administrator rights in system running from livecd use login root with password <strong>root</strong>. Access to the desktop CLD, CLDG and CLDX obtains by the user guest with password <strong>guest</strong>.</p>
+ <p>To obtain administrator rights in the system running from livecd use login root with password <strong>root</strong>. Access to the desktop CLD, CLDG and CLDX can be obtained by the user guest with password <strong>guest</strong>.</p>
<h2 id="Network-configuration">Network configuration<a href="#Network-configuration" class="wiki-anchor">&para;</a></h2>
- <p>In CLD, CLDG and CLDX Network Setup performs Networkmanager. The program has a graphical interface with which you can customize both wired and wireless networks. When you load the program, it tries to bring up a network interface and obtain an IP address from a DHCP server. Start the program using the icon in the upper right corner of the screen.</p>
+ <p>Network Setup in CLD, CLDG and CLDX is performed with the Networkmanager. The program has a graphical interface with which you can configure both wired and wireless networks. When you load the program, it tries to bring up a network interface and obtain an IP address from a DHCP server. Start the program using the icon in the upper right corner of the screen.</p>
- <p>Network Configuration of CLS, CDS and CSS is performed through a configuration file <em>/etc/conf.d/net</em>, help on setting up a network can be found in the file <em>/usr/share/doc/openrc/net.example</em>. After changing the settings, restart the network interface:</p>
+ <p>Network Configuration of CLS, CDS and CSS is performed through a configuration file <em>/etc/conf.d/net</em>, help on setting up a network can be found in <em>/usr/share/doc/openrc/net.example</em>. After changing the settings, restart the network interface:</p>
<pre>
@@ -59,10 +59,10 @@ pre {font-size:133% }
<h2 id="Partition-management">Partition management<a href="#Partition-management" class="wiki-anchor">&para;</a></h2>
- <p>Before installing, you may need to change the partitions on your hard disk. To set the CLD, CLDG and CLDX we recommend that you use the partition at least 10 GB. More detailed hardware requirements can be found <a href="http://www.calculate-linux.org/main/en/hardware_requirements" class="external">here</a>. The swap partition (swap) usually released in two large size of RAM. If the swap partition already exists, the system will use it. It is useful to have a separate partition for personal files (/home). Our recommendations on partitioning described <a href="http://www.calculate-linux.org/main/en/disk_partitioning" class="external">here</a>.</p>
+ <p>Before installing, you may need to change the partitions on your hard disk. To set the CLD, CLDG and CLDX, we recommend that you use the partition of at least 10 GB. More detailed hardware requirements can be found <a href="http://www.calculate-linux.org/main/en/hardware_requirements" class="external">here</a>. The swap partition (swap) will normally be twice the size of RAM. If the swap partition already exists, the system will use it. It is wise to have a separate partition for personal files (/home). See more detailed recommendations on partitioning <a href="http://www.calculate-linux.org/main/en/disk_partitioning" class="external">here</a>.</p>
- <p>In the CLD to change the disk partition included the program <em>Partitionmanager</em>, for CLDG and CLDX - <em>Gparted</em>. You can also perform disk partitioning in the graphical installer, that uses utilities <em>cfdisk</em>. CLS and CDS contains only the command line utilities: <em>fdisk</em> or <em>cfdisk</em>.</p>
+ <p>The CLD distro uses <em>Partitionmanager</em> to change the disk partitioning, while CLDG and CLDX use <em>Gparted</em>. You can also partition the disk in the graphical installer, using <em>cfdisk</em> utilities. Note that CLS and CDS contain only the command line utilities: <em>fdisk</em> or <em>cfdisk</em>.</p>
<p>To view a list of existing partitions, open a console as user <em>root</em> and type:<br /><pre>
@@ -70,16 +70,16 @@ fdisk -l
</pre></p>
- <p>Note: To obtain <em>root</em> permissions in the console, use su or sudo.</p>
+ <p>Note: To obtain <em>root</em> permissions in console, use su or sudo.</p>
- <p>If you never used Linux, you will need a bit of time trying to get used to the other headings.<br />In Linux, partitions are referred to as <em>sda1, sda2, ...</em> instead of the usual C:\, D:\, ...</p>
+ <p>If you are new to Linux, you will need a bit of time getting used to the headings differences.<br />In Linux, partitions are referred to as <em>sda1, sda2, ...</em> instead of the usual C:\, D:\, ...</p>
- <p>You can also use already prepared partition or create it from <em>Windows</em>. To determine the selected partition in Linux, remember the sequence of its location and size. Usualy, drive, C:\ corresponds sda1, disk D:\ - sda2.</p>
+ <p>You can also use the existing partition or create it from <em>Windows</em>. To determine the selected partition in Linux, remember the sequence of its location and size. Usually, drive C:\ corresponds to sda1, disk D:\, to sda2.</p>
- <h2 id="Installation">Installation<a href="#Installation" class="wiki-anchor">&para;</a></h2>
+ <p><h2 id="Installation">Installation<a href="#Installation" class="wiki-anchor">&para;</a></h2>
<p>Installing Calculate Linux 10.9 or higher performs by program <code>cl-install</code>. CLD, CLDG, CLDX and CLS distros have a graphical front-end <code>cl-install-gui</code>. The program can be run by clicking on the icon "Calculate Linux Install" on the desktop.</p>
@@ -98,21 +98,21 @@ List of most commonly used parameters:
</ul>
- <p>During installation, the program will extract <em>stage4</em> - the image of the system - and performs the initial configuration using templates.</p>
+ <p>During installation, the program will extract <em>stage4</em> - the image of the system - and performs the initial configuration using templates.</p></p>
<h2 id="Installing-on-USB-Flash">Installing on USB-Flash<a href="#Installing-on-USB-Flash" class="wiki-anchor">&para;</a></h2>
- <p><em>Before you begin, make a backup of your data on a flash drive.</em></p>
+ <p><em>Before you begin, we highly recommend that you make a backup of your data on a flash drive.</em></p>
- <p>To install the system on the USB-Flash uses a command line utility <code>cl-install</code>. Plug the flash drive to your computer. To determine the device name of your stick, run following command in console with the rights <em>root</em>:<br /><pre>
+ <p>To install the system on the USB-Flash uses a command line utility <code>cl-install</code>. Plug the flash drive to your computer. If you don't know the device name of your stick, run the following in console with the rights <em>root</em>:<br /><pre>
fdisk -l
</pre></p>
- <p>If your flash drive was defined as device /dev/sdb, to make installation of the system to it, type in console:<br /><pre>
+ <p>If your flash drive was defined as device /dev/sdb, type in console to install the system on it:<br /><pre>
cl-install -d /dev/sdb1
</pre></p>
@@ -120,24 +120,24 @@ cl-install -d /dev/sdb1
<h2 id="The-first-launch">The first launch<a href="#The-first-launch" class="wiki-anchor">&para;</a></h2>
- <p>After installing the CLD, CLDX and CLSG in the system are two users: <em>root</em> and <em>guest</em> (if you do not specify other users). Access to the graphical session can get the user <em>guest</em>. Use the username <em>guest</em> with password <strong>guest</strong> to login.</p>
+ <p>After installing the CLD, CLDX and CLSG you get two users: <em>root</em> and <em>guest</em> (if you have not specified other user accounts). The user <em>guest</em> can get access to the graphical environment: use the username <em>guest</em> with password <strong>guest</strong> to login.</p>
- <p>In CLS by default have no graphical invitation to enter the password. After installation you can login as root and launch window manager with command:<br /><pre>
+ <p>CLS has by default no graphical invitation to enter the password. After installation you can login as root and launch window manager typing:<br /><pre>
startx
</pre></p>
- <p>For <em>root</em> user, use the command "su". Create users described in detail <a href="http://www.calculate-linux.org/main/en/create_system_users" class="external">here</a>.</p>
+ <p>To become the <em>root</em> user, use the command "su". More details on creating user accounts can be found <a href="http://www.calculate-linux.org/main/en/create_system_users" class="external">here</a>.</p>
- <p>By default, you can log into the system remotely using ssh only by root. You can add a space to other users or to replace the root user edit the options AllowUsers file <em>/etc/ssh/sshd_config</em>. We recommend to remove the right to remotely access the system for the user <em>root</em>.</p>
+ <p>By default, you can log into the system remotely using ssh only by root. To add a space for other users or to replace the root user edit the options AllowUsers in <em>/etc/ssh/sshd_config</em>. We recommend to deny the remote access for the <em>root</em> user.</p>
<h2 id="Update">Update<a href="#Update" class="wiki-anchor">&para;</a></h2>
- <p>Calculate Linux uses a rolling-release model updates. You can update the system virtually unlimited number of times, using manager software installation "emerge". To update the packages in the distribution, execute:<br /><pre>
+ <p>Calculate Linux is a rolling-release distribution. You can update the system virtually unlimited number of times, using the "emerge" software manager. To update all of the installed packages, execute:<br /><pre>
layman -s calculate
eix-update
emerge -uD world
@@ -149,13 +149,13 @@ eix-sync
</pre></p>
- <p>After that, you can upgrade existing or install new versions of programs, using the program "emerge". Quick reference shows the <a href="http://www.calculate-linux.org/main/en/add_and_remove_programs" class="external">here</a>. Read also the <a href="http://www.calculate-linux.org/main/en/system_update_guide" class="external">System Update Guide</a>.</p>
+ <p>After that, you can upgrade existing or install new versions of programs with "emerge". A quick reference can be found <a href="http://www.calculate-linux.org/main/en/add_and_remove_programs" class="external">here</a>. Read also the <a href="http://www.calculate-linux.org/main/en/system_update_guide" class="external">System Update Guide</a>.</p>
<h2 id="Help">Help<a href="#Help" class="wiki-anchor">&para;</a></h2>
- <p>If your installation has any difficulties, or you want to share your impressions, visit the IRC channel <em>#calculate</em> (server FreeNode) user community Calculate Linux. It's enough to use Xchat icon on your desktop.</p>
+ <p>If you have any difficulties installing Calculate Linux, or if you want to share your impressions, visit the IRC channel <em>#calculate</em> (server FreeNode) of our user community. You just have to click on the Xchat icon on your desktop.</p>
<p>Website: <a class="external" href="http://www.calculate-linux.org">http://www.calculate-linux.org</a><br />Newsletter: <a class="external" href="http://www.calculate-linux.org/main/en/maillist">http://www.calculate-linux.org/main/en/maillist</a><br />IRC chat: <a class="external" href="http://www.calculate-linux.org/irc">http://www.calculate-linux.org/irc</a></p>
diff --git data/xautologin data/xautologin
index c33a1bf..d854e2f 100644
--- data/xautologin
+++ data/xautologin
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2010 Calculate Ltd. http://www.calculate-linux.org
+# Copyright 2011 Calculate Ltd. http://www.calculate-linux.org
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -100,6 +100,7 @@ EOF
sessreg -d -l ${DISPLAYNUM} ${XUSER}
# perform logout scripts for user
env USER=${XUSER} /usr/share/calculate/xdm/xdm --logout
+ sleep 7
[[ -n $XPID ]] && kill $XPID
wait $XPID
done
diff --git man/cl-install.1 man/cl-install.1
index 8e64242..f2ddcee 100644
--- man/cl-install.1
+++ man/cl-install.1
@@ -52,7 +52,7 @@ Lets you choose your distribution. Valid values are "CDS", "CLD", "CLDG", "CLD
.PP
\fB\-\-march\fR \fIarchitecture\fR
.RS 4
-Lets you choose your CPU's architecture. Valid values are "i686" and "x86_64". If specified, the required distro will be searched for in '/var/calculate/linux' and '/var/calculate/remote/linux'.
+Lets you choose your CPU's architecture. Valid values are "i686", "x86_64" and "auto". If specified, the required distro will be searched for in '/var/calculate/linux' and '/var/calculate/remote/linux'.
.RE
.PP
\fB\-\-build\fR
diff --git man/ru/cl-install.1 man/ru/cl-install.1
index 94c5cdd..6aeb790 100644
--- man/ru/cl-install.1
+++ man/ru/cl-install.1
@@ -52,7 +52,7 @@ DISK - раздел для установки или директория, в с
.PP
\fB\-\-march\fR \fIархитектура\fR
.RS 4
-Выбор архитектуры процессора, допустимые значения "i686", "x86_64". В случае использования параметра будет выполнен поиск необходимого дистрибутива из исходных директорий.
+Выбор архитектуры процессора, допустимые значения "i686", "x86_64", "auto". В случае использования параметра будет выполнен поиск необходимого дистрибутива из исходных директорий.
.RE
.PP
\fB\-\-build\fR
diff --git pym/cl_fill_install.py pym/cl_fill_install.py
index f7e861c..27b0881 100644
--- pym/cl_fill_install.py
+++ pym/cl_fill_install.py
@@ -29,7 +29,7 @@ from cl_utils import isMount,typeFile,getTupleVersion,pathJoin,isFstabMount,\
FStab, lspci, getInstalledVideo,getDeviceType, \
getPartitionType, getOsProberHash, getProgPath, \
getRaidPartitions, getLvmPartitions, getLvmGroups, \
- refreshLVM, refreshUdev, getPasswdUsers
+ getPasswdUsers
from cl_distr import DistributiveRepository,PartitionDistributive
from cl_fill import clLocale
from operator import itemgetter
@@ -325,11 +325,6 @@ class fillVars(object, glob_attr):
else:
return devpath
- # refresh information about LVM
- refreshLVM()
- # refresh information about device in udevadm info
- refreshUdev()
-
devicesHash = self.Get('os_device_hash')
sysBlockPath = '/sys/block'
# get disks from sys block which not contains partitions
@@ -838,6 +833,8 @@ class fillVars(object, glob_attr):
def get_os_install_linux_ver(self):
"""Linux version of installation os"""
+ if self.Get('cl_action') != "system":
+ return self.Get('os_linux_ver')
imagename = self.getImage(self.Get('os_install_scratch'),
self.Get('os_install_root_type'),
self.Get('cl_image_path'),
diff --git pym/cl_install.py pym/cl_install.py
index 1d68c9b..c723dc5 100644
--- pym/cl_install.py
+++ pym/cl_install.py
@@ -27,7 +27,8 @@ from cl_utils import runOsCommand,appendProgramToEnvFile, \
scanDirectory,process,getTupleVersion, \
detectDeviceForPartition,listDirectory, \
cmpVersion,STDOUT,getUdevDeviceInfo, \
- getLvmPartitions,getInstalledVideo
+ getLvmPartitions,getInstalledVideo, \
+ getSupportArch, refreshLVM, refreshUdev
from cl_vars_share import varsShare
from cl_kernel_utils import KernelConfig,InitRamFs
@@ -800,6 +801,11 @@ class cl_install(color_print, SignalInterrupt):
Spinner().setWriteFunc(self.defaultPrint)
cl_overriding.exit = installExit
cl_overriding.printERROR = overprintERROR
+ # refresh information about LVM
+ refreshLVM()
+ # refresh information about device in udevadm info
+ refreshUdev()
+
def setNoColor(self):
self.color = False
@@ -2403,10 +2409,12 @@ class cl_install(color_print, SignalInterrupt):
def checkCorrectBootRecordDisk(self):
"""Check boot record disk"""
mbr = self.clVars.Get('os_install_mbr')
+ if mbr == "off" or mbr == "":
+ return True
tableOnBootDisk = self.varSelect('os_device_table',
where="os_device_dev",eq=mbr)
if not tableOnBootDisk:
- self.printERROR(_("Disk '%s' without partition table cann't "
+ self.printERROR(_("Disk '%s' without partition table can't "
"contains boot record")%mbr)
return False
return True
@@ -2693,3 +2701,9 @@ the system") + " (yes/no)"
else:
self.clVars.Set('os_install_clock_timezone',timezone,force=True)
return True
+
+ def setArchitecture(self,march):
+ """Set architecture by march (support auto keyword)"""
+ if march == "auto":
+ march = getSupportArch()[-1]
+ self.clVars.Set('os_install_arch_machine', march, True)
diff --git pym/cl_install_cmd.py pym/cl_install_cmd.py
index 570ecbe..6f5e7ec 100644
--- pym/cl_install_cmd.py
+++ pym/cl_install_cmd.py
@@ -70,8 +70,9 @@ CMD_OPTIONS = [{'shortOption':"d",
{'longOption':"march",
'optVal':"ARCH",
'type':'choice',
- 'choices':['i686','x86_64'],
- 'help':_("select processor architecture")
+ 'choices':['i686','x86_64','auto'],
+ 'help':_("select processor architecture")+ \
+ " (i686,x86_64 or auto)"
},
{'longOption':"build",
'help':_("installation for assembling")
@@ -446,8 +447,7 @@ class install_cmd(share_cmd):
if self.optobj.values.s:
self.logicObj.setLinuxName(self.optobj.values.s.upper())
if self.optobj.values.march:
- self.logicObj.clVars.Set('os_install_arch_machine',
- self.optobj.values.march,True)
+ self.logicObj.setArchitecture(self.optobj.values.march)
if self.optobj.values.nouuid:
self.logicObj.clVars.Set('cl_uuid_set','off',True)
if self.optobj.values.build:

@ -1,386 +0,0 @@
diff --git data/bashlogin data/bashlogin
index ea9493a..4152a1c 100644
--- data/bashlogin
+++ data/bashlogin
@@ -1,7 +1,26 @@
#!/bin/bash
+# Copyright 2011 Calculate Ltd. http://www.calculate-linux.org
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
export HOME=/root
cat /etc/motd 2>/dev/null
-cd /root
-[[ -e .bash_profile ]] && source .bash_profile
-exec -l /bin/bash -i
+cd $HOME
+if [[ -f .bashrc ]]
+then
+ source .bashrc
+elif [[ -f .bash_profile ]]
+then
+ source .bash_profile
+fi
+exec -l -a bash /bin/bash
diff --git data/calculate data/calculate
index f213a07..7339b32 100644
--- data/calculate
+++ data/calculate
@@ -1,4 +1,17 @@
#!/sbin/runscript
+# Copyright 2011 Calculate Ltd. http://www.calculate-linux.org
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
depend() {
need localmount root fsck modules
@@ -88,7 +101,11 @@ configure_users() {
then
for user in $(variable_value cl_migrate_user | sed -r "s/[][,']//g")
do
- cl-desktop $user
+ HOME_DIR=`getent passwd $user | awk -F: '{ print( $6 ); }'`
+ if [[ $user == "root" ]] || [[ -f $HOME_DIR/.calculate/ini.env ]]
+ then
+ cl-desktop $user
+ fi
done
fi
}
diff --git data/handbook-en.html data/handbook-en.html
index 971fb57..baf868f 100644
--- data/handbook-en.html
+++ data/handbook-en.html
@@ -23,10 +23,10 @@ pre {font-size:133% }
<h2 id="Thank-you-for-using-Calculate-Linux">Thank you for using Calculate Linux!<a href="#Thank-you-for-using-Calculate-Linux" class="wiki-anchor">&para;</a></h2>
- <p>We have tried to do for you the most convenient system for work, using the original installer, redesigned user interface, templates, Calculate utilities and Gentoo Portages. The system distributed as installation image, which contains best software. Most of software have an free license, which allows you to install, distribute and modify the source code.</p>
+ <p>We do our best to offer you a most convenient system for work, using the original installer, redesigned user interface, templates, Calculate utilities and Gentoo Portages. The system is distributed as an installation image, which contains chosen software. Most of the software we have included come under the free license, thus allowing you to install, distribute and modify the source code.</p>
- <p>In the description you may see the following abbreviations for distributions:</p>
+ <p>Below is the complete list of our distributions with their abbreviations:</p>
<ul>
@@ -40,16 +40,16 @@ pre {font-size:133% }
</ul>
- <p>To obtain administrator rights in system running from livecd use login root with password <strong>root</strong>. Access to the desktop CLD, CLDG and CLDX obtains by the user guest with password <strong>guest</strong>.</p>
+ <p>To obtain administrator rights in the system running from livecd use login root with password <strong>root</strong>. Access to the desktop CLD, CLDG and CLDX can be obtained by the user guest with password <strong>guest</strong>.</p>
<h2 id="Network-configuration">Network configuration<a href="#Network-configuration" class="wiki-anchor">&para;</a></h2>
- <p>In CLD, CLDG and CLDX Network Setup performs Networkmanager. The program has a graphical interface with which you can customize both wired and wireless networks. When you load the program, it tries to bring up a network interface and obtain an IP address from a DHCP server. Start the program using the icon in the upper right corner of the screen.</p>
+ <p>Network Setup in CLD, CLDG and CLDX is performed with the Networkmanager. The program has a graphical interface with which you can configure both wired and wireless networks. When you load the program, it tries to bring up a network interface and obtain an IP address from a DHCP server. Start the program using the icon in the upper right corner of the screen.</p>
- <p>Network Configuration of CLS, CDS and CSS is performed through a configuration file <em>/etc/conf.d/net</em>, help on setting up a network can be found in the file <em>/usr/share/doc/openrc/net.example</em>. After changing the settings, restart the network interface:</p>
+ <p>Network Configuration of CLS, CDS and CSS is performed through a configuration file <em>/etc/conf.d/net</em>, help on setting up a network can be found in <em>/usr/share/doc/openrc/net.example</em>. After changing the settings, restart the network interface:</p>
<pre>
@@ -59,10 +59,10 @@ pre {font-size:133% }
<h2 id="Partition-management">Partition management<a href="#Partition-management" class="wiki-anchor">&para;</a></h2>
- <p>Before installing, you may need to change the partitions on your hard disk. To set the CLD, CLDG and CLDX we recommend that you use the partition at least 10 GB. More detailed hardware requirements can be found <a href="http://www.calculate-linux.org/main/en/hardware_requirements" class="external">here</a>. The swap partition (swap) usually released in two large size of RAM. If the swap partition already exists, the system will use it. It is useful to have a separate partition for personal files (/home). Our recommendations on partitioning described <a href="http://www.calculate-linux.org/main/en/disk_partitioning" class="external">here</a>.</p>
+ <p>Before installing, you may need to change the partitions on your hard disk. To set the CLD, CLDG and CLDX, we recommend that you use the partition of at least 10 GB. More detailed hardware requirements can be found <a href="http://www.calculate-linux.org/main/en/hardware_requirements" class="external">here</a>. The swap partition (swap) will normally be twice the size of RAM. If the swap partition already exists, the system will use it. It is wise to have a separate partition for personal files (/home). See more detailed recommendations on partitioning <a href="http://www.calculate-linux.org/main/en/disk_partitioning" class="external">here</a>.</p>
- <p>In the CLD to change the disk partition included the program <em>Partitionmanager</em>, for CLDG and CLDX - <em>Gparted</em>. You can also perform disk partitioning in the graphical installer, that uses utilities <em>cfdisk</em>. CLS and CDS contains only the command line utilities: <em>fdisk</em> or <em>cfdisk</em>.</p>
+ <p>The CLD distro uses <em>Partitionmanager</em> to change the disk partitioning, while CLDG and CLDX use <em>Gparted</em>. You can also partition the disk in the graphical installer, using <em>cfdisk</em> utilities. Note that CLS and CDS contain only the command line utilities: <em>fdisk</em> or <em>cfdisk</em>.</p>
<p>To view a list of existing partitions, open a console as user <em>root</em> and type:<br /><pre>
@@ -70,16 +70,16 @@ fdisk -l
</pre></p>
- <p>Note: To obtain <em>root</em> permissions in the console, use su or sudo.</p>
+ <p>Note: To obtain <em>root</em> permissions in console, use su or sudo.</p>
- <p>If you never used Linux, you will need a bit of time trying to get used to the other headings.<br />In Linux, partitions are referred to as <em>sda1, sda2, ...</em> instead of the usual C:\, D:\, ...</p>
+ <p>If you are new to Linux, you will need a bit of time getting used to the headings differences.<br />In Linux, partitions are referred to as <em>sda1, sda2, ...</em> instead of the usual C:\, D:\, ...</p>
- <p>You can also use already prepared partition or create it from <em>Windows</em>. To determine the selected partition in Linux, remember the sequence of its location and size. Usualy, drive, C:\ corresponds sda1, disk D:\ - sda2.</p>
+ <p>You can also use the existing partition or create it from <em>Windows</em>. To determine the selected partition in Linux, remember the sequence of its location and size. Usually, drive C:\ corresponds to sda1, disk D:\, to sda2.</p>
- <h2 id="Installation">Installation<a href="#Installation" class="wiki-anchor">&para;</a></h2>
+ <p><h2 id="Installation">Installation<a href="#Installation" class="wiki-anchor">&para;</a></h2>
<p>Installing Calculate Linux 10.9 or higher performs by program <code>cl-install</code>. CLD, CLDG, CLDX and CLS distros have a graphical front-end <code>cl-install-gui</code>. The program can be run by clicking on the icon "Calculate Linux Install" on the desktop.</p>
@@ -98,21 +98,21 @@ List of most commonly used parameters:
</ul>
- <p>During installation, the program will extract <em>stage4</em> - the image of the system - and performs the initial configuration using templates.</p>
+ <p>During installation, the program will extract <em>stage4</em> - the image of the system - and performs the initial configuration using templates.</p></p>
<h2 id="Installing-on-USB-Flash">Installing on USB-Flash<a href="#Installing-on-USB-Flash" class="wiki-anchor">&para;</a></h2>
- <p><em>Before you begin, make a backup of your data on a flash drive.</em></p>
+ <p><em>Before you begin, we highly recommend that you make a backup of your data on a flash drive.</em></p>
- <p>To install the system on the USB-Flash uses a command line utility <code>cl-install</code>. Plug the flash drive to your computer. To determine the device name of your stick, run following command in console with the rights <em>root</em>:<br /><pre>
+ <p>To install the system on the USB-Flash uses a command line utility <code>cl-install</code>. Plug the flash drive to your computer. If you don't know the device name of your stick, run the following in console with the rights <em>root</em>:<br /><pre>
fdisk -l
</pre></p>
- <p>If your flash drive was defined as device /dev/sdb, to make installation of the system to it, type in console:<br /><pre>
+ <p>If your flash drive was defined as device /dev/sdb, type in console to install the system on it:<br /><pre>
cl-install -d /dev/sdb1
</pre></p>
@@ -120,24 +120,24 @@ cl-install -d /dev/sdb1
<h2 id="The-first-launch">The first launch<a href="#The-first-launch" class="wiki-anchor">&para;</a></h2>
- <p>After installing the CLD, CLDX and CLSG in the system are two users: <em>root</em> and <em>guest</em> (if you do not specify other users). Access to the graphical session can get the user <em>guest</em>. Use the username <em>guest</em> with password <strong>guest</strong> to login.</p>
+ <p>After installing the CLD, CLDX and CLSG you get two users: <em>root</em> and <em>guest</em> (if you have not specified other user accounts). The user <em>guest</em> can get access to the graphical environment: use the username <em>guest</em> with password <strong>guest</strong> to login.</p>
- <p>In CLS by default have no graphical invitation to enter the password. After installation you can login as root and launch window manager with command:<br /><pre>
+ <p>CLS has by default no graphical invitation to enter the password. After installation you can login as root and launch window manager typing:<br /><pre>
startx
</pre></p>
- <p>For <em>root</em> user, use the command "su". Create users described in detail <a href="http://www.calculate-linux.org/main/en/create_system_users" class="external">here</a>.</p>
+ <p>To become the <em>root</em> user, use the command "su". More details on creating user accounts can be found <a href="http://www.calculate-linux.org/main/en/create_system_users" class="external">here</a>.</p>
- <p>By default, you can log into the system remotely using ssh only by root. You can add a space to other users or to replace the root user edit the options AllowUsers file <em>/etc/ssh/sshd_config</em>. We recommend to remove the right to remotely access the system for the user <em>root</em>.</p>
+ <p>By default, you can log into the system remotely using ssh only by root. To add a space for other users or to replace the root user edit the options AllowUsers in <em>/etc/ssh/sshd_config</em>. We recommend to deny the remote access for the <em>root</em> user.</p>
<h2 id="Update">Update<a href="#Update" class="wiki-anchor">&para;</a></h2>
- <p>Calculate Linux uses a rolling-release model updates. You can update the system virtually unlimited number of times, using manager software installation "emerge". To update the packages in the distribution, execute:<br /><pre>
+ <p>Calculate Linux is a rolling-release distribution. You can update the system virtually unlimited number of times, using the "emerge" software manager. To update all of the installed packages, execute:<br /><pre>
layman -s calculate
eix-update
emerge -uD world
@@ -149,13 +149,13 @@ eix-sync
</pre></p>
- <p>After that, you can upgrade existing or install new versions of programs, using the program "emerge". Quick reference shows the <a href="http://www.calculate-linux.org/main/en/add_and_remove_programs" class="external">here</a>. Read also the <a href="http://www.calculate-linux.org/main/en/system_update_guide" class="external">System Update Guide</a>.</p>
+ <p>After that, you can upgrade existing or install new versions of programs with "emerge". A quick reference can be found <a href="http://www.calculate-linux.org/main/en/add_and_remove_programs" class="external">here</a>. Read also the <a href="http://www.calculate-linux.org/main/en/system_update_guide" class="external">System Update Guide</a>.</p>
<h2 id="Help">Help<a href="#Help" class="wiki-anchor">&para;</a></h2>
- <p>If your installation has any difficulties, or you want to share your impressions, visit the IRC channel <em>#calculate</em> (server FreeNode) user community Calculate Linux. It's enough to use Xchat icon on your desktop.</p>
+ <p>If you have any difficulties installing Calculate Linux, or if you want to share your impressions, visit the IRC channel <em>#calculate</em> (server FreeNode) of our user community. You just have to click on the Xchat icon on your desktop.</p>
<p>Website: <a class="external" href="http://www.calculate-linux.org">http://www.calculate-linux.org</a><br />Newsletter: <a class="external" href="http://www.calculate-linux.org/main/en/maillist">http://www.calculate-linux.org/main/en/maillist</a><br />IRC chat: <a class="external" href="http://www.calculate-linux.org/irc">http://www.calculate-linux.org/irc</a></p>
diff --git data/xautologin data/xautologin
index c33a1bf..5fb23bd 100644
--- data/xautologin
+++ data/xautologin
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2010 Calculate Ltd. http://www.calculate-linux.org
+# Copyright 2011 Calculate Ltd. http://www.calculate-linux.org
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -38,6 +38,7 @@ killXserver()
[[ -d /proc/$KILLXPID ]] || break
sleep 1
done
+ WAITRELOGIN=
# kill X by -KILL
[[ -d /proc/$KILLXPID ]] && kill -KILL $KILLXPID &>/dev/null
}
@@ -50,6 +51,7 @@ HOMEDIR=`getent passwd $XUSER | awk -F: '{ print( $6 ); }'`
export DISPLAY=${DISPLAYNUM}
export XAUTHORITY=$HOMEDIR/.Xauthority
+WAITRELOGIN=7
while id $XUSER &>/dev/null &&
[[ -n $MAINLOOP ]] &&
[[ "$(rc-status -r)" != "shutdown" ]]
@@ -99,6 +101,10 @@ EOF
# remove user from utmp and wtmp
sessreg -d -l ${DISPLAYNUM} ${XUSER}
# perform logout scripts for user
+ if [[ -n $WAITRELOGIN ]]
+ then
+ sleep $WAITRELOGIN
+ fi
env USER=${XUSER} /usr/share/calculate/xdm/xdm --logout
[[ -n $XPID ]] && kill $XPID
wait $XPID
diff --git man/cl-install.1 man/cl-install.1
index 8e64242..f2ddcee 100644
--- man/cl-install.1
+++ man/cl-install.1
@@ -52,7 +52,7 @@ Lets you choose your distribution. Valid values are "CDS", "CLD", "CLDG", "CLD
.PP
\fB\-\-march\fR \fIarchitecture\fR
.RS 4
-Lets you choose your CPU's architecture. Valid values are "i686" and "x86_64". If specified, the required distro will be searched for in '/var/calculate/linux' and '/var/calculate/remote/linux'.
+Lets you choose your CPU's architecture. Valid values are "i686", "x86_64" and "auto". If specified, the required distro will be searched for in '/var/calculate/linux' and '/var/calculate/remote/linux'.
.RE
.PP
\fB\-\-build\fR
diff --git man/ru/cl-install.1 man/ru/cl-install.1
index 94c5cdd..6aeb790 100644
--- man/ru/cl-install.1
+++ man/ru/cl-install.1
@@ -52,7 +52,7 @@ DISK - раздел для установки или директория, в с
.PP
\fB\-\-march\fR \fIархитектура\fR
.RS 4
-Выбор архитектуры процессора, допустимые значения "i686", "x86_64". В случае использования параметра будет выполнен поиск необходимого дистрибутива из исходных директорий.
+Выбор архитектуры процессора, допустимые значения "i686", "x86_64", "auto". В случае использования параметра будет выполнен поиск необходимого дистрибутива из исходных директорий.
.RE
.PP
\fB\-\-build\fR
diff --git pym/cl_fill_install.py pym/cl_fill_install.py
index f7e861c..27b0881 100644
--- pym/cl_fill_install.py
+++ pym/cl_fill_install.py
@@ -29,7 +29,7 @@ from cl_utils import isMount,typeFile,getTupleVersion,pathJoin,isFstabMount,\
FStab, lspci, getInstalledVideo,getDeviceType, \
getPartitionType, getOsProberHash, getProgPath, \
getRaidPartitions, getLvmPartitions, getLvmGroups, \
- refreshLVM, refreshUdev, getPasswdUsers
+ getPasswdUsers
from cl_distr import DistributiveRepository,PartitionDistributive
from cl_fill import clLocale
from operator import itemgetter
@@ -325,11 +325,6 @@ class fillVars(object, glob_attr):
else:
return devpath
- # refresh information about LVM
- refreshLVM()
- # refresh information about device in udevadm info
- refreshUdev()
-
devicesHash = self.Get('os_device_hash')
sysBlockPath = '/sys/block'
# get disks from sys block which not contains partitions
@@ -838,6 +833,8 @@ class fillVars(object, glob_attr):
def get_os_install_linux_ver(self):
"""Linux version of installation os"""
+ if self.Get('cl_action') != "system":
+ return self.Get('os_linux_ver')
imagename = self.getImage(self.Get('os_install_scratch'),
self.Get('os_install_root_type'),
self.Get('cl_image_path'),
diff --git pym/cl_install.py pym/cl_install.py
index 1d68c9b..c723dc5 100644
--- pym/cl_install.py
+++ pym/cl_install.py
@@ -27,7 +27,8 @@ from cl_utils import runOsCommand,appendProgramToEnvFile, \
scanDirectory,process,getTupleVersion, \
detectDeviceForPartition,listDirectory, \
cmpVersion,STDOUT,getUdevDeviceInfo, \
- getLvmPartitions,getInstalledVideo
+ getLvmPartitions,getInstalledVideo, \
+ getSupportArch, refreshLVM, refreshUdev
from cl_vars_share import varsShare
from cl_kernel_utils import KernelConfig,InitRamFs
@@ -800,6 +801,11 @@ class cl_install(color_print, SignalInterrupt):
Spinner().setWriteFunc(self.defaultPrint)
cl_overriding.exit = installExit
cl_overriding.printERROR = overprintERROR
+ # refresh information about LVM
+ refreshLVM()
+ # refresh information about device in udevadm info
+ refreshUdev()
+
def setNoColor(self):
self.color = False
@@ -2403,10 +2409,12 @@ class cl_install(color_print, SignalInterrupt):
def checkCorrectBootRecordDisk(self):
"""Check boot record disk"""
mbr = self.clVars.Get('os_install_mbr')
+ if mbr == "off" or mbr == "":
+ return True
tableOnBootDisk = self.varSelect('os_device_table',
where="os_device_dev",eq=mbr)
if not tableOnBootDisk:
- self.printERROR(_("Disk '%s' without partition table cann't "
+ self.printERROR(_("Disk '%s' without partition table can't "
"contains boot record")%mbr)
return False
return True
@@ -2693,3 +2701,9 @@ the system") + " (yes/no)"
else:
self.clVars.Set('os_install_clock_timezone',timezone,force=True)
return True
+
+ def setArchitecture(self,march):
+ """Set architecture by march (support auto keyword)"""
+ if march == "auto":
+ march = getSupportArch()[-1]
+ self.clVars.Set('os_install_arch_machine', march, True)
diff --git pym/cl_install_cmd.py pym/cl_install_cmd.py
index 570ecbe..6f5e7ec 100644
--- pym/cl_install_cmd.py
+++ pym/cl_install_cmd.py
@@ -70,8 +70,9 @@ CMD_OPTIONS = [{'shortOption':"d",
{'longOption':"march",
'optVal':"ARCH",
'type':'choice',
- 'choices':['i686','x86_64'],
- 'help':_("select processor architecture")
+ 'choices':['i686','x86_64','auto'],
+ 'help':_("select processor architecture")+ \
+ " (i686,x86_64 or auto)"
},
{'longOption':"build",
'help':_("installation for assembling")
@@ -446,8 +447,7 @@ class install_cmd(share_cmd):
if self.optobj.values.s:
self.logicObj.setLinuxName(self.optobj.values.s.upper())
if self.optobj.values.march:
- self.logicObj.clVars.Set('os_install_arch_machine',
- self.optobj.values.march,True)
+ self.logicObj.setArchitecture(self.optobj.values.march)
if self.optobj.values.nouuid:
self.logicObj.clVars.Set('cl_uuid_set','off',True)
if self.optobj.values.build:

@ -2,6 +2,13 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-lib-2.2.25 (18 Oct 2011)
18 Oct 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
-calculate-lib-2.2.24.ebuild, -calculate-lib-2.2.24-r1.ebuild,
-files/calculate-lib-2.2.24-r1.patch, +calculate-lib-2.2.25.ebuild:
Version bump. Remove old.
*calculate-lib-3.0.9999 (11 Oct 2011)
11 Oct 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

@ -1,16 +1,15 @@
AUX calculate-lib-2.2.24-r1.patch 535 RMD160 b54af4930a0b0e0f53ee4a9c546e73035dec200b SHA1 ddd43affd722945698c5823eefdfe3945d7d4fb1 SHA256 b265137d9df4ff2190ddb598de81c21c762d768c3c662ddae3e2789f876ac132
AUX calculate-lib-2.2.24-r2.patch 980 RMD160 416217331dd555f3aedbb808df8bc1cfaeeb0b17 SHA1 5c6c38e73b79d6cf1d7212228bf8966d06a950aa SHA256 16e151beb50f88a1a3f5a5c1c86e0e46bd3a5ca7e98e566b3b9039160e337451
DIST calculate-lib-2.1.11.tar.bz2 61687 RMD160 93ca4f84ff2cd7018addfd4de162959d78e51f78 SHA1 53149951c346fea7709cb43b4d8ebefe63acb0fd SHA256 62976c08d4fb4810389ace6f5a99abb5a962f6c8d9053ff943d0669480fb5599
DIST calculate-lib-2.1.8.tar.bz2 61178 RMD160 4a4ed063a9b4d3b82723f5f6eb046c97ad9fcda1 SHA1 93eb20057afff6e98c409388e1259a3ad078bb7a SHA256 ef8e315001663da7a45e69b82dc7c158fb0e10bd567efa95bf8a654ed441144a
DIST calculate-lib-2.2.24.tar.bz2 109443 RMD160 6e67f4adf69cd611a822cb2ab05084b85d4c32e3 SHA1 db96a8844e5beae0f27e22d646613c79b0682881 SHA256 172fd33fe0d8985d73eacbff882286827f0f15960ef37b641c687bd455ec7857
DIST calculate-lib-2.2.25.tar.bz2 109844 RMD160 a7ae69d929a1c73394f1ea03fb3c8f21fcf9bb33 SHA1 240f92d4cd508d788498397cc02e36664bad8801 SHA256 c366472c5a972bb1e7c363c0045e4ee8a497d3a2ef40a5a9a1b2ae194601aa05
EBUILD calculate-lib-2.1.11.ebuild 585 RMD160 742e544ac2f98074ac2cf29227c931e213cff023 SHA1 64e098b169359f3106c0e360261cb5fbb99602f4 SHA256 501467786f3943c8fcf47b787b9582c8aa4f8dfec9e664d784f098b6a3702ba7
EBUILD calculate-lib-2.1.8-r1.ebuild 730 RMD160 a207fbb024eaedeff679eb052b6ca04f289f914f SHA1 68c72562dc796958dd83dc4c59b2444678180b52 SHA256 b6a343b0f4d9e557ca42f5505c56c2373c04d1fa98191cf03b15cd0cdd0bb603
EBUILD calculate-lib-2.1.8-r2.ebuild 810 RMD160 ff412a1e0f7ea1ec3493738e23e3e7ec9334d49d SHA1 251a1fa961d07ef51c1c29ff930f73839b838bc8 SHA256 9cb04ff79362d497c9ac6a52353933683201337cb50104ab7a0b70ba6fdb04c1
EBUILD calculate-lib-2.2.24-r1.ebuild 813 RMD160 c6376d17c33e92ae7d3f8b3036efeceaa266b06f SHA1 c6258579150f11dde4d8b92388ceb1b3dc7892ec SHA256 8bf0d104fc7e9fdb76bd68b2139f3a6c0aed5a77432640a2d52a76424b822c92
EBUILD calculate-lib-2.2.24-r2.ebuild 827 RMD160 87f1c1ee89fbf1fabc2df8c4b8d7d4ae535cc651 SHA1 78d598debb2227138a38ab5de104ed239b8d2596 SHA256 7a390ad0e919cf2a3d0ea85bfca070ae4050755bfae97d841c500861c21a979e
EBUILD calculate-lib-2.2.24.ebuild 686 RMD160 8913900f72c73a4aafa50aa19e23e725218319a9 SHA1 2a9a405491df2b0052820708947b1be7b920c23d SHA256 73fa36bc61e08b1070ebb390ad0128e7fe02142abbb9f711e91ff5a2176ee015
EBUILD calculate-lib-2.2.25.ebuild 685 RMD160 43e6ab9361d04ac60f06819ac4f6a31ab452868a SHA1 f6d64ea2484b2eb610385824eebff0ebd54180ea SHA256 64c4353505d85dc3fedb46ef4b50cc27a546dcf549f9e7f3272b0554872c1460
EBUILD calculate-lib-2.2.9999.ebuild 656 RMD160 85058ff3964a829330b506998b134bd0993e92e8 SHA1 6d6f0e7c00e2f467ee4a8fe0a587bfd45e488b79 SHA256 35451656788914b0890f8d5238f2cab70d858718eb43e38b162cd975eb89e8ca
EBUILD calculate-lib-3.0.9999.ebuild 652 RMD160 78c65a45a537a14d66c1fcfc7f52daf9008c51b2 SHA1 85af54783630ae4282c56345f87aa0f74a1eae2e SHA256 7dd7a8fd2a56999a23b2ea322eb89082042bc20835db4817dedbbdf8a2d18cec
EBUILD calculate-lib-9999.ebuild 481 RMD160 7a38a4d9bae891390473cf03d6bd559fe4eb0128 SHA1 1d7ff49c4dc52e6f5c01f08e9f1c78c22470740e SHA256 7115ae3b0e37f82195f2506151baa81179c5d08ae5071982ad2afd3e576b7fd9
MISC ChangeLog 28386 RMD160 8e5e0c16adc617986bba269c997284864e50eb9e SHA1 f2164531c6e3d68c9a47c4b4dac702894ea146f1 SHA256 f192ac62ac35157fe06e7f5bf586429a4bc5fd172d4bb34bcb3aaa992aa8ed55
MISC ChangeLog 28647 RMD160 418bba5eeca95a3215988ce020a82bc192904091 SHA1 62e292792f1f06282a1509101a5e5975dabef619 SHA256 478f61ce25abda5396fbbd1d4dbd326f2b7a9b9ba31e03600f51ec67f119f414
MISC metadata.xml 303 RMD160 774b65ed76939d6878496ad6ef6451849bdced05 SHA1 7d08569697a290ede98c88ab59db3cdc3037bd15 SHA256 181519d9679fd9aee9a7a9806733a50728d3da0b1e0ad54f31499200f7f5c6ec

@ -1,35 +0,0 @@
# Copyright 1999-2011 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/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The library for Calculate 2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="2.2"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="!<sys-apps/calculate-lib-2.1.8-r1
!=sys-apps/calculate-lib-2.1.9
!=sys-apps/calculate-lib-2.1.10
!minimal? ( dev-python/py-smbpasswd )
>=dev-python/pyxml-0.8
sys-apps/iproute2
sys-apps/pciutils
sys-fs/lvm2
sys-fs/mdadm
sys-apps/file[python]"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# add detect cpu support arch
epatch "${FILESDIR}/calculate-lib-2.2.24-r1.patch"
}

@ -25,4 +25,3 @@ DEPEND="!<sys-apps/calculate-lib-2.1.8-r1
sys-fs/mdadm
sys-apps/file[python]"
RDEPEND="${DEPEND}"

@ -1,19 +0,0 @@
diff --git pym/cl_utils.py pym/cl_utils.py
index 6da750d..2450693 100644
--- pym/cl_utils.py
+++ pym/cl_utils.py
@@ -1353,3 +1353,14 @@ def getCmdLineParam(paramName):
return params[-1]
else:
return ""
+
+def getSupportArch():
+ """Get supported architectures by processor.
+
+ Is support processor x86_64 else only i686.
+ """
+ if filter(lambda x:x.startswith('flags') and " lm " in x,
+ readLinesFile('/proc/cpuinfo')):
+ return ['i686','x86_64']
+ else:
+ return ['i686']

@ -2,6 +2,38 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-templates-2.2.25 (18 Oct 2011)
18 Oct 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
-calculate-templates-2.2.24.ebuild, -calculate-templates-2.2.24-r1.ebuild,
-calculate-templates-2.2.24-r2.ebuild, -calculate-templates-2.2.24-r3.ebuild,
-calculate-templates-2.2.24-r4.ebuild, -calculate-templates-2.2.24-r5.ebuild,
-calculate-templates-2.2.24-r6.ebuild, -calculate-templates-2.2.24-r7.ebuild,
-calculate-templates-2.2.24-r8.ebuild, -calculate-templates-2.2.24-r9.ebuild,
-calculate-templates-2.2.24-r10.ebuild,
-calculate-templates-2.2.24-r11.ebuild,
-calculate-templates-2.2.24-r12.ebuild,
-calculate-templates-2.2.24-r13.ebuild,
-calculate-templates-2.2.24-r14.ebuild,
-calculate-templates-2.2.24-r15.ebuild,
-calculate-templates-2.2.24-r16.ebuild,
-calculate-templates-2.2.24-r17.ebuild,
-files/calculate-templates-2.2.24-r1.patch,
-files/calculate-templates-2.2.24-r10.patch,
-files/calculate-templates-2.2.24-r11.patch,
-files/calculate-templates-2.2.24-r12.patch,
-files/calculate-templates-2.2.24-r15.patch,
-files/calculate-templates-2.2.24-r16.patch,
-files/calculate-templates-2.2.24-r17.patch,
-files/calculate-templates-2.2.24-r2.patch,
-files/calculate-templates-2.2.24-r3.patch,
-files/calculate-templates-2.2.24-r4.patch,
-files/calculate-templates-2.2.24-r5.patch,
-files/calculate-templates-2.2.24-r7.patch,
-files/calculate-templates-2.2.24-r8.patch,
+calculate-templates-2.2.25.ebuild:
Version bump. Remove old.
11 Oct 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
calculate-templates-2.2.9999.ebuild:
Update live

@ -1,40 +1,8 @@
AUX calculate-templates-2.2.24-r1.patch 26788 RMD160 69e729d5fe4de042dddbe8d236bcf8585e0c1959 SHA1 73cb910c4e525617e2c4dfe77853490f97158498 SHA256 21bfd0b78b17848c83f48e760b55839c2b3f7a4357ea1bdd3f466b983fc2493c
AUX calculate-templates-2.2.24-r10.patch 271 RMD160 e77a38462a6dcd9dbb8eef537ec37568db07bdeb SHA1 4d0bb83d95afc845180277c9e4c16e89542d2b45 SHA256 b3e60db60a000addbabf6fee30da845cfbc4310fc682675bf1235246c56bcca5
AUX calculate-templates-2.2.24-r11.patch 1347 RMD160 fabfbc2b31917c59cba141c009a8e3fffac39f6e SHA1 318ceeeb553b1aaae1ec009c9105ed39995697d2 SHA256 d30eb295f73ad16ae4666a33b31f9edafa97ca7d77bdaccb95b177c6f5d8a741
AUX calculate-templates-2.2.24-r12.patch 1713 RMD160 96a705eff2f918d995889beb8acf220dde0cf49c SHA1 bf78fc4834187d9054ba93c06be652d30b0ddc72 SHA256 7dbd905a4cc0e96558038bcbfd5a7d801e5c385ea8aede033ea0755979535b17
AUX calculate-templates-2.2.24-r15.patch 4728 RMD160 cf19a4f39df418a86743cee27bfe6ce80b89e411 SHA1 e30eb6554c40d4e78e3c8fe8ecf6f7f48522ecb5 SHA256 2f32e03b630925d92f46cd41c169fa2b8a558380938f042b1874f3cb15928e95
AUX calculate-templates-2.2.24-r16.patch 5137 RMD160 27716a46a2ce2338332174676d983fde8c7b83f5 SHA1 d439e2805b8fcf41d27a054e126728199118f279 SHA256 9cc81c24fdeaac590dd5edbe60a20927d4daf78f641b8161c591497385a5aebf
AUX calculate-templates-2.2.24-r17.patch 8992 RMD160 b4ce10b7cd7cd60ce09d1066efc8cdaecab16177 SHA1 c8003fc1d0d484e0f8db7d672e64eca65ba2faaf SHA256 089b67eb85f63690acce4aac7f0d01e0f6ac3c1ad19018349aa3500d0b4b130e
AUX calculate-templates-2.2.24-r18.patch 10652 RMD160 6839fa064d6481982097fa1197b8e100e42a7975 SHA1 d265d6c0954b3b457793c73b36a9856328840d53 SHA256 603ae51416714c7a5cab4541870d3097cbd3a80e161158bf2ff96dd3efa13394
AUX calculate-templates-2.2.24-r2.patch 29270 RMD160 3a19fd9766d9509208ae1d52b69c53d0f8fc05bb SHA1 6d983c99eaed48b5de88a74dae25f3fb9b7007dd SHA256 5131e6a392cf1429644f366dbfb0f663aa611db3c2bb9500d71377e89f9c260f
AUX calculate-templates-2.2.24-r3.patch 31113 RMD160 7510e5ce024506f7ee86ca3f38d48f7a2d5388ab SHA1 bee1057dd2766f2b4c6233c37cf835c1bda66ee6 SHA256 2963cff2bbb2e0f16c8149dab18f765713dd46d389e3e47ff281be5f57f6c0ab
AUX calculate-templates-2.2.24-r4.patch 37017 RMD160 83231a453ec1e996a89138957dcae88dbf5e54f0 SHA1 93f55fbd3e3f608422c0382435efefee41f7c53f SHA256 2246d7a5f5831dc04c1a8faa098178a1f278c4e6e833e9fdfad82e62c0f376a1
AUX calculate-templates-2.2.24-r5.patch 43300 RMD160 56c136c99d3050c7b32b821d119be7955bd38efa SHA1 2a4b9fc985b612ba2be1976fe4701bc51625b2b6 SHA256 780649b09dfd409d94ea3a50ceb64dbba8e0d4af2cdd85d77c24b310eeb7a296
AUX calculate-templates-2.2.24-r7.patch 2641 RMD160 9c8ed19017fb1903f688d60379ca1f08953f432d SHA1 84b5278ee5c2d88938c43caa68a88a00d1431a5d SHA256 2c5de5f7446dc9c22f09b93f091e59dbfea99a5b623390b928aa50d828c82697
AUX calculate-templates-2.2.24-r8.patch 3799 RMD160 b32dca424fcbcbb4d0461f38603cda9c2c22f095 SHA1 18859fba773368c04ab5d919c761d27459ebfe00 SHA256 c6d8529753d957a902674f39abb3c833496f1bd4b5ccaa49db1b46252636df39
DIST calculate-templates-2.2.24-r14.tar.bz2 248364 RMD160 5e930938c5565a3bf385a749637fab23be7587f3 SHA1 c0109d9751b89f5642ed1ca4c867f5e2622ed919 SHA256 9d854abba9c4a699ff9d794f977dddf6bbbf06e20c1b0a8a461fe50973c999ab
DIST calculate-templates-2.2.24-r6.tar.bz2 247568 RMD160 df6d8b2cb09c292668528b08382afd563c2e81f7 SHA1 df12ef7a680e76dc13ab2666df8ef84ff4504944 SHA256 b339b318e7dcb5ab045278f0b736fdddd1d5cd53e60c017e73324b7cb23d4d51
DIST calculate-templates-2.2.24-r9.tar.bz2 248040 RMD160 a4523a32ce2374bb993821f0a7f70d34476ccc69 SHA1 705b710ebbf6110d0aea9c64da4faa4a83208c6d SHA256 87ac54def8fd64491ddaeb613a588393f9670cd6b9c654b90e01deed9c9e1e03
DIST calculate-templates-2.2.24.tar.bz2 247373 RMD160 eccaa0fb8a02ce6114b9fa24367e5d3ba38b80a4 SHA1 556aa83ce71e2202d9ca66fb6c8b1bc0dfbff44b SHA256 26a3c18c2e18167d4099412e69001cd1f8fd5c2f7165dcd3f24b80701f5d2751
EBUILD calculate-templates-2.2.24-r1.ebuild 718 RMD160 99d37d439cc2018902fd036acc35d5676a413074 SHA1 d575a81a56ffb19d3f7337d3f20f43da3e3e2c87 SHA256 f765421192ffb1ff987917e4578dd6fa532101841125b43447d69c12eeffb59f
EBUILD calculate-templates-2.2.24-r10.ebuild 880 RMD160 bdfc1ad95592dee49bc6746660f2a5416e49bd77 SHA1 9834d1a30bf5dbfa41de884bb293146a3c3ae05d SHA256 fa832d9d14dbf25e8caaa8aa4872c2c59a34210de3cd8e1263595af0f87d49c6
EBUILD calculate-templates-2.2.24-r11.ebuild 880 RMD160 d4b3183157e85d5325eafbeee68144f4862f332c SHA1 b20fb387163091dd7aee065d2be5a04089039d27 SHA256 83fff3aed9fa88dd2f688edfd74771eecd18428bcbbf56d20474ed6e334cdcbe
EBUILD calculate-templates-2.2.24-r12.ebuild 900 RMD160 c217ad4376dbcbc291d0619fad714967702b89a6 SHA1 40302b7edbbae7afe1692993f5166b71d3fe93d4 SHA256 dab2eadaee76ffebee3bb79fab211e9cc818927440e4b99064bc0c603c5b3132
EBUILD calculate-templates-2.2.24-r13.ebuild 900 RMD160 c217ad4376dbcbc291d0619fad714967702b89a6 SHA1 40302b7edbbae7afe1692993f5166b71d3fe93d4 SHA256 dab2eadaee76ffebee3bb79fab211e9cc818927440e4b99064bc0c603c5b3132
EBUILD calculate-templates-2.2.24-r14.ebuild 586 RMD160 5f84136e75ae518bb2da02ca84ad3f05c13037c8 SHA1 9bd4a6ef3ae063fcdaaacf166b34a1e48e469824 SHA256 404d358db9e73f32e99af35b643a2646b5736ab980672a972f8ae89cb1e10e55
EBUILD calculate-templates-2.2.24-r15.ebuild 913 RMD160 6a0da30c8caa9394f1ffe14a38504c0623856a7b SHA1 b7e430ced916cba8ff3ffaa2a975980d1681bf6c SHA256 1e358010a0d06c86ab1ab3d7aa6696f19572730eb6daf6d13b94b59464230fa1
EBUILD calculate-templates-2.2.24-r16.ebuild 954 RMD160 20fa017ac522ddcdfa70507535bb111907fee81b SHA1 528b4e2f61b77b5963ec1fec0c268472cc27863c SHA256 5836c1e9c147e04a60c3bd0b740230bdd5d2f6ccefa53d2802ce366ee9e4167d
EBUILD calculate-templates-2.2.24-r17.ebuild 987 RMD160 66d66589d3a6df92867616c15846458d52e775f2 SHA1 38e33a2b2bb9a6910e7f91259f3a9c089204afb4 SHA256 ff6cf347c09a968714e6c49bdd8c3f05ad074edc557371c920503ebc9bb00b68
DIST calculate-templates-2.2.25.tar.bz2 248801 RMD160 e25f0aacb69d7a8c2ad05bc6a9963542d6da089c SHA1 094baf9b4f04dd3edd626e69f1e9f1d67c3acbaf SHA256 89e48b483f74681911ba76af1372e5e71f92c69b022ee267362efba010f19df2
EBUILD calculate-templates-2.2.24-r18.ebuild 1020 RMD160 43bc0dd6a61cd90f59b97a8037b6c4cc09b06eff SHA1 1f27355708a3cd47310ae1f3cd2670d74c8dd5ea SHA256 e6b9d88573e79c4586f776f191d20d8e7333c0f1a96f76fe4745e67835bf496d
EBUILD calculate-templates-2.2.24-r2.ebuild 756 RMD160 adf29c1539951953719d5b83be14f590e437fed6 SHA1 de95021a634954babe1fa0ca35181bf1886381d3 SHA256 78b9eec76d49c5328f0d749167c70ca59c8ce1c1756d59b4dbfdfd8c19b78e43
EBUILD calculate-templates-2.2.24-r3.ebuild 780 RMD160 17d989eeb58626ec9cd4ab15317ea4a71684066b SHA1 be7388e7eb46fa0d0c9470c8142b984f0006048d SHA256 75f351bd28a216d4442be24df2c8a03409c744b0f4ae867c40c93b336da78541
EBUILD calculate-templates-2.2.24-r4.ebuild 800 RMD160 da6643dd8795bede79d57fb5b3c577fcb5a784ac SHA1 7d1a022a3bb3133ca79e72c9e940be177fc9e43f SHA256 f00a3e9bac3ec8bf025e44a8f39f79cbe62877bea642fa645de95b7105e829cc
EBUILD calculate-templates-2.2.24-r5.ebuild 800 RMD160 76ea8a54bbfabe63e76844eb430c904944d20596 SHA1 750467abc158882c83a16801dc24cbf06f6defc3 SHA256 2987075004edb08ad846fba682fc1b750dd653c11ba604211ccf5b9c98c357d2
EBUILD calculate-templates-2.2.24-r6.ebuild 585 RMD160 c6b7644ff26907fa64ade9337fdc96b9beee809c SHA1 6f46f29b7443da2a3818daf19e6a889116a0fd6b SHA256 a35a2cbd039aa0676303c5df2ba2b2015ba79b4e8af40ac3abc26f6560345bce
EBUILD calculate-templates-2.2.24-r7.ebuild 809 RMD160 06ec1787f2f4495f1ff8703abf1a6dbc0f766aed SHA1 76c935dab6cc2abb6661995057efef34d1adf661 SHA256 05d16d7e43bb5cb73c717f8eb5da8ad2b7fc1550139b354259b04b466b55c138
EBUILD calculate-templates-2.2.24-r8.ebuild 824 RMD160 68a9e89b9805dd598bfaaf4607f4ca3825eaecf1 SHA1 45907c1dba4ff2f9fc4c21b94d2dd709ce5ad919 SHA256 b7a6758c86bd6296b11ebebb5551ac77623028b1f9d5afc3dcf5a6f3b8af8fff
EBUILD calculate-templates-2.2.24-r9.ebuild 585 RMD160 466d295a7b46d2b7bcac885e82f7199e12237e52 SHA1 713a7bdc0b36efbb23647504febb9f97509f44b7 SHA256 c189f5f5dbbe5b225e582d03a9ac01081ba7cc239080fa22131063bfea825756
EBUILD calculate-templates-2.2.24.ebuild 582 RMD160 77c74362587b218b15ad9651903420e3ec01962f SHA1 ea9150e2e0476a8d5236f0388e3cdfd1a268bdf7 SHA256 4d0808a6993e403745b7820596d99cb8d2a206b4938f8ea916c1f305c61d2687
EBUILD calculate-templates-2.2.25.ebuild 582 RMD160 15014412aaccd88cbc047be175962878d49cabfd SHA1 fd2ddf693700c8c6c6df06c013cf1d9cbfc5c9df SHA256 17797276c8bc240cc6185b30de0a636018ed3029adb3839bd7491a2a421f2f3d
EBUILD calculate-templates-2.2.9999.ebuild 588 RMD160 8cafdd0daa7954e72c0b1268de2bcb6231c60d29 SHA1 505be2090f00df6c97b9b7e8b25716c7c0c1299a SHA256 2cbfb74187bc5d197ea7d2187d570b8e1981eba5f724623d44f461435a25d5a6
MISC ChangeLog 35861 RMD160 5acdf0c14ce1579fcb2645f7d0e04827c3abd482 SHA1 7c1b5226802d809c2bb784c988209c3dcc546960 SHA256 dd135cd143b3ea4293bf63a9d8502951414b40f68d899fea6eb1dc6280342c9f
MISC ChangeLog 37368 RMD160 af9977259aa5f6a1a1cd04c884f2f603af9d2528 SHA1 a7dd2b7c795945a5ccf2b8676a132a6cfc4bf645 SHA256 244ca14abfd437ec54f2b5026a804dae0eba09709c19f37ad0cf0145bd0c472c
MISC metadata.xml 338 RMD160 4a1a51881bdf09b961217d2056114ca4ccb8b4d2 SHA1 5fcb2724427f9ac5dda07abb5c829c24e6db9ae6 SHA256 175d9ae86b71b291a519414e816b05290d0e4be74726cc8d5449a500c51a3b2d

@ -1,37 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-lib-2.2.24"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# Fix install panel application
epatch "${FILESDIR}/calculate-templates-2.2.24-r1.patch"
}
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

@ -1,39 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}-r9.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-lib-2.2.24"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# Fix install panel application, fix conf.d/net by flash installation
# create auxilary dirs, mc colors, sudo su, xmbc,fix kmix crash
# alsa-utils templates moving, net.eth0 for iso image
epatch "${FILESDIR}/calculate-templates-2.2.24-r10.patch"
}
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

@ -1,39 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}-r9.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-lib-2.2.24"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# Fix install panel application, fix conf.d/net by flash installation
# create auxilary dirs, mc colors, sudo su, xmbc,fix kmix crash
# alsa-utils templates moving, net.eth0 for iso image
epatch "${FILESDIR}/calculate-templates-2.2.24-r11.patch"
}
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

@ -1,40 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}-r9.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-lib-2.2.24"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# Fix install panel application, fix conf.d/net by flash installation
# create auxilary dirs, mc colors, sudo su, xmbc,fix kmix crash
# alsa-utils templates moving, net.eth0 for iso image
# refix xautologin
epatch "${FILESDIR}/calculate-templates-2.2.24-r12.patch"
}
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

@ -1,40 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}-r9.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-lib-2.2.24"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# Fix install panel application, fix conf.d/net by flash installation
# create auxilary dirs, mc colors, sudo su, xmbc,fix kmix crash
# alsa-utils templates moving, net.eth0 for iso image
# refix xautologin
epatch "${FILESDIR}/calculate-templates-2.2.24-r12.patch"
}
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

@ -1,29 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}-r14.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-lib-2.2.24"
RDEPEND="${DEPEND}"
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

@ -1,40 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}-r9.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-lib-2.2.24"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# Fix install panel application, fix conf.d/net by flash installation
# create auxilary dirs, mc colors, sudo su, xmbc,fix kmix crash
# alsa-utils templates moving, net.eth0 for iso image
# refix xautologin, fix adblock
epatch "${FILESDIR}/calculate-templates-2.2.24-r15.patch"
}
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

@ -1,40 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}-r9.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-lib-2.2.24"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# Fix install panel application, fix conf.d/net by flash installation
# create auxilary dirs, mc colors, sudo su, xmbc,fix kmix crash
# alsa-utils templates moving, net.eth0 for iso image
# refix xautologin, fix adblock, remove migrate from firefox to chromium
epatch "${FILESDIR}/calculate-templates-2.2.24-r16.patch"
}
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

@ -1,41 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}-r9.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-lib-2.2.24"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# Fix install panel application, fix conf.d/net by flash installation
# create auxilary dirs, mc colors, sudo su, xmbc,fix kmix crash
# alsa-utils templates moving, net.eth0 for iso image
# refix xautologin, fix adblock, remove migrate from firefox to chromium
# update auto allow for kwallet
epatch "${FILESDIR}/calculate-templates-2.2.24-r17.patch"
}
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

@ -1,37 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-lib-2.2.24"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# Fix install panel application, fix conf.d/net by flash installation
epatch "${FILESDIR}/calculate-templates-2.2.24-r2.patch"
}
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

@ -1,38 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-lib-2.2.24"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# Fix install panel application, fix conf.d/net by flash installation
# create auxilary dirs
epatch "${FILESDIR}/calculate-templates-2.2.24-r3.patch"
}
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

@ -1,38 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-lib-2.2.24"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# Fix install panel application, fix conf.d/net by flash installation
# create auxilary dirs, mc colors, sudo su
epatch "${FILESDIR}/calculate-templates-2.2.24-r4.patch"
}
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

@ -1,38 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-lib-2.2.24"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# Fix install panel application, fix conf.d/net by flash installation
# create auxilary dirs, mc colors, sudo su
epatch "${FILESDIR}/calculate-templates-2.2.24-r5.patch"
}
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

@ -1,29 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}-r6.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-lib-2.2.24"
RDEPEND="${DEPEND}"
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

@ -1,38 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}-r6.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-lib-2.2.24"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# Fix install panel application, fix conf.d/net by flash installation
# create auxilary dirs, mc colors, sudo su, xmbc
epatch "${FILESDIR}/calculate-templates-2.2.24-r7.patch"
}
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

@ -1,38 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}-r6.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-lib-2.2.24"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# Fix install panel application, fix conf.d/net by flash installation
# create auxilary dirs, mc colors, sudo su, xmbc,fix kmix crash
epatch "${FILESDIR}/calculate-templates-2.2.24-r8.patch"
}
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

@ -1,29 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}-r9.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-lib-2.2.24"
RDEPEND="${DEPEND}"
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-lib-2.2.24"
DEPEND="~sys-apps/calculate-lib-2.2.25"
RDEPEND="${DEPEND}"

@ -1,287 +0,0 @@
diff --git install/1merge/Desktop/100-Browser/chromium/calculate/.calculate_directory install/1merge/Desktop/100-Browser/chromium/calculate/.calculate_directory
index ed0a326..9c2b262 100644
--- install/1merge/Desktop/100-Browser/chromium/calculate/.calculate_directory
+++ install/1merge/Desktop/100-Browser/chromium/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-browser.desktop)==||ini(desktop.browser)==||ini(desktop.browser)==chromium
+# Calculate append=skip exists(/usr/share/applications/calculate-browser.desktop,root)==||ini(desktop.browser)==||ini(desktop.browser)==chromium
diff --git install/1merge/Desktop/100-Browser/firefox-bin/calculate/.calculate_directory install/1merge/Desktop/100-Browser/firefox-bin/calculate/.calculate_directory
index c710cde..4bb95fa 100644
--- install/1merge/Desktop/100-Browser/firefox-bin/calculate/.calculate_directory
+++ install/1merge/Desktop/100-Browser/firefox-bin/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-browser.desktop)==||ini(desktop.browser)==||ini(desktop.browser)==firefox-bin
+# Calculate append=skip exists(/usr/share/applications/calculate-browser.desktop,root)==||ini(desktop.browser)==||ini(desktop.browser)==firefox-bin
diff --git install/1merge/Desktop/100-Browser/firefox/calculate/.calculate_directory install/1merge/Desktop/100-Browser/firefox/calculate/.calculate_directory
index 19c7fe4..9991f06 100644
--- install/1merge/Desktop/100-Browser/firefox/calculate/.calculate_directory
+++ install/1merge/Desktop/100-Browser/firefox/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-browser.desktop)==||ini(desktop.browser)==||ini(desktop.browser)==firefox
+# Calculate append=skip exists(/usr/share/applications/calculate-browser.desktop,root)==||ini(desktop.browser)==||ini(desktop.browser)==firefox
diff --git install/1merge/Desktop/100-Browser/opera/calculate/.calculate_directory install/1merge/Desktop/100-Browser/opera/calculate/.calculate_directory
index c98ebd6..444a81d 100644
--- install/1merge/Desktop/100-Browser/opera/calculate/.calculate_directory
+++ install/1merge/Desktop/100-Browser/opera/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-browser.desktop)==||ini(desktop.browser)==||ini(desktop.browser)==opera
+# Calculate append=skip exists(/usr/share/applications/calculate-browser.desktop,root)==||ini(desktop.browser)==||ini(desktop.browser)==opera
diff --git install/1merge/Desktop/110-Mail/claws-mail/calculate/.calculate_directory install/1merge/Desktop/110-Mail/claws-mail/calculate/.calculate_directory
index 4c71763..7acc7a0 100644
--- install/1merge/Desktop/110-Mail/claws-mail/calculate/.calculate_directory
+++ install/1merge/Desktop/110-Mail/claws-mail/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-mail.desktop)==||ini(desktop.mail)==||ini(desktop.mail)==claws-mail
+# Calculate append=skip exists(/usr/share/applications/calculate-mail.desktop,root)==||ini(desktop.mail)==||ini(desktop.mail)==claws-mail
diff --git install/1merge/Desktop/110-Mail/evolution/calculate/.calculate_directory install/1merge/Desktop/110-Mail/evolution/calculate/.calculate_directory
index 47c90ee..f94cebc 100644
--- install/1merge/Desktop/110-Mail/evolution/calculate/.calculate_directory
+++ install/1merge/Desktop/110-Mail/evolution/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-mail.desktop)==||ini(desktop.mail)==||ini(desktop.mail)==evolution
+# Calculate append=skip exists(/usr/share/applications/calculate-mail.desktop,root)==||ini(desktop.mail)==||ini(desktop.mail)==evolution
diff --git install/1merge/Desktop/110-Mail/kmail/calculate/.calculate_directory install/1merge/Desktop/110-Mail/kmail/calculate/.calculate_directory
index 655bc70..622ac45 100644
--- install/1merge/Desktop/110-Mail/kmail/calculate/.calculate_directory
+++ install/1merge/Desktop/110-Mail/kmail/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-mail.desktop)==||ini(desktop.mail)==||ini(desktop.mail)==kmail
+# Calculate append=skip exists(/usr/share/applications/calculate-mail.desktop,root)==||ini(desktop.mail)==||ini(desktop.mail)==kmail
diff --git install/1merge/Desktop/120-Chat/konversation/calculate/.calculate_directory install/1merge/Desktop/120-Chat/konversation/calculate/.calculate_directory
index ff6ad44..30abc59 100644
--- install/1merge/Desktop/120-Chat/konversation/calculate/.calculate_directory
+++ install/1merge/Desktop/120-Chat/konversation/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-chat.desktop)==||ini(desktop.chat)==||ini(desktop.chat)==konversation
+# Calculate append=skip exists(/usr/share/applications/calculate-chat.desktop,root)==||ini(desktop.chat)==||ini(desktop.chat)==konversation
diff --git install/1merge/Desktop/120-Chat/xchat/calculate/.calculate_directory install/1merge/Desktop/120-Chat/xchat/calculate/.calculate_directory
index 5551734..e758207 100644
--- install/1merge/Desktop/120-Chat/xchat/calculate/.calculate_directory
+++ install/1merge/Desktop/120-Chat/xchat/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-chat.desktop)==||ini(desktop.chat)==||ini(desktop.chat)==xchat
+# Calculate append=skip exists(/usr/share/applications/calculate-chat.desktop,root)==||ini(desktop.chat)==||ini(desktop.chat)==xchat
diff --git install/1merge/Desktop/130-IM/kopete/calculate/.calculate_directory install/1merge/Desktop/130-IM/kopete/calculate/.calculate_directory
index 6ae3660..70109a6 100644
--- install/1merge/Desktop/130-IM/kopete/calculate/.calculate_directory
+++ install/1merge/Desktop/130-IM/kopete/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-im.desktop)==||ini(desktop.im)==||ini(desktop.im)==kopete
+# Calculate append=skip exists(/usr/share/applications/calculate-im.desktop,root)==||ini(desktop.im)==||ini(desktop.im)==kopete
diff --git install/1merge/Desktop/130-IM/pidgin/calculate/.calculate_directory install/1merge/Desktop/130-IM/pidgin/calculate/.calculate_directory
index b23036d..55f2d3b 100644
--- install/1merge/Desktop/130-IM/pidgin/calculate/.calculate_directory
+++ install/1merge/Desktop/130-IM/pidgin/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-im.desktop)==||ini(desktop.im)==||ini(desktop.im)==pidgin
+# Calculate append=skip exists(/usr/share/applications/calculate-im.desktop,root)==||ini(desktop.im)==||ini(desktop.im)==pidgin
diff --git install/1merge/Desktop/200-Writer/libreoffice-bin/calculate/.calculate_directory install/1merge/Desktop/200-Writer/libreoffice-bin/calculate/.calculate_directory
index 1b735b4..bba3ab4 100644
--- install/1merge/Desktop/200-Writer/libreoffice-bin/calculate/.calculate_directory
+++ install/1merge/Desktop/200-Writer/libreoffice-bin/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-writer.desktop)==||ini(desktop.writer)==||ini(desktop.writer)==libreoffice-bin
+# Calculate append=skip exists(/usr/share/applications/calculate-writer.desktop,root)==||ini(desktop.writer)==||ini(desktop.writer)==libreoffice-bin
diff --git install/1merge/Desktop/200-Writer/libreoffice/calculate/.calculate_directory install/1merge/Desktop/200-Writer/libreoffice/calculate/.calculate_directory
index ec584c9..8cb4ff4 100644
--- install/1merge/Desktop/200-Writer/libreoffice/calculate/.calculate_directory
+++ install/1merge/Desktop/200-Writer/libreoffice/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-writer.desktop)==||ini(desktop.writer)==||ini(desktop.writer)==libreoffice
+# Calculate append=skip exists(/usr/share/applications/calculate-writer.desktop,root)==||ini(desktop.writer)==||ini(desktop.writer)==libreoffice
diff --git install/1merge/Desktop/210-Calc/libreoffice-bin/calculate/.calculate_directory install/1merge/Desktop/210-Calc/libreoffice-bin/calculate/.calculate_directory
index 5bb79da..e64d7fc 100644
--- install/1merge/Desktop/210-Calc/libreoffice-bin/calculate/.calculate_directory
+++ install/1merge/Desktop/210-Calc/libreoffice-bin/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-calc.desktop)==||ini(desktop.calc)==||ini(desktop.calc)==libreoffice-bin
+# Calculate append=skip exists(/usr/share/applications/calculate-calc.desktop,root)==||ini(desktop.calc)==||ini(desktop.calc)==libreoffice-bin
diff --git install/1merge/Desktop/210-Calc/libreoffice/calculate/.calculate_directory install/1merge/Desktop/210-Calc/libreoffice/calculate/.calculate_directory
index 62739f6..829e038 100644
--- install/1merge/Desktop/210-Calc/libreoffice/calculate/.calculate_directory
+++ install/1merge/Desktop/210-Calc/libreoffice/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-calc.desktop)==||ini(desktop.calc)==||ini(desktop.calc)==libreoffice
+# Calculate append=skip exists(/usr/share/applications/calculate-calc.desktop,root)==||ini(desktop.calc)==||ini(desktop.calc)==libreoffice
diff --git install/1merge/Desktop/220-Calculator/galculator/calculate/.calculate_directory install/1merge/Desktop/220-Calculator/galculator/calculate/.calculate_directory
index f0ef9db..845035e 100644
--- install/1merge/Desktop/220-Calculator/galculator/calculate/.calculate_directory
+++ install/1merge/Desktop/220-Calculator/galculator/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-calculator.desktop)==||ini(desktop.calculator)==||ini(desktop.calculator)==galculator
+# Calculate append=skip exists(/usr/share/applications/calculate-calculator.desktop,root)==||ini(desktop.calculator)==||ini(desktop.calculator)==galculator
diff --git install/1merge/Desktop/220-Calculator/gcalctool/calculate/.calculate_directory install/1merge/Desktop/220-Calculator/gcalctool/calculate/.calculate_directory
index 1708ed8..dd26126 100644
--- install/1merge/Desktop/220-Calculator/gcalctool/calculate/.calculate_directory
+++ install/1merge/Desktop/220-Calculator/gcalctool/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-calculator.desktop)==||ini(desktop.calculator)==||ini(desktop.calculator)==gcalctool
+# Calculate append=skip exists(/usr/share/applications/calculate-calculator.desktop,root)==||ini(desktop.calculator)==||ini(desktop.calculator)==gcalctool
diff --git install/1merge/Desktop/220-Calculator/kcalc/calculate/.calculate_directory install/1merge/Desktop/220-Calculator/kcalc/calculate/.calculate_directory
index e1ee67a..65e263c 100644
--- install/1merge/Desktop/220-Calculator/kcalc/calculate/.calculate_directory
+++ install/1merge/Desktop/220-Calculator/kcalc/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-calculator.desktop)==||ini(desktop.calculator)==||ini(desktop.calculator)==kcalc
+# Calculate append=skip exists(/usr/share/applications/calculate-calculator.desktop,root)==||ini(desktop.calculator)==||ini(desktop.calculator)==kcalc
diff --git install/1merge/Desktop/300-ImageEdit/gimp/calculate/.calculate_directory install/1merge/Desktop/300-ImageEdit/gimp/calculate/.calculate_directory
index 5e5bc33..c986788 100644
--- install/1merge/Desktop/300-ImageEdit/gimp/calculate/.calculate_directory
+++ install/1merge/Desktop/300-ImageEdit/gimp/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-imageedit.desktop)==||ini(desktop.imageedit)==||ini(desktop.imageedit)==gimp
+# Calculate append=skip exists(/usr/share/applications/calculate-imageedit.desktop,root)==||ini(desktop.imageedit)==||ini(desktop.imageedit)==gimp
diff --git install/1merge/Desktop/310-ImageView/digikam/calculate/.calculate_directory install/1merge/Desktop/310-ImageView/digikam/calculate/.calculate_directory
index fd78d65..dce8286 100644
--- install/1merge/Desktop/310-ImageView/digikam/calculate/.calculate_directory
+++ install/1merge/Desktop/310-ImageView/digikam/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-imageview.desktop)==||ini(desktop.imageview)==||ini(desktop.imageview)==digikam
+# Calculate append=skip exists(/usr/share/applications/calculate-imageview.desktop,root)==||ini(desktop.imageview)==||ini(desktop.imageview)==digikam
diff --git install/1merge/Desktop/310-ImageView/eog/calculate/.calculate_directory install/1merge/Desktop/310-ImageView/eog/calculate/.calculate_directory
index cfa5649..0ad8b12 100644
--- install/1merge/Desktop/310-ImageView/eog/calculate/.calculate_directory
+++ install/1merge/Desktop/310-ImageView/eog/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-imageview.desktop)==||ini(desktop.imageview)==||ini(desktop.imageview)==eog
+# Calculate append=skip exists(/usr/share/applications/calculate-imageview.desktop,root)==||ini(desktop.imageview)==||ini(desktop.imageview)==eog
diff --git install/1merge/Desktop/310-ImageView/gqview/calculate/.calculate_directory install/1merge/Desktop/310-ImageView/gqview/calculate/.calculate_directory
index 231681b..5148562 100644
--- install/1merge/Desktop/310-ImageView/gqview/calculate/.calculate_directory
+++ install/1merge/Desktop/310-ImageView/gqview/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-imageview.desktop)==||ini(desktop.imageview)==||ini(desktop.imageview)==gqview
+# Calculate append=skip exists(/usr/share/applications/calculate-imageview.desktop,root)==||ini(desktop.imageview)==||ini(desktop.imageview)==gqview
diff --git install/1merge/Desktop/400-AudioPlayer/amarok/calculate/.calculate_directory install/1merge/Desktop/400-AudioPlayer/amarok/calculate/.calculate_directory
index 809976d..e1140f5 100644
--- install/1merge/Desktop/400-AudioPlayer/amarok/calculate/.calculate_directory
+++ install/1merge/Desktop/400-AudioPlayer/amarok/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==amarok
+# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop,root)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==amarok
diff --git install/1merge/Desktop/400-AudioPlayer/audacious/calculate/.calculate_directory install/1merge/Desktop/400-AudioPlayer/audacious/calculate/.calculate_directory
index ec7962d..c076834 100644
--- install/1merge/Desktop/400-AudioPlayer/audacious/calculate/.calculate_directory
+++ install/1merge/Desktop/400-AudioPlayer/audacious/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==audacious
+# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop,root)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==audacious
diff --git install/1merge/Desktop/400-AudioPlayer/deadbeef/calculate/.calculate_directory install/1merge/Desktop/400-AudioPlayer/deadbeef/calculate/.calculate_directory
index d4a2fb1..6855f3d 100644
--- install/1merge/Desktop/400-AudioPlayer/deadbeef/calculate/.calculate_directory
+++ install/1merge/Desktop/400-AudioPlayer/deadbeef/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==deadbeef
+# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop,root)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==deadbeef
diff --git install/1merge/Desktop/400-AudioPlayer/quodlibet/calculate/.calculate_directory install/1merge/Desktop/400-AudioPlayer/quodlibet/calculate/.calculate_directory
index 23a5228..cb426d5 100644
--- install/1merge/Desktop/400-AudioPlayer/quodlibet/calculate/.calculate_directory
+++ install/1merge/Desktop/400-AudioPlayer/quodlibet/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==quodlibet
+# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop,root)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==quodlibet
diff --git install/1merge/Desktop/400-AudioPlayer/rhythmbox/calculate/.calculate_directory install/1merge/Desktop/400-AudioPlayer/rhythmbox/calculate/.calculate_directory
index 46d23b0..808b57f 100644
--- install/1merge/Desktop/400-AudioPlayer/rhythmbox/calculate/.calculate_directory
+++ install/1merge/Desktop/400-AudioPlayer/rhythmbox/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==rhythmbox
+# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop,root)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==rhythmbox
diff --git install/1merge/Desktop/500-VideoPlayer/gnome-mplayer/calculate/.calculate_directory install/1merge/Desktop/500-VideoPlayer/gnome-mplayer/calculate/.calculate_directory
index c93e440..9b6176c 100644
--- install/1merge/Desktop/500-VideoPlayer/gnome-mplayer/calculate/.calculate_directory
+++ install/1merge/Desktop/500-VideoPlayer/gnome-mplayer/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-videoplayer.desktop)==||ini(desktop.videoplayer)==||ini(desktop.videoplayer)==gnome-mplayer
+# Calculate append=skip exists(/usr/share/applications/calculate-videoplayer.desktop,root)==||ini(desktop.videoplayer)==||ini(desktop.videoplayer)==gnome-mplayer
diff --git install/1merge/Desktop/500-VideoPlayer/smplayer/calculate/.calculate_directory install/1merge/Desktop/500-VideoPlayer/smplayer/calculate/.calculate_directory
index ec3963a..2ac5a8c 100644
--- install/1merge/Desktop/500-VideoPlayer/smplayer/calculate/.calculate_directory
+++ install/1merge/Desktop/500-VideoPlayer/smplayer/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-videoplayer.desktop)==||ini(desktop.videoplayer)==||ini(desktop.videoplayer)==smplayer
+# Calculate append=skip exists(/usr/share/applications/calculate-videoplayer.desktop,root)==||ini(desktop.videoplayer)==||ini(desktop.videoplayer)==smplayer
diff --git install/1merge/Desktop/500-VideoPlayer/totem/calculate/.calculate_directory install/1merge/Desktop/500-VideoPlayer/totem/calculate/.calculate_directory
index 2371094..4544c05 100644
--- install/1merge/Desktop/500-VideoPlayer/totem/calculate/.calculate_directory
+++ install/1merge/Desktop/500-VideoPlayer/totem/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-videoplayer.desktop)==||ini(desktop.videoplayer)==||ini(desktop.videoplayer)==totem
+# Calculate append=skip exists(/usr/share/applications/calculate-videoplayer.desktop,root)==||ini(desktop.videoplayer)==||ini(desktop.videoplayer)==totem
diff --git install/1merge/Desktop/600-ImageBurn/brasero/calculate/.calculate_directory install/1merge/Desktop/600-ImageBurn/brasero/calculate/.calculate_directory
index 0881619..4e4c9ec 100644
--- install/1merge/Desktop/600-ImageBurn/brasero/calculate/.calculate_directory
+++ install/1merge/Desktop/600-ImageBurn/brasero/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-imageburn.desktop)==||ini(desktop.imageburn)==||ini(desktop.imageburn)==brasero
+# Calculate append=skip exists(/usr/share/applications/calculate-imageburn.desktop,root)==||ini(desktop.imageburn)==||ini(desktop.imageburn)==brasero
diff --git install/1merge/Desktop/600-ImageBurn/k3b/calculate/.calculate_directory install/1merge/Desktop/600-ImageBurn/k3b/calculate/.calculate_directory
index 47dbc69..f124176 100644
--- install/1merge/Desktop/600-ImageBurn/k3b/calculate/.calculate_directory
+++ install/1merge/Desktop/600-ImageBurn/k3b/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-imageburn.desktop)==||ini(desktop.imageburn)==||ini(desktop.imageburn)==k3b
+# Calculate append=skip exists(/usr/share/applications/calculate-imageburn.desktop,root)==||ini(desktop.imageburn)==||ini(desktop.imageburn)==k3b
diff --git install/1merge/Desktop/600-ImageBurn/xfburn/calculate/.calculate_directory install/1merge/Desktop/600-ImageBurn/xfburn/calculate/.calculate_directory
index 25abb2c..2bcbaec 100644
--- install/1merge/Desktop/600-ImageBurn/xfburn/calculate/.calculate_directory
+++ install/1merge/Desktop/600-ImageBurn/xfburn/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-imageburn.desktop)==||ini(desktop.imageburn)==||ini(desktop.imageburn)==xfburn
+# Calculate append=skip exists(/usr/share/applications/calculate-imageburn.desktop,root)==||ini(desktop.imageburn)==||ini(desktop.imageburn)==xfburn
diff --git install/1merge/Desktop/700-Dict/goldendict/calculate/.calculate_directory install/1merge/Desktop/700-Dict/goldendict/calculate/.calculate_directory
index 7bbbdd2..7992626 100644
--- install/1merge/Desktop/700-Dict/goldendict/calculate/.calculate_directory
+++ install/1merge/Desktop/700-Dict/goldendict/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-dict.desktop)==||ini(desktop.dict)==||ini(desktop.dict)==goldendict
+# Calculate append=skip exists(/usr/share/applications/calculate-dict.desktop,root)==||ini(desktop.dict)==||ini(desktop.dict)==goldendict
diff --git install/1merge/Desktop/700-Dict/stardict/calculate/.calculate_directory install/1merge/Desktop/700-Dict/stardict/calculate/.calculate_directory
index 7150a7e..bcdb4c4 100644
--- install/1merge/Desktop/700-Dict/stardict/calculate/.calculate_directory
+++ install/1merge/Desktop/700-Dict/stardict/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-dict.desktop)==||ini(desktop.dict)==||ini(desktop.dict)==stardict
+# Calculate append=skip exists(/usr/share/applications/calculate-dict.desktop,root)==||ini(desktop.dict)==||ini(desktop.dict)==stardict
diff --git install/1merge/Desktop/800-TextEdit/gedit/calculate/.calculate_directory install/1merge/Desktop/800-TextEdit/gedit/calculate/.calculate_directory
index 8b8af31..7f3a6e2 100644
--- install/1merge/Desktop/800-TextEdit/gedit/calculate/.calculate_directory
+++ install/1merge/Desktop/800-TextEdit/gedit/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-textedit.desktop)==||ini(desktop.textedit)==||ini(desktop.textedit)==gedit
+# Calculate append=skip exists(/usr/share/applications/calculate-textedit.desktop,root)==||ini(desktop.textedit)==||ini(desktop.textedit)==gedit
diff --git install/1merge/Desktop/800-TextEdit/kwrite/calculate/.calculate_directory install/1merge/Desktop/800-TextEdit/kwrite/calculate/.calculate_directory
index 04bd479..32244bc 100644
--- install/1merge/Desktop/800-TextEdit/kwrite/calculate/.calculate_directory
+++ install/1merge/Desktop/800-TextEdit/kwrite/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-textedit.desktop)==||ini(desktop.textedit)==||ini(desktop.textedit)==kwrite
+# Calculate append=skip exists(/usr/share/applications/calculate-textedit.desktop,root)==||ini(desktop.textedit)==||ini(desktop.textedit)==kwrite
diff --git install/1merge/Desktop/800-TextEdit/leafpad/calculate/.calculate_directory install/1merge/Desktop/800-TextEdit/leafpad/calculate/.calculate_directory
index 05304bd..f9a1833 100644
--- install/1merge/Desktop/800-TextEdit/leafpad/calculate/.calculate_directory
+++ install/1merge/Desktop/800-TextEdit/leafpad/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-textedit.desktop)==||ini(desktop.textedit)==||ini(desktop.textedit)==leafpad
+# Calculate append=skip exists(/usr/share/applications/calculate-textedit.desktop,root)==||ini(desktop.textedit)==||ini(desktop.textedit)==leafpad
diff --git install/1merge/Desktop/900-Terminal/gnome-terminal/calculate/.calculate_directory install/1merge/Desktop/900-Terminal/gnome-terminal/calculate/.calculate_directory
index 362fd07..00ae274 100644
--- install/1merge/Desktop/900-Terminal/gnome-terminal/calculate/.calculate_directory
+++ install/1merge/Desktop/900-Terminal/gnome-terminal/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-terminal.desktop)==||ini(desktop.terminal)==||ini(desktop.terminal)==gnome-terminal
+# Calculate append=skip exists(/usr/share/applications/calculate-terminal.desktop,root)==||ini(desktop.terminal)==||ini(desktop.terminal)==gnome-terminal
diff --git install/1merge/Desktop/900-Terminal/konsole/calculate/.calculate_directory install/1merge/Desktop/900-Terminal/konsole/calculate/.calculate_directory
index 418dcf3..95fc9cf 100644
--- install/1merge/Desktop/900-Terminal/konsole/calculate/.calculate_directory
+++ install/1merge/Desktop/900-Terminal/konsole/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-terminal.desktop)==||ini(desktop.terminal)==||ini(desktop.terminal)==konsole
+# Calculate append=skip exists(/usr/share/applications/calculate-terminal.desktop,root)==||ini(desktop.terminal)==||ini(desktop.terminal)==konsole
diff --git install/1merge/Desktop/900-Terminal/terminal/calculate/.calculate_directory install/1merge/Desktop/900-Terminal/terminal/calculate/.calculate_directory
index f89de45..b452ffe 100644
--- install/1merge/Desktop/900-Terminal/terminal/calculate/.calculate_directory
+++ install/1merge/Desktop/900-Terminal/terminal/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-terminal.desktop)==||ini(desktop.terminal)==||ini(desktop.terminal)==terminal
+# Calculate append=skip exists(/usr/share/applications/calculate-terminal.desktop,root)==||ini(desktop.terminal)==||ini(desktop.terminal)==terminal

@ -1,7 +0,0 @@
diff --git builder/squash/etc/init.d/net.eth0 builder/squash/etc/init.d/net.eth0
new file mode 100644
index 0000000..9e6b506
--- /dev/null
+++ builder/squash/etc/init.d/net.eth0
@@ -0,0 +1 @@
+# Calculate name=net.eth0 link=net.lo symbolic pkg(net-misc/networkmanager)==

@ -1,19 +0,0 @@
diff --git builder/squash/etc/init.d/net.eth0 builder/squash/etc/init.d/net.eth0
new file mode 100644
index 0000000..9e6b506
--- /dev/null
+++ builder/squash/etc/init.d/net.eth0
@@ -0,0 +1 @@
+# Calculate name=net.eth0 link=net.lo symbolic pkg(net-misc/networkmanager)==
diff --git desktop/desktop-root/60-mc-4.7/.mc/ini desktop/desktop-root/60-mc-4.7/.mc/ini
index 1994d7a..d36eb71 100644
--- desktop/desktop-root/60-mc-4.7/.mc/ini
+++ desktop/desktop-root/60-mc-4.7/.mc/ini
@@ -1,4 +1,7 @@
# Calculate format=kde
+[Colors]
+base_color=,black:normal=,black:selected=black,cyan:marked=,black:markselect=yellow,cyan:errors=white,red:menu=white,cyan:reverse=black,lightgray:dnormal=black,lightgray:dfocus=black,cyan:dhotnormal=blue,lightgray:dhotfocus=blue,cyan:viewunderline=,black:menuhot=yellow,cyan:menusel=white,black:menuhotsel=yellow,black:helpnormal=black,lightgray:helpitalic=red,lightgray:helpbold=blue,lightgray:helplink=black,cyan:helpslink=yellow,blue:gauge=white,black:input=black,cyan:directory=white,black:executable=green,black:link=gray,black:stalelink=brightred,blue:device=,black:core=red,blue:special=red,black:editnormal=lightgray,black:editbold=yellow,blue:editmarked=black,cyan:errdhotnormal=yellow,red:errdhotfocus=yellow,lightgray
+
[Layout]
#видимость верхней строчки меню
menubar_visible=0

@ -1,28 +0,0 @@
diff --git builder/squash/etc/init.d/net.eth0 builder/squash/etc/init.d/net.eth0
new file mode 100644
index 0000000..9e6b506
--- /dev/null
+++ builder/squash/etc/init.d/net.eth0
@@ -0,0 +1 @@
+# Calculate name=net.eth0 link=net.lo symbolic pkg(net-misc/networkmanager)==
diff --git desktop/desktop-root/60-mc-4.7/.mc/ini desktop/desktop-root/60-mc-4.7/.mc/ini
index 1994d7a..d36eb71 100644
--- desktop/desktop-root/60-mc-4.7/.mc/ini
+++ desktop/desktop-root/60-mc-4.7/.mc/ini
@@ -1,4 +1,7 @@
# Calculate format=kde
+[Colors]
+base_color=,black:normal=,black:selected=black,cyan:marked=,black:markselect=yellow,cyan:errors=white,red:menu=white,cyan:reverse=black,lightgray:dnormal=black,lightgray:dfocus=black,cyan:dhotnormal=blue,lightgray:dhotfocus=blue,cyan:viewunderline=,black:menuhot=yellow,cyan:menusel=white,black:menuhotsel=yellow,black:helpnormal=black,lightgray:helpitalic=red,lightgray:helpbold=blue,lightgray:helplink=black,cyan:helpslink=yellow,blue:gauge=white,black:input=black,cyan:directory=white,black:executable=green,black:link=gray,black:stalelink=brightred,blue:device=,black:core=red,blue:special=red,black:editnormal=lightgray,black:editbold=yellow,blue:editmarked=black,cyan:errdhotnormal=yellow,red:errdhotfocus=yellow,lightgray
+
[Layout]
#видимость верхней строчки меню
menubar_visible=0
diff --git desktop/desktop/20-kde-4.7/Desktop/calculate-community.desktop desktop/desktop/20-kde-4.7/Desktop/calculate-community.desktop
index 4eca333..3960914 100644
--- desktop/desktop/20-kde-4.7/Desktop/calculate-community.desktop
+++ desktop/desktop/20-kde-4.7/Desktop/calculate-community.desktop
@@ -3,3 +3,4 @@
[Desktop Entry]
!NoDisplay=
+OnlyShowIn=KDE;

@ -1,91 +0,0 @@
diff --git desktop/00-desktop-init/empty_dir/0ini.env desktop/00-desktop-init/empty_dir/0ini.env
index fd0937a..6560917 100644
--- desktop/00-desktop-init/empty_dir/0ini.env
+++ desktop/00-desktop-init/empty_dir/0ini.env
@@ -4,7 +4,7 @@
update = on
[ver]
-patch = 2.2.13
+patch = 2.2.24
[update]
patch = on
diff --git desktop/desktop/00-patch-2.2.10/.calculate_directory desktop/desktop/00-patch-2.2.10/.calculate_directory
index 9ea3814..7b5186f 100644
--- desktop/desktop/00-patch-2.2.10/.calculate_directory
+++ desktop/desktop/00-patch-2.2.10/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip belong(calculate-templates)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.10
+# Calculate append=skip belong(calculate-utilities)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.10
diff --git desktop/desktop/00-patch-2.2.12/.calculate_directory desktop/desktop/00-patch-2.2.12/.calculate_directory
index 3f135e2..3bad719 100644
--- desktop/desktop/00-patch-2.2.12/.calculate_directory
+++ desktop/desktop/00-patch-2.2.12/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip belong(calculate-templates)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.12
+# Calculate append=skip belong(calculate-utilities)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.12
diff --git desktop/desktop/00-patch-2.2.13/.calculate_directory desktop/desktop/00-patch-2.2.13/.calculate_directory
index 81943f4..3932c91 100644
--- desktop/desktop/00-patch-2.2.13/.calculate_directory
+++ desktop/desktop/00-patch-2.2.13/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip belong(calculate-templates)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.13
+# Calculate append=skip belong(calculate-utilities)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.13
diff --git desktop/desktop/00-patch-2.2.22/.calculate_directory desktop/desktop/00-patch-2.2.22/.calculate_directory
index 9259f63..0ed217d 100644
--- desktop/desktop/00-patch-2.2.22/.calculate_directory
+++ desktop/desktop/00-patch-2.2.22/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip belong(calculate-templates)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.22
+# Calculate append=skip belong(calculate-utilities)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.22
diff --git desktop/desktop/00-patch-2.2.23/.calculate_directory desktop/desktop/00-patch-2.2.23/.calculate_directory
index dd6d923..3c18666 100644
--- desktop/desktop/00-patch-2.2.23/.calculate_directory
+++ desktop/desktop/00-patch-2.2.23/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip belong(calculate-templates)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.23
+# Calculate append=skip belong(calculate-utilities)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.23
diff --git desktop/desktop/00-patch-2.2.24/.calculate_directory desktop/desktop/00-patch-2.2.24/.calculate_directory
new file mode 100644
index 0000000..4d30994
--- /dev/null
+++ desktop/desktop/00-patch-2.2.24/.calculate_directory
@@ -0,0 +1 @@
+# Calculate append=skip belong(calculate-utilities)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.24
diff --git desktop/desktop/00-patch-2.2.24/adblock-fix.sh desktop/desktop/00-patch-2.2.24/adblock-fix.sh
new file mode 100644
index 0000000..acf4f7f
--- /dev/null
+++ desktop/desktop/00-patch-2.2.24/adblock-fix.sh
@@ -0,0 +1,7 @@
+# Calculate path=/tmp pkg(www-apps/chromium-adblock)!= exec=/bin/bash name=adblock-fix-#-ur_login-#.sh
+
+if [[ -d #-ur_home_path-#/.config/chromium/Default/Extensions/gighmmpiobklfepjocnamgkkbiglidom ]]
+then
+ chown #-ur_login-#:#-ur_group-# -R #-ur_home_path-#/.config/chromium/Default/Extensions/gighmmpiobklfepjocnamgkkbiglidom &>/dev/null
+fi
+exit 0
diff --git desktop/desktop/00-patch-2.2.24/ini.env desktop/desktop/00-patch-2.2.24/ini.env
new file mode 100644
index 0000000..8d9b683
--- /dev/null
+++ desktop/desktop/00-patch-2.2.24/ini.env
@@ -0,0 +1,7 @@
+# Calculate format=samba path=~/.calculate
+
+[ver]
+patch = 2.2.24
+
+[update]
+patch = on
diff --git desktop/desktop/60-chromium-6.0/.config/chromium/Default/Extensions/adblock-install.sh desktop/desktop/60-chromium-6.0/.config/chromium/Default/Extensions/adblock-install.sh
index 1e6fad0..04633df 100644
--- desktop/desktop/60-chromium-6.0/.config/chromium/Default/Extensions/adblock-install.sh
+++ desktop/desktop/60-chromium-6.0/.config/chromium/Default/Extensions/adblock-install.sh
@@ -1,4 +1,5 @@
# Calculate path=/tmp pkg(www-apps/chromium-adblock)!= exec=/bin/bash name=adblock-install-#-ur_login-#.sh
cp -r /usr/share/chromium-adblock/gighmmpiobklfepjocnamgkkbiglidom #-ur_home_path-#/.config/chromium/Default/Extensions/
+chown #-ur_login-#:#-ur_group-# -R #-ur_home_path-#/.config/chromium/Default/Extensions/gighmmpiobklfepjocnamgkkbiglidom &>/dev/null
exit 0

@ -1,100 +0,0 @@
diff --git desktop/00-desktop-init/empty_dir/0ini.env desktop/00-desktop-init/empty_dir/0ini.env
index fd0937a..6560917 100644
--- desktop/00-desktop-init/empty_dir/0ini.env
+++ desktop/00-desktop-init/empty_dir/0ini.env
@@ -4,7 +4,7 @@
update = on
[ver]
-patch = 2.2.13
+patch = 2.2.24
[update]
patch = on
diff --git desktop/desktop/00-patch-2.2.10/.calculate_directory desktop/desktop/00-patch-2.2.10/.calculate_directory
index 9ea3814..7b5186f 100644
--- desktop/desktop/00-patch-2.2.10/.calculate_directory
+++ desktop/desktop/00-patch-2.2.10/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip belong(calculate-templates)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.10
+# Calculate append=skip belong(calculate-utilities)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.10
diff --git desktop/desktop/00-patch-2.2.12/.calculate_directory desktop/desktop/00-patch-2.2.12/.calculate_directory
index 3f135e2..3bad719 100644
--- desktop/desktop/00-patch-2.2.12/.calculate_directory
+++ desktop/desktop/00-patch-2.2.12/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip belong(calculate-templates)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.12
+# Calculate append=skip belong(calculate-utilities)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.12
diff --git desktop/desktop/00-patch-2.2.13/.calculate_directory desktop/desktop/00-patch-2.2.13/.calculate_directory
index 81943f4..3932c91 100644
--- desktop/desktop/00-patch-2.2.13/.calculate_directory
+++ desktop/desktop/00-patch-2.2.13/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip belong(calculate-templates)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.13
+# Calculate append=skip belong(calculate-utilities)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.13
diff --git desktop/desktop/00-patch-2.2.22/.calculate_directory desktop/desktop/00-patch-2.2.22/.calculate_directory
index 9259f63..0ed217d 100644
--- desktop/desktop/00-patch-2.2.22/.calculate_directory
+++ desktop/desktop/00-patch-2.2.22/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip belong(calculate-templates)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.22
+# Calculate append=skip belong(calculate-utilities)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.22
diff --git desktop/desktop/00-patch-2.2.23/.calculate_directory desktop/desktop/00-patch-2.2.23/.calculate_directory
index dd6d923..3c18666 100644
--- desktop/desktop/00-patch-2.2.23/.calculate_directory
+++ desktop/desktop/00-patch-2.2.23/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip belong(calculate-templates)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.23
+# Calculate append=skip belong(calculate-utilities)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.23
diff --git desktop/desktop/00-patch-2.2.24/.calculate_directory desktop/desktop/00-patch-2.2.24/.calculate_directory
new file mode 100644
index 0000000..4d30994
--- /dev/null
+++ desktop/desktop/00-patch-2.2.24/.calculate_directory
@@ -0,0 +1 @@
+# Calculate append=skip belong(calculate-utilities)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.24
diff --git desktop/desktop/00-patch-2.2.24/adblock-fix.sh desktop/desktop/00-patch-2.2.24/adblock-fix.sh
new file mode 100644
index 0000000..acf4f7f
--- /dev/null
+++ desktop/desktop/00-patch-2.2.24/adblock-fix.sh
@@ -0,0 +1,7 @@
+# Calculate path=/tmp pkg(www-apps/chromium-adblock)!= exec=/bin/bash name=adblock-fix-#-ur_login-#.sh
+
+if [[ -d #-ur_home_path-#/.config/chromium/Default/Extensions/gighmmpiobklfepjocnamgkkbiglidom ]]
+then
+ chown #-ur_login-#:#-ur_group-# -R #-ur_home_path-#/.config/chromium/Default/Extensions/gighmmpiobklfepjocnamgkkbiglidom &>/dev/null
+fi
+exit 0
diff --git desktop/desktop/00-patch-2.2.24/ini.env desktop/desktop/00-patch-2.2.24/ini.env
new file mode 100644
index 0000000..8d9b683
--- /dev/null
+++ desktop/desktop/00-patch-2.2.24/ini.env
@@ -0,0 +1,7 @@
+# Calculate format=samba path=~/.calculate
+
+[ver]
+patch = 2.2.24
+
+[update]
+patch = on
diff --git desktop/desktop/60-chromium-6.0/.config/chromium/Default/Extensions/adblock-install.sh desktop/desktop/60-chromium-6.0/.config/chromium/Default/Extensions/adblock-install.sh
index 1e6fad0..04633df 100644
--- desktop/desktop/60-chromium-6.0/.config/chromium/Default/Extensions/adblock-install.sh
+++ desktop/desktop/60-chromium-6.0/.config/chromium/Default/Extensions/adblock-install.sh
@@ -1,4 +1,5 @@
# Calculate path=/tmp pkg(www-apps/chromium-adblock)!= exec=/bin/bash name=adblock-install-#-ur_login-#.sh
cp -r /usr/share/chromium-adblock/gighmmpiobklfepjocnamgkkbiglidom #-ur_home_path-#/.config/chromium/Default/Extensions/
+chown #-ur_login-#:#-ur_group-# -R #-ur_home_path-#/.config/chromium/Default/Extensions/gighmmpiobklfepjocnamgkkbiglidom &>/dev/null
exit 0
diff --git desktop/desktop/60-chromium-6.0/.config/chromium/First Run desktop/desktop/60-chromium-6.0/.config/chromium/First Run
index 8b3bbff..8d1c8b6 100644
--- desktop/desktop/60-chromium-6.0/.config/chromium/First Run
+++ desktop/desktop/60-chromium-6.0/.config/chromium/First Run
@@ -1,2 +1 @@
-# Calculate exists(~/.mozilla)==
-# will not migrate if Firefox had not run
\ No newline at end of file
+

@ -1,157 +0,0 @@
diff --git desktop/00-desktop-init/empty_dir/0ini.env desktop/00-desktop-init/empty_dir/0ini.env
index fd0937a..6560917 100644
--- desktop/00-desktop-init/empty_dir/0ini.env
+++ desktop/00-desktop-init/empty_dir/0ini.env
@@ -4,7 +4,7 @@
update = on
[ver]
-patch = 2.2.13
+patch = 2.2.24
[update]
patch = on
diff --git desktop/desktop/00-patch-2.2.10/.calculate_directory desktop/desktop/00-patch-2.2.10/.calculate_directory
index 9ea3814..7b5186f 100644
--- desktop/desktop/00-patch-2.2.10/.calculate_directory
+++ desktop/desktop/00-patch-2.2.10/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip belong(calculate-templates)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.10
+# Calculate append=skip belong(calculate-utilities)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.10
diff --git desktop/desktop/00-patch-2.2.12/.calculate_directory desktop/desktop/00-patch-2.2.12/.calculate_directory
index 3f135e2..3bad719 100644
--- desktop/desktop/00-patch-2.2.12/.calculate_directory
+++ desktop/desktop/00-patch-2.2.12/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip belong(calculate-templates)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.12
+# Calculate append=skip belong(calculate-utilities)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.12
diff --git desktop/desktop/00-patch-2.2.13/.calculate_directory desktop/desktop/00-patch-2.2.13/.calculate_directory
index 81943f4..3932c91 100644
--- desktop/desktop/00-patch-2.2.13/.calculate_directory
+++ desktop/desktop/00-patch-2.2.13/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip belong(calculate-templates)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.13
+# Calculate append=skip belong(calculate-utilities)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.13
diff --git desktop/desktop/00-patch-2.2.22/.calculate_directory desktop/desktop/00-patch-2.2.22/.calculate_directory
index 9259f63..0ed217d 100644
--- desktop/desktop/00-patch-2.2.22/.calculate_directory
+++ desktop/desktop/00-patch-2.2.22/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip belong(calculate-templates)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.22
+# Calculate append=skip belong(calculate-utilities)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.22
diff --git desktop/desktop/00-patch-2.2.23/.calculate_directory desktop/desktop/00-patch-2.2.23/.calculate_directory
index dd6d923..3c18666 100644
--- desktop/desktop/00-patch-2.2.23/.calculate_directory
+++ desktop/desktop/00-patch-2.2.23/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip belong(calculate-templates)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.23
+# Calculate append=skip belong(calculate-utilities)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.23
diff --git desktop/desktop/00-patch-2.2.24/.calculate_directory desktop/desktop/00-patch-2.2.24/.calculate_directory
new file mode 100644
index 0000000..4d30994
--- /dev/null
+++ desktop/desktop/00-patch-2.2.24/.calculate_directory
@@ -0,0 +1 @@
+# Calculate append=skip belong(calculate-utilities)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.24
diff --git desktop/desktop/00-patch-2.2.24/adblock-fix.sh desktop/desktop/00-patch-2.2.24/adblock-fix.sh
new file mode 100644
index 0000000..acf4f7f
--- /dev/null
+++ desktop/desktop/00-patch-2.2.24/adblock-fix.sh
@@ -0,0 +1,7 @@
+# Calculate path=/tmp pkg(www-apps/chromium-adblock)!= exec=/bin/bash name=adblock-fix-#-ur_login-#.sh
+
+if [[ -d #-ur_home_path-#/.config/chromium/Default/Extensions/gighmmpiobklfepjocnamgkkbiglidom ]]
+then
+ chown #-ur_login-#:#-ur_group-# -R #-ur_home_path-#/.config/chromium/Default/Extensions/gighmmpiobklfepjocnamgkkbiglidom &>/dev/null
+fi
+exit 0
diff --git desktop/desktop/00-patch-2.2.24/ini.env desktop/desktop/00-patch-2.2.24/ini.env
new file mode 100644
index 0000000..8d9b683
--- /dev/null
+++ desktop/desktop/00-patch-2.2.24/ini.env
@@ -0,0 +1,7 @@
+# Calculate format=samba path=~/.calculate
+
+[ver]
+patch = 2.2.24
+
+[update]
+patch = on
diff --git desktop/desktop/20-kwallet-4.6/kwalletrc desktop/desktop/20-kwallet-4.6/kwalletrc
index d317bc0..38aa932 100644
--- desktop/desktop/20-kwallet-4.6/kwalletrc
+++ desktop/desktop/20-kwallet-4.6/kwalletrc
@@ -3,40 +3,40 @@
# Applications that access is allowed
[Auto Allow]
#?os_locale_lang==en_US#
-kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Akonadi Resource,KDE Daemon
+kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Akonadi Resource,KDE Daemon,IMAP Account 1 of type IMAP E-Mail Server
#os_locale_lang#
#?os_locale_lang==ru_RU#
-kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Источник данных Akonadi,Служба KDE
+kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Источник данных Akonadi,Служба KDE,IMAP Account 1 of type Почтовый сервер IMAP
#os_locale_lang#
#?os_locale_lang==de_DE#
-kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Akonadi-Ressource,KDE-Dienst
+kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Akonadi-Ressource,KDE-Dienst,IMAP Account 1 of type IMAP-E-Mail-Server
#os_locale_lang#
#?os_locale_lang==es_ES#
-kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Recurso de Akonadi,Servicio de KDE
+kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Recurso de Akonadi,Servicio de KDE,IMAP Account 1 of type Servidor de correo IMAP
#os_locale_lang#
#?os_locale_lang==it_IT#
-kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Risorsa Akonadi,Demone KDE
+kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Risorsa Akonadi,Demone KDE,IMAP Account 1 of type Server di posta IMAP
#os_locale_lang#
#?os_locale_lang==fr_FR#
-kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Ressource Akonadi,Démon de KDE
+kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Ressource Akonadi,Démon de KDE,IMAP Account 1 of type Serveur de courriels IMAP
#os_locale_lang#
#?os_locale_lang==pl_PL#
-kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Zasób Akonadi,KDE Daemon
+kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Zasób Akonadi,KDE Daemon,IMAP Account 1 of type Serwer poczty IMAP
#os_locale_lang#
#?os_locale_lang==pt_PT#
-kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Recurso do Akonadi,Servidor do KDE
+kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Recurso do Akonadi,Servidor do KDE,IMAP Account 1 of type Servidor de E-Mail IMAP
#os_locale_lang#
#?os_locale_lang==pt_BR#
-kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Recurso do Akonadi,Serviço do KDE
+kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Recurso do Akonadi,Serviço do KDE IMAP Account 1 of type Servidor de e-mails IMAP
#os_locale_lang#
#?os_locale_lang==bg_BG#
-kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Akonadi Resource,KDE Daemon
+kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Akonadi Resource,KDE Daemon,IMAP Account 1 of type IMAP E-Mail Server
#os_locale_lang#
#?os_locale_lang==ro_RO#
-kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Akonadi Resource,Demon KDE
+kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Akonadi Resource,Demon KDE,IMAP Account 1 of type Server de poștă IMAP
#os_locale_lang#
#?os_locale_lang==uk_UA#
-kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Ресурс Akonadi,Фонова служба KDE
+kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Ресурс Akonadi,Фонова служба KDE,IMAP Account 1 of type Сервер пошти IMAP
#os_locale_lang#
[Wallet]
diff --git desktop/desktop/60-chromium-6.0/.config/chromium/Default/Extensions/adblock-install.sh desktop/desktop/60-chromium-6.0/.config/chromium/Default/Extensions/adblock-install.sh
index 1e6fad0..04633df 100644
--- desktop/desktop/60-chromium-6.0/.config/chromium/Default/Extensions/adblock-install.sh
+++ desktop/desktop/60-chromium-6.0/.config/chromium/Default/Extensions/adblock-install.sh
@@ -1,4 +1,5 @@
# Calculate path=/tmp pkg(www-apps/chromium-adblock)!= exec=/bin/bash name=adblock-install-#-ur_login-#.sh
cp -r /usr/share/chromium-adblock/gighmmpiobklfepjocnamgkkbiglidom #-ur_home_path-#/.config/chromium/Default/Extensions/
+chown #-ur_login-#:#-ur_group-# -R #-ur_home_path-#/.config/chromium/Default/Extensions/gighmmpiobklfepjocnamgkkbiglidom &>/dev/null
exit 0
diff --git desktop/desktop/60-chromium-6.0/.config/chromium/First Run desktop/desktop/60-chromium-6.0/.config/chromium/First Run
index 8b3bbff..8d1c8b6 100644
--- desktop/desktop/60-chromium-6.0/.config/chromium/First Run
+++ desktop/desktop/60-chromium-6.0/.config/chromium/First Run
@@ -1,2 +1 @@
-# Calculate exists(~/.mozilla)==
-# will not migrate if Firefox had not run
\ No newline at end of file
+

@ -1,334 +0,0 @@
diff --git install/1merge/Desktop/100-Browser/chromium/calculate/.calculate_directory install/1merge/Desktop/100-Browser/chromium/calculate/.calculate_directory
index ed0a326..9c2b262 100644
--- install/1merge/Desktop/100-Browser/chromium/calculate/.calculate_directory
+++ install/1merge/Desktop/100-Browser/chromium/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-browser.desktop)==||ini(desktop.browser)==||ini(desktop.browser)==chromium
+# Calculate append=skip exists(/usr/share/applications/calculate-browser.desktop,root)==||ini(desktop.browser)==||ini(desktop.browser)==chromium
diff --git install/1merge/Desktop/100-Browser/firefox-bin/calculate/.calculate_directory install/1merge/Desktop/100-Browser/firefox-bin/calculate/.calculate_directory
index c710cde..4bb95fa 100644
--- install/1merge/Desktop/100-Browser/firefox-bin/calculate/.calculate_directory
+++ install/1merge/Desktop/100-Browser/firefox-bin/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-browser.desktop)==||ini(desktop.browser)==||ini(desktop.browser)==firefox-bin
+# Calculate append=skip exists(/usr/share/applications/calculate-browser.desktop,root)==||ini(desktop.browser)==||ini(desktop.browser)==firefox-bin
diff --git install/1merge/Desktop/100-Browser/firefox/calculate/.calculate_directory install/1merge/Desktop/100-Browser/firefox/calculate/.calculate_directory
index 19c7fe4..9991f06 100644
--- install/1merge/Desktop/100-Browser/firefox/calculate/.calculate_directory
+++ install/1merge/Desktop/100-Browser/firefox/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-browser.desktop)==||ini(desktop.browser)==||ini(desktop.browser)==firefox
+# Calculate append=skip exists(/usr/share/applications/calculate-browser.desktop,root)==||ini(desktop.browser)==||ini(desktop.browser)==firefox
diff --git install/1merge/Desktop/100-Browser/opera/calculate/.calculate_directory install/1merge/Desktop/100-Browser/opera/calculate/.calculate_directory
index c98ebd6..444a81d 100644
--- install/1merge/Desktop/100-Browser/opera/calculate/.calculate_directory
+++ install/1merge/Desktop/100-Browser/opera/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-browser.desktop)==||ini(desktop.browser)==||ini(desktop.browser)==opera
+# Calculate append=skip exists(/usr/share/applications/calculate-browser.desktop,root)==||ini(desktop.browser)==||ini(desktop.browser)==opera
diff --git install/1merge/Desktop/110-Mail/claws-mail/calculate/.calculate_directory install/1merge/Desktop/110-Mail/claws-mail/calculate/.calculate_directory
index 4c71763..7acc7a0 100644
--- install/1merge/Desktop/110-Mail/claws-mail/calculate/.calculate_directory
+++ install/1merge/Desktop/110-Mail/claws-mail/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-mail.desktop)==||ini(desktop.mail)==||ini(desktop.mail)==claws-mail
+# Calculate append=skip exists(/usr/share/applications/calculate-mail.desktop,root)==||ini(desktop.mail)==||ini(desktop.mail)==claws-mail
diff --git install/1merge/Desktop/110-Mail/evolution/calculate/.calculate_directory install/1merge/Desktop/110-Mail/evolution/calculate/.calculate_directory
index 47c90ee..f94cebc 100644
--- install/1merge/Desktop/110-Mail/evolution/calculate/.calculate_directory
+++ install/1merge/Desktop/110-Mail/evolution/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-mail.desktop)==||ini(desktop.mail)==||ini(desktop.mail)==evolution
+# Calculate append=skip exists(/usr/share/applications/calculate-mail.desktop,root)==||ini(desktop.mail)==||ini(desktop.mail)==evolution
diff --git install/1merge/Desktop/110-Mail/kmail/calculate/.calculate_directory install/1merge/Desktop/110-Mail/kmail/calculate/.calculate_directory
index 655bc70..622ac45 100644
--- install/1merge/Desktop/110-Mail/kmail/calculate/.calculate_directory
+++ install/1merge/Desktop/110-Mail/kmail/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-mail.desktop)==||ini(desktop.mail)==||ini(desktop.mail)==kmail
+# Calculate append=skip exists(/usr/share/applications/calculate-mail.desktop,root)==||ini(desktop.mail)==||ini(desktop.mail)==kmail
diff --git install/1merge/Desktop/120-Chat/konversation/calculate/.calculate_directory install/1merge/Desktop/120-Chat/konversation/calculate/.calculate_directory
index ff6ad44..30abc59 100644
--- install/1merge/Desktop/120-Chat/konversation/calculate/.calculate_directory
+++ install/1merge/Desktop/120-Chat/konversation/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-chat.desktop)==||ini(desktop.chat)==||ini(desktop.chat)==konversation
+# Calculate append=skip exists(/usr/share/applications/calculate-chat.desktop,root)==||ini(desktop.chat)==||ini(desktop.chat)==konversation
diff --git install/1merge/Desktop/120-Chat/xchat/calculate/.calculate_directory install/1merge/Desktop/120-Chat/xchat/calculate/.calculate_directory
index 5551734..e758207 100644
--- install/1merge/Desktop/120-Chat/xchat/calculate/.calculate_directory
+++ install/1merge/Desktop/120-Chat/xchat/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-chat.desktop)==||ini(desktop.chat)==||ini(desktop.chat)==xchat
+# Calculate append=skip exists(/usr/share/applications/calculate-chat.desktop,root)==||ini(desktop.chat)==||ini(desktop.chat)==xchat
diff --git install/1merge/Desktop/130-IM/kopete/calculate/.calculate_directory install/1merge/Desktop/130-IM/kopete/calculate/.calculate_directory
index 6ae3660..70109a6 100644
--- install/1merge/Desktop/130-IM/kopete/calculate/.calculate_directory
+++ install/1merge/Desktop/130-IM/kopete/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-im.desktop)==||ini(desktop.im)==||ini(desktop.im)==kopete
+# Calculate append=skip exists(/usr/share/applications/calculate-im.desktop,root)==||ini(desktop.im)==||ini(desktop.im)==kopete
diff --git install/1merge/Desktop/130-IM/pidgin/calculate/.calculate_directory install/1merge/Desktop/130-IM/pidgin/calculate/.calculate_directory
index b23036d..55f2d3b 100644
--- install/1merge/Desktop/130-IM/pidgin/calculate/.calculate_directory
+++ install/1merge/Desktop/130-IM/pidgin/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-im.desktop)==||ini(desktop.im)==||ini(desktop.im)==pidgin
+# Calculate append=skip exists(/usr/share/applications/calculate-im.desktop,root)==||ini(desktop.im)==||ini(desktop.im)==pidgin
diff --git install/1merge/Desktop/200-Writer/libreoffice-bin/calculate/.calculate_directory install/1merge/Desktop/200-Writer/libreoffice-bin/calculate/.calculate_directory
index 1b735b4..bba3ab4 100644
--- install/1merge/Desktop/200-Writer/libreoffice-bin/calculate/.calculate_directory
+++ install/1merge/Desktop/200-Writer/libreoffice-bin/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-writer.desktop)==||ini(desktop.writer)==||ini(desktop.writer)==libreoffice-bin
+# Calculate append=skip exists(/usr/share/applications/calculate-writer.desktop,root)==||ini(desktop.writer)==||ini(desktop.writer)==libreoffice-bin
diff --git install/1merge/Desktop/200-Writer/libreoffice/calculate/.calculate_directory install/1merge/Desktop/200-Writer/libreoffice/calculate/.calculate_directory
index ec584c9..8cb4ff4 100644
--- install/1merge/Desktop/200-Writer/libreoffice/calculate/.calculate_directory
+++ install/1merge/Desktop/200-Writer/libreoffice/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-writer.desktop)==||ini(desktop.writer)==||ini(desktop.writer)==libreoffice
+# Calculate append=skip exists(/usr/share/applications/calculate-writer.desktop,root)==||ini(desktop.writer)==||ini(desktop.writer)==libreoffice
diff --git install/1merge/Desktop/210-Calc/libreoffice-bin/calculate/.calculate_directory install/1merge/Desktop/210-Calc/libreoffice-bin/calculate/.calculate_directory
index 5bb79da..e64d7fc 100644
--- install/1merge/Desktop/210-Calc/libreoffice-bin/calculate/.calculate_directory
+++ install/1merge/Desktop/210-Calc/libreoffice-bin/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-calc.desktop)==||ini(desktop.calc)==||ini(desktop.calc)==libreoffice-bin
+# Calculate append=skip exists(/usr/share/applications/calculate-calc.desktop,root)==||ini(desktop.calc)==||ini(desktop.calc)==libreoffice-bin
diff --git install/1merge/Desktop/210-Calc/libreoffice/calculate/.calculate_directory install/1merge/Desktop/210-Calc/libreoffice/calculate/.calculate_directory
index 62739f6..829e038 100644
--- install/1merge/Desktop/210-Calc/libreoffice/calculate/.calculate_directory
+++ install/1merge/Desktop/210-Calc/libreoffice/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-calc.desktop)==||ini(desktop.calc)==||ini(desktop.calc)==libreoffice
+# Calculate append=skip exists(/usr/share/applications/calculate-calc.desktop,root)==||ini(desktop.calc)==||ini(desktop.calc)==libreoffice
diff --git install/1merge/Desktop/220-Calculator/galculator/calculate/.calculate_directory install/1merge/Desktop/220-Calculator/galculator/calculate/.calculate_directory
index f0ef9db..845035e 100644
--- install/1merge/Desktop/220-Calculator/galculator/calculate/.calculate_directory
+++ install/1merge/Desktop/220-Calculator/galculator/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-calculator.desktop)==||ini(desktop.calculator)==||ini(desktop.calculator)==galculator
+# Calculate append=skip exists(/usr/share/applications/calculate-calculator.desktop,root)==||ini(desktop.calculator)==||ini(desktop.calculator)==galculator
diff --git install/1merge/Desktop/220-Calculator/gcalctool/calculate/.calculate_directory install/1merge/Desktop/220-Calculator/gcalctool/calculate/.calculate_directory
index 1708ed8..dd26126 100644
--- install/1merge/Desktop/220-Calculator/gcalctool/calculate/.calculate_directory
+++ install/1merge/Desktop/220-Calculator/gcalctool/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-calculator.desktop)==||ini(desktop.calculator)==||ini(desktop.calculator)==gcalctool
+# Calculate append=skip exists(/usr/share/applications/calculate-calculator.desktop,root)==||ini(desktop.calculator)==||ini(desktop.calculator)==gcalctool
diff --git install/1merge/Desktop/220-Calculator/kcalc/calculate/.calculate_directory install/1merge/Desktop/220-Calculator/kcalc/calculate/.calculate_directory
index e1ee67a..65e263c 100644
--- install/1merge/Desktop/220-Calculator/kcalc/calculate/.calculate_directory
+++ install/1merge/Desktop/220-Calculator/kcalc/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-calculator.desktop)==||ini(desktop.calculator)==||ini(desktop.calculator)==kcalc
+# Calculate append=skip exists(/usr/share/applications/calculate-calculator.desktop,root)==||ini(desktop.calculator)==||ini(desktop.calculator)==kcalc
diff --git install/1merge/Desktop/300-ImageEdit/gimp/calculate/.calculate_directory install/1merge/Desktop/300-ImageEdit/gimp/calculate/.calculate_directory
index 5e5bc33..c986788 100644
--- install/1merge/Desktop/300-ImageEdit/gimp/calculate/.calculate_directory
+++ install/1merge/Desktop/300-ImageEdit/gimp/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-imageedit.desktop)==||ini(desktop.imageedit)==||ini(desktop.imageedit)==gimp
+# Calculate append=skip exists(/usr/share/applications/calculate-imageedit.desktop,root)==||ini(desktop.imageedit)==||ini(desktop.imageedit)==gimp
diff --git install/1merge/Desktop/310-ImageView/digikam/calculate/.calculate_directory install/1merge/Desktop/310-ImageView/digikam/calculate/.calculate_directory
index fd78d65..dce8286 100644
--- install/1merge/Desktop/310-ImageView/digikam/calculate/.calculate_directory
+++ install/1merge/Desktop/310-ImageView/digikam/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-imageview.desktop)==||ini(desktop.imageview)==||ini(desktop.imageview)==digikam
+# Calculate append=skip exists(/usr/share/applications/calculate-imageview.desktop,root)==||ini(desktop.imageview)==||ini(desktop.imageview)==digikam
diff --git install/1merge/Desktop/310-ImageView/eog/calculate/.calculate_directory install/1merge/Desktop/310-ImageView/eog/calculate/.calculate_directory
index cfa5649..0ad8b12 100644
--- install/1merge/Desktop/310-ImageView/eog/calculate/.calculate_directory
+++ install/1merge/Desktop/310-ImageView/eog/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-imageview.desktop)==||ini(desktop.imageview)==||ini(desktop.imageview)==eog
+# Calculate append=skip exists(/usr/share/applications/calculate-imageview.desktop,root)==||ini(desktop.imageview)==||ini(desktop.imageview)==eog
diff --git install/1merge/Desktop/310-ImageView/gqview/calculate/.calculate_directory install/1merge/Desktop/310-ImageView/gqview/calculate/.calculate_directory
index 231681b..5148562 100644
--- install/1merge/Desktop/310-ImageView/gqview/calculate/.calculate_directory
+++ install/1merge/Desktop/310-ImageView/gqview/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-imageview.desktop)==||ini(desktop.imageview)==||ini(desktop.imageview)==gqview
+# Calculate append=skip exists(/usr/share/applications/calculate-imageview.desktop,root)==||ini(desktop.imageview)==||ini(desktop.imageview)==gqview
diff --git install/1merge/Desktop/400-AudioPlayer/amarok/calculate/.calculate_directory install/1merge/Desktop/400-AudioPlayer/amarok/calculate/.calculate_directory
index 809976d..e1140f5 100644
--- install/1merge/Desktop/400-AudioPlayer/amarok/calculate/.calculate_directory
+++ install/1merge/Desktop/400-AudioPlayer/amarok/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==amarok
+# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop,root)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==amarok
diff --git install/1merge/Desktop/400-AudioPlayer/audacious/calculate/.calculate_directory install/1merge/Desktop/400-AudioPlayer/audacious/calculate/.calculate_directory
index ec7962d..c076834 100644
--- install/1merge/Desktop/400-AudioPlayer/audacious/calculate/.calculate_directory
+++ install/1merge/Desktop/400-AudioPlayer/audacious/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==audacious
+# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop,root)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==audacious
diff --git install/1merge/Desktop/400-AudioPlayer/deadbeef/calculate/.calculate_directory install/1merge/Desktop/400-AudioPlayer/deadbeef/calculate/.calculate_directory
index d4a2fb1..6855f3d 100644
--- install/1merge/Desktop/400-AudioPlayer/deadbeef/calculate/.calculate_directory
+++ install/1merge/Desktop/400-AudioPlayer/deadbeef/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==deadbeef
+# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop,root)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==deadbeef
diff --git install/1merge/Desktop/400-AudioPlayer/quodlibet/calculate/.calculate_directory install/1merge/Desktop/400-AudioPlayer/quodlibet/calculate/.calculate_directory
index 23a5228..cb426d5 100644
--- install/1merge/Desktop/400-AudioPlayer/quodlibet/calculate/.calculate_directory
+++ install/1merge/Desktop/400-AudioPlayer/quodlibet/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==quodlibet
+# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop,root)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==quodlibet
diff --git install/1merge/Desktop/400-AudioPlayer/rhythmbox/calculate/.calculate_directory install/1merge/Desktop/400-AudioPlayer/rhythmbox/calculate/.calculate_directory
index 46d23b0..808b57f 100644
--- install/1merge/Desktop/400-AudioPlayer/rhythmbox/calculate/.calculate_directory
+++ install/1merge/Desktop/400-AudioPlayer/rhythmbox/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==rhythmbox
+# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop,root)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==rhythmbox
diff --git install/1merge/Desktop/500-VideoPlayer/gnome-mplayer/calculate/.calculate_directory install/1merge/Desktop/500-VideoPlayer/gnome-mplayer/calculate/.calculate_directory
index c93e440..9b6176c 100644
--- install/1merge/Desktop/500-VideoPlayer/gnome-mplayer/calculate/.calculate_directory
+++ install/1merge/Desktop/500-VideoPlayer/gnome-mplayer/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-videoplayer.desktop)==||ini(desktop.videoplayer)==||ini(desktop.videoplayer)==gnome-mplayer
+# Calculate append=skip exists(/usr/share/applications/calculate-videoplayer.desktop,root)==||ini(desktop.videoplayer)==||ini(desktop.videoplayer)==gnome-mplayer
diff --git install/1merge/Desktop/500-VideoPlayer/smplayer/calculate/.calculate_directory install/1merge/Desktop/500-VideoPlayer/smplayer/calculate/.calculate_directory
index ec3963a..2ac5a8c 100644
--- install/1merge/Desktop/500-VideoPlayer/smplayer/calculate/.calculate_directory
+++ install/1merge/Desktop/500-VideoPlayer/smplayer/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-videoplayer.desktop)==||ini(desktop.videoplayer)==||ini(desktop.videoplayer)==smplayer
+# Calculate append=skip exists(/usr/share/applications/calculate-videoplayer.desktop,root)==||ini(desktop.videoplayer)==||ini(desktop.videoplayer)==smplayer
diff --git install/1merge/Desktop/500-VideoPlayer/totem/calculate/.calculate_directory install/1merge/Desktop/500-VideoPlayer/totem/calculate/.calculate_directory
index 2371094..4544c05 100644
--- install/1merge/Desktop/500-VideoPlayer/totem/calculate/.calculate_directory
+++ install/1merge/Desktop/500-VideoPlayer/totem/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-videoplayer.desktop)==||ini(desktop.videoplayer)==||ini(desktop.videoplayer)==totem
+# Calculate append=skip exists(/usr/share/applications/calculate-videoplayer.desktop,root)==||ini(desktop.videoplayer)==||ini(desktop.videoplayer)==totem
diff --git install/1merge/Desktop/600-ImageBurn/brasero/calculate/.calculate_directory install/1merge/Desktop/600-ImageBurn/brasero/calculate/.calculate_directory
index 0881619..4e4c9ec 100644
--- install/1merge/Desktop/600-ImageBurn/brasero/calculate/.calculate_directory
+++ install/1merge/Desktop/600-ImageBurn/brasero/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-imageburn.desktop)==||ini(desktop.imageburn)==||ini(desktop.imageburn)==brasero
+# Calculate append=skip exists(/usr/share/applications/calculate-imageburn.desktop,root)==||ini(desktop.imageburn)==||ini(desktop.imageburn)==brasero
diff --git install/1merge/Desktop/600-ImageBurn/k3b/calculate/.calculate_directory install/1merge/Desktop/600-ImageBurn/k3b/calculate/.calculate_directory
index 47dbc69..f124176 100644
--- install/1merge/Desktop/600-ImageBurn/k3b/calculate/.calculate_directory
+++ install/1merge/Desktop/600-ImageBurn/k3b/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-imageburn.desktop)==||ini(desktop.imageburn)==||ini(desktop.imageburn)==k3b
+# Calculate append=skip exists(/usr/share/applications/calculate-imageburn.desktop,root)==||ini(desktop.imageburn)==||ini(desktop.imageburn)==k3b
diff --git install/1merge/Desktop/600-ImageBurn/xfburn/calculate/.calculate_directory install/1merge/Desktop/600-ImageBurn/xfburn/calculate/.calculate_directory
index 25abb2c..2bcbaec 100644
--- install/1merge/Desktop/600-ImageBurn/xfburn/calculate/.calculate_directory
+++ install/1merge/Desktop/600-ImageBurn/xfburn/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-imageburn.desktop)==||ini(desktop.imageburn)==||ini(desktop.imageburn)==xfburn
+# Calculate append=skip exists(/usr/share/applications/calculate-imageburn.desktop,root)==||ini(desktop.imageburn)==||ini(desktop.imageburn)==xfburn
diff --git install/1merge/Desktop/700-Dict/goldendict/calculate/.calculate_directory install/1merge/Desktop/700-Dict/goldendict/calculate/.calculate_directory
index 7bbbdd2..7992626 100644
--- install/1merge/Desktop/700-Dict/goldendict/calculate/.calculate_directory
+++ install/1merge/Desktop/700-Dict/goldendict/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-dict.desktop)==||ini(desktop.dict)==||ini(desktop.dict)==goldendict
+# Calculate append=skip exists(/usr/share/applications/calculate-dict.desktop,root)==||ini(desktop.dict)==||ini(desktop.dict)==goldendict
diff --git install/1merge/Desktop/700-Dict/stardict/calculate/.calculate_directory install/1merge/Desktop/700-Dict/stardict/calculate/.calculate_directory
index 7150a7e..bcdb4c4 100644
--- install/1merge/Desktop/700-Dict/stardict/calculate/.calculate_directory
+++ install/1merge/Desktop/700-Dict/stardict/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-dict.desktop)==||ini(desktop.dict)==||ini(desktop.dict)==stardict
+# Calculate append=skip exists(/usr/share/applications/calculate-dict.desktop,root)==||ini(desktop.dict)==||ini(desktop.dict)==stardict
diff --git install/1merge/Desktop/800-TextEdit/gedit/calculate/.calculate_directory install/1merge/Desktop/800-TextEdit/gedit/calculate/.calculate_directory
index 8b8af31..7f3a6e2 100644
--- install/1merge/Desktop/800-TextEdit/gedit/calculate/.calculate_directory
+++ install/1merge/Desktop/800-TextEdit/gedit/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-textedit.desktop)==||ini(desktop.textedit)==||ini(desktop.textedit)==gedit
+# Calculate append=skip exists(/usr/share/applications/calculate-textedit.desktop,root)==||ini(desktop.textedit)==||ini(desktop.textedit)==gedit
diff --git install/1merge/Desktop/800-TextEdit/kwrite/calculate/.calculate_directory install/1merge/Desktop/800-TextEdit/kwrite/calculate/.calculate_directory
index 04bd479..32244bc 100644
--- install/1merge/Desktop/800-TextEdit/kwrite/calculate/.calculate_directory
+++ install/1merge/Desktop/800-TextEdit/kwrite/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-textedit.desktop)==||ini(desktop.textedit)==||ini(desktop.textedit)==kwrite
+# Calculate append=skip exists(/usr/share/applications/calculate-textedit.desktop,root)==||ini(desktop.textedit)==||ini(desktop.textedit)==kwrite
diff --git install/1merge/Desktop/800-TextEdit/leafpad/calculate/.calculate_directory install/1merge/Desktop/800-TextEdit/leafpad/calculate/.calculate_directory
index 05304bd..f9a1833 100644
--- install/1merge/Desktop/800-TextEdit/leafpad/calculate/.calculate_directory
+++ install/1merge/Desktop/800-TextEdit/leafpad/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-textedit.desktop)==||ini(desktop.textedit)==||ini(desktop.textedit)==leafpad
+# Calculate append=skip exists(/usr/share/applications/calculate-textedit.desktop,root)==||ini(desktop.textedit)==||ini(desktop.textedit)==leafpad
diff --git install/1merge/Desktop/900-Terminal/gnome-terminal/calculate/.calculate_directory install/1merge/Desktop/900-Terminal/gnome-terminal/calculate/.calculate_directory
index 362fd07..00ae274 100644
--- install/1merge/Desktop/900-Terminal/gnome-terminal/calculate/.calculate_directory
+++ install/1merge/Desktop/900-Terminal/gnome-terminal/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-terminal.desktop)==||ini(desktop.terminal)==||ini(desktop.terminal)==gnome-terminal
+# Calculate append=skip exists(/usr/share/applications/calculate-terminal.desktop,root)==||ini(desktop.terminal)==||ini(desktop.terminal)==gnome-terminal
diff --git install/1merge/Desktop/900-Terminal/konsole/calculate/.calculate_directory install/1merge/Desktop/900-Terminal/konsole/calculate/.calculate_directory
index 418dcf3..95fc9cf 100644
--- install/1merge/Desktop/900-Terminal/konsole/calculate/.calculate_directory
+++ install/1merge/Desktop/900-Terminal/konsole/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-terminal.desktop)==||ini(desktop.terminal)==||ini(desktop.terminal)==konsole
+# Calculate append=skip exists(/usr/share/applications/calculate-terminal.desktop,root)==||ini(desktop.terminal)==||ini(desktop.terminal)==konsole
diff --git install/1merge/Desktop/900-Terminal/terminal/calculate/.calculate_directory install/1merge/Desktop/900-Terminal/terminal/calculate/.calculate_directory
index f89de45..b452ffe 100644
--- install/1merge/Desktop/900-Terminal/terminal/calculate/.calculate_directory
+++ install/1merge/Desktop/900-Terminal/terminal/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-terminal.desktop)==||ini(desktop.terminal)==||ini(desktop.terminal)==terminal
+# Calculate append=skip exists(/usr/share/applications/calculate-terminal.desktop,root)==||ini(desktop.terminal)==||ini(desktop.terminal)==terminal
diff --git install/1system/calculate-install/calculate2.env install/1system/calculate-install/calculate2.env
index 2077d51..29baa6d 100644
--- install/1system/calculate-install/calculate2.env
+++ install/1system/calculate-install/calculate2.env
@@ -1,21 +1,19 @@
-# Calculate format=raw comment=# os_root_type==hdd||os_install_linux_ver>10.8.81
-#?os_root_type==hdd||cl_autologin!=&&os_install_linux_shortname!=CMC&&os_install_root_type!=livecd||cl_autologin==&&os_install_linux_shortname==CMC&&os_install_root_type!=livecd#
+# Calculate format=raw comment=# os_install_root_type==hdd||os_install_linux_ver>10.8.81
+
+#?os_root_type==hdd||os_install_root_type==hdd&&pkg(sys-apps/calculate-install)>2.2.17-r1||cl_autologin!=&&os_install_linux_shortname!=CMC&&os_install_root_type!=livecd&&pkg(sys-apps/calculate-install)>2.2.24||cl_autologin==&&os_install_linux_shortname==CMC&&os_install_root_type!=livecd&&pkg(sys-apps/calculate-install)>2.2.24#
[install]
#os_root_type#
#?os_root_type==hdd#
-# Set previous hdd root device.
os_install_dev_from = #-os_root_dev-#
-# NTP is a protocol designed to synchronize the clocks of computers over a network.
os_install_ntp = #-os_install_ntp-#
#os_root_type#
-#?pkg(sys-apps/calculate-install)>2.2.17-r1&&os_root_type==hdd#
-# name of net manager which is used
+#?os_install_root_type==hdd&&pkg(sys-apps/calculate-install)>2.2.17-r1#
os_install_net_settings = #-os_install_net_conf-#
-#pkg#
-#?cl_autologin!=&&os_install_linux_shortname!=CMC&&os_install_root_type!=livecd#
+#os_install_root_type#
+#?cl_autologin!=&&os_install_linux_shortname!=CMC&&os_install_root_type!=livecd&&pkg(sys-apps/calculate-install)>2.2.24#
cl_autologin = #-cl_autologin-#
#cl_autologin#
-#?cl_autologin==&&os_install_linux_shortname==CMC&&os_install_root_type!=livecd#
+#?cl_autologin==&&os_install_linux_shortname==CMC&&os_install_root_type!=livecd&&pkg(sys-apps/calculate-install)>2.2.24#
cl_autologin =
#cl_autologin#
@@ -24,11 +22,11 @@ cl_autologin =
# Set auto-update configuration files.
cl_autoupdate_set = off
#os_install_linux_ver#
-#?os_install_linux_ver>10.8.91#
+#?os_install_linux_ver>10.8.91&&os_install_root_type!=livecd#
# keep value of root dev uuid (8 char) for kernel symlink
cl_kernel_uid = #-cl_install_kernel_uid-#
#os_install_linux_ver#
-#?os_install_linux_build!=#
+#?os_install_linux_build!=&&os_install_linux_ver>10.8.81#
# current linux build
os_linux_build = #-os_install_linux_build-#
#os_install_linux_build#

@ -1,373 +0,0 @@
diff --git desktop/desktop/20-plasma-4.7/plasma-desktop-appletsrc desktop/desktop/20-plasma-4.7/plasma-desktop-appletsrc
index f23decf..f4bfe4f 100644
--- desktop/desktop/20-plasma-4.7/plasma-desktop-appletsrc
+++ desktop/desktop/20-plasma-4.7/plasma-desktop-appletsrc
@@ -152,6 +152,8 @@ maxRows=1
showOnlyCurrentDesktop=true
#сортировка
sortingStrategy=0
+# не показывать всплывающие подсказки на панели задач
+showTooltip=false
[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
Order=#-sum(apporder,apporder+1)-#
diff --git install/1live/portage/portage/package.keywords/custom install/1live/portage/portage/package.keywords/custom
new file mode 100644
index 0000000..e69de29
diff --git install/1live/portage/portage/package.mask/custom install/1live/portage/portage/package.mask/custom
new file mode 100644
index 0000000..e69de29
diff --git install/1live/portage/portage/package.unmask/custom install/1live/portage/portage/package.unmask/custom
new file mode 100644
index 0000000..e69de29
diff --git install/1live/portage/portage/package.use/custom install/1live/portage/portage/package.use/custom
new file mode 100644
index 0000000..e69de29
diff --git install/1live/portage/portage/sets/.calculate_directory install/1live/portage/portage/sets/.calculate_directory
new file mode 100644
index 0000000..484da65
--- /dev/null
+++ install/1live/portage/portage/sets/.calculate_directory
@@ -0,0 +1 @@
+# Calculate exists(/etc/portage/sets,root)==
diff --git install/1merge/Desktop/100-Browser/chromium/calculate/.calculate_directory install/1merge/Desktop/100-Browser/chromium/calculate/.calculate_directory
index ed0a326..9c2b262 100644
--- install/1merge/Desktop/100-Browser/chromium/calculate/.calculate_directory
+++ install/1merge/Desktop/100-Browser/chromium/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-browser.desktop)==||ini(desktop.browser)==||ini(desktop.browser)==chromium
+# Calculate append=skip exists(/usr/share/applications/calculate-browser.desktop,root)==||ini(desktop.browser)==||ini(desktop.browser)==chromium
diff --git install/1merge/Desktop/100-Browser/firefox-bin/calculate/.calculate_directory install/1merge/Desktop/100-Browser/firefox-bin/calculate/.calculate_directory
index c710cde..4bb95fa 100644
--- install/1merge/Desktop/100-Browser/firefox-bin/calculate/.calculate_directory
+++ install/1merge/Desktop/100-Browser/firefox-bin/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-browser.desktop)==||ini(desktop.browser)==||ini(desktop.browser)==firefox-bin
+# Calculate append=skip exists(/usr/share/applications/calculate-browser.desktop,root)==||ini(desktop.browser)==||ini(desktop.browser)==firefox-bin
diff --git install/1merge/Desktop/100-Browser/firefox/calculate/.calculate_directory install/1merge/Desktop/100-Browser/firefox/calculate/.calculate_directory
index 19c7fe4..9991f06 100644
--- install/1merge/Desktop/100-Browser/firefox/calculate/.calculate_directory
+++ install/1merge/Desktop/100-Browser/firefox/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-browser.desktop)==||ini(desktop.browser)==||ini(desktop.browser)==firefox
+# Calculate append=skip exists(/usr/share/applications/calculate-browser.desktop,root)==||ini(desktop.browser)==||ini(desktop.browser)==firefox
diff --git install/1merge/Desktop/100-Browser/opera/calculate/.calculate_directory install/1merge/Desktop/100-Browser/opera/calculate/.calculate_directory
index c98ebd6..444a81d 100644
--- install/1merge/Desktop/100-Browser/opera/calculate/.calculate_directory
+++ install/1merge/Desktop/100-Browser/opera/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-browser.desktop)==||ini(desktop.browser)==||ini(desktop.browser)==opera
+# Calculate append=skip exists(/usr/share/applications/calculate-browser.desktop,root)==||ini(desktop.browser)==||ini(desktop.browser)==opera
diff --git install/1merge/Desktop/110-Mail/claws-mail/calculate/.calculate_directory install/1merge/Desktop/110-Mail/claws-mail/calculate/.calculate_directory
index 4c71763..7acc7a0 100644
--- install/1merge/Desktop/110-Mail/claws-mail/calculate/.calculate_directory
+++ install/1merge/Desktop/110-Mail/claws-mail/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-mail.desktop)==||ini(desktop.mail)==||ini(desktop.mail)==claws-mail
+# Calculate append=skip exists(/usr/share/applications/calculate-mail.desktop,root)==||ini(desktop.mail)==||ini(desktop.mail)==claws-mail
diff --git install/1merge/Desktop/110-Mail/evolution/calculate/.calculate_directory install/1merge/Desktop/110-Mail/evolution/calculate/.calculate_directory
index 47c90ee..f94cebc 100644
--- install/1merge/Desktop/110-Mail/evolution/calculate/.calculate_directory
+++ install/1merge/Desktop/110-Mail/evolution/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-mail.desktop)==||ini(desktop.mail)==||ini(desktop.mail)==evolution
+# Calculate append=skip exists(/usr/share/applications/calculate-mail.desktop,root)==||ini(desktop.mail)==||ini(desktop.mail)==evolution
diff --git install/1merge/Desktop/110-Mail/kmail/calculate/.calculate_directory install/1merge/Desktop/110-Mail/kmail/calculate/.calculate_directory
index 655bc70..622ac45 100644
--- install/1merge/Desktop/110-Mail/kmail/calculate/.calculate_directory
+++ install/1merge/Desktop/110-Mail/kmail/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-mail.desktop)==||ini(desktop.mail)==||ini(desktop.mail)==kmail
+# Calculate append=skip exists(/usr/share/applications/calculate-mail.desktop,root)==||ini(desktop.mail)==||ini(desktop.mail)==kmail
diff --git install/1merge/Desktop/120-Chat/konversation/calculate/.calculate_directory install/1merge/Desktop/120-Chat/konversation/calculate/.calculate_directory
index ff6ad44..30abc59 100644
--- install/1merge/Desktop/120-Chat/konversation/calculate/.calculate_directory
+++ install/1merge/Desktop/120-Chat/konversation/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-chat.desktop)==||ini(desktop.chat)==||ini(desktop.chat)==konversation
+# Calculate append=skip exists(/usr/share/applications/calculate-chat.desktop,root)==||ini(desktop.chat)==||ini(desktop.chat)==konversation
diff --git install/1merge/Desktop/120-Chat/xchat/calculate/.calculate_directory install/1merge/Desktop/120-Chat/xchat/calculate/.calculate_directory
index 5551734..e758207 100644
--- install/1merge/Desktop/120-Chat/xchat/calculate/.calculate_directory
+++ install/1merge/Desktop/120-Chat/xchat/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-chat.desktop)==||ini(desktop.chat)==||ini(desktop.chat)==xchat
+# Calculate append=skip exists(/usr/share/applications/calculate-chat.desktop,root)==||ini(desktop.chat)==||ini(desktop.chat)==xchat
diff --git install/1merge/Desktop/130-IM/kopete/calculate/.calculate_directory install/1merge/Desktop/130-IM/kopete/calculate/.calculate_directory
index 6ae3660..70109a6 100644
--- install/1merge/Desktop/130-IM/kopete/calculate/.calculate_directory
+++ install/1merge/Desktop/130-IM/kopete/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-im.desktop)==||ini(desktop.im)==||ini(desktop.im)==kopete
+# Calculate append=skip exists(/usr/share/applications/calculate-im.desktop,root)==||ini(desktop.im)==||ini(desktop.im)==kopete
diff --git install/1merge/Desktop/130-IM/pidgin/calculate/.calculate_directory install/1merge/Desktop/130-IM/pidgin/calculate/.calculate_directory
index b23036d..55f2d3b 100644
--- install/1merge/Desktop/130-IM/pidgin/calculate/.calculate_directory
+++ install/1merge/Desktop/130-IM/pidgin/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-im.desktop)==||ini(desktop.im)==||ini(desktop.im)==pidgin
+# Calculate append=skip exists(/usr/share/applications/calculate-im.desktop,root)==||ini(desktop.im)==||ini(desktop.im)==pidgin
diff --git install/1merge/Desktop/200-Writer/libreoffice-bin/calculate/.calculate_directory install/1merge/Desktop/200-Writer/libreoffice-bin/calculate/.calculate_directory
index 1b735b4..bba3ab4 100644
--- install/1merge/Desktop/200-Writer/libreoffice-bin/calculate/.calculate_directory
+++ install/1merge/Desktop/200-Writer/libreoffice-bin/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-writer.desktop)==||ini(desktop.writer)==||ini(desktop.writer)==libreoffice-bin
+# Calculate append=skip exists(/usr/share/applications/calculate-writer.desktop,root)==||ini(desktop.writer)==||ini(desktop.writer)==libreoffice-bin
diff --git install/1merge/Desktop/200-Writer/libreoffice/calculate/.calculate_directory install/1merge/Desktop/200-Writer/libreoffice/calculate/.calculate_directory
index ec584c9..8cb4ff4 100644
--- install/1merge/Desktop/200-Writer/libreoffice/calculate/.calculate_directory
+++ install/1merge/Desktop/200-Writer/libreoffice/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-writer.desktop)==||ini(desktop.writer)==||ini(desktop.writer)==libreoffice
+# Calculate append=skip exists(/usr/share/applications/calculate-writer.desktop,root)==||ini(desktop.writer)==||ini(desktop.writer)==libreoffice
diff --git install/1merge/Desktop/210-Calc/libreoffice-bin/calculate/.calculate_directory install/1merge/Desktop/210-Calc/libreoffice-bin/calculate/.calculate_directory
index 5bb79da..e64d7fc 100644
--- install/1merge/Desktop/210-Calc/libreoffice-bin/calculate/.calculate_directory
+++ install/1merge/Desktop/210-Calc/libreoffice-bin/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-calc.desktop)==||ini(desktop.calc)==||ini(desktop.calc)==libreoffice-bin
+# Calculate append=skip exists(/usr/share/applications/calculate-calc.desktop,root)==||ini(desktop.calc)==||ini(desktop.calc)==libreoffice-bin
diff --git install/1merge/Desktop/210-Calc/libreoffice/calculate/.calculate_directory install/1merge/Desktop/210-Calc/libreoffice/calculate/.calculate_directory
index 62739f6..829e038 100644
--- install/1merge/Desktop/210-Calc/libreoffice/calculate/.calculate_directory
+++ install/1merge/Desktop/210-Calc/libreoffice/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-calc.desktop)==||ini(desktop.calc)==||ini(desktop.calc)==libreoffice
+# Calculate append=skip exists(/usr/share/applications/calculate-calc.desktop,root)==||ini(desktop.calc)==||ini(desktop.calc)==libreoffice
diff --git install/1merge/Desktop/220-Calculator/galculator/calculate/.calculate_directory install/1merge/Desktop/220-Calculator/galculator/calculate/.calculate_directory
index f0ef9db..845035e 100644
--- install/1merge/Desktop/220-Calculator/galculator/calculate/.calculate_directory
+++ install/1merge/Desktop/220-Calculator/galculator/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-calculator.desktop)==||ini(desktop.calculator)==||ini(desktop.calculator)==galculator
+# Calculate append=skip exists(/usr/share/applications/calculate-calculator.desktop,root)==||ini(desktop.calculator)==||ini(desktop.calculator)==galculator
diff --git install/1merge/Desktop/220-Calculator/gcalctool/calculate/.calculate_directory install/1merge/Desktop/220-Calculator/gcalctool/calculate/.calculate_directory
index 1708ed8..dd26126 100644
--- install/1merge/Desktop/220-Calculator/gcalctool/calculate/.calculate_directory
+++ install/1merge/Desktop/220-Calculator/gcalctool/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-calculator.desktop)==||ini(desktop.calculator)==||ini(desktop.calculator)==gcalctool
+# Calculate append=skip exists(/usr/share/applications/calculate-calculator.desktop,root)==||ini(desktop.calculator)==||ini(desktop.calculator)==gcalctool
diff --git install/1merge/Desktop/220-Calculator/kcalc/calculate/.calculate_directory install/1merge/Desktop/220-Calculator/kcalc/calculate/.calculate_directory
index e1ee67a..65e263c 100644
--- install/1merge/Desktop/220-Calculator/kcalc/calculate/.calculate_directory
+++ install/1merge/Desktop/220-Calculator/kcalc/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-calculator.desktop)==||ini(desktop.calculator)==||ini(desktop.calculator)==kcalc
+# Calculate append=skip exists(/usr/share/applications/calculate-calculator.desktop,root)==||ini(desktop.calculator)==||ini(desktop.calculator)==kcalc
diff --git install/1merge/Desktop/300-ImageEdit/gimp/calculate/.calculate_directory install/1merge/Desktop/300-ImageEdit/gimp/calculate/.calculate_directory
index 5e5bc33..c986788 100644
--- install/1merge/Desktop/300-ImageEdit/gimp/calculate/.calculate_directory
+++ install/1merge/Desktop/300-ImageEdit/gimp/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-imageedit.desktop)==||ini(desktop.imageedit)==||ini(desktop.imageedit)==gimp
+# Calculate append=skip exists(/usr/share/applications/calculate-imageedit.desktop,root)==||ini(desktop.imageedit)==||ini(desktop.imageedit)==gimp
diff --git install/1merge/Desktop/310-ImageView/digikam/calculate/.calculate_directory install/1merge/Desktop/310-ImageView/digikam/calculate/.calculate_directory
index fd78d65..dce8286 100644
--- install/1merge/Desktop/310-ImageView/digikam/calculate/.calculate_directory
+++ install/1merge/Desktop/310-ImageView/digikam/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-imageview.desktop)==||ini(desktop.imageview)==||ini(desktop.imageview)==digikam
+# Calculate append=skip exists(/usr/share/applications/calculate-imageview.desktop,root)==||ini(desktop.imageview)==||ini(desktop.imageview)==digikam
diff --git install/1merge/Desktop/310-ImageView/eog/calculate/.calculate_directory install/1merge/Desktop/310-ImageView/eog/calculate/.calculate_directory
index cfa5649..0ad8b12 100644
--- install/1merge/Desktop/310-ImageView/eog/calculate/.calculate_directory
+++ install/1merge/Desktop/310-ImageView/eog/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-imageview.desktop)==||ini(desktop.imageview)==||ini(desktop.imageview)==eog
+# Calculate append=skip exists(/usr/share/applications/calculate-imageview.desktop,root)==||ini(desktop.imageview)==||ini(desktop.imageview)==eog
diff --git install/1merge/Desktop/310-ImageView/gqview/calculate/.calculate_directory install/1merge/Desktop/310-ImageView/gqview/calculate/.calculate_directory
index 231681b..5148562 100644
--- install/1merge/Desktop/310-ImageView/gqview/calculate/.calculate_directory
+++ install/1merge/Desktop/310-ImageView/gqview/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-imageview.desktop)==||ini(desktop.imageview)==||ini(desktop.imageview)==gqview
+# Calculate append=skip exists(/usr/share/applications/calculate-imageview.desktop,root)==||ini(desktop.imageview)==||ini(desktop.imageview)==gqview
diff --git install/1merge/Desktop/400-AudioPlayer/amarok/calculate/.calculate_directory install/1merge/Desktop/400-AudioPlayer/amarok/calculate/.calculate_directory
index 809976d..e1140f5 100644
--- install/1merge/Desktop/400-AudioPlayer/amarok/calculate/.calculate_directory
+++ install/1merge/Desktop/400-AudioPlayer/amarok/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==amarok
+# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop,root)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==amarok
diff --git install/1merge/Desktop/400-AudioPlayer/audacious/calculate/.calculate_directory install/1merge/Desktop/400-AudioPlayer/audacious/calculate/.calculate_directory
index ec7962d..c076834 100644
--- install/1merge/Desktop/400-AudioPlayer/audacious/calculate/.calculate_directory
+++ install/1merge/Desktop/400-AudioPlayer/audacious/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==audacious
+# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop,root)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==audacious
diff --git install/1merge/Desktop/400-AudioPlayer/deadbeef/calculate/.calculate_directory install/1merge/Desktop/400-AudioPlayer/deadbeef/calculate/.calculate_directory
index d4a2fb1..6855f3d 100644
--- install/1merge/Desktop/400-AudioPlayer/deadbeef/calculate/.calculate_directory
+++ install/1merge/Desktop/400-AudioPlayer/deadbeef/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==deadbeef
+# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop,root)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==deadbeef
diff --git install/1merge/Desktop/400-AudioPlayer/quodlibet/calculate/.calculate_directory install/1merge/Desktop/400-AudioPlayer/quodlibet/calculate/.calculate_directory
index 23a5228..cb426d5 100644
--- install/1merge/Desktop/400-AudioPlayer/quodlibet/calculate/.calculate_directory
+++ install/1merge/Desktop/400-AudioPlayer/quodlibet/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==quodlibet
+# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop,root)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==quodlibet
diff --git install/1merge/Desktop/400-AudioPlayer/rhythmbox/calculate/.calculate_directory install/1merge/Desktop/400-AudioPlayer/rhythmbox/calculate/.calculate_directory
index 46d23b0..808b57f 100644
--- install/1merge/Desktop/400-AudioPlayer/rhythmbox/calculate/.calculate_directory
+++ install/1merge/Desktop/400-AudioPlayer/rhythmbox/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==rhythmbox
+# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop,root)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==rhythmbox
diff --git install/1merge/Desktop/500-VideoPlayer/gnome-mplayer/calculate/.calculate_directory install/1merge/Desktop/500-VideoPlayer/gnome-mplayer/calculate/.calculate_directory
index c93e440..9b6176c 100644
--- install/1merge/Desktop/500-VideoPlayer/gnome-mplayer/calculate/.calculate_directory
+++ install/1merge/Desktop/500-VideoPlayer/gnome-mplayer/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-videoplayer.desktop)==||ini(desktop.videoplayer)==||ini(desktop.videoplayer)==gnome-mplayer
+# Calculate append=skip exists(/usr/share/applications/calculate-videoplayer.desktop,root)==||ini(desktop.videoplayer)==||ini(desktop.videoplayer)==gnome-mplayer
diff --git install/1merge/Desktop/500-VideoPlayer/smplayer/calculate/.calculate_directory install/1merge/Desktop/500-VideoPlayer/smplayer/calculate/.calculate_directory
index ec3963a..2ac5a8c 100644
--- install/1merge/Desktop/500-VideoPlayer/smplayer/calculate/.calculate_directory
+++ install/1merge/Desktop/500-VideoPlayer/smplayer/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-videoplayer.desktop)==||ini(desktop.videoplayer)==||ini(desktop.videoplayer)==smplayer
+# Calculate append=skip exists(/usr/share/applications/calculate-videoplayer.desktop,root)==||ini(desktop.videoplayer)==||ini(desktop.videoplayer)==smplayer
diff --git install/1merge/Desktop/500-VideoPlayer/totem/calculate/.calculate_directory install/1merge/Desktop/500-VideoPlayer/totem/calculate/.calculate_directory
index 2371094..4544c05 100644
--- install/1merge/Desktop/500-VideoPlayer/totem/calculate/.calculate_directory
+++ install/1merge/Desktop/500-VideoPlayer/totem/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-videoplayer.desktop)==||ini(desktop.videoplayer)==||ini(desktop.videoplayer)==totem
+# Calculate append=skip exists(/usr/share/applications/calculate-videoplayer.desktop,root)==||ini(desktop.videoplayer)==||ini(desktop.videoplayer)==totem
diff --git install/1merge/Desktop/600-ImageBurn/brasero/calculate/.calculate_directory install/1merge/Desktop/600-ImageBurn/brasero/calculate/.calculate_directory
index 0881619..4e4c9ec 100644
--- install/1merge/Desktop/600-ImageBurn/brasero/calculate/.calculate_directory
+++ install/1merge/Desktop/600-ImageBurn/brasero/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-imageburn.desktop)==||ini(desktop.imageburn)==||ini(desktop.imageburn)==brasero
+# Calculate append=skip exists(/usr/share/applications/calculate-imageburn.desktop,root)==||ini(desktop.imageburn)==||ini(desktop.imageburn)==brasero
diff --git install/1merge/Desktop/600-ImageBurn/k3b/calculate/.calculate_directory install/1merge/Desktop/600-ImageBurn/k3b/calculate/.calculate_directory
index 47dbc69..f124176 100644
--- install/1merge/Desktop/600-ImageBurn/k3b/calculate/.calculate_directory
+++ install/1merge/Desktop/600-ImageBurn/k3b/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-imageburn.desktop)==||ini(desktop.imageburn)==||ini(desktop.imageburn)==k3b
+# Calculate append=skip exists(/usr/share/applications/calculate-imageburn.desktop,root)==||ini(desktop.imageburn)==||ini(desktop.imageburn)==k3b
diff --git install/1merge/Desktop/600-ImageBurn/xfburn/calculate/.calculate_directory install/1merge/Desktop/600-ImageBurn/xfburn/calculate/.calculate_directory
index 25abb2c..2bcbaec 100644
--- install/1merge/Desktop/600-ImageBurn/xfburn/calculate/.calculate_directory
+++ install/1merge/Desktop/600-ImageBurn/xfburn/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-imageburn.desktop)==||ini(desktop.imageburn)==||ini(desktop.imageburn)==xfburn
+# Calculate append=skip exists(/usr/share/applications/calculate-imageburn.desktop,root)==||ini(desktop.imageburn)==||ini(desktop.imageburn)==xfburn
diff --git install/1merge/Desktop/700-Dict/goldendict/calculate/.calculate_directory install/1merge/Desktop/700-Dict/goldendict/calculate/.calculate_directory
index 7bbbdd2..7992626 100644
--- install/1merge/Desktop/700-Dict/goldendict/calculate/.calculate_directory
+++ install/1merge/Desktop/700-Dict/goldendict/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-dict.desktop)==||ini(desktop.dict)==||ini(desktop.dict)==goldendict
+# Calculate append=skip exists(/usr/share/applications/calculate-dict.desktop,root)==||ini(desktop.dict)==||ini(desktop.dict)==goldendict
diff --git install/1merge/Desktop/700-Dict/stardict/calculate/.calculate_directory install/1merge/Desktop/700-Dict/stardict/calculate/.calculate_directory
index 7150a7e..bcdb4c4 100644
--- install/1merge/Desktop/700-Dict/stardict/calculate/.calculate_directory
+++ install/1merge/Desktop/700-Dict/stardict/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-dict.desktop)==||ini(desktop.dict)==||ini(desktop.dict)==stardict
+# Calculate append=skip exists(/usr/share/applications/calculate-dict.desktop,root)==||ini(desktop.dict)==||ini(desktop.dict)==stardict
diff --git install/1merge/Desktop/800-TextEdit/gedit/calculate/.calculate_directory install/1merge/Desktop/800-TextEdit/gedit/calculate/.calculate_directory
index 8b8af31..7f3a6e2 100644
--- install/1merge/Desktop/800-TextEdit/gedit/calculate/.calculate_directory
+++ install/1merge/Desktop/800-TextEdit/gedit/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-textedit.desktop)==||ini(desktop.textedit)==||ini(desktop.textedit)==gedit
+# Calculate append=skip exists(/usr/share/applications/calculate-textedit.desktop,root)==||ini(desktop.textedit)==||ini(desktop.textedit)==gedit
diff --git install/1merge/Desktop/800-TextEdit/kwrite/calculate/.calculate_directory install/1merge/Desktop/800-TextEdit/kwrite/calculate/.calculate_directory
index 04bd479..32244bc 100644
--- install/1merge/Desktop/800-TextEdit/kwrite/calculate/.calculate_directory
+++ install/1merge/Desktop/800-TextEdit/kwrite/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-textedit.desktop)==||ini(desktop.textedit)==||ini(desktop.textedit)==kwrite
+# Calculate append=skip exists(/usr/share/applications/calculate-textedit.desktop,root)==||ini(desktop.textedit)==||ini(desktop.textedit)==kwrite
diff --git install/1merge/Desktop/800-TextEdit/leafpad/calculate/.calculate_directory install/1merge/Desktop/800-TextEdit/leafpad/calculate/.calculate_directory
index 05304bd..f9a1833 100644
--- install/1merge/Desktop/800-TextEdit/leafpad/calculate/.calculate_directory
+++ install/1merge/Desktop/800-TextEdit/leafpad/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-textedit.desktop)==||ini(desktop.textedit)==||ini(desktop.textedit)==leafpad
+# Calculate append=skip exists(/usr/share/applications/calculate-textedit.desktop,root)==||ini(desktop.textedit)==||ini(desktop.textedit)==leafpad
diff --git install/1merge/Desktop/900-Terminal/gnome-terminal/calculate/.calculate_directory install/1merge/Desktop/900-Terminal/gnome-terminal/calculate/.calculate_directory
index 362fd07..00ae274 100644
--- install/1merge/Desktop/900-Terminal/gnome-terminal/calculate/.calculate_directory
+++ install/1merge/Desktop/900-Terminal/gnome-terminal/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-terminal.desktop)==||ini(desktop.terminal)==||ini(desktop.terminal)==gnome-terminal
+# Calculate append=skip exists(/usr/share/applications/calculate-terminal.desktop,root)==||ini(desktop.terminal)==||ini(desktop.terminal)==gnome-terminal
diff --git install/1merge/Desktop/900-Terminal/konsole/calculate/.calculate_directory install/1merge/Desktop/900-Terminal/konsole/calculate/.calculate_directory
index 418dcf3..95fc9cf 100644
--- install/1merge/Desktop/900-Terminal/konsole/calculate/.calculate_directory
+++ install/1merge/Desktop/900-Terminal/konsole/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-terminal.desktop)==||ini(desktop.terminal)==||ini(desktop.terminal)==konsole
+# Calculate append=skip exists(/usr/share/applications/calculate-terminal.desktop,root)==||ini(desktop.terminal)==||ini(desktop.terminal)==konsole
diff --git install/1merge/Desktop/900-Terminal/terminal/calculate/.calculate_directory install/1merge/Desktop/900-Terminal/terminal/calculate/.calculate_directory
index f89de45..b452ffe 100644
--- install/1merge/Desktop/900-Terminal/terminal/calculate/.calculate_directory
+++ install/1merge/Desktop/900-Terminal/terminal/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-terminal.desktop)==||ini(desktop.terminal)==||ini(desktop.terminal)==terminal
+# Calculate append=skip exists(/usr/share/applications/calculate-terminal.desktop,root)==||ini(desktop.terminal)==||ini(desktop.terminal)==terminal
diff --git install/1system/calculate-install/calculate2.env install/1system/calculate-install/calculate2.env
index 2077d51..29baa6d 100644
--- install/1system/calculate-install/calculate2.env
+++ install/1system/calculate-install/calculate2.env
@@ -1,21 +1,19 @@
-# Calculate format=raw comment=# os_root_type==hdd||os_install_linux_ver>10.8.81
-#?os_root_type==hdd||cl_autologin!=&&os_install_linux_shortname!=CMC&&os_install_root_type!=livecd||cl_autologin==&&os_install_linux_shortname==CMC&&os_install_root_type!=livecd#
+# Calculate format=raw comment=# os_install_root_type==hdd||os_install_linux_ver>10.8.81
+
+#?os_root_type==hdd||os_install_root_type==hdd&&pkg(sys-apps/calculate-install)>2.2.17-r1||cl_autologin!=&&os_install_linux_shortname!=CMC&&os_install_root_type!=livecd&&pkg(sys-apps/calculate-install)>2.2.24||cl_autologin==&&os_install_linux_shortname==CMC&&os_install_root_type!=livecd&&pkg(sys-apps/calculate-install)>2.2.24#
[install]
#os_root_type#
#?os_root_type==hdd#
-# Set previous hdd root device.
os_install_dev_from = #-os_root_dev-#
-# NTP is a protocol designed to synchronize the clocks of computers over a network.
os_install_ntp = #-os_install_ntp-#
#os_root_type#
-#?pkg(sys-apps/calculate-install)>2.2.17-r1&&os_root_type==hdd#
-# name of net manager which is used
+#?os_install_root_type==hdd&&pkg(sys-apps/calculate-install)>2.2.17-r1#
os_install_net_settings = #-os_install_net_conf-#
-#pkg#
-#?cl_autologin!=&&os_install_linux_shortname!=CMC&&os_install_root_type!=livecd#
+#os_install_root_type#
+#?cl_autologin!=&&os_install_linux_shortname!=CMC&&os_install_root_type!=livecd&&pkg(sys-apps/calculate-install)>2.2.24#
cl_autologin = #-cl_autologin-#
#cl_autologin#
-#?cl_autologin==&&os_install_linux_shortname==CMC&&os_install_root_type!=livecd#
+#?cl_autologin==&&os_install_linux_shortname==CMC&&os_install_root_type!=livecd&&pkg(sys-apps/calculate-install)>2.2.24#
cl_autologin =
#cl_autologin#
@@ -24,11 +22,11 @@ cl_autologin =
# Set auto-update configuration files.
cl_autoupdate_set = off
#os_install_linux_ver#
-#?os_install_linux_ver>10.8.91#
+#?os_install_linux_ver>10.8.91&&os_install_root_type!=livecd#
# keep value of root dev uuid (8 char) for kernel symlink
cl_kernel_uid = #-cl_install_kernel_uid-#
#os_install_linux_ver#
-#?os_install_linux_build!=#
+#?os_install_linux_build!=&&os_install_linux_ver>10.8.81#
# current linux build
os_linux_build = #-os_install_linux_build-#
#os_install_linux_build#
diff --git install/1system/calculate-install/linux/.calculate_directory install/1system/calculate-install/linux/.calculate_directory
new file mode 100644
index 0000000..814ccaf
--- /dev/null
+++ install/1system/calculate-install/linux/.calculate_directory
@@ -0,0 +1 @@
+# Calculate path=/var/calculate

@ -1,512 +0,0 @@
diff --git desktop/desktop-live/60-bash-3.0/.bash_profile desktop/desktop-live/60-bash-3.0/.bash_profile
new file mode 100644
index 0000000..f03143d
--- /dev/null
+++ desktop/desktop-live/60-bash-3.0/.bash_profile
@@ -0,0 +1,3 @@
+#Calculate os_root_type==livecd
+alias su="sudo su -"
+
diff --git desktop/desktop-live/60-bash-3.0/.bashrc desktop/desktop-live/60-bash-3.0/.bashrc
new file mode 100644
index 0000000..f03143d
--- /dev/null
+++ desktop/desktop-live/60-bash-3.0/.bashrc
@@ -0,0 +1,3 @@
+#Calculate os_root_type==livecd
+alias su="sudo su -"
+
diff --git desktop/desktop-live/60-bash-3.0/.calculate/ini.env desktop/desktop-live/60-bash-3.0/.calculate/ini.env
new file mode 100644
index 0000000..01cd32f
--- /dev/null
+++ desktop/desktop-live/60-bash-3.0/.calculate/ini.env
@@ -0,0 +1,7 @@
+# Calculate format=samba
+
+[ver]
+bash = 3.0
+
+[update]
+bash = on
diff --git desktop/desktop-live/60-bash-3.0/.calculate_directory desktop/desktop-live/60-bash-3.0/.calculate_directory
new file mode 100644
index 0000000..aa85a6a
--- /dev/null
+++ desktop/desktop-live/60-bash-3.0/.calculate_directory
@@ -0,0 +1 @@
+# Calculate append=skip belong(bash)!=&&ini(update.bash)!=off&&ini(ver.bash)==&&pkg(app-shells/bash)>=3.0
diff --git desktop/desktop/20-plasma-4.7/plasma-desktop-appletsrc desktop/desktop/20-plasma-4.7/plasma-desktop-appletsrc
index f23decf..f4bfe4f 100644
--- desktop/desktop/20-plasma-4.7/plasma-desktop-appletsrc
+++ desktop/desktop/20-plasma-4.7/plasma-desktop-appletsrc
@@ -152,6 +152,8 @@ maxRows=1
showOnlyCurrentDesktop=true
#сортировка
sortingStrategy=0
+# не показывать всплывающие подсказки на панели задач
+showTooltip=false
[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
Order=#-sum(apporder,apporder+1)-#
diff --git desktop/desktop/30-gnome-2.30/.gconf/apps/gnome-terminal/profiles/Default/%gconf.xml desktop/desktop/30-gnome-2.30/.gconf/apps/gnome-terminal/profiles/Default/%gconf.xml
index 02ccbc9..3ffad19 100644
--- desktop/desktop/30-gnome-2.30/.gconf/apps/gnome-terminal/profiles/Default/%gconf.xml
+++ desktop/desktop/30-gnome-2.30/.gconf/apps/gnome-terminal/profiles/Default/%gconf.xml
@@ -7,7 +7,7 @@
<entry name="use_system_font" type="bool" value="false"/>
<entry name="scrollback_lines" type="int" value="5000"/>
<entry name="palette" type="string">
- <stringvalue>#2E2E34343636:#CCCC00000000:#4E4E9A9A0606:#C4C4A0A00000:#34346565A4A4:#757550507B7B:#060698209A9A:#D3D3D7D7CFCF:#555557575353:#EFEF29292929:#8A8AE2E23434:#FCFCE9E94F4F:#72729F9FCFCF:#ADAD7F7FA8A8:#3434E2E2E2E2:#EEEEEEEEECEC</stringvalue>
+ <stringvalue>#3F3F3F3F3F3F:#707050505050:#6060B4B48A8A:#DFDFAFAF8F8F:#9A9AB8B8D7D7:#DCDC8C8CC3C3:#8C8CD0D0D3D3:#DCDCDCDCCCCC:#707090908080:#DCDCA3A3A3A3:#7272D5D5A3A3:#F0F0DFDFAFAF:#9494BFBFF3F3:#ECEC9393D3D3:#9393E0E0E3E3:#FFFFFFFFFFFF</stringvalue>
</entry>
<entry name="use_theme_colors" type="bool" value="false"/>
<entry name="visible_name" type="string">
@@ -15,9 +15,9 @@
</entry>
<entry name="login_shell" type="bool" value="true"/>
<entry name="background_color" type="string">
- <stringvalue>#000000000000</stringvalue>
+ <stringvalue>#2C2C2C2C2C2C</stringvalue>
</entry>
<entry name="foreground_color" type="string">
- <stringvalue>#FFFFFFFFFFFF</stringvalue>
+ <stringvalue>#DCDCDCDCCCCC</stringvalue>
</entry>
</gconf>
diff --git desktop/desktop/40-xfce-4.8/.config/Terminal/terminalrc desktop/desktop/40-xfce-4.8/.config/Terminal/terminalrc
index 2ff75a9..75c9cd2 100644
--- desktop/desktop/40-xfce-4.8/.config/Terminal/terminalrc
+++ desktop/desktop/40-xfce-4.8/.config/Terminal/terminalrc
@@ -3,10 +3,23 @@
FontName=Droid Sans Mono 10
MiscSingleClick=TRUE
ShortcutsNoMenukey=TRUE
-ColorBackground=#273a273a273a
-ColorPalette5=#50665066ce38
-ColorPalette13=#88428842ffff
-ColorPalette10=#e72f77c777c7
-ColorPalette2=#c7fd3c233c23
-ColorPalette4=#c50b69a20e39
-
+ColorPalette1=#3f3f3f3f3f3f
+ColorPalette2=#707050505050
+ColorPalette3=#6060b4b48a8a
+ColorPalette4=#dfdfafaf8f8f
+ColorPalette5=#9a9ab8b8d7d7
+ColorPalette6=#dcdc8c8cc3c3
+ColorPalette7=#8c8cd0d0d3d3
+ColorPalette8=#dcdcdcdccccc
+ColorPalette9=#707090908080
+ColorPalette10=#dcdca3a3a3a3
+ColorPalette11=#7272d5d5a3a3
+ColorPalette12=#f0f0dfdfafaf
+ColorPalette13=#9494bfbff3f3
+ColorPalette14=#ecec9393d3d3
+ColorPalette15=#9393e0e0e3e3
+ColorPalette16=#ffffffffffff
+ColorCursor=#dcdcdcdccccc
+ColorForeground=#dcdcdcdccccc
+ColorBackground=#2c2c2c2c2c2c
+TabActivityColor=#2c2c2c2c2c2c
diff --git desktop/desktop/60-bash-3.0/.bashrc desktop/desktop/60-bash-3.0/.bashrc
deleted file mode 100644
index f03143d..0000000
--- desktop/desktop/60-bash-3.0/.bashrc
+++ /dev/null
@@ -1,3 +0,0 @@
-#Calculate os_root_type==livecd
-alias su="sudo su -"
-
diff --git desktop/desktop/60-bash-3.0/.calculate/ini.env desktop/desktop/60-bash-3.0/.calculate/ini.env
deleted file mode 100644
index 01cd32f..0000000
--- desktop/desktop/60-bash-3.0/.calculate/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[ver]
-bash = 3.0
-
-[update]
-bash = on
diff --git desktop/desktop/60-bash-3.0/.calculate_directory desktop/desktop/60-bash-3.0/.calculate_directory
deleted file mode 100644
index aa85a6a..0000000
--- desktop/desktop/60-bash-3.0/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip belong(bash)!=&&ini(update.bash)!=off&&ini(ver.bash)==&&pkg(app-shells/bash)>=3.0
diff --git desktop/desktop/60-mc-4.7/.mc/ini desktop/desktop/60-mc-4.7/.mc/ini
index 1994d7a..d36eb71 100644
--- desktop/desktop/60-mc-4.7/.mc/ini
+++ desktop/desktop/60-mc-4.7/.mc/ini
@@ -1,4 +1,7 @@
# Calculate format=kde
+[Colors]
+base_color=,black:normal=,black:selected=black,cyan:marked=,black:markselect=yellow,cyan:errors=white,red:menu=white,cyan:reverse=black,lightgray:dnormal=black,lightgray:dfocus=black,cyan:dhotnormal=blue,lightgray:dhotfocus=blue,cyan:viewunderline=,black:menuhot=yellow,cyan:menusel=white,black:menuhotsel=yellow,black:helpnormal=black,lightgray:helpitalic=red,lightgray:helpbold=blue,lightgray:helplink=black,cyan:helpslink=yellow,blue:gauge=white,black:input=black,cyan:directory=white,black:executable=green,black:link=gray,black:stalelink=brightred,blue:device=,black:core=red,blue:special=red,black:editnormal=lightgray,black:editbold=yellow,blue:editmarked=black,cyan:errdhotnormal=yellow,red:errdhotfocus=yellow,lightgray
+
[Layout]
#видимость верхней строчки меню
menubar_visible=0
diff --git install/1live/portage/portage/package.keywords/custom install/1live/portage/portage/package.keywords/custom
new file mode 100644
index 0000000..e69de29
diff --git install/1live/portage/portage/package.mask/custom install/1live/portage/portage/package.mask/custom
new file mode 100644
index 0000000..e69de29
diff --git install/1live/portage/portage/package.unmask/custom install/1live/portage/portage/package.unmask/custom
new file mode 100644
index 0000000..e69de29
diff --git install/1live/portage/portage/package.use/custom install/1live/portage/portage/package.use/custom
new file mode 100644
index 0000000..e69de29
diff --git install/1live/portage/portage/sets/.calculate_directory install/1live/portage/portage/sets/.calculate_directory
new file mode 100644
index 0000000..484da65
--- /dev/null
+++ install/1live/portage/portage/sets/.calculate_directory
@@ -0,0 +1 @@
+# Calculate exists(/etc/portage/sets,root)==
diff --git install/1merge/Desktop/100-Browser/chromium/calculate/.calculate_directory install/1merge/Desktop/100-Browser/chromium/calculate/.calculate_directory
index ed0a326..9c2b262 100644
--- install/1merge/Desktop/100-Browser/chromium/calculate/.calculate_directory
+++ install/1merge/Desktop/100-Browser/chromium/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-browser.desktop)==||ini(desktop.browser)==||ini(desktop.browser)==chromium
+# Calculate append=skip exists(/usr/share/applications/calculate-browser.desktop,root)==||ini(desktop.browser)==||ini(desktop.browser)==chromium
diff --git install/1merge/Desktop/100-Browser/firefox-bin/calculate/.calculate_directory install/1merge/Desktop/100-Browser/firefox-bin/calculate/.calculate_directory
index c710cde..4bb95fa 100644
--- install/1merge/Desktop/100-Browser/firefox-bin/calculate/.calculate_directory
+++ install/1merge/Desktop/100-Browser/firefox-bin/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-browser.desktop)==||ini(desktop.browser)==||ini(desktop.browser)==firefox-bin
+# Calculate append=skip exists(/usr/share/applications/calculate-browser.desktop,root)==||ini(desktop.browser)==||ini(desktop.browser)==firefox-bin
diff --git install/1merge/Desktop/100-Browser/firefox/calculate/.calculate_directory install/1merge/Desktop/100-Browser/firefox/calculate/.calculate_directory
index 19c7fe4..9991f06 100644
--- install/1merge/Desktop/100-Browser/firefox/calculate/.calculate_directory
+++ install/1merge/Desktop/100-Browser/firefox/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-browser.desktop)==||ini(desktop.browser)==||ini(desktop.browser)==firefox
+# Calculate append=skip exists(/usr/share/applications/calculate-browser.desktop,root)==||ini(desktop.browser)==||ini(desktop.browser)==firefox
diff --git install/1merge/Desktop/100-Browser/opera/calculate/.calculate_directory install/1merge/Desktop/100-Browser/opera/calculate/.calculate_directory
index c98ebd6..444a81d 100644
--- install/1merge/Desktop/100-Browser/opera/calculate/.calculate_directory
+++ install/1merge/Desktop/100-Browser/opera/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-browser.desktop)==||ini(desktop.browser)==||ini(desktop.browser)==opera
+# Calculate append=skip exists(/usr/share/applications/calculate-browser.desktop,root)==||ini(desktop.browser)==||ini(desktop.browser)==opera
diff --git install/1merge/Desktop/110-Mail/claws-mail/calculate/.calculate_directory install/1merge/Desktop/110-Mail/claws-mail/calculate/.calculate_directory
index 4c71763..7acc7a0 100644
--- install/1merge/Desktop/110-Mail/claws-mail/calculate/.calculate_directory
+++ install/1merge/Desktop/110-Mail/claws-mail/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-mail.desktop)==||ini(desktop.mail)==||ini(desktop.mail)==claws-mail
+# Calculate append=skip exists(/usr/share/applications/calculate-mail.desktop,root)==||ini(desktop.mail)==||ini(desktop.mail)==claws-mail
diff --git install/1merge/Desktop/110-Mail/evolution/calculate/.calculate_directory install/1merge/Desktop/110-Mail/evolution/calculate/.calculate_directory
index 47c90ee..f94cebc 100644
--- install/1merge/Desktop/110-Mail/evolution/calculate/.calculate_directory
+++ install/1merge/Desktop/110-Mail/evolution/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-mail.desktop)==||ini(desktop.mail)==||ini(desktop.mail)==evolution
+# Calculate append=skip exists(/usr/share/applications/calculate-mail.desktop,root)==||ini(desktop.mail)==||ini(desktop.mail)==evolution
diff --git install/1merge/Desktop/110-Mail/kmail/calculate/.calculate_directory install/1merge/Desktop/110-Mail/kmail/calculate/.calculate_directory
index 655bc70..622ac45 100644
--- install/1merge/Desktop/110-Mail/kmail/calculate/.calculate_directory
+++ install/1merge/Desktop/110-Mail/kmail/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-mail.desktop)==||ini(desktop.mail)==||ini(desktop.mail)==kmail
+# Calculate append=skip exists(/usr/share/applications/calculate-mail.desktop,root)==||ini(desktop.mail)==||ini(desktop.mail)==kmail
diff --git install/1merge/Desktop/120-Chat/konversation/calculate/.calculate_directory install/1merge/Desktop/120-Chat/konversation/calculate/.calculate_directory
index ff6ad44..30abc59 100644
--- install/1merge/Desktop/120-Chat/konversation/calculate/.calculate_directory
+++ install/1merge/Desktop/120-Chat/konversation/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-chat.desktop)==||ini(desktop.chat)==||ini(desktop.chat)==konversation
+# Calculate append=skip exists(/usr/share/applications/calculate-chat.desktop,root)==||ini(desktop.chat)==||ini(desktop.chat)==konversation
diff --git install/1merge/Desktop/120-Chat/xchat/calculate/.calculate_directory install/1merge/Desktop/120-Chat/xchat/calculate/.calculate_directory
index 5551734..e758207 100644
--- install/1merge/Desktop/120-Chat/xchat/calculate/.calculate_directory
+++ install/1merge/Desktop/120-Chat/xchat/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-chat.desktop)==||ini(desktop.chat)==||ini(desktop.chat)==xchat
+# Calculate append=skip exists(/usr/share/applications/calculate-chat.desktop,root)==||ini(desktop.chat)==||ini(desktop.chat)==xchat
diff --git install/1merge/Desktop/130-IM/kopete/calculate/.calculate_directory install/1merge/Desktop/130-IM/kopete/calculate/.calculate_directory
index 6ae3660..70109a6 100644
--- install/1merge/Desktop/130-IM/kopete/calculate/.calculate_directory
+++ install/1merge/Desktop/130-IM/kopete/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-im.desktop)==||ini(desktop.im)==||ini(desktop.im)==kopete
+# Calculate append=skip exists(/usr/share/applications/calculate-im.desktop,root)==||ini(desktop.im)==||ini(desktop.im)==kopete
diff --git install/1merge/Desktop/130-IM/pidgin/calculate/.calculate_directory install/1merge/Desktop/130-IM/pidgin/calculate/.calculate_directory
index b23036d..55f2d3b 100644
--- install/1merge/Desktop/130-IM/pidgin/calculate/.calculate_directory
+++ install/1merge/Desktop/130-IM/pidgin/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-im.desktop)==||ini(desktop.im)==||ini(desktop.im)==pidgin
+# Calculate append=skip exists(/usr/share/applications/calculate-im.desktop,root)==||ini(desktop.im)==||ini(desktop.im)==pidgin
diff --git install/1merge/Desktop/200-Writer/libreoffice-bin/calculate/.calculate_directory install/1merge/Desktop/200-Writer/libreoffice-bin/calculate/.calculate_directory
index 1b735b4..bba3ab4 100644
--- install/1merge/Desktop/200-Writer/libreoffice-bin/calculate/.calculate_directory
+++ install/1merge/Desktop/200-Writer/libreoffice-bin/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-writer.desktop)==||ini(desktop.writer)==||ini(desktop.writer)==libreoffice-bin
+# Calculate append=skip exists(/usr/share/applications/calculate-writer.desktop,root)==||ini(desktop.writer)==||ini(desktop.writer)==libreoffice-bin
diff --git install/1merge/Desktop/200-Writer/libreoffice/calculate/.calculate_directory install/1merge/Desktop/200-Writer/libreoffice/calculate/.calculate_directory
index ec584c9..8cb4ff4 100644
--- install/1merge/Desktop/200-Writer/libreoffice/calculate/.calculate_directory
+++ install/1merge/Desktop/200-Writer/libreoffice/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-writer.desktop)==||ini(desktop.writer)==||ini(desktop.writer)==libreoffice
+# Calculate append=skip exists(/usr/share/applications/calculate-writer.desktop,root)==||ini(desktop.writer)==||ini(desktop.writer)==libreoffice
diff --git install/1merge/Desktop/210-Calc/libreoffice-bin/calculate/.calculate_directory install/1merge/Desktop/210-Calc/libreoffice-bin/calculate/.calculate_directory
index 5bb79da..e64d7fc 100644
--- install/1merge/Desktop/210-Calc/libreoffice-bin/calculate/.calculate_directory
+++ install/1merge/Desktop/210-Calc/libreoffice-bin/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-calc.desktop)==||ini(desktop.calc)==||ini(desktop.calc)==libreoffice-bin
+# Calculate append=skip exists(/usr/share/applications/calculate-calc.desktop,root)==||ini(desktop.calc)==||ini(desktop.calc)==libreoffice-bin
diff --git install/1merge/Desktop/210-Calc/libreoffice/calculate/.calculate_directory install/1merge/Desktop/210-Calc/libreoffice/calculate/.calculate_directory
index 62739f6..829e038 100644
--- install/1merge/Desktop/210-Calc/libreoffice/calculate/.calculate_directory
+++ install/1merge/Desktop/210-Calc/libreoffice/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-calc.desktop)==||ini(desktop.calc)==||ini(desktop.calc)==libreoffice
+# Calculate append=skip exists(/usr/share/applications/calculate-calc.desktop,root)==||ini(desktop.calc)==||ini(desktop.calc)==libreoffice
diff --git install/1merge/Desktop/220-Calculator/galculator/calculate/.calculate_directory install/1merge/Desktop/220-Calculator/galculator/calculate/.calculate_directory
index f0ef9db..845035e 100644
--- install/1merge/Desktop/220-Calculator/galculator/calculate/.calculate_directory
+++ install/1merge/Desktop/220-Calculator/galculator/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-calculator.desktop)==||ini(desktop.calculator)==||ini(desktop.calculator)==galculator
+# Calculate append=skip exists(/usr/share/applications/calculate-calculator.desktop,root)==||ini(desktop.calculator)==||ini(desktop.calculator)==galculator
diff --git install/1merge/Desktop/220-Calculator/gcalctool/calculate/.calculate_directory install/1merge/Desktop/220-Calculator/gcalctool/calculate/.calculate_directory
index 1708ed8..dd26126 100644
--- install/1merge/Desktop/220-Calculator/gcalctool/calculate/.calculate_directory
+++ install/1merge/Desktop/220-Calculator/gcalctool/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-calculator.desktop)==||ini(desktop.calculator)==||ini(desktop.calculator)==gcalctool
+# Calculate append=skip exists(/usr/share/applications/calculate-calculator.desktop,root)==||ini(desktop.calculator)==||ini(desktop.calculator)==gcalctool
diff --git install/1merge/Desktop/220-Calculator/kcalc/calculate/.calculate_directory install/1merge/Desktop/220-Calculator/kcalc/calculate/.calculate_directory
index e1ee67a..65e263c 100644
--- install/1merge/Desktop/220-Calculator/kcalc/calculate/.calculate_directory
+++ install/1merge/Desktop/220-Calculator/kcalc/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-calculator.desktop)==||ini(desktop.calculator)==||ini(desktop.calculator)==kcalc
+# Calculate append=skip exists(/usr/share/applications/calculate-calculator.desktop,root)==||ini(desktop.calculator)==||ini(desktop.calculator)==kcalc
diff --git install/1merge/Desktop/300-ImageEdit/gimp/calculate/.calculate_directory install/1merge/Desktop/300-ImageEdit/gimp/calculate/.calculate_directory
index 5e5bc33..c986788 100644
--- install/1merge/Desktop/300-ImageEdit/gimp/calculate/.calculate_directory
+++ install/1merge/Desktop/300-ImageEdit/gimp/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-imageedit.desktop)==||ini(desktop.imageedit)==||ini(desktop.imageedit)==gimp
+# Calculate append=skip exists(/usr/share/applications/calculate-imageedit.desktop,root)==||ini(desktop.imageedit)==||ini(desktop.imageedit)==gimp
diff --git install/1merge/Desktop/310-ImageView/digikam/calculate/.calculate_directory install/1merge/Desktop/310-ImageView/digikam/calculate/.calculate_directory
index fd78d65..dce8286 100644
--- install/1merge/Desktop/310-ImageView/digikam/calculate/.calculate_directory
+++ install/1merge/Desktop/310-ImageView/digikam/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-imageview.desktop)==||ini(desktop.imageview)==||ini(desktop.imageview)==digikam
+# Calculate append=skip exists(/usr/share/applications/calculate-imageview.desktop,root)==||ini(desktop.imageview)==||ini(desktop.imageview)==digikam
diff --git install/1merge/Desktop/310-ImageView/eog/calculate/.calculate_directory install/1merge/Desktop/310-ImageView/eog/calculate/.calculate_directory
index cfa5649..0ad8b12 100644
--- install/1merge/Desktop/310-ImageView/eog/calculate/.calculate_directory
+++ install/1merge/Desktop/310-ImageView/eog/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-imageview.desktop)==||ini(desktop.imageview)==||ini(desktop.imageview)==eog
+# Calculate append=skip exists(/usr/share/applications/calculate-imageview.desktop,root)==||ini(desktop.imageview)==||ini(desktop.imageview)==eog
diff --git install/1merge/Desktop/310-ImageView/gqview/calculate/.calculate_directory install/1merge/Desktop/310-ImageView/gqview/calculate/.calculate_directory
index 231681b..5148562 100644
--- install/1merge/Desktop/310-ImageView/gqview/calculate/.calculate_directory
+++ install/1merge/Desktop/310-ImageView/gqview/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-imageview.desktop)==||ini(desktop.imageview)==||ini(desktop.imageview)==gqview
+# Calculate append=skip exists(/usr/share/applications/calculate-imageview.desktop,root)==||ini(desktop.imageview)==||ini(desktop.imageview)==gqview
diff --git install/1merge/Desktop/400-AudioPlayer/amarok/calculate/.calculate_directory install/1merge/Desktop/400-AudioPlayer/amarok/calculate/.calculate_directory
index 809976d..e1140f5 100644
--- install/1merge/Desktop/400-AudioPlayer/amarok/calculate/.calculate_directory
+++ install/1merge/Desktop/400-AudioPlayer/amarok/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==amarok
+# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop,root)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==amarok
diff --git install/1merge/Desktop/400-AudioPlayer/audacious/calculate/.calculate_directory install/1merge/Desktop/400-AudioPlayer/audacious/calculate/.calculate_directory
index ec7962d..c076834 100644
--- install/1merge/Desktop/400-AudioPlayer/audacious/calculate/.calculate_directory
+++ install/1merge/Desktop/400-AudioPlayer/audacious/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==audacious
+# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop,root)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==audacious
diff --git install/1merge/Desktop/400-AudioPlayer/deadbeef/calculate/.calculate_directory install/1merge/Desktop/400-AudioPlayer/deadbeef/calculate/.calculate_directory
index d4a2fb1..6855f3d 100644
--- install/1merge/Desktop/400-AudioPlayer/deadbeef/calculate/.calculate_directory
+++ install/1merge/Desktop/400-AudioPlayer/deadbeef/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==deadbeef
+# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop,root)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==deadbeef
diff --git install/1merge/Desktop/400-AudioPlayer/quodlibet/calculate/.calculate_directory install/1merge/Desktop/400-AudioPlayer/quodlibet/calculate/.calculate_directory
index 23a5228..cb426d5 100644
--- install/1merge/Desktop/400-AudioPlayer/quodlibet/calculate/.calculate_directory
+++ install/1merge/Desktop/400-AudioPlayer/quodlibet/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==quodlibet
+# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop,root)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==quodlibet
diff --git install/1merge/Desktop/400-AudioPlayer/rhythmbox/calculate/.calculate_directory install/1merge/Desktop/400-AudioPlayer/rhythmbox/calculate/.calculate_directory
index 46d23b0..808b57f 100644
--- install/1merge/Desktop/400-AudioPlayer/rhythmbox/calculate/.calculate_directory
+++ install/1merge/Desktop/400-AudioPlayer/rhythmbox/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==rhythmbox
+# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop,root)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==rhythmbox
diff --git install/1merge/Desktop/500-VideoPlayer/gnome-mplayer/calculate/.calculate_directory install/1merge/Desktop/500-VideoPlayer/gnome-mplayer/calculate/.calculate_directory
index c93e440..9b6176c 100644
--- install/1merge/Desktop/500-VideoPlayer/gnome-mplayer/calculate/.calculate_directory
+++ install/1merge/Desktop/500-VideoPlayer/gnome-mplayer/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-videoplayer.desktop)==||ini(desktop.videoplayer)==||ini(desktop.videoplayer)==gnome-mplayer
+# Calculate append=skip exists(/usr/share/applications/calculate-videoplayer.desktop,root)==||ini(desktop.videoplayer)==||ini(desktop.videoplayer)==gnome-mplayer
diff --git install/1merge/Desktop/500-VideoPlayer/smplayer/calculate/.calculate_directory install/1merge/Desktop/500-VideoPlayer/smplayer/calculate/.calculate_directory
index ec3963a..2ac5a8c 100644
--- install/1merge/Desktop/500-VideoPlayer/smplayer/calculate/.calculate_directory
+++ install/1merge/Desktop/500-VideoPlayer/smplayer/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-videoplayer.desktop)==||ini(desktop.videoplayer)==||ini(desktop.videoplayer)==smplayer
+# Calculate append=skip exists(/usr/share/applications/calculate-videoplayer.desktop,root)==||ini(desktop.videoplayer)==||ini(desktop.videoplayer)==smplayer
diff --git install/1merge/Desktop/500-VideoPlayer/totem/calculate/.calculate_directory install/1merge/Desktop/500-VideoPlayer/totem/calculate/.calculate_directory
index 2371094..4544c05 100644
--- install/1merge/Desktop/500-VideoPlayer/totem/calculate/.calculate_directory
+++ install/1merge/Desktop/500-VideoPlayer/totem/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-videoplayer.desktop)==||ini(desktop.videoplayer)==||ini(desktop.videoplayer)==totem
+# Calculate append=skip exists(/usr/share/applications/calculate-videoplayer.desktop,root)==||ini(desktop.videoplayer)==||ini(desktop.videoplayer)==totem
diff --git install/1merge/Desktop/600-ImageBurn/brasero/calculate/.calculate_directory install/1merge/Desktop/600-ImageBurn/brasero/calculate/.calculate_directory
index 0881619..4e4c9ec 100644
--- install/1merge/Desktop/600-ImageBurn/brasero/calculate/.calculate_directory
+++ install/1merge/Desktop/600-ImageBurn/brasero/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-imageburn.desktop)==||ini(desktop.imageburn)==||ini(desktop.imageburn)==brasero
+# Calculate append=skip exists(/usr/share/applications/calculate-imageburn.desktop,root)==||ini(desktop.imageburn)==||ini(desktop.imageburn)==brasero
diff --git install/1merge/Desktop/600-ImageBurn/k3b/calculate/.calculate_directory install/1merge/Desktop/600-ImageBurn/k3b/calculate/.calculate_directory
index 47dbc69..f124176 100644
--- install/1merge/Desktop/600-ImageBurn/k3b/calculate/.calculate_directory
+++ install/1merge/Desktop/600-ImageBurn/k3b/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-imageburn.desktop)==||ini(desktop.imageburn)==||ini(desktop.imageburn)==k3b
+# Calculate append=skip exists(/usr/share/applications/calculate-imageburn.desktop,root)==||ini(desktop.imageburn)==||ini(desktop.imageburn)==k3b
diff --git install/1merge/Desktop/600-ImageBurn/xfburn/calculate/.calculate_directory install/1merge/Desktop/600-ImageBurn/xfburn/calculate/.calculate_directory
index 25abb2c..2bcbaec 100644
--- install/1merge/Desktop/600-ImageBurn/xfburn/calculate/.calculate_directory
+++ install/1merge/Desktop/600-ImageBurn/xfburn/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-imageburn.desktop)==||ini(desktop.imageburn)==||ini(desktop.imageburn)==xfburn
+# Calculate append=skip exists(/usr/share/applications/calculate-imageburn.desktop,root)==||ini(desktop.imageburn)==||ini(desktop.imageburn)==xfburn
diff --git install/1merge/Desktop/700-Dict/goldendict/calculate/.calculate_directory install/1merge/Desktop/700-Dict/goldendict/calculate/.calculate_directory
index 7bbbdd2..7992626 100644
--- install/1merge/Desktop/700-Dict/goldendict/calculate/.calculate_directory
+++ install/1merge/Desktop/700-Dict/goldendict/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-dict.desktop)==||ini(desktop.dict)==||ini(desktop.dict)==goldendict
+# Calculate append=skip exists(/usr/share/applications/calculate-dict.desktop,root)==||ini(desktop.dict)==||ini(desktop.dict)==goldendict
diff --git install/1merge/Desktop/700-Dict/stardict/calculate/.calculate_directory install/1merge/Desktop/700-Dict/stardict/calculate/.calculate_directory
index 7150a7e..bcdb4c4 100644
--- install/1merge/Desktop/700-Dict/stardict/calculate/.calculate_directory
+++ install/1merge/Desktop/700-Dict/stardict/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-dict.desktop)==||ini(desktop.dict)==||ini(desktop.dict)==stardict
+# Calculate append=skip exists(/usr/share/applications/calculate-dict.desktop,root)==||ini(desktop.dict)==||ini(desktop.dict)==stardict
diff --git install/1merge/Desktop/800-TextEdit/gedit/calculate/.calculate_directory install/1merge/Desktop/800-TextEdit/gedit/calculate/.calculate_directory
index 8b8af31..7f3a6e2 100644
--- install/1merge/Desktop/800-TextEdit/gedit/calculate/.calculate_directory
+++ install/1merge/Desktop/800-TextEdit/gedit/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-textedit.desktop)==||ini(desktop.textedit)==||ini(desktop.textedit)==gedit
+# Calculate append=skip exists(/usr/share/applications/calculate-textedit.desktop,root)==||ini(desktop.textedit)==||ini(desktop.textedit)==gedit
diff --git install/1merge/Desktop/800-TextEdit/kwrite/calculate/.calculate_directory install/1merge/Desktop/800-TextEdit/kwrite/calculate/.calculate_directory
index 04bd479..32244bc 100644
--- install/1merge/Desktop/800-TextEdit/kwrite/calculate/.calculate_directory
+++ install/1merge/Desktop/800-TextEdit/kwrite/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-textedit.desktop)==||ini(desktop.textedit)==||ini(desktop.textedit)==kwrite
+# Calculate append=skip exists(/usr/share/applications/calculate-textedit.desktop,root)==||ini(desktop.textedit)==||ini(desktop.textedit)==kwrite
diff --git install/1merge/Desktop/800-TextEdit/leafpad/calculate/.calculate_directory install/1merge/Desktop/800-TextEdit/leafpad/calculate/.calculate_directory
index 05304bd..f9a1833 100644
--- install/1merge/Desktop/800-TextEdit/leafpad/calculate/.calculate_directory
+++ install/1merge/Desktop/800-TextEdit/leafpad/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-textedit.desktop)==||ini(desktop.textedit)==||ini(desktop.textedit)==leafpad
+# Calculate append=skip exists(/usr/share/applications/calculate-textedit.desktop,root)==||ini(desktop.textedit)==||ini(desktop.textedit)==leafpad
diff --git install/1merge/Desktop/900-Terminal/gnome-terminal/calculate/.calculate_directory install/1merge/Desktop/900-Terminal/gnome-terminal/calculate/.calculate_directory
index 362fd07..00ae274 100644
--- install/1merge/Desktop/900-Terminal/gnome-terminal/calculate/.calculate_directory
+++ install/1merge/Desktop/900-Terminal/gnome-terminal/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-terminal.desktop)==||ini(desktop.terminal)==||ini(desktop.terminal)==gnome-terminal
+# Calculate append=skip exists(/usr/share/applications/calculate-terminal.desktop,root)==||ini(desktop.terminal)==||ini(desktop.terminal)==gnome-terminal
diff --git install/1merge/Desktop/900-Terminal/konsole/calculate/.calculate_directory install/1merge/Desktop/900-Terminal/konsole/calculate/.calculate_directory
index 418dcf3..95fc9cf 100644
--- install/1merge/Desktop/900-Terminal/konsole/calculate/.calculate_directory
+++ install/1merge/Desktop/900-Terminal/konsole/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-terminal.desktop)==||ini(desktop.terminal)==||ini(desktop.terminal)==konsole
+# Calculate append=skip exists(/usr/share/applications/calculate-terminal.desktop,root)==||ini(desktop.terminal)==||ini(desktop.terminal)==konsole
diff --git install/1merge/Desktop/900-Terminal/terminal/calculate/.calculate_directory install/1merge/Desktop/900-Terminal/terminal/calculate/.calculate_directory
index f89de45..b452ffe 100644
--- install/1merge/Desktop/900-Terminal/terminal/calculate/.calculate_directory
+++ install/1merge/Desktop/900-Terminal/terminal/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-terminal.desktop)==||ini(desktop.terminal)==||ini(desktop.terminal)==terminal
+# Calculate append=skip exists(/usr/share/applications/calculate-terminal.desktop,root)==||ini(desktop.terminal)==||ini(desktop.terminal)==terminal
diff --git install/1system/calculate-install/calculate2.env install/1system/calculate-install/calculate2.env
index 2077d51..29baa6d 100644
--- install/1system/calculate-install/calculate2.env
+++ install/1system/calculate-install/calculate2.env
@@ -1,21 +1,19 @@
-# Calculate format=raw comment=# os_root_type==hdd||os_install_linux_ver>10.8.81
-#?os_root_type==hdd||cl_autologin!=&&os_install_linux_shortname!=CMC&&os_install_root_type!=livecd||cl_autologin==&&os_install_linux_shortname==CMC&&os_install_root_type!=livecd#
+# Calculate format=raw comment=# os_install_root_type==hdd||os_install_linux_ver>10.8.81
+
+#?os_root_type==hdd||os_install_root_type==hdd&&pkg(sys-apps/calculate-install)>2.2.17-r1||cl_autologin!=&&os_install_linux_shortname!=CMC&&os_install_root_type!=livecd&&pkg(sys-apps/calculate-install)>2.2.24||cl_autologin==&&os_install_linux_shortname==CMC&&os_install_root_type!=livecd&&pkg(sys-apps/calculate-install)>2.2.24#
[install]
#os_root_type#
#?os_root_type==hdd#
-# Set previous hdd root device.
os_install_dev_from = #-os_root_dev-#
-# NTP is a protocol designed to synchronize the clocks of computers over a network.
os_install_ntp = #-os_install_ntp-#
#os_root_type#
-#?pkg(sys-apps/calculate-install)>2.2.17-r1&&os_root_type==hdd#
-# name of net manager which is used
+#?os_install_root_type==hdd&&pkg(sys-apps/calculate-install)>2.2.17-r1#
os_install_net_settings = #-os_install_net_conf-#
-#pkg#
-#?cl_autologin!=&&os_install_linux_shortname!=CMC&&os_install_root_type!=livecd#
+#os_install_root_type#
+#?cl_autologin!=&&os_install_linux_shortname!=CMC&&os_install_root_type!=livecd&&pkg(sys-apps/calculate-install)>2.2.24#
cl_autologin = #-cl_autologin-#
#cl_autologin#
-#?cl_autologin==&&os_install_linux_shortname==CMC&&os_install_root_type!=livecd#
+#?cl_autologin==&&os_install_linux_shortname==CMC&&os_install_root_type!=livecd&&pkg(sys-apps/calculate-install)>2.2.24#
cl_autologin =
#cl_autologin#
@@ -24,11 +22,11 @@ cl_autologin =
# Set auto-update configuration files.
cl_autoupdate_set = off
#os_install_linux_ver#
-#?os_install_linux_ver>10.8.91#
+#?os_install_linux_ver>10.8.91&&os_install_root_type!=livecd#
# keep value of root dev uuid (8 char) for kernel symlink
cl_kernel_uid = #-cl_install_kernel_uid-#
#os_install_linux_ver#
-#?os_install_linux_build!=#
+#?os_install_linux_build!=&&os_install_linux_ver>10.8.81#
# current linux build
os_linux_build = #-os_install_linux_build-#
#os_install_linux_build#
diff --git install/1system/calculate-install/linux/.calculate_directory install/1system/calculate-install/linux/.calculate_directory
new file mode 100644
index 0000000..814ccaf
--- /dev/null
+++ install/1system/calculate-install/linux/.calculate_directory
@@ -0,0 +1 @@
+# Calculate path=/var/calculate

@ -1,619 +0,0 @@
diff --git desktop/desktop-live/.calculate_directory desktop/desktop-live/.calculate_directory
deleted file mode 100644
index 5f296ea..0000000
--- desktop/desktop-live/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=~ name= chmod=0700 chown=#-ur_login-#:#-ur_group-# cl_chroot_status==off&&ac_desktop_live==up&&ini(main.update)!=off
diff --git desktop/desktop-live/20-kde-always/.calculate_directory desktop/desktop-live/20-kde-always/.calculate_directory
deleted file mode 100644
index 339dc6c..0000000
--- desktop/desktop-live/20-kde-always/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip belong(kdelibs)!=&&ini(update.kde)!=off&&pkg(kde-base/kdelibs)>=4.4
diff --git desktop/desktop-live/20-kde-always/.kde4/share/config/plasma-desktop-appletsrc.panel-resize desktop/desktop-live/20-kde-always/.kde4/share/config/plasma-desktop-appletsrc.panel-resize
deleted file mode 100644
index 23079d0..0000000
--- desktop/desktop-live/20-kde-always/.kde4/share/config/plasma-desktop-appletsrc.panel-resize
+++ /dev/null
@@ -1,19 +0,0 @@
-# Calculate name=plasma-desktop-appletsrc format=plasma ini(resolution)!=#-os_x11_standart-#
-#------------------------------------------------------------------------------
-#рабочий стол
-#------------------------------------------------------------------------------
-
-[Containments][#-sum(cont,1)-#]
-geometry=0,0,#-os_x11_width-#,#-os_x11_height-#
-
-#------------------------------------------------------------------------------
-#верхняя панель
-#------------------------------------------------------------------------------
-#-sum(panel,,31)-#
-
-[Containments][#-sum(cont,cont+1)-#]
-geometry=0,0,#-os_x11_width-#,#-sum(panel,panel)-#
-
-[Containments][#-sum(cont,cont)-#][Configuration]
-maximumSize=#-os_x11_width-#,#-sum(panel,panel)-#
-minimumSize=#-os_x11_width-#,#-sum(panel,panel)-#
diff --git desktop/desktop-live/30-gnome-2.30/.calculate_directory desktop/desktop-live/30-gnome-2.30/.calculate_directory
deleted file mode 100644
index 70fd6c5..0000000
--- desktop/desktop-live/30-gnome-2.30/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip belong(libgnome)!=&&ini(update.gnome)!=off&&pkg(gnome-base/libgnome)>=2.30
diff --git desktop/desktop-live/30-gnome-2.30/.gconf/%gconf.xml desktop/desktop-live/30-gnome-2.30/.gconf/%gconf.xml
deleted file mode 100644
index e69de29..0000000
diff --git desktop/desktop-live/30-gnome-2.30/.gconf/desktop/%gconf.xml desktop/desktop-live/30-gnome-2.30/.gconf/desktop/%gconf.xml
deleted file mode 100644
index e69de29..0000000
diff --git desktop/desktop-live/30-gnome-2.30/.gconf/desktop/gnome/%gconf.xml desktop/desktop-live/30-gnome-2.30/.gconf/desktop/gnome/%gconf.xml
deleted file mode 100644
index e69de29..0000000
diff --git desktop/desktop-live/30-gnome-2.30/.gconf/desktop/gnome/background/%gconf.xml desktop/desktop-live/30-gnome-2.30/.gconf/desktop/gnome/background/%gconf.xml
deleted file mode 100644
index 2090917..0000000
--- desktop/desktop-live/30-gnome-2.30/.gconf/desktop/gnome/background/%gconf.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-# Calculate format=xml_gconf
-<?xml version="1.0"?>
-<gconf>
- <entry name="picture_filename" type="string">
- <stringvalue>/usr/share/pixmaps/backgrounds/gnome/calculate/#-os_x11_standart-#.jpg</stringvalue>
- </entry>
- <entry name="picture_options" type="string">
- <stringvalue>stretched</stringvalue>
- </entry>
-</gconf>
diff --git desktop/desktop-live/40-xfce-always/.calculate_directory desktop/desktop-live/40-xfce-always/.calculate_directory
deleted file mode 100644
index 1ee8d52..0000000
--- desktop/desktop-live/40-xfce-always/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip belong(xfdesktop)!=&&ini(update.xfce)!=off&&pkg(xfce-base/xfdesktop)>=4.8
diff --git desktop/desktop-live/40-xfce-always/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml desktop/desktop-live/40-xfce-always/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
deleted file mode 100644
index 3a5122a..0000000
--- desktop/desktop-live/40-xfce-always/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-# Calculate format=xml_xfce
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-desktop" version="1.0">
- <property name="desktop-icons" type="empty">
- <property name="file-icons" type="empty">
- <property name="show-trash" type="bool" value="false"/>
- <property name="show-removable" type="bool" value="false"/>
- <property name="show-filesystem" type="bool" value="false"/>
-#?env(client.os_remote_auth)==||ur_domain_set==off#
- <property name="show-home" type="bool" value="true"/>
-#env#
-#?env(client.os_remote_auth)!=&&ur_domain_set==on#
- <property name="show-home" type="bool" value="false"/>
-#env#
- </property>
- <property name="icon-size" type="uint" value="48"/>
- </property>
- <property name="backdrop" type="empty">
- <property name="screen0" type="empty">
- <property name="monitor0" type="empty">
- <property name="image-path" type="string" value="/usr/share/wallpapers/Calculate_Linux/contents/images/#-os_x11_standart-#.jpg"/>
- </property>
- </property>
- </property>
-</channel>
diff --git desktop/desktop/20-kde-4.7/.kde4/share/apps/konsole/Shell.profile desktop/desktop/20-kde-4.7/.kde4/share/apps/konsole/Shell.profile
index d36b414..1249796 100644
--- desktop/desktop/20-kde-4.7/.kde4/share/apps/konsole/Shell.profile
+++ desktop/desktop/20-kde-4.7/.kde4/share/apps/konsole/Shell.profile
@@ -1,7 +1,7 @@
# Calculate format=kde
[Appearance]
#тема
-ColorScheme=WhiteOnBlack
+ColorScheme=DarkPastels
[General]
#формат заголовка вкладки (заголовок окна устанавливается оболочкой)
diff --git desktop/desktop/20-kde-4.7/Desktop/calculate-community.desktop desktop/desktop/20-kde-4.7/Desktop/calculate-community.desktop
index 400f158..4eca333 100644
--- desktop/desktop/20-kde-4.7/Desktop/calculate-community.desktop
+++ desktop/desktop/20-kde-4.7/Desktop/calculate-community.desktop
@@ -1,2 +1,5 @@
# Calculate format=kde link=/usr/share/applications/calculate-chat.desktop mirror os_root_type==livecd chmod=0755
#!/usr/bin/env xdg-open
+
+[Desktop Entry]
+!NoDisplay=
diff --git desktop/desktop/20-plasma-4.7/plasma-desktop-appletsrc desktop/desktop/20-plasma-4.7/plasma-desktop-appletsrc
index f23decf..f4bfe4f 100644
--- desktop/desktop/20-plasma-4.7/plasma-desktop-appletsrc
+++ desktop/desktop/20-plasma-4.7/plasma-desktop-appletsrc
@@ -152,6 +152,8 @@ maxRows=1
showOnlyCurrentDesktop=true
#сортировка
sortingStrategy=0
+# не показывать всплывающие подсказки на панели задач
+showTooltip=false
[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
Order=#-sum(apporder,apporder+1)-#
diff --git desktop/desktop/30-gnome-2.30/.gconf/apps/gnome-terminal/profiles/Default/%gconf.xml desktop/desktop/30-gnome-2.30/.gconf/apps/gnome-terminal/profiles/Default/%gconf.xml
index 02ccbc9..3ffad19 100644
--- desktop/desktop/30-gnome-2.30/.gconf/apps/gnome-terminal/profiles/Default/%gconf.xml
+++ desktop/desktop/30-gnome-2.30/.gconf/apps/gnome-terminal/profiles/Default/%gconf.xml
@@ -7,7 +7,7 @@
<entry name="use_system_font" type="bool" value="false"/>
<entry name="scrollback_lines" type="int" value="5000"/>
<entry name="palette" type="string">
- <stringvalue>#2E2E34343636:#CCCC00000000:#4E4E9A9A0606:#C4C4A0A00000:#34346565A4A4:#757550507B7B:#060698209A9A:#D3D3D7D7CFCF:#555557575353:#EFEF29292929:#8A8AE2E23434:#FCFCE9E94F4F:#72729F9FCFCF:#ADAD7F7FA8A8:#3434E2E2E2E2:#EEEEEEEEECEC</stringvalue>
+ <stringvalue>#3F3F3F3F3F3F:#707050505050:#6060B4B48A8A:#DFDFAFAF8F8F:#9A9AB8B8D7D7:#DCDC8C8CC3C3:#8C8CD0D0D3D3:#DCDCDCDCCCCC:#707090908080:#DCDCA3A3A3A3:#7272D5D5A3A3:#F0F0DFDFAFAF:#9494BFBFF3F3:#ECEC9393D3D3:#9393E0E0E3E3:#FFFFFFFFFFFF</stringvalue>
</entry>
<entry name="use_theme_colors" type="bool" value="false"/>
<entry name="visible_name" type="string">
@@ -15,9 +15,9 @@
</entry>
<entry name="login_shell" type="bool" value="true"/>
<entry name="background_color" type="string">
- <stringvalue>#000000000000</stringvalue>
+ <stringvalue>#2C2C2C2C2C2C</stringvalue>
</entry>
<entry name="foreground_color" type="string">
- <stringvalue>#FFFFFFFFFFFF</stringvalue>
+ <stringvalue>#DCDCDCDCCCCC</stringvalue>
</entry>
</gconf>
diff --git desktop/desktop/40-xfce-4.8/.config/Terminal/terminalrc desktop/desktop/40-xfce-4.8/.config/Terminal/terminalrc
index 2ff75a9..75c9cd2 100644
--- desktop/desktop/40-xfce-4.8/.config/Terminal/terminalrc
+++ desktop/desktop/40-xfce-4.8/.config/Terminal/terminalrc
@@ -3,10 +3,23 @@
FontName=Droid Sans Mono 10
MiscSingleClick=TRUE
ShortcutsNoMenukey=TRUE
-ColorBackground=#273a273a273a
-ColorPalette5=#50665066ce38
-ColorPalette13=#88428842ffff
-ColorPalette10=#e72f77c777c7
-ColorPalette2=#c7fd3c233c23
-ColorPalette4=#c50b69a20e39
-
+ColorPalette1=#3f3f3f3f3f3f
+ColorPalette2=#707050505050
+ColorPalette3=#6060b4b48a8a
+ColorPalette4=#dfdfafaf8f8f
+ColorPalette5=#9a9ab8b8d7d7
+ColorPalette6=#dcdc8c8cc3c3
+ColorPalette7=#8c8cd0d0d3d3
+ColorPalette8=#dcdcdcdccccc
+ColorPalette9=#707090908080
+ColorPalette10=#dcdca3a3a3a3
+ColorPalette11=#7272d5d5a3a3
+ColorPalette12=#f0f0dfdfafaf
+ColorPalette13=#9494bfbff3f3
+ColorPalette14=#ecec9393d3d3
+ColorPalette15=#9393e0e0e3e3
+ColorPalette16=#ffffffffffff
+ColorCursor=#dcdcdcdccccc
+ColorForeground=#dcdcdcdccccc
+ColorBackground=#2c2c2c2c2c2c
+TabActivityColor=#2c2c2c2c2c2c
diff --git desktop/desktop/60-bash-3.0/.bash_profile desktop/desktop/60-bash-3.0/.bash_profile
new file mode 100644
index 0000000..f03143d
--- /dev/null
+++ desktop/desktop/60-bash-3.0/.bash_profile
@@ -0,0 +1,3 @@
+#Calculate os_root_type==livecd
+alias su="sudo su -"
+
diff --git desktop/desktop/60-mc-4.7/.mc/ini desktop/desktop/60-mc-4.7/.mc/ini
index 1994d7a..d36eb71 100644
--- desktop/desktop/60-mc-4.7/.mc/ini
+++ desktop/desktop/60-mc-4.7/.mc/ini
@@ -1,4 +1,7 @@
# Calculate format=kde
+[Colors]
+base_color=,black:normal=,black:selected=black,cyan:marked=,black:markselect=yellow,cyan:errors=white,red:menu=white,cyan:reverse=black,lightgray:dnormal=black,lightgray:dfocus=black,cyan:dhotnormal=blue,lightgray:dhotfocus=blue,cyan:viewunderline=,black:menuhot=yellow,cyan:menusel=white,black:menuhotsel=yellow,black:helpnormal=black,lightgray:helpitalic=red,lightgray:helpbold=blue,lightgray:helplink=black,cyan:helpslink=yellow,blue:gauge=white,black:input=black,cyan:directory=white,black:executable=green,black:link=gray,black:stalelink=brightred,blue:device=,black:core=red,blue:special=red,black:editnormal=lightgray,black:editbold=yellow,blue:editmarked=black,cyan:errdhotnormal=yellow,red:errdhotfocus=yellow,lightgray
+
[Layout]
#видимость верхней строчки меню
menubar_visible=0
diff --git install/1live/baselayout/motd.en install/1live/baselayout/motd.en
index 0eace80..b1aefc7 100644
--- install/1live/baselayout/motd.en
+++ install/1live/baselayout/motd.en
@@ -4,9 +4,8 @@ Welcome to the #-os_install_linux_name-# Installation CD!
If any ethernet adapters were detected at boot, they should be auto-configured
if DHCP is available on your network.
To specify network settings, use utility "cl_install".
-Example:"cl-install --live --ip 192.168.1.100/24 \
- --route default:192.168.1.1 \
- --dns 192.168.1.1"
+Example:"cl-install --startup --ip 192.168.1.100/24 \
+ --route default:192.168.1.1 --dns 192.168.1.1"
#?os_install_linux_system==server||os_install_linux_shortname==CLS#
And restart net.eth0 by command "/etc/init.d/net.eth0 restart".
#os_install_linux_system#
diff --git install/1live/baselayout/motd.ru install/1live/baselayout/motd.ru
index c9fbad8..8aa4559 100644
--- install/1live/baselayout/motd.ru
+++ install/1live/baselayout/motd.ru
@@ -4,9 +4,8 @@
Если какой-либо из сетевых адаπтеров был обнаружен πри загрузке, он будет
автоматически сконфигурирован, если в сети достуπен DHCP сервер.
Для указания сетевых настроек используйте утилиту "cl-install".
-Пример:"cl-install --live --ip 192.168.1.100/24 \
- --route default:192.168.1.1 \
- --dns 192.168.1.1"
+Пример:"cl-install --startup --ip 192.168.1.100/24 \
+ --route default:192.168.1.1 --dns 192.168.1.1"
#?os_install_linux_system==server||os_install_linux_shortname==CLS#
И перезапустите net.eth0 командой "/etc/init.d/net.eth0 restart".
#os_install_linux_system#
diff --git install/1live/portage/portage/package.keywords/custom install/1live/portage/portage/package.keywords/custom
new file mode 100644
index 0000000..e69de29
diff --git install/1live/portage/portage/package.mask/custom install/1live/portage/portage/package.mask/custom
new file mode 100644
index 0000000..e69de29
diff --git install/1live/portage/portage/package.unmask/custom install/1live/portage/portage/package.unmask/custom
new file mode 100644
index 0000000..e69de29
diff --git install/1live/portage/portage/package.use/custom install/1live/portage/portage/package.use/custom
new file mode 100644
index 0000000..e69de29
diff --git install/1live/portage/portage/sets/.calculate_directory install/1live/portage/portage/sets/.calculate_directory
new file mode 100644
index 0000000..484da65
--- /dev/null
+++ install/1live/portage/portage/sets/.calculate_directory
@@ -0,0 +1 @@
+# Calculate exists(/etc/portage/sets,root)==
diff --git install/1merge/Desktop/100-Browser/chromium/calculate/.calculate_directory install/1merge/Desktop/100-Browser/chromium/calculate/.calculate_directory
index ed0a326..9c2b262 100644
--- install/1merge/Desktop/100-Browser/chromium/calculate/.calculate_directory
+++ install/1merge/Desktop/100-Browser/chromium/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-browser.desktop)==||ini(desktop.browser)==||ini(desktop.browser)==chromium
+# Calculate append=skip exists(/usr/share/applications/calculate-browser.desktop,root)==||ini(desktop.browser)==||ini(desktop.browser)==chromium
diff --git install/1merge/Desktop/100-Browser/firefox-bin/calculate/.calculate_directory install/1merge/Desktop/100-Browser/firefox-bin/calculate/.calculate_directory
index c710cde..4bb95fa 100644
--- install/1merge/Desktop/100-Browser/firefox-bin/calculate/.calculate_directory
+++ install/1merge/Desktop/100-Browser/firefox-bin/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-browser.desktop)==||ini(desktop.browser)==||ini(desktop.browser)==firefox-bin
+# Calculate append=skip exists(/usr/share/applications/calculate-browser.desktop,root)==||ini(desktop.browser)==||ini(desktop.browser)==firefox-bin
diff --git install/1merge/Desktop/100-Browser/firefox/calculate/.calculate_directory install/1merge/Desktop/100-Browser/firefox/calculate/.calculate_directory
index 19c7fe4..9991f06 100644
--- install/1merge/Desktop/100-Browser/firefox/calculate/.calculate_directory
+++ install/1merge/Desktop/100-Browser/firefox/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-browser.desktop)==||ini(desktop.browser)==||ini(desktop.browser)==firefox
+# Calculate append=skip exists(/usr/share/applications/calculate-browser.desktop,root)==||ini(desktop.browser)==||ini(desktop.browser)==firefox
diff --git install/1merge/Desktop/100-Browser/opera/calculate/.calculate_directory install/1merge/Desktop/100-Browser/opera/calculate/.calculate_directory
index c98ebd6..444a81d 100644
--- install/1merge/Desktop/100-Browser/opera/calculate/.calculate_directory
+++ install/1merge/Desktop/100-Browser/opera/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-browser.desktop)==||ini(desktop.browser)==||ini(desktop.browser)==opera
+# Calculate append=skip exists(/usr/share/applications/calculate-browser.desktop,root)==||ini(desktop.browser)==||ini(desktop.browser)==opera
diff --git install/1merge/Desktop/110-Mail/claws-mail/calculate/.calculate_directory install/1merge/Desktop/110-Mail/claws-mail/calculate/.calculate_directory
index 4c71763..7acc7a0 100644
--- install/1merge/Desktop/110-Mail/claws-mail/calculate/.calculate_directory
+++ install/1merge/Desktop/110-Mail/claws-mail/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-mail.desktop)==||ini(desktop.mail)==||ini(desktop.mail)==claws-mail
+# Calculate append=skip exists(/usr/share/applications/calculate-mail.desktop,root)==||ini(desktop.mail)==||ini(desktop.mail)==claws-mail
diff --git install/1merge/Desktop/110-Mail/evolution/calculate/.calculate_directory install/1merge/Desktop/110-Mail/evolution/calculate/.calculate_directory
index 47c90ee..f94cebc 100644
--- install/1merge/Desktop/110-Mail/evolution/calculate/.calculate_directory
+++ install/1merge/Desktop/110-Mail/evolution/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-mail.desktop)==||ini(desktop.mail)==||ini(desktop.mail)==evolution
+# Calculate append=skip exists(/usr/share/applications/calculate-mail.desktop,root)==||ini(desktop.mail)==||ini(desktop.mail)==evolution
diff --git install/1merge/Desktop/110-Mail/kmail/calculate/.calculate_directory install/1merge/Desktop/110-Mail/kmail/calculate/.calculate_directory
index 655bc70..622ac45 100644
--- install/1merge/Desktop/110-Mail/kmail/calculate/.calculate_directory
+++ install/1merge/Desktop/110-Mail/kmail/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-mail.desktop)==||ini(desktop.mail)==||ini(desktop.mail)==kmail
+# Calculate append=skip exists(/usr/share/applications/calculate-mail.desktop,root)==||ini(desktop.mail)==||ini(desktop.mail)==kmail
diff --git install/1merge/Desktop/120-Chat/konversation/calculate/.calculate_directory install/1merge/Desktop/120-Chat/konversation/calculate/.calculate_directory
index ff6ad44..30abc59 100644
--- install/1merge/Desktop/120-Chat/konversation/calculate/.calculate_directory
+++ install/1merge/Desktop/120-Chat/konversation/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-chat.desktop)==||ini(desktop.chat)==||ini(desktop.chat)==konversation
+# Calculate append=skip exists(/usr/share/applications/calculate-chat.desktop,root)==||ini(desktop.chat)==||ini(desktop.chat)==konversation
diff --git install/1merge/Desktop/120-Chat/xchat/calculate/.calculate_directory install/1merge/Desktop/120-Chat/xchat/calculate/.calculate_directory
index 5551734..e758207 100644
--- install/1merge/Desktop/120-Chat/xchat/calculate/.calculate_directory
+++ install/1merge/Desktop/120-Chat/xchat/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-chat.desktop)==||ini(desktop.chat)==||ini(desktop.chat)==xchat
+# Calculate append=skip exists(/usr/share/applications/calculate-chat.desktop,root)==||ini(desktop.chat)==||ini(desktop.chat)==xchat
diff --git install/1merge/Desktop/130-IM/kopete/calculate/.calculate_directory install/1merge/Desktop/130-IM/kopete/calculate/.calculate_directory
index 6ae3660..70109a6 100644
--- install/1merge/Desktop/130-IM/kopete/calculate/.calculate_directory
+++ install/1merge/Desktop/130-IM/kopete/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-im.desktop)==||ini(desktop.im)==||ini(desktop.im)==kopete
+# Calculate append=skip exists(/usr/share/applications/calculate-im.desktop,root)==||ini(desktop.im)==||ini(desktop.im)==kopete
diff --git install/1merge/Desktop/130-IM/pidgin/calculate/.calculate_directory install/1merge/Desktop/130-IM/pidgin/calculate/.calculate_directory
index b23036d..55f2d3b 100644
--- install/1merge/Desktop/130-IM/pidgin/calculate/.calculate_directory
+++ install/1merge/Desktop/130-IM/pidgin/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-im.desktop)==||ini(desktop.im)==||ini(desktop.im)==pidgin
+# Calculate append=skip exists(/usr/share/applications/calculate-im.desktop,root)==||ini(desktop.im)==||ini(desktop.im)==pidgin
diff --git install/1merge/Desktop/200-Writer/libreoffice-bin/calculate/.calculate_directory install/1merge/Desktop/200-Writer/libreoffice-bin/calculate/.calculate_directory
index 1b735b4..bba3ab4 100644
--- install/1merge/Desktop/200-Writer/libreoffice-bin/calculate/.calculate_directory
+++ install/1merge/Desktop/200-Writer/libreoffice-bin/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-writer.desktop)==||ini(desktop.writer)==||ini(desktop.writer)==libreoffice-bin
+# Calculate append=skip exists(/usr/share/applications/calculate-writer.desktop,root)==||ini(desktop.writer)==||ini(desktop.writer)==libreoffice-bin
diff --git install/1merge/Desktop/200-Writer/libreoffice/calculate/.calculate_directory install/1merge/Desktop/200-Writer/libreoffice/calculate/.calculate_directory
index ec584c9..8cb4ff4 100644
--- install/1merge/Desktop/200-Writer/libreoffice/calculate/.calculate_directory
+++ install/1merge/Desktop/200-Writer/libreoffice/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-writer.desktop)==||ini(desktop.writer)==||ini(desktop.writer)==libreoffice
+# Calculate append=skip exists(/usr/share/applications/calculate-writer.desktop,root)==||ini(desktop.writer)==||ini(desktop.writer)==libreoffice
diff --git install/1merge/Desktop/210-Calc/libreoffice-bin/calculate/.calculate_directory install/1merge/Desktop/210-Calc/libreoffice-bin/calculate/.calculate_directory
index 5bb79da..e64d7fc 100644
--- install/1merge/Desktop/210-Calc/libreoffice-bin/calculate/.calculate_directory
+++ install/1merge/Desktop/210-Calc/libreoffice-bin/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-calc.desktop)==||ini(desktop.calc)==||ini(desktop.calc)==libreoffice-bin
+# Calculate append=skip exists(/usr/share/applications/calculate-calc.desktop,root)==||ini(desktop.calc)==||ini(desktop.calc)==libreoffice-bin
diff --git install/1merge/Desktop/210-Calc/libreoffice/calculate/.calculate_directory install/1merge/Desktop/210-Calc/libreoffice/calculate/.calculate_directory
index 62739f6..829e038 100644
--- install/1merge/Desktop/210-Calc/libreoffice/calculate/.calculate_directory
+++ install/1merge/Desktop/210-Calc/libreoffice/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-calc.desktop)==||ini(desktop.calc)==||ini(desktop.calc)==libreoffice
+# Calculate append=skip exists(/usr/share/applications/calculate-calc.desktop,root)==||ini(desktop.calc)==||ini(desktop.calc)==libreoffice
diff --git install/1merge/Desktop/220-Calculator/galculator/calculate/.calculate_directory install/1merge/Desktop/220-Calculator/galculator/calculate/.calculate_directory
index f0ef9db..845035e 100644
--- install/1merge/Desktop/220-Calculator/galculator/calculate/.calculate_directory
+++ install/1merge/Desktop/220-Calculator/galculator/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-calculator.desktop)==||ini(desktop.calculator)==||ini(desktop.calculator)==galculator
+# Calculate append=skip exists(/usr/share/applications/calculate-calculator.desktop,root)==||ini(desktop.calculator)==||ini(desktop.calculator)==galculator
diff --git install/1merge/Desktop/220-Calculator/gcalctool/calculate/.calculate_directory install/1merge/Desktop/220-Calculator/gcalctool/calculate/.calculate_directory
index 1708ed8..dd26126 100644
--- install/1merge/Desktop/220-Calculator/gcalctool/calculate/.calculate_directory
+++ install/1merge/Desktop/220-Calculator/gcalctool/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-calculator.desktop)==||ini(desktop.calculator)==||ini(desktop.calculator)==gcalctool
+# Calculate append=skip exists(/usr/share/applications/calculate-calculator.desktop,root)==||ini(desktop.calculator)==||ini(desktop.calculator)==gcalctool
diff --git install/1merge/Desktop/220-Calculator/kcalc/calculate/.calculate_directory install/1merge/Desktop/220-Calculator/kcalc/calculate/.calculate_directory
index e1ee67a..65e263c 100644
--- install/1merge/Desktop/220-Calculator/kcalc/calculate/.calculate_directory
+++ install/1merge/Desktop/220-Calculator/kcalc/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-calculator.desktop)==||ini(desktop.calculator)==||ini(desktop.calculator)==kcalc
+# Calculate append=skip exists(/usr/share/applications/calculate-calculator.desktop,root)==||ini(desktop.calculator)==||ini(desktop.calculator)==kcalc
diff --git install/1merge/Desktop/300-ImageEdit/gimp/calculate/.calculate_directory install/1merge/Desktop/300-ImageEdit/gimp/calculate/.calculate_directory
index 5e5bc33..c986788 100644
--- install/1merge/Desktop/300-ImageEdit/gimp/calculate/.calculate_directory
+++ install/1merge/Desktop/300-ImageEdit/gimp/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-imageedit.desktop)==||ini(desktop.imageedit)==||ini(desktop.imageedit)==gimp
+# Calculate append=skip exists(/usr/share/applications/calculate-imageedit.desktop,root)==||ini(desktop.imageedit)==||ini(desktop.imageedit)==gimp
diff --git install/1merge/Desktop/310-ImageView/digikam/calculate/.calculate_directory install/1merge/Desktop/310-ImageView/digikam/calculate/.calculate_directory
index fd78d65..dce8286 100644
--- install/1merge/Desktop/310-ImageView/digikam/calculate/.calculate_directory
+++ install/1merge/Desktop/310-ImageView/digikam/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-imageview.desktop)==||ini(desktop.imageview)==||ini(desktop.imageview)==digikam
+# Calculate append=skip exists(/usr/share/applications/calculate-imageview.desktop,root)==||ini(desktop.imageview)==||ini(desktop.imageview)==digikam
diff --git install/1merge/Desktop/310-ImageView/eog/calculate/.calculate_directory install/1merge/Desktop/310-ImageView/eog/calculate/.calculate_directory
index cfa5649..0ad8b12 100644
--- install/1merge/Desktop/310-ImageView/eog/calculate/.calculate_directory
+++ install/1merge/Desktop/310-ImageView/eog/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-imageview.desktop)==||ini(desktop.imageview)==||ini(desktop.imageview)==eog
+# Calculate append=skip exists(/usr/share/applications/calculate-imageview.desktop,root)==||ini(desktop.imageview)==||ini(desktop.imageview)==eog
diff --git install/1merge/Desktop/310-ImageView/gqview/calculate/.calculate_directory install/1merge/Desktop/310-ImageView/gqview/calculate/.calculate_directory
index 231681b..5148562 100644
--- install/1merge/Desktop/310-ImageView/gqview/calculate/.calculate_directory
+++ install/1merge/Desktop/310-ImageView/gqview/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-imageview.desktop)==||ini(desktop.imageview)==||ini(desktop.imageview)==gqview
+# Calculate append=skip exists(/usr/share/applications/calculate-imageview.desktop,root)==||ini(desktop.imageview)==||ini(desktop.imageview)==gqview
diff --git install/1merge/Desktop/400-AudioPlayer/amarok/calculate/.calculate_directory install/1merge/Desktop/400-AudioPlayer/amarok/calculate/.calculate_directory
index 809976d..e1140f5 100644
--- install/1merge/Desktop/400-AudioPlayer/amarok/calculate/.calculate_directory
+++ install/1merge/Desktop/400-AudioPlayer/amarok/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==amarok
+# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop,root)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==amarok
diff --git install/1merge/Desktop/400-AudioPlayer/audacious/calculate/.calculate_directory install/1merge/Desktop/400-AudioPlayer/audacious/calculate/.calculate_directory
index ec7962d..c076834 100644
--- install/1merge/Desktop/400-AudioPlayer/audacious/calculate/.calculate_directory
+++ install/1merge/Desktop/400-AudioPlayer/audacious/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==audacious
+# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop,root)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==audacious
diff --git install/1merge/Desktop/400-AudioPlayer/deadbeef/calculate/.calculate_directory install/1merge/Desktop/400-AudioPlayer/deadbeef/calculate/.calculate_directory
index d4a2fb1..6855f3d 100644
--- install/1merge/Desktop/400-AudioPlayer/deadbeef/calculate/.calculate_directory
+++ install/1merge/Desktop/400-AudioPlayer/deadbeef/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==deadbeef
+# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop,root)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==deadbeef
diff --git install/1merge/Desktop/400-AudioPlayer/quodlibet/calculate/.calculate_directory install/1merge/Desktop/400-AudioPlayer/quodlibet/calculate/.calculate_directory
index 23a5228..cb426d5 100644
--- install/1merge/Desktop/400-AudioPlayer/quodlibet/calculate/.calculate_directory
+++ install/1merge/Desktop/400-AudioPlayer/quodlibet/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==quodlibet
+# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop,root)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==quodlibet
diff --git install/1merge/Desktop/400-AudioPlayer/rhythmbox/calculate/.calculate_directory install/1merge/Desktop/400-AudioPlayer/rhythmbox/calculate/.calculate_directory
index 46d23b0..808b57f 100644
--- install/1merge/Desktop/400-AudioPlayer/rhythmbox/calculate/.calculate_directory
+++ install/1merge/Desktop/400-AudioPlayer/rhythmbox/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==rhythmbox
+# Calculate append=skip exists(/usr/share/applications/calculate-audioplayer.desktop,root)==||ini(desktop.audioplayer)==||ini(desktop.audioplayer)==rhythmbox
diff --git install/1merge/Desktop/500-VideoPlayer/gnome-mplayer/calculate/.calculate_directory install/1merge/Desktop/500-VideoPlayer/gnome-mplayer/calculate/.calculate_directory
index c93e440..9b6176c 100644
--- install/1merge/Desktop/500-VideoPlayer/gnome-mplayer/calculate/.calculate_directory
+++ install/1merge/Desktop/500-VideoPlayer/gnome-mplayer/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-videoplayer.desktop)==||ini(desktop.videoplayer)==||ini(desktop.videoplayer)==gnome-mplayer
+# Calculate append=skip exists(/usr/share/applications/calculate-videoplayer.desktop,root)==||ini(desktop.videoplayer)==||ini(desktop.videoplayer)==gnome-mplayer
diff --git install/1merge/Desktop/500-VideoPlayer/smplayer/calculate/.calculate_directory install/1merge/Desktop/500-VideoPlayer/smplayer/calculate/.calculate_directory
index ec3963a..2ac5a8c 100644
--- install/1merge/Desktop/500-VideoPlayer/smplayer/calculate/.calculate_directory
+++ install/1merge/Desktop/500-VideoPlayer/smplayer/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-videoplayer.desktop)==||ini(desktop.videoplayer)==||ini(desktop.videoplayer)==smplayer
+# Calculate append=skip exists(/usr/share/applications/calculate-videoplayer.desktop,root)==||ini(desktop.videoplayer)==||ini(desktop.videoplayer)==smplayer
diff --git install/1merge/Desktop/500-VideoPlayer/totem/calculate/.calculate_directory install/1merge/Desktop/500-VideoPlayer/totem/calculate/.calculate_directory
index 2371094..4544c05 100644
--- install/1merge/Desktop/500-VideoPlayer/totem/calculate/.calculate_directory
+++ install/1merge/Desktop/500-VideoPlayer/totem/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-videoplayer.desktop)==||ini(desktop.videoplayer)==||ini(desktop.videoplayer)==totem
+# Calculate append=skip exists(/usr/share/applications/calculate-videoplayer.desktop,root)==||ini(desktop.videoplayer)==||ini(desktop.videoplayer)==totem
diff --git install/1merge/Desktop/600-ImageBurn/brasero/calculate/.calculate_directory install/1merge/Desktop/600-ImageBurn/brasero/calculate/.calculate_directory
index 0881619..4e4c9ec 100644
--- install/1merge/Desktop/600-ImageBurn/brasero/calculate/.calculate_directory
+++ install/1merge/Desktop/600-ImageBurn/brasero/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-imageburn.desktop)==||ini(desktop.imageburn)==||ini(desktop.imageburn)==brasero
+# Calculate append=skip exists(/usr/share/applications/calculate-imageburn.desktop,root)==||ini(desktop.imageburn)==||ini(desktop.imageburn)==brasero
diff --git install/1merge/Desktop/600-ImageBurn/k3b/calculate/.calculate_directory install/1merge/Desktop/600-ImageBurn/k3b/calculate/.calculate_directory
index 47dbc69..f124176 100644
--- install/1merge/Desktop/600-ImageBurn/k3b/calculate/.calculate_directory
+++ install/1merge/Desktop/600-ImageBurn/k3b/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-imageburn.desktop)==||ini(desktop.imageburn)==||ini(desktop.imageburn)==k3b
+# Calculate append=skip exists(/usr/share/applications/calculate-imageburn.desktop,root)==||ini(desktop.imageburn)==||ini(desktop.imageburn)==k3b
diff --git install/1merge/Desktop/600-ImageBurn/xfburn/calculate/.calculate_directory install/1merge/Desktop/600-ImageBurn/xfburn/calculate/.calculate_directory
index 25abb2c..2bcbaec 100644
--- install/1merge/Desktop/600-ImageBurn/xfburn/calculate/.calculate_directory
+++ install/1merge/Desktop/600-ImageBurn/xfburn/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-imageburn.desktop)==||ini(desktop.imageburn)==||ini(desktop.imageburn)==xfburn
+# Calculate append=skip exists(/usr/share/applications/calculate-imageburn.desktop,root)==||ini(desktop.imageburn)==||ini(desktop.imageburn)==xfburn
diff --git install/1merge/Desktop/700-Dict/goldendict/calculate/.calculate_directory install/1merge/Desktop/700-Dict/goldendict/calculate/.calculate_directory
index 7bbbdd2..7992626 100644
--- install/1merge/Desktop/700-Dict/goldendict/calculate/.calculate_directory
+++ install/1merge/Desktop/700-Dict/goldendict/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-dict.desktop)==||ini(desktop.dict)==||ini(desktop.dict)==goldendict
+# Calculate append=skip exists(/usr/share/applications/calculate-dict.desktop,root)==||ini(desktop.dict)==||ini(desktop.dict)==goldendict
diff --git install/1merge/Desktop/700-Dict/stardict/calculate/.calculate_directory install/1merge/Desktop/700-Dict/stardict/calculate/.calculate_directory
index 7150a7e..bcdb4c4 100644
--- install/1merge/Desktop/700-Dict/stardict/calculate/.calculate_directory
+++ install/1merge/Desktop/700-Dict/stardict/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-dict.desktop)==||ini(desktop.dict)==||ini(desktop.dict)==stardict
+# Calculate append=skip exists(/usr/share/applications/calculate-dict.desktop,root)==||ini(desktop.dict)==||ini(desktop.dict)==stardict
diff --git install/1merge/Desktop/800-TextEdit/gedit/calculate/.calculate_directory install/1merge/Desktop/800-TextEdit/gedit/calculate/.calculate_directory
index 8b8af31..7f3a6e2 100644
--- install/1merge/Desktop/800-TextEdit/gedit/calculate/.calculate_directory
+++ install/1merge/Desktop/800-TextEdit/gedit/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-textedit.desktop)==||ini(desktop.textedit)==||ini(desktop.textedit)==gedit
+# Calculate append=skip exists(/usr/share/applications/calculate-textedit.desktop,root)==||ini(desktop.textedit)==||ini(desktop.textedit)==gedit
diff --git install/1merge/Desktop/800-TextEdit/kwrite/calculate/.calculate_directory install/1merge/Desktop/800-TextEdit/kwrite/calculate/.calculate_directory
index 04bd479..32244bc 100644
--- install/1merge/Desktop/800-TextEdit/kwrite/calculate/.calculate_directory
+++ install/1merge/Desktop/800-TextEdit/kwrite/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-textedit.desktop)==||ini(desktop.textedit)==||ini(desktop.textedit)==kwrite
+# Calculate append=skip exists(/usr/share/applications/calculate-textedit.desktop,root)==||ini(desktop.textedit)==||ini(desktop.textedit)==kwrite
diff --git install/1merge/Desktop/800-TextEdit/leafpad/calculate/.calculate_directory install/1merge/Desktop/800-TextEdit/leafpad/calculate/.calculate_directory
index 05304bd..f9a1833 100644
--- install/1merge/Desktop/800-TextEdit/leafpad/calculate/.calculate_directory
+++ install/1merge/Desktop/800-TextEdit/leafpad/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-textedit.desktop)==||ini(desktop.textedit)==||ini(desktop.textedit)==leafpad
+# Calculate append=skip exists(/usr/share/applications/calculate-textedit.desktop,root)==||ini(desktop.textedit)==||ini(desktop.textedit)==leafpad
diff --git install/1merge/Desktop/900-Terminal/gnome-terminal/calculate/.calculate_directory install/1merge/Desktop/900-Terminal/gnome-terminal/calculate/.calculate_directory
index 362fd07..00ae274 100644
--- install/1merge/Desktop/900-Terminal/gnome-terminal/calculate/.calculate_directory
+++ install/1merge/Desktop/900-Terminal/gnome-terminal/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-terminal.desktop)==||ini(desktop.terminal)==||ini(desktop.terminal)==gnome-terminal
+# Calculate append=skip exists(/usr/share/applications/calculate-terminal.desktop,root)==||ini(desktop.terminal)==||ini(desktop.terminal)==gnome-terminal
diff --git install/1merge/Desktop/900-Terminal/konsole/calculate/.calculate_directory install/1merge/Desktop/900-Terminal/konsole/calculate/.calculate_directory
index 418dcf3..95fc9cf 100644
--- install/1merge/Desktop/900-Terminal/konsole/calculate/.calculate_directory
+++ install/1merge/Desktop/900-Terminal/konsole/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-terminal.desktop)==||ini(desktop.terminal)==||ini(desktop.terminal)==konsole
+# Calculate append=skip exists(/usr/share/applications/calculate-terminal.desktop,root)==||ini(desktop.terminal)==||ini(desktop.terminal)==konsole
diff --git install/1merge/Desktop/900-Terminal/terminal/calculate/.calculate_directory install/1merge/Desktop/900-Terminal/terminal/calculate/.calculate_directory
index f89de45..b452ffe 100644
--- install/1merge/Desktop/900-Terminal/terminal/calculate/.calculate_directory
+++ install/1merge/Desktop/900-Terminal/terminal/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip exists(/usr/share/applications/calculate-terminal.desktop)==||ini(desktop.terminal)==||ini(desktop.terminal)==terminal
+# Calculate append=skip exists(/usr/share/applications/calculate-terminal.desktop,root)==||ini(desktop.terminal)==||ini(desktop.terminal)==terminal
diff --git install/1system/calculate-install/calculate2.env install/1system/calculate-install/calculate2.env
index 2077d51..29baa6d 100644
--- install/1system/calculate-install/calculate2.env
+++ install/1system/calculate-install/calculate2.env
@@ -1,21 +1,19 @@
-# Calculate format=raw comment=# os_root_type==hdd||os_install_linux_ver>10.8.81
-#?os_root_type==hdd||cl_autologin!=&&os_install_linux_shortname!=CMC&&os_install_root_type!=livecd||cl_autologin==&&os_install_linux_shortname==CMC&&os_install_root_type!=livecd#
+# Calculate format=raw comment=# os_install_root_type==hdd||os_install_linux_ver>10.8.81
+
+#?os_root_type==hdd||os_install_root_type==hdd&&pkg(sys-apps/calculate-install)>2.2.17-r1||cl_autologin!=&&os_install_linux_shortname!=CMC&&os_install_root_type!=livecd&&pkg(sys-apps/calculate-install)>2.2.24||cl_autologin==&&os_install_linux_shortname==CMC&&os_install_root_type!=livecd&&pkg(sys-apps/calculate-install)>2.2.24#
[install]
#os_root_type#
#?os_root_type==hdd#
-# Set previous hdd root device.
os_install_dev_from = #-os_root_dev-#
-# NTP is a protocol designed to synchronize the clocks of computers over a network.
os_install_ntp = #-os_install_ntp-#
#os_root_type#
-#?pkg(sys-apps/calculate-install)>2.2.17-r1&&os_root_type==hdd#
-# name of net manager which is used
+#?os_install_root_type==hdd&&pkg(sys-apps/calculate-install)>2.2.17-r1#
os_install_net_settings = #-os_install_net_conf-#
-#pkg#
-#?cl_autologin!=&&os_install_linux_shortname!=CMC&&os_install_root_type!=livecd#
+#os_install_root_type#
+#?cl_autologin!=&&os_install_linux_shortname!=CMC&&os_install_root_type!=livecd&&pkg(sys-apps/calculate-install)>2.2.24#
cl_autologin = #-cl_autologin-#
#cl_autologin#
-#?cl_autologin==&&os_install_linux_shortname==CMC&&os_install_root_type!=livecd#
+#?cl_autologin==&&os_install_linux_shortname==CMC&&os_install_root_type!=livecd&&pkg(sys-apps/calculate-install)>2.2.24#
cl_autologin =
#cl_autologin#
@@ -24,11 +22,11 @@ cl_autologin =
# Set auto-update configuration files.
cl_autoupdate_set = off
#os_install_linux_ver#
-#?os_install_linux_ver>10.8.91#
+#?os_install_linux_ver>10.8.91&&os_install_root_type!=livecd#
# keep value of root dev uuid (8 char) for kernel symlink
cl_kernel_uid = #-cl_install_kernel_uid-#
#os_install_linux_ver#
-#?os_install_linux_build!=#
+#?os_install_linux_build!=&&os_install_linux_ver>10.8.81#
# current linux build
os_linux_build = #-os_install_linux_build-#
#os_install_linux_build#
diff --git install/1system/calculate-install/linux/.calculate_directory install/1system/calculate-install/linux/.calculate_directory
new file mode 100644
index 0000000..814ccaf
--- /dev/null
+++ install/1system/calculate-install/linux/.calculate_directory
@@ -0,0 +1 @@
+# Calculate path=/var/calculate

@ -1,75 +0,0 @@
diff --git desktop/desktop/60-xbmc-10.0/guisettings.xml desktop/desktop/60-xbmc-10.0/guisettings.xml
index 094edba..1e009ec 100644
--- desktop/desktop/60-xbmc-10.0/guisettings.xml
+++ desktop/desktop/60-xbmc-10.0/guisettings.xml
@@ -1,10 +1,69 @@
# Calculate path=~/.xbmc/userdata
<settings>
<locale>
+#?os_locale_lang==en_US#
+ <language>English (US)</language>
+ <timezone>America/New_York</timezone>
+ <timezonecountry>United States</timezonecountry>
+#os_locale_lang#
+#?os_locale_lang==ru_RU#
<charset>CP1251</charset>
- <country>USA</country>
+ <language>Russian</language>
+ <timezone>Europe/Moscow</timezone>
+ <timezonecountry>Russia</timezonecountry>
+#os_locale_lang#
+#?os_locale_lang==de_DE#
+ <language>German</language>
+ <timezone>Europe/Berlin</timezone>
+ <timezonecountry>Germany</timezonecountry>
+#os_locale_lang#
+#?os_locale_lang==es_ES#
<language>Russian</language>
<timezone>Europe/Moscow</timezone>
<timezonecountry>Russia</timezonecountry>
+#os_locale_lang#
+#?os_locale_lang==it_IT#
+ <language>Italian</language>
+ <timezone>Europe/Rome</timezone>
+ <timezonecountry>Italy</timezonecountry>
+#os_locale_lang#
+#?os_locale_lang==fr_FR#
+ <language>French</language>
+ <timezone>Europe/Paris</timezone>
+ <timezonecountry>France</timezonecountry>
+#os_locale_lang#
+#?os_locale_lang==pl_PL#
+ <language>Polish</language>
+ <timezone>Europe/Warsaw</timezone>
+ <timezonecountry>Poland</timezonecountry>
+#os_locale_lang#
+#?os_locale_lang==pt_PT#
+ <language>Portuguese</language>
+ <timezone>Europe/Lisbon</timezone>
+ <timezonecountry>Portugal</timezonecountry>
+#os_locale_lang#
+#?os_locale_lang==pt_BR#
+ <language>Portuguese (Brazil)</language>
+ <timezone>America/Puerto_Rico</timezone>
+ <timezonecountry>Puerto Rico</timezonecountry>
+#os_locale_lang#
+#?os_locale_lang==bg_BG#
+ <language>Bulgarian</language>
+ <timezone>Europe/Sofia</timezone>
+ <timezonecountry>Bulgaria</timezonecountry>
+#os_locale_lang#
+#?os_locale_lang==ro_RO#
+ <language>Romanian</language>
+ <timezone>Europe/Bucharest</timezone>
+ <timezonecountry>Romania</timezonecountry>
+#os_locale_lang#
+#?os_locale_lang==uk_UA#
+ <language>Ukrainian</language>
+ <timezone>Europe/Kiev</timezone>
+ <timezonecountry>Ukraine</timezonecountry>
+#os_locale_lang#
</locale>
+ <powermanagement>
+ <shutdownstate>1</shutdownstate>
+ </powermanagement>
</settings>

@ -1,111 +0,0 @@
diff --git desktop/desktop/60-xbmc-10.0/guisettings.xml desktop/desktop/60-xbmc-10.0/guisettings.xml
index 094edba..1e009ec 100644
--- desktop/desktop/60-xbmc-10.0/guisettings.xml
+++ desktop/desktop/60-xbmc-10.0/guisettings.xml
@@ -1,10 +1,69 @@
# Calculate path=~/.xbmc/userdata
<settings>
<locale>
+#?os_locale_lang==en_US#
+ <language>English (US)</language>
+ <timezone>America/New_York</timezone>
+ <timezonecountry>United States</timezonecountry>
+#os_locale_lang#
+#?os_locale_lang==ru_RU#
<charset>CP1251</charset>
- <country>USA</country>
+ <language>Russian</language>
+ <timezone>Europe/Moscow</timezone>
+ <timezonecountry>Russia</timezonecountry>
+#os_locale_lang#
+#?os_locale_lang==de_DE#
+ <language>German</language>
+ <timezone>Europe/Berlin</timezone>
+ <timezonecountry>Germany</timezonecountry>
+#os_locale_lang#
+#?os_locale_lang==es_ES#
<language>Russian</language>
<timezone>Europe/Moscow</timezone>
<timezonecountry>Russia</timezonecountry>
+#os_locale_lang#
+#?os_locale_lang==it_IT#
+ <language>Italian</language>
+ <timezone>Europe/Rome</timezone>
+ <timezonecountry>Italy</timezonecountry>
+#os_locale_lang#
+#?os_locale_lang==fr_FR#
+ <language>French</language>
+ <timezone>Europe/Paris</timezone>
+ <timezonecountry>France</timezonecountry>
+#os_locale_lang#
+#?os_locale_lang==pl_PL#
+ <language>Polish</language>
+ <timezone>Europe/Warsaw</timezone>
+ <timezonecountry>Poland</timezonecountry>
+#os_locale_lang#
+#?os_locale_lang==pt_PT#
+ <language>Portuguese</language>
+ <timezone>Europe/Lisbon</timezone>
+ <timezonecountry>Portugal</timezonecountry>
+#os_locale_lang#
+#?os_locale_lang==pt_BR#
+ <language>Portuguese (Brazil)</language>
+ <timezone>America/Puerto_Rico</timezone>
+ <timezonecountry>Puerto Rico</timezonecountry>
+#os_locale_lang#
+#?os_locale_lang==bg_BG#
+ <language>Bulgarian</language>
+ <timezone>Europe/Sofia</timezone>
+ <timezonecountry>Bulgaria</timezonecountry>
+#os_locale_lang#
+#?os_locale_lang==ro_RO#
+ <language>Romanian</language>
+ <timezone>Europe/Bucharest</timezone>
+ <timezonecountry>Romania</timezonecountry>
+#os_locale_lang#
+#?os_locale_lang==uk_UA#
+ <language>Ukrainian</language>
+ <timezone>Europe/Kiev</timezone>
+ <timezonecountry>Ukraine</timezonecountry>
+#os_locale_lang#
</locale>
+ <powermanagement>
+ <shutdownstate>1</shutdownstate>
+ </powermanagement>
</settings>
diff --git install/1live/alsa-utils/init.d/alsasound install/1live/alsa-utils/init.d/alsasound
index db5b317..f6cb83a 100644
--- install/1live/alsa-utils/init.d/alsasound
+++ install/1live/alsa-utils/init.d/alsasound
@@ -12,6 +12,31 @@
amixer scontrols | grep -v Mic | sed -nr "/Wave|Master|Front|LFE|Center|Side|Speaker|Surround|PCM/ s/.*'([^']+)'.*/\\\\1/p" | xargs -I {} amixer -q set "{}" 85% unmute &amp;&gt;/dev/null
# mute all mics
amixer scontrols | sed -nr "/Mic/ s/.*'([^']+)'.*/\\\\1/p" | xargs -I {} amixer -q set "{}" 0% mute &amp;&gt;/dev/null
+ save
+ if ! grep -q "PCM Playback Volume" ${alsastatedir}/asound.state
+ then
+ sed -ri "s/^\}/\
+ control.39 \{\\n\
+ iface MIXER\\n\
+ name 'PCM Playback Volume'\\n\
+ value.0 255\\n\
+ value.1 255\\n\
+ comment \{\\n\
+ access 'read write user'\\n\
+ type INTEGER\\n\
+ count 2\\n\
+ range '0 - 255'\\n\
+ tlv '0000000100000008ffffec1400000014'\\n\
+ dbmin -5100\\n\
+ dbmax 0\\n\
+ dbvalue.0 0\\n\
+ dbvalue.1 0\\n\
+ }\\n\
+ \}\\n\
+\}\\n\
+/" ${alsastatedir}/asound.state
+ restore
+ fi
\3</text>
<reg>(\s*ebegin "Loading ALSA modules"
\s*eindent

@ -2,6 +2,28 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-utilities-2.2.25 (18 Oct 2011)
18 Oct 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
-calculate-utilities-2.2.24.ebuild, -calculate-utilities-2.2.24-r1.ebuild,
-calculate-utilities-2.2.24-r2.ebuild, -calculate-utilities-2.2.24-r3.ebuild,
-calculate-utilities-2.2.24-r4.ebuild, -calculate-utilities-2.2.24-r5.ebuild,
-calculate-utilities-2.2.24-r6.ebuild, -calculate-utilities-2.2.24-r7.ebuild,
-calculate-utilities-2.2.24-r8.ebuild, -calculate-utilities-2.2.24-r9.ebuild,
-calculate-utilities-2.2.24-r10.ebuild,
-calculate-utilities-2.2.24-r11.ebuild,
-calculate-utilities-2.2.24-r12.ebuild,
-calculate-utilities-2.2.24-r13.ebuild,
-calculate-utilities-2.2.24-r14.ebuild,
-calculate-utilities-2.2.24-r15.ebuild,
-calculate-utilities-2.2.24-r16.ebuild,
-calculate-utilities-2.2.24-r17.ebuild,
-calculate-utilities-2.2.24-r18.ebuild,
-calculate-utilities-2.2.24-r19.ebuild,
-calculate-utilities-2.2.24-r20.ebuild,
-calculate-utilities-2.2.24-r21.ebuild, +calculate-utilities-2.2.25.ebuild:
Version bump. Remove old.
*calculate-utilities-2.2.24-r22 (10 Oct 2011)
10 Oct 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

@ -1,26 +1,5 @@
EBUILD calculate-utilities-2.2.24-r1.ebuild 864 RMD160 a22eb8673a948936e0badbe143b5fedfbfbd8c51 SHA1 0b5d4989ce0937f069e8d99fbb210592f473d8dc SHA256 12b90974f2941a3c49f816bc89075dbb641a16654709baa1ff9ee2fb20815e20
EBUILD calculate-utilities-2.2.24-r10.ebuild 885 RMD160 7c2dca1a68d899570f495bfe6772973baa02e2a0 SHA1 aa2a994ed2d385624af35c46ff6ee41889100c67 SHA256 4203e4764c30fda8aa3eb5315ab9b63de835374abea65b25f6a003c340871f99
EBUILD calculate-utilities-2.2.24-r11.ebuild 885 RMD160 64ca1a7435a144d2171fc4b0c3a25d9cee3cdda9 SHA1 39516662c63115e050c3afb3d42129652d8ed3bd SHA256 4a7adef67201f31be09ecdd0342693f55e62f7cfe23cf85e2139eb63547ad05b
EBUILD calculate-utilities-2.2.24-r12.ebuild 886 RMD160 5bd53b7327aadbec836350e19439f17e1c3a1cf0 SHA1 7b8a1aa7708dacb4cf48e0364b32e05e335ec146 SHA256 676d5c2035da0d36407b0bf8b0d542cab098284daa711ac9e9de9ce7627a8264
EBUILD calculate-utilities-2.2.24-r13.ebuild 886 RMD160 5bd53b7327aadbec836350e19439f17e1c3a1cf0 SHA1 7b8a1aa7708dacb4cf48e0364b32e05e335ec146 SHA256 676d5c2035da0d36407b0bf8b0d542cab098284daa711ac9e9de9ce7627a8264
EBUILD calculate-utilities-2.2.24-r14.ebuild 886 RMD160 7a5304240ec71f69b181dbc80d278ec251989120 SHA1 9328eca153deee5dffaa8478e5b32e8da365357e SHA256 60a27af30a2d617444ca0bcc99a4dde5ec88d52fa7c45d8ab43611d0ea6a6234
EBUILD calculate-utilities-2.2.24-r15.ebuild 886 RMD160 65c1492ada189d37beee62cb4f5332199fdd5c4d SHA1 202aba0d8ff899a4ddf9c641ca12046dceba170f SHA256 f31a1520673defdbb114cae3180b471f07a7c171696c3025da69144921277d9a
EBUILD calculate-utilities-2.2.24-r16.ebuild 886 RMD160 61b0d4ff24facb0d5e61f25ab73141530b015de4 SHA1 b6ac556265dbb487ef0bd6bd166be1b2283800cc SHA256 c49009184b8a35e536c65b553216afd1b8d02459dc9a7b7ea040cd2edab328b2
EBUILD calculate-utilities-2.2.24-r17.ebuild 886 RMD160 ff32e139fe6f0e207abed92bb423d68ba5e1644e SHA1 47da52aa1f0802689864c4f79ad390fd525670b4 SHA256 49379514add260efde3b3ec5dfae3e55cb8513f80f80443ff6a54d3a54ae6a1a
EBUILD calculate-utilities-2.2.24-r18.ebuild 886 RMD160 91ec351ec6077c4c429e794053915e7b3a3a0aac SHA1 622a198668ce573b5ca16cde92f6972e254d56c2 SHA256 516cfa9982dad67e1c5ea220c501cd17e322c5e4a0469af14b90834f6661f0b6
EBUILD calculate-utilities-2.2.24-r19.ebuild 886 RMD160 9f5425a8d4b18236de146a08327f9b9cb2137ef1 SHA1 831852f5570464284f0dad8990a84e7dec3c16f3 SHA256 bc8b9c547bc9f24a3e8b5bf876bdbc375ed5078e789baccdde2cb8de7dfdd1fb
EBUILD calculate-utilities-2.2.24-r2.ebuild 867 RMD160 df598038cc6cc3971cab35ed7984a1dd590bec98 SHA1 a77db53bab42d35ae2677224e3ebc0c26a650a59 SHA256 db8f05e541179081778143f3706c10e42febe96c72fe5a2feceefeff73fd5a50
EBUILD calculate-utilities-2.2.24-r20.ebuild 886 RMD160 1f5eecc1248532f406e3aaa22e9a0284c1563906 SHA1 f3edfd11b46129c6549fd09665056d0f3708c1e5 SHA256 91638ea12c3b11cfa4bbed594505465b35ee408a09e45eaf6a9879da392cec88
EBUILD calculate-utilities-2.2.24-r21.ebuild 886 RMD160 669da1caad73181283470fbf493c6026e2759c16 SHA1 01f4dc1c7eee134588bdecd98564e50b36d5a077 SHA256 e8309ec36e44c4b55dd993ee07fbd7d10e128274546ef5261a1a25b31e638a0b
EBUILD calculate-utilities-2.2.24-r22.ebuild 889 RMD160 88f55580d44fb61439a61698c0c634baf475c3a3 SHA1 391b67fd249fb9517c8bfab3e276845620234cac SHA256 a804cb3622e20f821dc4e7bd1c89b7dcb347c860362589396d0ac325136b6686
EBUILD calculate-utilities-2.2.24-r3.ebuild 873 RMD160 8f0b91ade772b6642311b50efd772daa5a4c76cc SHA1 ad4cfb779ce2a85b9dfe6bc040bff73827fce20b SHA256 3d4ea669782aed05bcc33a16117ef01e22c28585e300b751fb5162a13d990901
EBUILD calculate-utilities-2.2.24-r4.ebuild 873 RMD160 70f067baed3cd831660617cc2d7a5997712b7fa4 SHA1 a307de135d4ab9526036861ef51f9caa8eef0fd4 SHA256 0024670d48e1510cd2a20f28c623d4f72c9963f66b3f723a5c1e55935362088f
EBUILD calculate-utilities-2.2.24-r5.ebuild 885 RMD160 086c3f072e81e739dbe46d2345d7c68d8e115265 SHA1 9d7d6694849fd371e1865a294bd8223d0a9cd99d SHA256 5664f8a0f64a4b7bb75f4746314519b13dc55f112bd04f6a82126ec15db454b5
EBUILD calculate-utilities-2.2.24-r6.ebuild 885 RMD160 1b2a1004d9dfe34d53dbee65895390549be74c73 SHA1 9f2efc1e5edcd063cd6f469eaf827fa779c6bcc0 SHA256 2143bf1b761323d31b6e62ee5dadf162d1fd3506405cfbfd85e8c10b870747dc
EBUILD calculate-utilities-2.2.24-r7.ebuild 885 RMD160 ed397e97011f5250d5ceba8a2cff68ac1c698868 SHA1 d1d5f02cf46df4960c65c4541581201854dc6bfc SHA256 5083fc75f3080dc29dd4e3fcc5428ff6dc5768085b301d2145423133195bbd50
EBUILD calculate-utilities-2.2.24-r8.ebuild 885 RMD160 fc01b867dd5b79294cdf0581954be124f53a05f5 SHA1 0a16405f40a5122326ec4de2f83dafd1c12a8cf9 SHA256 218d678cf21b5ee200dcfa67b68ca9f7dafc650e8dd13ffc63c20cb8aa07b10e
EBUILD calculate-utilities-2.2.24-r9.ebuild 885 RMD160 64810ea35986869adff8dd3298607985978e6e59 SHA1 5951c55c53517cb66a87276101aac01c9afcf99f SHA256 7a9c5a4e8710dd651474ec505853102858c44bc7bffb9716d3752924297c610c
EBUILD calculate-utilities-2.2.24.ebuild 861 RMD160 71a8eac35eade9be90df9cacbb5b4d9ba07d3664 SHA1 258da46af67a0e0995074a9c7f01b33234711ca9 SHA256 f1a33869f243365632a9af11ab9ed2538a6b2c183dd9ddbf28d48ad564df3d54
EBUILD calculate-utilities-2.2.25.ebuild 861 RMD160 e4d64358df7a0d26719652d509270b93f28c4124 SHA1 e3e923e41586a5631ee5ced45ad27ef95d0de78e SHA256 9b32bb8e5042d6cde0fa806b91d10bacf7cde4d9f5299e1f2a39a09ede539664
EBUILD calculate-utilities-2.2.9999.ebuild 840 RMD160 0c7324a9ed480118ac19f62b162c9ee62c25f964 SHA1 7dadab1430ed147334ed7e9b4fcc86dc99e25d56 SHA256 f3ee28f9f765e7302c83eb4a15a09bdf066f09e6b40e34f6d52157a946df5e66
EBUILD calculate-utilities-3.0.9999.ebuild 439 RMD160 c74900e23075714e31c29740a5f4cc49bad3e3ea SHA1 f27867b8efacf1b83853e9d1e9fe3764cd3a6dac SHA256 8e7b5ecb5f7fa38ae48d65c6a5e435a00de8626af27d57c96b64ac188a2f17ab
MISC ChangeLog 29989 RMD160 133e62ca6c7c6d3f0e60b0dc219e2d51e4fc0e9e SHA1 6bf0a58c02d522a28843002c6d327eeb1fb47cdf SHA256 fb620e1b3741e3d94ad092f4a2b90ef770c352cfda19ee950e36cb648823d846
MISC ChangeLog 31058 RMD160 c0598a37793a9a55336e4d3126f5b3e894c08634 SHA1 77413ec903d38aa461a067f93d766f1f802c0b6f SHA256 b1d60eecf8c7191dd3c305231e2c6cf11fa4f41a65c507c7b2da5f39bacb9988

@ -1,36 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=3
DESCRIPTION="Calculate Utilities meta package"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
SRC_URI=""
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="
cl_assemble
cl_builder
cl_client
cl_desktop
cl_installgui
cl_server
"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-2.2.24-r1
=sys-apps/calculate-templates-2.2.24
=sys-apps/calculate-lib-2.2.24
=sys-apps/calculate-i18n-2.2.24
cl_assemble? ( =sys-apps/calculate-assemble-2.2.24 )
cl_builder? ( =sys-apps/calculate-builder-2.2.24 )
cl_client? ( =sys-apps/calculate-client-2.2.24 )
cl_desktop? ( =sys-apps/calculate-desktop-2.2.24 )
cl_installgui? ( =app-misc/calculate-install-gui-2.2.24 )
cl_server? ( =sys-apps/calculate-server-2.1.14-r6 )
"

@ -1,36 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=3
DESCRIPTION="Calculate Utilities meta package"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
SRC_URI=""
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="
cl_assemble
cl_builder
cl_client
cl_desktop
cl_installgui
cl_server
"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-2.2.24-r6
=sys-apps/calculate-templates-2.2.24-r8
=sys-apps/calculate-lib-2.2.24-r2
=sys-apps/calculate-i18n-2.2.24-r1
cl_assemble? ( =sys-apps/calculate-assemble-2.2.24 )
cl_builder? ( =sys-apps/calculate-builder-2.2.24-r2 )
cl_client? ( =sys-apps/calculate-client-2.2.24-r1 )
cl_desktop? ( =sys-apps/calculate-desktop-2.2.24-r2 )
cl_installgui? ( =app-misc/calculate-install-gui-2.2.24-r1 )
cl_server? ( =sys-apps/calculate-server-2.1.14-r6 )
"

@ -1,36 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=3
DESCRIPTION="Calculate Utilities meta package"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
SRC_URI=""
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="
cl_assemble
cl_builder
cl_client
cl_desktop
cl_installgui
cl_server
"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-2.2.24-r6
=sys-apps/calculate-templates-2.2.24-r9
=sys-apps/calculate-lib-2.2.24-r2
=sys-apps/calculate-i18n-2.2.24-r1
cl_assemble? ( =sys-apps/calculate-assemble-2.2.24 )
cl_builder? ( =sys-apps/calculate-builder-2.2.24-r2 )
cl_client? ( =sys-apps/calculate-client-2.2.24-r1 )
cl_desktop? ( =sys-apps/calculate-desktop-2.2.24-r2 )
cl_installgui? ( =app-misc/calculate-install-gui-2.2.24-r1 )
cl_server? ( =sys-apps/calculate-server-2.1.14-r6 )
"

@ -1,36 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=3
DESCRIPTION="Calculate Utilities meta package"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
SRC_URI=""
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="
cl_assemble
cl_builder
cl_client
cl_desktop
cl_installgui
cl_server
"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-2.2.24-r6
=sys-apps/calculate-templates-2.2.24-r10
=sys-apps/calculate-lib-2.2.24-r2
=sys-apps/calculate-i18n-2.2.24-r1
cl_assemble? ( =sys-apps/calculate-assemble-2.2.24 )
cl_builder? ( =sys-apps/calculate-builder-2.2.24-r2 )
cl_client? ( =sys-apps/calculate-client-2.2.24-r1 )
cl_desktop? ( =sys-apps/calculate-desktop-2.2.24-r2 )
cl_installgui? ( =app-misc/calculate-install-gui-2.2.24-r1 )
cl_server? ( =sys-apps/calculate-server-2.1.14-r6 )
"

@ -1,36 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=3
DESCRIPTION="Calculate Utilities meta package"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
SRC_URI=""
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="
cl_assemble
cl_builder
cl_client
cl_desktop
cl_installgui
cl_server
"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-2.2.24-r6
=sys-apps/calculate-templates-2.2.24-r10
=sys-apps/calculate-lib-2.2.24-r2
=sys-apps/calculate-i18n-2.2.24-r1
cl_assemble? ( =sys-apps/calculate-assemble-2.2.24 )
cl_builder? ( =sys-apps/calculate-builder-2.2.24-r2 )
cl_client? ( =sys-apps/calculate-client-2.2.24-r1 )
cl_desktop? ( =sys-apps/calculate-desktop-2.2.24-r2 )
cl_installgui? ( =app-misc/calculate-install-gui-2.2.24-r1 )
cl_server? ( =sys-apps/calculate-server-2.1.14-r6 )
"

@ -1,36 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=3
DESCRIPTION="Calculate Utilities meta package"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
SRC_URI=""
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="
cl_assemble
cl_builder
cl_client
cl_desktop
cl_installgui
cl_server
"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-2.2.24-r6
=sys-apps/calculate-templates-2.2.24-r11
=sys-apps/calculate-lib-2.2.24-r2
=sys-apps/calculate-i18n-2.2.24-r1
cl_assemble? ( =sys-apps/calculate-assemble-2.2.24 )
cl_builder? ( =sys-apps/calculate-builder-2.2.24-r2 )
cl_client? ( =sys-apps/calculate-client-2.2.24-r1 )
cl_desktop? ( =sys-apps/calculate-desktop-2.2.24-r2 )
cl_installgui? ( =app-misc/calculate-install-gui-2.2.24-r1 )
cl_server? ( =sys-apps/calculate-server-2.1.14-r6 )
"

@ -1,36 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=3
DESCRIPTION="Calculate Utilities meta package"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
SRC_URI=""
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="
cl_assemble
cl_builder
cl_client
cl_desktop
cl_installgui
cl_server
"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-2.2.24-r7
=sys-apps/calculate-templates-2.2.24-r12
=sys-apps/calculate-lib-2.2.24-r2
=sys-apps/calculate-i18n-2.2.24-r1
cl_assemble? ( =sys-apps/calculate-assemble-2.2.24 )
cl_builder? ( =sys-apps/calculate-builder-2.2.24-r2 )
cl_client? ( =sys-apps/calculate-client-2.2.24-r1 )
cl_desktop? ( =sys-apps/calculate-desktop-2.2.24-r2 )
cl_installgui? ( =app-misc/calculate-install-gui-2.2.24-r1 )
cl_server? ( =sys-apps/calculate-server-2.1.14-r6 )
"

@ -1,36 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=3
DESCRIPTION="Calculate Utilities meta package"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
SRC_URI=""
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="
cl_assemble
cl_builder
cl_client
cl_desktop
cl_installgui
cl_server
"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-2.2.24-r7
=sys-apps/calculate-templates-2.2.24-r12
=sys-apps/calculate-lib-2.2.24-r2
=sys-apps/calculate-i18n-2.2.24-r1
cl_assemble? ( =sys-apps/calculate-assemble-2.2.24 )
cl_builder? ( =sys-apps/calculate-builder-2.2.24-r3 )
cl_client? ( =sys-apps/calculate-client-2.2.24-r1 )
cl_desktop? ( =sys-apps/calculate-desktop-2.2.24-r2 )
cl_installgui? ( =app-misc/calculate-install-gui-2.2.24-r1 )
cl_server? ( =sys-apps/calculate-server-2.1.14-r6 )
"

@ -1,36 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=3
DESCRIPTION="Calculate Utilities meta package"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
SRC_URI=""
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="
cl_assemble
cl_builder
cl_client
cl_desktop
cl_installgui
cl_server
"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-2.2.24-r7
=sys-apps/calculate-templates-2.2.24-r14
=sys-apps/calculate-lib-2.2.24-r2
=sys-apps/calculate-i18n-2.2.24-r1
cl_assemble? ( =sys-apps/calculate-assemble-2.2.24 )
cl_builder? ( =sys-apps/calculate-builder-2.2.24-r3 )
cl_client? ( =sys-apps/calculate-client-2.2.24-r1 )
cl_desktop? ( =sys-apps/calculate-desktop-2.2.24-r2 )
cl_installgui? ( =app-misc/calculate-install-gui-2.2.24-r1 )
cl_server? ( =sys-apps/calculate-server-2.1.14-r6 )
"

@ -1,36 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=3
DESCRIPTION="Calculate Utilities meta package"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
SRC_URI=""
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="
cl_assemble
cl_builder
cl_client
cl_desktop
cl_installgui
cl_server
"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-2.2.24-r7
=sys-apps/calculate-templates-2.2.24-r15
=sys-apps/calculate-lib-2.2.24-r2
=sys-apps/calculate-i18n-2.2.24-r1
cl_assemble? ( =sys-apps/calculate-assemble-2.2.24 )
cl_builder? ( =sys-apps/calculate-builder-2.2.24-r3 )
cl_client? ( =sys-apps/calculate-client-2.2.24-r1 )
cl_desktop? ( =sys-apps/calculate-desktop-2.2.24-r2 )
cl_installgui? ( =app-misc/calculate-install-gui-2.2.24-r1 )
cl_server? ( =sys-apps/calculate-server-2.1.14-r6 )
"

@ -1,36 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=3
DESCRIPTION="Calculate Utilities meta package"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
SRC_URI=""
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="
cl_assemble
cl_builder
cl_client
cl_desktop
cl_installgui
cl_server
"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-2.2.24-r7
=sys-apps/calculate-templates-2.2.24-r16
=sys-apps/calculate-lib-2.2.24-r2
=sys-apps/calculate-i18n-2.2.24-r1
cl_assemble? ( =sys-apps/calculate-assemble-2.2.24 )
cl_builder? ( =sys-apps/calculate-builder-2.2.24-r3 )
cl_client? ( =sys-apps/calculate-client-2.2.24-r1 )
cl_desktop? ( =sys-apps/calculate-desktop-2.2.24-r2 )
cl_installgui? ( =app-misc/calculate-install-gui-2.2.24-r1 )
cl_server? ( =sys-apps/calculate-server-2.1.14-r6 )
"

@ -1,36 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=3
DESCRIPTION="Calculate Utilities meta package"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
SRC_URI=""
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="
cl_assemble
cl_builder
cl_client
cl_desktop
cl_installgui
cl_server
"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-2.2.24-r1
=sys-apps/calculate-templates-2.2.24-r1
=sys-apps/calculate-lib-2.2.24
=sys-apps/calculate-i18n-2.2.24
cl_assemble? ( =sys-apps/calculate-assemble-2.2.24 )
cl_builder? ( =sys-apps/calculate-builder-2.2.24 )
cl_client? ( =sys-apps/calculate-client-2.2.24 )
cl_desktop? ( =sys-apps/calculate-desktop-2.2.24 )
cl_installgui? ( =app-misc/calculate-install-gui-2.2.24 )
cl_server? ( =sys-apps/calculate-server-2.1.14-r6 )
"

@ -1,36 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=3
DESCRIPTION="Calculate Utilities meta package"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
SRC_URI=""
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="
cl_assemble
cl_builder
cl_client
cl_desktop
cl_installgui
cl_server
"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-2.2.24-r7
=sys-apps/calculate-templates-2.2.24-r17
=sys-apps/calculate-lib-2.2.24-r2
=sys-apps/calculate-i18n-2.2.24-r1
cl_assemble? ( =sys-apps/calculate-assemble-2.2.24 )
cl_builder? ( =sys-apps/calculate-builder-2.2.24-r3 )
cl_client? ( =sys-apps/calculate-client-2.2.24-r1 )
cl_desktop? ( =sys-apps/calculate-desktop-2.2.24-r2 )
cl_installgui? ( =app-misc/calculate-install-gui-2.2.24-r1 )
cl_server? ( =sys-apps/calculate-server-2.1.14-r6 )
"

@ -1,36 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=3
DESCRIPTION="Calculate Utilities meta package"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
SRC_URI=""
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="
cl_assemble
cl_builder
cl_client
cl_desktop
cl_installgui
cl_server
"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-2.2.24-r7
=sys-apps/calculate-templates-2.2.24-r17
=sys-apps/calculate-lib-2.2.24-r2
=sys-apps/calculate-i18n-2.2.24-r1
cl_assemble? ( =sys-apps/calculate-assemble-2.2.24 )
cl_builder? ( =sys-apps/calculate-builder-2.2.24-r4 )
cl_client? ( =sys-apps/calculate-client-2.2.24-r1 )
cl_desktop? ( =sys-apps/calculate-desktop-2.2.24-r2 )
cl_installgui? ( =app-misc/calculate-install-gui-2.2.24-r1 )
cl_server? ( =sys-apps/calculate-server-2.1.14-r6 )
"

@ -1,36 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=3
DESCRIPTION="Calculate Utilities meta package"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
SRC_URI=""
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="
cl_assemble
cl_builder
cl_client
cl_desktop
cl_installgui
cl_server
"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-2.2.24-r2
=sys-apps/calculate-templates-2.2.24-r1
=sys-apps/calculate-lib-2.2.24-r1
=sys-apps/calculate-i18n-2.2.24
cl_assemble? ( =sys-apps/calculate-assemble-2.2.24 )
cl_builder? ( =sys-apps/calculate-builder-2.2.24 )
cl_client? ( =sys-apps/calculate-client-2.2.24-r1 )
cl_desktop? ( =sys-apps/calculate-desktop-2.2.24 )
cl_installgui? ( =app-misc/calculate-install-gui-2.2.24 )
cl_server? ( =sys-apps/calculate-server-2.1.14-r6 )
"

@ -1,36 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=3
DESCRIPTION="Calculate Utilities meta package"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
SRC_URI=""
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="
cl_assemble
cl_builder
cl_client
cl_desktop
cl_installgui
cl_server
"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-2.2.24-r3
=sys-apps/calculate-templates-2.2.24-r2
=sys-apps/calculate-lib-2.2.24-r1
=sys-apps/calculate-i18n-2.2.24
cl_assemble? ( =sys-apps/calculate-assemble-2.2.24 )
cl_builder? ( =sys-apps/calculate-builder-2.2.24 )
cl_client? ( =sys-apps/calculate-client-2.2.24-r1 )
cl_desktop? ( =sys-apps/calculate-desktop-2.2.24 )
cl_installgui? ( =app-misc/calculate-install-gui-2.2.24 )
cl_server? ( =sys-apps/calculate-server-2.1.14-r6 )
"

@ -1,36 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=3
DESCRIPTION="Calculate Utilities meta package"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
SRC_URI=""
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="
cl_assemble
cl_builder
cl_client
cl_desktop
cl_installgui
cl_server
"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-2.2.24-r4
=sys-apps/calculate-templates-2.2.24-r3
=sys-apps/calculate-lib-2.2.24-r2
=sys-apps/calculate-i18n-2.2.24-r1
cl_assemble? ( =sys-apps/calculate-assemble-2.2.24 )
cl_builder? ( =sys-apps/calculate-builder-2.2.24-r1 )
cl_client? ( =sys-apps/calculate-client-2.2.24-r1 )
cl_desktop? ( =sys-apps/calculate-desktop-2.2.24-r1 )
cl_installgui? ( =app-misc/calculate-install-gui-2.2.24-r1 )
cl_server? ( =sys-apps/calculate-server-2.1.14-r6 )
"

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save