calculate
/
calculate-overlay
5
2
Fork 4
Code Issues 12 Pull Requests 2 Releases Wiki Activity

Update utilities.

Browse Source
atratsevskiy
Mike Hiretsky 13 years ago
parent 3798bf583f
commit d8caecf8c8
30 changed files with 1432 additions and 7 deletions
Show Stats Download Patch File Download Diff File

7
app-misc/calculate-install-gui/ChangeLog
Unescape View File

@ -2,6 +2,13 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-install-gui-2.2.24-r1 (28 Sep 2011)
28 Sep 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+calculate-install-gui-2.2.24-r1.ebuild,
+files/calculate-install-gui-2.2.24-r1.patch:
Update for bugfix
*calculate-install-gui-2.2.24 (20 Sep 2011)
20 Sep 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

4
app-misc/calculate-install-gui/Manifest
Unescape View File

@ -1,5 +1,7 @@
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
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.9999.ebuild 702 RMD160 33a61388c426640f23f0b0a070cd0fd8e2c62c4d SHA1 438003f2460ad566dfd20a0dbefe82885f5ecac6 SHA256 6331f4eb498edf37a679edde292eee1ec90668f8186eaadb7637f12daf590486
MISC ChangeLog 15122 RMD160 5736c69a51b3d7ecfb6e31acb7e6f825ca6d3e32 SHA1 8f6be2656242ef7f625ff996645abad7eee18699 SHA256 b20a7928f384dd70785ee019089e0953329944ded9314d852a7bdb1a539d7e3d
MISC ChangeLog 15342 RMD160 dc8edbe851a19683d80bb12e34656d4c5a1cf10a SHA1 1c05495b0ad542f71a4c02404eb25235ed802947 SHA256 3d27fee959c275848361c243c4a462b24594fbf7d8030d5a880b6a0c58c87109
MISC metadata.xml 319 RMD160 c12d856d94a4bbba48275f44c4e9a0eae1ac6f21 SHA1 cddfe781ee5b88c7f5c94d7c5f03a07e61ae3336 SHA256 2a18634b4a257808c269e8c986462b316780c4f8b9a19c7c8b733fa3310a4147

42
app-misc/calculate-install-gui/calculate-install-gui-2.2.24-r1.ebuild
Unescape View File

@ -0,0 +1,42 @@
# 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="GUI frontend for the program of installation Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-install-2.2.24
x11-libs/qtermwidget
x11-libs/qt-core"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# fix available filesystems
epatch "${FILESDIR}/calculate-install-gui-2.2.24-r1.patch"
}
src_configure() {
CMAKE_PREFIX_PATH=/usr cmake .
}
src_compile() {
emake || die "make failed"
}
src_install() {
emake DESTDIR="${D}" install || die 'make install failed'
dodoc README
}

17
app-misc/calculate-install-gui/files/calculate-install-gui-2.2.24-r1.patch
Unescape View File

@ -0,0 +1,17 @@
diff --git src/mountpointdialog.cpp src/mountpointdialog.cpp
index 49c2867..e736d82 100644
--- src/mountpointdialog.cpp
+++ src/mountpointdialog.cpp
@@ -101,10 +101,12 @@ void MountPointDialog::setupUi()
m_labFS = new QLabel( tr("File system: ") );
m_cmbboxFS = new QComboBox;
+ m_cmbboxFS->addItem( "btrfs" );
m_cmbboxFS->addItem( "ext2" );
m_cmbboxFS->addItem( "ext3" );
m_cmbboxFS->addItem( "ext4" );
m_cmbboxFS->addItem( "jfs" );
+ m_cmbboxFS->addItem( "nilfs2" );
m_cmbboxFS->addItem( "reiserfs" );
m_cmbboxFS->addItem( "xfs" );
m_cmbboxFS->addItem( "swap" );

2
sys-apps/calculate-builder/Manifest
Unescape View File

@ -1,4 +1,6 @@
AUX calculate-builder-2.2.24-r1.patch 2551 RMD160 3d01601506bc6178ee5a0ecef3772ceaf41f8f1d SHA1 cdd27e6e4ae567e2bf88023f3cc2e8db0236df38 SHA256 846e60fa3255abad18666bb74f1f9bd253c35224bb4b227abf0640d7477e037c
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.ebuild 588 RMD160 4ab4eb3ba650bf43594b70b68d9e3c9844d14bcf SHA1 f754e4af234393852b58ffbbbc8aff3d18408007 SHA256 1f138c0c6dca0195f43c4aca60a87632980ee9c2f7dcc3c8658d487c97b45ec4
EBUILD calculate-builder-2.2.9999.ebuild 557 RMD160 d6e0da8ee7ba77531266337a099a0e0e067d40ae SHA1 c92269a96eea95799d1cbd1860d0ee5b2a452e28 SHA256 6a99eb07e7beb65b1a14d4479e0ecab3da3b608733bb1c09ea739a71ed3eb869
MISC ChangeLog 17546 RMD160 8ea99aa45412b71b654d7ffdc94daf0b30a26281 SHA1 13e858a20a5bd409e6f63ae9c9cea82ec13c9ef5 SHA256 08b91cf44b96eede30ff6d708e21b1a453e12bb98557295afe45597cdf319cd7

31
sys-apps/calculate-builder/calculate-builder-2.2.24-r1.ebuild
Unescape View File

@ -0,0 +1,31 @@
# 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"
}

60
sys-apps/calculate-builder/files/calculate-builder-2.2.24-r1.patch
Unescape View File

@ -0,0 +1,60 @@
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:

7
sys-apps/calculate-desktop/ChangeLog
Unescape View File

@ -2,6 +2,13 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-desktop-2.2.24-r1 (28 Sep 2011)
28 Sep 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+calculate-desktop-2.2.24-r1.ebuild,
+files/calculate-desktop-2.2.24-r1.patch:
Update for feature
21 Sep 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
-calculate-desktop-2.2.18.ebuild, -calculate-desktop-2.2.19.ebuild,
-calculate-desktop-2.2.20.ebuild, -calculate-desktop-2.2.21.ebuild,

4
sys-apps/calculate-desktop/Manifest
Unescape View File

@ -1,5 +1,7 @@
AUX calculate-desktop-2.2.24-r1.patch 6519 RMD160 b0e088b347c24432d7aa8392910d8798c128dae8 SHA1 54f5db9c8b430b34815606d32037738e42c4b087 SHA256 4831f75d6de1bf304ef9cde084ec4a88aa90fc94d92fca613b552cb35a19f6a0
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
EBUILD calculate-desktop-2.2.24.ebuild 875 RMD160 7c55bc31eb2ff1c66b520056959ee2e907ac6660 SHA1 4f5fe5d78e66b9b0b73a92dfe368d874238b3237 SHA256 d71248dd870c930de0d3e035130c0fff9bff9b8defbe63c2048f86e5f447cf9e
EBUILD calculate-desktop-2.2.9999.ebuild 889 RMD160 5b753ae615aacbd630f6b47767b0338c65e5a10b SHA1 120c45f40d1c1bcb997fae0c1aae5d1bde668ed5 SHA256 a1c6d08b709b822250b3a8c8d621838517d6229bcbc1229eae1218c4446ed45e
MISC ChangeLog 14967 RMD160 12f41b042ee2b03ebbcef1cef7981b5928d2e923 SHA1 0c7af5a06f508bebc112956087d276094bfa2310 SHA256 81729d119b92230b7377a37e315dc54092e3759b33437584b123ffbaa827c895
MISC ChangeLog 15176 RMD160 166814c5c74276f247760bd6eb5ea7d0c9019e40 SHA1 5f3481b3615dfe78b5bea80c367c28df1c274ae5 SHA256 f3953f75eb39cfa060576769fb3a63608a28c2dbc9965ba566b44ebf43cb990c
MISC metadata.xml 315 RMD160 36a1a8d03aed0a483def83e076f484a64d452a8b SHA1 f6e70641eab777d2417d8a7600e8d3f09f53f96f SHA256 67fea0b1af7d10c0f86e72ab40f527e99c6f81f7aace4716344bdfb97c769a18

42
sys-apps/calculate-desktop/calculate-desktop-2.2.24-r1.ebuild
Unescape View File

@ -0,0 +1,42 @@
# 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
}

143
sys-apps/calculate-desktop/files/calculate-desktop-2.2.24-r1.patch
Unescape View File

@ -0,0 +1,143 @@
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):
"""Инсталяция программы"""

6
sys-apps/calculate-i18n/ChangeLog
Unescape View File

@ -2,6 +2,12 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-i18n-2.2.24-r1 (28 Sep 2011)
28 Sep 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+calculate-i18n-2.2.24-r1.ebuild, +files/calculate-i18n-2.2.24-r1.patch:
Update for install,desktop,builder
21 Sep 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
-calculate-i18n-2.2.19.ebuild, -calculate-i18n-2.2.19-r1.ebuild,
-calculate-i18n-2.2.19-r2.ebuild, -calculate-i18n-2.2.19-r3.ebuild,

4
sys-apps/calculate-i18n/Manifest
Unescape View File

@ -1,5 +1,7 @@
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
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.9999.ebuild 682 RMD160 e6de150ef304f88a676dfb3aff3b48e26052caa1 SHA1 09065402bd25b54e112920338d70930b7e85104a SHA256 e1a9fbd50702f829252e802ed7dd8a919b520a99cdccf9ce97c679d05c1d8c43
MISC ChangeLog 4505 RMD160 b5cd18a473e97120a126884a51375e133609bafa SHA1 026635d50eb2ad8b01a1bf6fde41b3f44fab66a7 SHA256 17b8e21ea25005eac60ffb4053e74ba0296d7e5327a31de402a1433b5ddaff86
MISC ChangeLog 4719 RMD160 bb51b9303e89b6b688334d0f0d2dd211d53dcc8d SHA1 42319071550f24239598b62e748dbe73e024fa1d SHA256 73e3a008a637acba741d02e16d55bc055aa5a789712b48b4d2e0cd70a4794b3a
MISC metadata.xml 276 RMD160 d9730825fc3ad1b5ea7ba45704121ebd29e38b11 SHA1 c4c1576efbc38119efca43cfa273cb9f433f1de1 SHA256 a2312171d1cbfac41a263c0be692d3d12cfa3aab51979af64487824ae674bc2c

33
sys-apps/calculate-i18n/calculate-i18n-2.2.24-r1.ebuild
Unescape View File

@ -0,0 +1,33 @@
# 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 assembling tasks of Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
RDEPEND=">=sys-apps/calculate-lib-2.2.19
!<sys-apps/calculate-install-2.2.19
!<sys-apps/calculate-client-2.2.19
!<sys-apps/calculate-desktop-2.2.19
!<sys-apps/calculate-builder-2.2.19
!<sys-apps/calculate-assemble-2.2.19"
DEPEND="sys-devel/gettext
${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# update translate
epatch "${FILESDIR}/calculate-i18n-2.2.24-r1.patch"
}

76
sys-apps/calculate-i18n/files/calculate-i18n-2.2.24-r1.patch
Unescape View File

@ -0,0 +1,76 @@
diff --git ru/cl_builder_ru.po ru/cl_builder_ru.po
index 729d7d3..6c9623a 100644
--- ru/cl_builder_ru.po
+++ ru/cl_builder_ru.po
@@ -441,3 +441,6 @@ msgstr "Выполнение '%s'"
msgid "use only live templates on startup"
msgstr "при первой загрузке использовать только live шаблоны"
+
+msgid "Create cache for %s home directory"
+msgstr "Создание кэша для домашней директории пользователя %s"
diff --git ru/cl_desktop_ru.po ru/cl_desktop_ru.po
index bb46f45..2f1ecc4 100644
--- ru/cl_desktop_ru.po
+++ ru/cl_desktop_ru.po
@@ -112,3 +112,39 @@ msgstr "показать применнные шаблоны"
msgid "Following files were changed"
msgstr "Следующие файлы были изменены"
+
+msgid "create cache of user home directory"
+msgstr "создать кэш пользовательсокй домашней директории"
+
+msgid "Can not create cache for user %s"
+msgstr "Не удалось создать кэш для пользователя %s"
+
+msgid "because home directory exists"
+msgstr "так как домашняя директория уже существует"
+
+msgid "Can not create cache"
+msgstr "Не удалось создать кэш"
+
+msgid "Cache for user %s home directory is created"
+msgstr "Кэш для домашней директории пользователя %s создан"
+
+msgid "Can not create user home directory from cache"
+msgstr "Не удалось создать домашнюю директорию из кэша"
+
+msgid "Created home dir %s from cache"
+msgstr "Домашняя директория %s создана из кэша"
+
+msgid "Can not remove user home directory %s"
+msgstr "Не удалось удалить пользовательскую домашнюю директорию %s"
+
+msgid "Can not remove cache file %s"
+msgstr "Не удалось удалить файл кэша %s"
+
+msgid "Can not create %s directory"
+msgstr "Не удалось создать %s директорию"
+
+msgid "Write permission denied for %s directory"
+msgstr "Нет прав на запись в директорию %s"
+
+msgid "Can not create %s cache archive"
+msgstr "Не удалось создать архив %s для кэша"
diff --git ru/cl_install_ru.po ru/cl_install_ru.po
index ef5104a..b5440b1 100644
--- ru/cl_install_ru.po
+++ ru/cl_install_ru.po
@@ -854,9 +854,6 @@ msgstr ""
"Legacy grub не поддерживает загрузки с raid или lvm без выделенного /boot "
"раздела"
-msgid "Disk '%s' without partition table cann't contains boot record"
-msgstr "Диск '%s' без таблицы разделов не может содержать загрузчик"
-
msgid "For creating bind mount point need specify source directory as DISK"
msgstr ""
"Для создания bind точки монтирования необходимо указать исходную директорию "
@@ -1033,3 +1030,6 @@ msgstr "Пользователь с автовходом не может быт
msgid "User %s is not exists"
msgstr "Пользователь %s не существует"
+
+msgid "Disk '%s' without partition table can't contains boot record"
+msgstr "Диск '%s' без таблицы разделов не может содержать загрузчик"

7
sys-apps/calculate-install/ChangeLog
Unescape View File

@ -2,6 +2,13 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-install-2.2.24-r4 (28 Sep 2011)
28 Sep 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+calculate-install-2.2.24-r4.ebuild,
+files/calculate-install-2.2.24-r4.patch:
Update for featues and bugfix
*calculate-install-2.2.24-r3 (23 Sep 2011)
23 Sep 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

4
sys-apps/calculate-install/Manifest
Unescape View File

@ -1,11 +1,13 @@
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
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.ebuild 805 RMD160 03a686ea79b138f2c91e9b7e0ec2282ad28f5f78 SHA1 7cb0dc07aa7eaec1ba6d8d722c08b0936a4b12a9 SHA256 f425da4dbc0ccac4b126517d4770a273add08f26f147d599b6261662561eb2ab
EBUILD calculate-install-2.2.9999.ebuild 597 RMD160 6ce3f529d563f3a9b3fc04fc698e5039b7388d9f SHA1 168ec5e36c8082191397df4650f09ccca8304944 SHA256 e23a9ee3c69b28e3207a44caccbd740c3d46cd3542aab3342bd6b81e0b750f65
MISC ChangeLog 31319 RMD160 9bae86135aea36bd0c3bffaff7037ccd3f176e7a SHA1 dbba43b47e7a6638d0808355441a82cfc0440ba6 SHA256 140e8f7a0ba070416c8d937878c3d94be8295bf66a97214262310abe7b31917b
MISC ChangeLog 31539 RMD160 823a4a4f68fdbd24278639fedda00daf1bd7c182 SHA1 b49c52587bbc470829ba940605f1536b4645cffe SHA256 e343083cbd07dced9ef3404dc4ce9949c718d141c427e85f542d84f6b48765d3
MISC metadata.xml 310 RMD160 769e4f17a9354da6b168b72a5d65d978f65bf6dd SHA1 83aaae376052d69c7327e880cf028ebc0dea608b SHA256 c29d3efc676d8308872920db5223c78469db86ac236b5d45c3ee98ceb8fca846

43
sys-apps/calculate-install/calculate-install-2.2.24-r4.ebuild
Unescape View File

@ -0,0 +1,43 @@
# 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"
}

360
sys-apps/calculate-install/files/calculate-install-2.2.24-r4.patch
Unescape View File

@ -0,0 +1,360 @@
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:

6
sys-apps/calculate-lib/ChangeLog
Unescape View File

@ -2,6 +2,12 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-lib-2.2.24-r2 (28 Sep 2011)
28 Sep 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+calculate-lib-2.2.24-r2.ebuild, +files/calculate-lib-2.2.24-r2.patch:
Update for featues
*calculate-lib-2.2.24-r1 (21 Sep 2011)
21 Sep 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

4
sys-apps/calculate-lib/Manifest
Unescape View File

@ -1,4 +1,5 @@
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
@ -6,8 +7,9 @@ EBUILD calculate-lib-2.1.11.ebuild 585 RMD160 742e544ac2f98074ac2cf29227c931e213
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.9999.ebuild 728 RMD160 97f2109ef20b7f0b0d8abdadde26ec4c7d5931f4 SHA1 83cc645d38abd7e52f3228ac92ecd969957d9660 SHA256 f47cff065f822d197af642beb81f2bf3f51b6efa258b0957e7e1fbeb97265d26
EBUILD calculate-lib-9999.ebuild 478 RMD160 475f773bcc396b982075e94227f6a2dfecbd8e6c SHA1 9cf4d6435107149325bbae478b7cca0744bd4ee5 SHA256 875180915737475bf30aa7f9d1f41af23e4a088af7d972eb22d7631c133ba5f6
MISC ChangeLog 27975 RMD160 000d62bfed56b33935c132cd825fabed4f0aaafa SHA1 64ce6c18715dd1a41b0d3be51aca8dfe48605bb5 SHA256 402586752d0d276954ffe6a7ee697fc7c4fcc0d2c9188b7c629b473ce223d3d1
MISC ChangeLog 28170 RMD160 aac498e0f4d9ce93292f604cb6451481edf42152 SHA1 fa0f9adfe66bd2d13d68931fa1ccd74d41fac3d7 SHA256 1b7eadc1dbf64e0069fe4f0a0d2b430b8806729f31a75000d2c5188c2e4e6f98
MISC metadata.xml 303 RMD160 774b65ed76939d6878496ad6ef6451849bdced05 SHA1 7d08569697a290ede98c88ab59db3cdc3037bd15 SHA256 181519d9679fd9aee9a7a9806733a50728d3da0b1e0ad54f31499200f7f5c6ec

35
sys-apps/calculate-lib/calculate-lib-2.2.24-r2.ebuild
Unescape View File

@ -0,0 +1,35 @@
# 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, add makeDirs
epatch "${FILESDIR}/calculate-lib-2.2.24-r2.patch"
}

35
sys-apps/calculate-lib/files/calculate-lib-2.2.24-r2.patch
Unescape View File

@ -0,0 +1,35 @@
diff --git pym/cl_utils.py pym/cl_utils.py
index 6da750d..351f80d 100644
--- pym/cl_utils.py
+++ pym/cl_utils.py
@@ -1353,3 +1353,30 @@ 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']
+
+def makeDirectory(pathname):
+ """Make directory and parent.
+
+ If directory exists then return False else True"""
+ try:
+ parent = path.split(path.normpath(pathname))[0]
+ if not path.exists(parent):
+ makeDirectory(parent)
+ else:
+ if path.exists(pathname):
+ return False
+ os.mkdir(pathname)
+ return True
+ except Exception, e:
+ return False

7
sys-apps/calculate-templates/ChangeLog
Unescape View File

@ -2,6 +2,13 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-templates-2.2.24-r3 (28 Sep 2011)
28 Sep 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+calculate-templates-2.2.24-r3.ebuild,
+files/calculate-templates-2.2.24-r3.patch:
Update for featues
*calculate-templates-2.2.24-r2 (23 Sep 2011)
23 Sep 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

4
sys-apps/calculate-templates/Manifest
Unescape View File

@ -1,9 +1,11 @@
AUX calculate-templates-2.2.24-r1.patch 26788 RMD160 69e729d5fe4de042dddbe8d236bcf8585e0c1959 SHA1 73cb910c4e525617e2c4dfe77853490f97158498 SHA256 21bfd0b78b17848c83f48e760b55839c2b3f7a4357ea1bdd3f466b983fc2493c
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
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-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.ebuild 582 RMD160 77c74362587b218b15ad9651903420e3ec01962f SHA1 ea9150e2e0476a8d5236f0388e3cdfd1a268bdf7 SHA256 4d0808a6993e403745b7820596d99cb8d2a206b4938f8ea916c1f305c61d2687
EBUILD calculate-templates-2.2.9999.ebuild 574 RMD160 0898335742573bd029339ae8682b1676cdc6c91c SHA1 d05a1b5986858e35e7f0618a7660ad8e43bbca43 SHA256 c201dbf1dc238f309993c20148918661f057fe406fdb87ed4ef6c3bca0261427
MISC ChangeLog 33726 RMD160 d9f74a66418a65d755571e287c5529a898a38f05 SHA1 002f7f7ed28b1f32ceb8997784a760923ae846cc SHA256 1d6c8cf59635c9e98a70be66d5b2027dbb1b014f36c80a59f0d961bec46560c3
MISC ChangeLog 33941 RMD160 2bcd065607553796098c89b2981add233244a751 SHA1 b04204cc419be40efe06dcf4b3240afb483c4d1a SHA256 c6638e68eaa75a11617405af7d4cd8ae4ccb070501445eec963efdc6436edfca
MISC metadata.xml 338 RMD160 4a1a51881bdf09b961217d2056114ca4ccb8b4d2 SHA1 5fcb2724427f9ac5dda07abb5c829c24e6db9ae6 SHA256 175d9ae86b71b291a519414e816b05290d0e4be74726cc8d5449a500c51a3b2d

38
sys-apps/calculate-templates/calculate-templates-2.2.24-r3.ebuild
Unescape View File

@ -0,0 +1,38 @@
# 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 *
}

373
sys-apps/calculate-templates/files/calculate-templates-2.2.24-r3.patch
Unescape View File

@ -0,0 +1,373 @@
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

6
sys-apps/calculate-utilities/ChangeLog
Unescape View File

@ -2,6 +2,12 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-utilities-2.2.24-r5 (28 Sep 2011)
28 Sep 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+calculate-utilities-2.2.24-r5.ebuild:
Update for templates lib install i18n desktop builder install-gui
*calculate-utilities-2.2.24-r4 (23 Sep 2011)
23 Sep 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

3
sys-apps/calculate-utilities/Manifest
Unescape View File

@ -2,6 +2,7 @@ EBUILD calculate-utilities-2.2.24-r1.ebuild 864 RMD160 a22eb8673a948936e0badbe14
EBUILD calculate-utilities-2.2.24-r2.ebuild 867 RMD160 df598038cc6cc3971cab35ed7984a1dd590bec98 SHA1 a77db53bab42d35ae2677224e3ebc0c26a650a59 SHA256 db8f05e541179081778143f3706c10e42febe96c72fe5a2feceefeff73fd5a50
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.ebuild 861 RMD160 71a8eac35eade9be90df9cacbb5b4d9ba07d3664 SHA1 258da46af67a0e0995074a9c7f01b33234711ca9 SHA256 f1a33869f243365632a9af11ab9ed2538a6b2c183dd9ddbf28d48ad564df3d54
EBUILD calculate-utilities-2.2.9999.ebuild 840 RMD160 0c7324a9ed480118ac19f62b162c9ee62c25f964 SHA1 7dadab1430ed147334ed7e9b4fcc86dc99e25d56 SHA256 f3ee28f9f765e7302c83eb4a15a09bdf066f09e6b40e34f6d52157a946df5e66
MISC ChangeLog 26881 RMD160 d54c4548ae0edf25238218ded909071e7a0fa656 SHA1 bdbb6351d190a543c9371087b6a8ef7f76a1fded SHA256 652bc92678616c5b88333d6aee0da397ce6355f44058a6d86f9f708f529eb38a
MISC ChangeLog 27097 RMD160 4b9de055a1389dfde55b4645767d21ebbf307702 SHA1 baae6f4b39c2d9e3c72962ecbb0d0f3a967e112c SHA256 af9f5e226ad65eb8224812de227d7d52f050885b07e20c47fef60751e77116a5

36
sys-apps/calculate-utilities/calculate-utilities-2.2.24-r5.ebuild
Unescape View File

@ -0,0 +1,36 @@
# 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 )
"
Write Preview
Loading…
Cancel
Save