Update calculate-install for fix fstab bug.

sys-apps/calculate-install/ChangeLog

@@ -2,6 +2,13 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*calculate-install-2.2.4-r4 (26 Dec 2010)
+
+  26 Dec 2010; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+  +calculate-install-2.2.4-r4.ebuild,
+  +files/calculate-install-2.2.4-fix_fstab.patch:
+  Update calculate-install for fix get options from fstab.
+
 *calculate-install-2.2.4 (23 Dec 2010)
 
   23 Dec 2010; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

sys-apps/calculate-install/Manifest

@@ -1,9 +1,11 @@
+AUX calculate-install-2.2.4-fix_fstab.patch 1910 RMD160 78bbef8679649b246952740b2bf4ca076962071d SHA1 692237adf3458fe6963e59d631a88c514d9dd868 SHA256 24016b4c01ceb954c87dde7a01fc2e066947ab79c34711eb9ce8f6dd5b570427
 AUX calculate-install-2.2.4-fix_uuid_fstab.patch 2855 RMD160 a7ca8c3a974ec0fcd22bf6eb17dd31215b103b43 SHA1 5e085ba66fbde593e7382131d10eb3f9b05251db SHA256 d71e8c0a78fc66c518e9d720f64fd72de11ffe813eb06c45f895321fa48104fa
 DIST calculate-install-2.2.3.tar.bz2 61306 RMD160 21022f3b0afdeea728940164c25f0b028b446ad2 SHA1 6515b31a3c1a130c3d8a097cb0fa099b966b93bc SHA256 70b75fd42bb54bbdffd01ef677f784da5febfd269e6d255dc5c4240420de4b7f
 DIST calculate-install-2.2.4.tar.bz2 62718 RMD160 6949c3d43568b26f871abef2cafba5d94116868d SHA1 b5181c9037fe007f8984517da9c601f0b704bab3 SHA256 8ca05ef67b4ea1b1a25d12a810aaebdbfa91fb93d507f44e43394b5eb6c33836
 EBUILD calculate-install-2.2.3.ebuild 692 RMD160 3db608b914b4d52de5d319fc86dbbf16e634ea07 SHA1 cadf8d4652d50e9a6eb6516ebe4580d6494a9bb0 SHA256 41506134befa3b8e9d869656fd58a29f8eae561485387f851e40df2656401155
 EBUILD calculate-install-2.2.4-r2.ebuild 692 RMD160 22ead77a586d837929de72be176e746397a46ebd SHA1 0ba3d6f755a5538afbf1628fb690fe95cb7e39ec SHA256 70319e169428f04fd0cef7bc70c530897b2630c9ff4e6ad19ff5dc5f39fff5ca
 EBUILD calculate-install-2.2.4-r3.ebuild 845 RMD160 b82cdf585d1f6f19a7f8f2bb15a9f1f75af4a571 SHA1 ba269c1567a54044b788f6e13cab1e1d4c37ba37 SHA256 cc62078379733460d1b18ce1e7a68dce1410f5a4d04d4e5f247504ba0d6d4371
+EBUILD calculate-install-2.2.4-r4.ebuild 840 RMD160 6bbfec345aa38b6bae55e629e53be91668c9f7e0 SHA1 2cf5a1546d04147554f81a57ac556385684aab5c SHA256 78a5b224d95ff9a7fe9cf2819028d4d12517925874d6091a9bc1dc1fe61122fd
 EBUILD calculate-install-2.2.9999.ebuild 540 RMD160 038eb80ed7ab1120e6305cbfe2eca480a48aa1c0 SHA1 0cc13d21f94d71f0e6bb6dce3e8abfa1f2f66a4f SHA256 7f9bd4b0b6c2fa260f2e93c78fdee24b32545dc2a98e19363f4933dcc32d3557
-MISC ChangeLog 14767 RMD160 f6a62e35dc5b0853e017a8428a413e6daef03aad SHA1 2138a285d30cd76c4d32b680d114b95aef01dc55 SHA256 829c5ec5d2ecde9695c8ea40cffeed911ba733c7b6734449a797f1baf3714844
+MISC ChangeLog 15018 RMD160 b085485b7eb4938b1801993753eb8ac07d8f7b73 SHA1 40dae007dd8509d6c67714a4830d7c10e72991b5 SHA256 45100b6ffcdcc3ae7b44f7bde7edeb02104f41e8e340a77f99dc4726b074c018
 MISC metadata.xml 310 RMD160 769e4f17a9354da6b168b72a5d65d978f65bf6dd SHA1 83aaae376052d69c7327e880cf028ebc0dea608b SHA256 c29d3efc676d8308872920db5223c78469db86ac236b5d45c3ee98ceb8fca846

sys-apps/calculate-install/calculate-install-2.2.4-r4.ebuild

@@ -0,0 +1,38 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+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-lib-2.2.4
+	app-portage/layman
+	!minimal? ( sys-boot/grub
+	sys-fs/dosfstools
+	sys-fs/squashfs-tools
+	sys-block/parted )"
+
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	# fix read options from fstab with UUID
+	epatch "${FILESDIR}/calculate-install-2.2.4-fix_fstab.patch"
+}
+
+pkg_postinst() {
+	einfo "For configure calculate-install perform:"
+	einfo "  cl-install --install"
+}

sys-apps/calculate-install/files/calculate-install-2.2.4-fix_fstab.patch

@@ -0,0 +1,39 @@
+diff --git a/pym/cl_fill_install.py b/pym/cl_fill_install.py
+index 9e55112..3977c35 100644
+--- a/pym/cl_fill_install.py
++++ b/pym/cl_fill_install.py
+@@ -258,20 +258,29 @@ class fillVars(object, glob_attr):
+                         key = blkid_hash[key]
+                         disk_hash[dev][key] = value[1:-1]
+         # discard comment and empty string
++        devuuid = '/dev/disk/by-uuid'
++        mapUuidDev = dict(
++            map(lambda x:("UUID=%s"%os.path.basename(x),
++                    os.path.normpath(os.path.join(devuuid,os.readlink(x)))),
++            filter(os.path.islink,
++            map(lambda x:os.path.join(devuuid,x),
++            os.listdir(devuuid)))))
++        mapDevUuid = dict(map(lambda x:(x[1],x[0]),mapUuidDev.items()))
+         mountOptionsList = \
+             filter(lambda x: x.strip() and not x.strip().startswith('#'),
+                    open("/etc/fstab").readlines())
+         # split all string by columns and discard string which has less that 4
+         # columns
+         mountOptionsList = \
++            map(lambda x:[mapUuidDev.get(x[0],x[0])]+x[1:4],
+             filter(lambda x: len(x)>=4,
+-                   map(lambda x: filter(lambda x: x ,
+-                                        x.replace('\t',' ').split(' ')),
+-                       mountOptionsList))
++            map(lambda x: filter(lambda x: x ,
++                          x.replace('\t',' ').split(' ')),
++            mountOptionsList)))
+         # get dev which has ntfs filesystem
+         mountFormatList = \
+-            filter(lambda x: x[0] in disk_hash.keys() and \
+-                             x[1] in ("ntfs","ntfs-3g"),
++            filter(lambda x: x[0] in disk_hash.keys() \
++                             and x[1] in ("ntfs","ntfs-3g"),
+                    map(lambda y: (y[0],y[2]), mountOptionsList))
+         # split options and discard rw opt
+         mountOptionsList = \