Update calculate-utilities for discard cache.

sys-apps/calculate-builder/ChangeLog

@@ -2,6 +2,13 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*calculate-builder-2.2.24-r2 (29 Sep 2011)
+
+  29 Sep 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+  +calculate-builder-2.2.24-r2.ebuild,
+  +files/calculate-builder-2.2.24-r2.patch:
+  Undo creating cache for guest
+
   21 Sep 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
   -calculate-builder-2.2.18.ebuild, -calculate-builder-2.2.19.ebuild,
   -calculate-builder-2.2.19-r1.ebuild,

sys-apps/calculate-builder/Manifest

@@ -1,7 +1,9 @@
 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
 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.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
+MISC ChangeLog 17766 RMD160 e960eb53f64777a0e834453ae5ebbdc23a54b433 SHA1 e8513da0e7e5441cef72fa007e2a9d372365ae57 SHA256 47da68795bddbe719767562428f52939ad62d5cf1f4d7af8ec7b094cd79697f4
 MISC metadata.xml 270 RMD160 b5ff308a82cd6e594c2f04731cdbe9f80a945042 SHA1 58dbf7eb15bb2e6c6c8514f483e51dfacd1c62e9 SHA256 b65e150429ecbf36cf03d094f4e3e7518f536c61289cecff6b817326703d58a0

sys-apps/calculate-builder/calculate-builder-2.2.24-r2.ebuild

@@ -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}"
+
+	# fix run chroot command
+	epatch "${FILESDIR}/calculate-builder-2.2.24-r2.patch"
+}

sys-apps/calculate-builder/files/calculate-builder-2.2.24-r2.patch

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

sys-apps/calculate-desktop/ChangeLog

@@ -2,6 +2,13 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*calculate-desktop-2.2.24-r2 (29 Sep 2011)
+
+  29 Sep 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+  +calculate-desktop-2.2.24-r2.ebuild,
+  +files/calculate-desktop-2.2.24-r2.patch:
+  Undo cache. Remove --live
+
 *calculate-desktop-2.2.24-r1 (28 Sep 2011)
 
   28 Sep 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

sys-apps/calculate-desktop/Manifest

@@ -1,7 +1,9 @@
 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
+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.9999.ebuild 889 RMD160 5b753ae615aacbd630f6b47767b0338c65e5a10b SHA1 120c45f40d1c1bcb997fae0c1aae5d1bde668ed5 SHA256 a1c6d08b709b822250b3a8c8d621838517d6229bcbc1229eae1218c4446ed45e
-MISC ChangeLog 15176 RMD160 166814c5c74276f247760bd6eb5ea7d0c9019e40 SHA1 5f3481b3615dfe78b5bea80c367c28df1c274ae5 SHA256 f3953f75eb39cfa060576769fb3a63608a28c2dbc9965ba566b44ebf43cb990c
+MISC ChangeLog 15392 RMD160 c3c9fb3ed80ac3229384a34c2ec396d32273d209 SHA1 f9c32921ed6696a0fbf40eb53f28354d8dcd7881 SHA256 395645cc1cd8c2a928ef4e33bd99fe1bd82eef15c023e1e6f70c9575374905b6
 MISC metadata.xml 315 RMD160 36a1a8d03aed0a483def83e076f484a64d452a8b SHA1 f6e70641eab777d2417d8a7600e8d3f09f53f96f SHA256 67fea0b1af7d10c0f86e72ab40f527e99c6f81f7aace4716344bdfb97c769a18

sys-apps/calculate-desktop/calculate-desktop-2.2.24-r2.ebuild

@@ -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}"
+
+	# discard --live option
+	epatch "${FILESDIR}/calculate-desktop-2.2.24-r2.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
+}

sys-apps/calculate-desktop/files/calculate-desktop-2.2.24-r2.patch

@@ -0,0 +1,171 @@
+diff --git data/login.d/20desktop data/login.d/20desktop
+index 43a0138..c55f333 100644
+--- data/login.d/20desktop
++++ data/login.d/20desktop
+@@ -27,24 +27,16 @@ then
+      [[ -z "`ls ${userHome}`" ]] ||
+      diff -uq <(ls -A1 /etc/skel | wc) <(ls -A1 ${userHome} | sort) &>/dev/null
+   then
+-    APPENDCMD=""
+-  # run configure only mutable params of user profile if it is live system
+-  # and profile already configured
+-  elif [[ "`desktop_variable_value os_root_type`" != "hdd" ]]
+-  then
+-    APPENDCMD="--live"
+-  else
+-    exit 0
+-  fi
+-  ERRORLOG=`/usr/bin/cl-desktop $APPENDCMD --progress --color=never $USER 2>&1`
+-  # raise xmessage error if cl-desktop failed
+-  if [ "$?" -gt "0" ];
+-  then
+-    # write error message to logfile
+-    echo "$ERRORLOG" >> $FILE_LOG
+-    # display error by xmessage
+-    xmes cl-desktop "$ERRORLOG"
+-    exit 1
++    ERRORLOG=`/usr/bin/cl-desktop --progress --color=never $USER 2>&1`
++    # raise xmessage error if cl-desktop failed
++    if [ "$?" -gt "0" ];
++    then
++      # write error message to logfile
++      echo "$ERRORLOG" >> $FILE_LOG
++      # display error by xmessage
++      xmes cl-desktop "$ERRORLOG"
++      exit 1
++    fi
+   fi
+ fi
+ exit 0
+diff --git pym/cl_desktop.py pym/cl_desktop.py
+index 321f90a..3c8fdd4 100644
+--- pym/cl_desktop.py
++++ pym/cl_desktop.py
+@@ -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, verbose=False):
+         """Создание профиля пользователя (пользовательской директории)"""
+         # Имя пользователя
+         self.verbose = verbose
+@@ -240,12 +240,8 @@ class desktop(share):
+         if not os.path.exists(homeDir):
+             flagHomeExists = False
+             self.createUserDir(uid, gid, homeDir)
+-        # if live action then action update mutable params of profile (live)
+-        # else action is update user profile
+-        if live:
+-            self.clVars.Set("cl_action", "live", True)
+-        else:
+-            self.clVars.Set("cl_action", "desktop", True)
++        # Действие -  шаблоны пользователя
++        self.clVars.Set("cl_action", "desktop", True)
+         # Применяем профили для пользователя
+         dirsAndFiles = self.applyTemplatesFromUser(progress)
+         if not dirsAndFiles:
+diff --git pym/cl_desktop_cmd.py pym/cl_desktop_cmd.py
+index 0dab534..c5ff655 100644
+--- pym/cl_desktop_cmd.py
++++ pym/cl_desktop_cmd.py
+@@ -35,9 +35,7 @@ EXAMPLES = _("%prog user_name")
+ DESCRIPTION = _("Create home directory for the new user account")
+ 
+ # Опции командной строки
+-CMD_OPTIONS = [{'longOption':"live",
+-                'help':_("update only mutable parameters of user profile")},
+-               {'longOption':"verbose",
++CMD_OPTIONS = [{'longOption':"verbose",
+                 'help':_("display the template is applied")},
+                {'longOption':"set"},
+                {'longOption':"install",
+@@ -145,8 +143,7 @@ class desktop_cmd(share_cmd):
+ 
+     def createHome(self, optObj):
+         """Создание домашней директории"""
+-        return self.logicObj.createHome(optObj.progress,optObj.live,
+-            optObj.verbose)
++        return self.logicObj.createHome(optObj.progress, optObj.verbose)
+ 
+     def install(self):
+         """Инсталяция программы"""
+diff --git pym/cl_fill_desktop.py pym/cl_fill_desktop.py
+index 8b3a753..9637744 100644
+--- pym/cl_fill_desktop.py
++++ pym/cl_fill_desktop.py
+@@ -34,9 +34,7 @@ class fillVars():
+         return ""
+ 
+     def get_ac_desktop_install(self):
+-        """
+-        Trigger for templates of package installation and uninstallation
+-        """
++        """переключатель для шаблонов инсталяции и удаления программы"""
+         ret = ""
+         action = self.Get("cl_action")
+         if action in ("install","merge"):
+@@ -46,9 +44,7 @@ class fillVars():
+         return ret
+ 
+     def get_ac_desktop_merge(self):
+-        """
+-        Trigger for the merge templates
+-        """
++        """переключатель для шаблонов merge"""
+         ret = ""
+         action = self.Get("cl_action")
+         if action in ("install","merge"):
+@@ -56,25 +52,13 @@ class fillVars():
+         return ret
+ 
+     def get_ac_desktop_desktop(self):
+-        """
+-        Trigger for templates of user profile creating
+-        """
++        """переключатель для шаблонов создания пользовательского профиля"""
+         ret = ""
+         action = self.Get("cl_action")
+         if action in ("desktop",):
+             ret = "up"
+         return ret
+ 
+-    def get_ac_desktop_live(self):
+-        """
+-        Trigger for templates update live configuration of profile
+-        """
+-        ret = ""
+-        action = self.Get("cl_action")
+-        if action in ("desktop","live"):
+-            ret = "up"
+-        return ret
+-
+     def get_ur_domain_set(self):
+         '''доменный пользователь "on", "off"'''
+         ret = "off"
+diff --git pym/cl_vars_desktop.py pym/cl_vars_desktop.py
+index 8d19381..bcd6715 100644
+--- pym/cl_vars_desktop.py
++++ pym/cl_vars_desktop.py
+@@ -54,18 +54,15 @@ class Data:
+     # Host Jabber пользователя
+     ur_jid_host = {'mode':"w"}
+ 
+-    # trigger for the merge templates
++    # переключатель для шаблонов merge
+     ac_desktop_merge = {}
+ 
+-    # trigger for templates of package installation and uninstallation
++    # переключатель для шаблонов инсталяции и удаления программы
+     ac_desktop_install = {}
+ 
+-    # trigger for templates of user profile creating
++    # переключатель для шаблонов создания пользовательского профиля
+     ac_desktop_desktop = {}
+ 
+-    # trigger for templates update live configuration of profile
+-    ac_desktop_live = {}
+-
+     # доменный пользователь "on", "off"
+     ur_domain_set = {}
+ 

sys-apps/calculate-install/ChangeLog

@@ -2,6 +2,13 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*calculate-install-2.2.24-r5 (29 Sep 2011)
+
+  29 Sep 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+  +calculate-install-2.2.24-r5.ebuild,
+  +files/calculate-install-2.2.24-r5.patch:
+  Remove cache home dir
+
 *calculate-install-2.2.24-r4 (28 Sep 2011)
 
   28 Sep 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

sys-apps/calculate-install/Manifest

@@ -2,12 +2,14 @@ AUX calculate-install-2.2.24-r1.patch 2887 RMD160 081aaf2ac8d65f300e503c8b543f46
 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
 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.ebuild 805 RMD160 03a686ea79b138f2c91e9b7e0ec2282ad28f5f78 SHA1 7cb0dc07aa7eaec1ba6d8d722c08b0936a4b12a9 SHA256 f425da4dbc0ccac4b126517d4770a273add08f26f147d599b6261662561eb2ab
 EBUILD calculate-install-2.2.9999.ebuild 597 RMD160 6ce3f529d563f3a9b3fc04fc698e5039b7388d9f SHA1 168ec5e36c8082191397df4650f09ccca8304944 SHA256 e23a9ee3c69b28e3207a44caccbd740c3d46cd3542aab3342bd6b81e0b750f65
-MISC ChangeLog 31539 RMD160 823a4a4f68fdbd24278639fedda00daf1bd7c182 SHA1 b49c52587bbc470829ba940605f1536b4645cffe SHA256 e343083cbd07dced9ef3404dc4ce9949c718d141c427e85f542d84f6b48765d3
+MISC ChangeLog 31751 RMD160 673d973a447c47cca3a4fdb003d1ff1c08486915 SHA1 ca8e27e63c69f8f0361d4b1a32c5c12bf3029067 SHA256 c9e7752e86973a3ac582ba8ede5940801f8d57058fd396d625242d93f694afbc
 MISC metadata.xml 310 RMD160 769e4f17a9354da6b168b72a5d65d978f65bf6dd SHA1 83aaae376052d69c7327e880cf028ebc0dea608b SHA256 c29d3efc676d8308872920db5223c78469db86ac236b5d45c3ee98ceb8fca846

sys-apps/calculate-install/calculate-install-2.2.24-r5.ebuild

@@ -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
+	# some fixes
+	epatch "${FILESDIR}/calculate-install-2.2.24-r5.patch"
+}
+
+pkg_postinst() {
+	einfo "For configure calculate-install perform:"
+	einfo "  cl-install --install"
+}

sys-apps/calculate-install/files/calculate-install-2.2.24-r5.patch

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

sys-apps/calculate-templates/ChangeLog

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

sys-apps/calculate-templates/Manifest

@@ -2,12 +2,14 @@ AUX calculate-templates-2.2.24-r1.patch 26788 RMD160 69e729d5fe4de042dddbe8d236b
 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
 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-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.ebuild 582 RMD160 77c74362587b218b15ad9651903420e3ec01962f SHA1 ea9150e2e0476a8d5236f0388e3cdfd1a268bdf7 SHA256 4d0808a6993e403745b7820596d99cb8d2a206b4938f8ea916c1f305c61d2687
 EBUILD calculate-templates-2.2.9999.ebuild 574 RMD160 0898335742573bd029339ae8682b1676cdc6c91c SHA1 d05a1b5986858e35e7f0618a7660ad8e43bbca43 SHA256 c201dbf1dc238f309993c20148918661f057fe406fdb87ed4ef6c3bca0261427
-MISC ChangeLog 33941 RMD160 2bcd065607553796098c89b2981add233244a751 SHA1 b04204cc419be40efe06dcf4b3240afb483c4d1a SHA256 c6638e68eaa75a11617405af7d4cd8ae4ccb070501445eec963efdc6436edfca
+MISC ChangeLog 34157 RMD160 9bd8881978aaab3dd8d50ceca291d3d2f7040edf SHA1 a5e408dc2c83c08d7e050d493784ef0a716a70e0 SHA256 ff465f0f0058220878f631cc3c36524081735ebddff53d87f0e1ca45d4b6896b
 MISC metadata.xml 338 RMD160 4a1a51881bdf09b961217d2056114ca4ccb8b4d2 SHA1 5fcb2724427f9ac5dda07abb5c829c24e6db9ae6 SHA256 175d9ae86b71b291a519414e816b05290d0e4be74726cc8d5449a500c51a3b2d

sys-apps/calculate-templates/calculate-templates-2.2.24-r5.ebuild

@@ -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, 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 *
+}

sys-apps/calculate-templates/files/calculate-templates-2.2.24-r5.patch

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

sys-apps/calculate-utilities/ChangeLog

@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*calculate-utilities-2.2.24-r7 (29 Sep 2011)
+
+  29 Sep 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+  +calculate-utilities-2.2.24-r7.ebuild:
+  Update for revert cache
+
 *calculate-utilities-2.2.24-r6 (28 Sep 2011)
 
   28 Sep 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

sys-apps/calculate-utilities/Manifest

@@ -4,6 +4,7 @@ EBUILD calculate-utilities-2.2.24-r3.ebuild 873 RMD160 8f0b91ade772b6642311b50ef
 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.ebuild 861 RMD160 71a8eac35eade9be90df9cacbb5b4d9ba07d3664 SHA1 258da46af67a0e0995074a9c7f01b33234711ca9 SHA256 f1a33869f243365632a9af11ab9ed2538a6b2c183dd9ddbf28d48ad564df3d54
 EBUILD calculate-utilities-2.2.9999.ebuild 840 RMD160 0c7324a9ed480118ac19f62b162c9ee62c25f964 SHA1 7dadab1430ed147334ed7e9b4fcc86dc99e25d56 SHA256 f3ee28f9f765e7302c83eb4a15a09bdf066f09e6b40e34f6d52157a946df5e66
-MISC ChangeLog 27268 RMD160 bce9fc7e7a612e2f72b00def608ee3cbbdf4f8f3 SHA1 ceb2d7cb5a785c05b85f99b0257c65ec8b271fe4 SHA256 c91d192747bec138803547a52603215e37b272c50b2d143d6286dc80b2b16afc
+MISC ChangeLog 27442 RMD160 74d97439e638ff264c7a22337faf1bccec80b1b0 SHA1 43b455854f23e86ec51e8fb974a97c5269defa7f SHA256 bfc960c7914e2fb46b83d703642305c32d520d39e8b1b0905e3bfe8295325d46

sys-apps/calculate-utilities/calculate-utilities-2.2.24-r7.ebuild

@@ -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-r5
+	=sys-apps/calculate-templates-2.2.24-r5
+	=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 )
+"