Update for fix calculate-install syntax error.

atratsevskiy
Mike Hiretsky 13 years ago
parent 68387f7885
commit 9fc8975ba3

@ -2,6 +2,13 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-install-2.2.14-r3 (05 May 2011)
05 May 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+calculate-install-2.2.14-r3.ebuild,
+files/calculate-install-2.2.14-fix_syntax_error.patch:
Update for fix syntax error.
*calculate-install-2.2.14-r1 (20 Apr 2011)
20 Apr 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

@ -1,11 +1,13 @@
AUX calculate-install-2.2.14-backport.patch 7695 RMD160 02cb1659b610d59c1a31fb0d31430e47b17b2bb3 SHA1 070ec968dc6d3fb2c0087fc3a6c90d49a58bc6eb SHA256 c84ddda8c4366c1466a2b45409af78ce89afd420232138491e5bbe69247cc8c5
AUX calculate-install-2.2.14-fix_syntax_error.patch 853 RMD160 071bf929a8086abac474c6434528be165151e492 SHA1 27ceb1f8785466f80284a0bab8f2dbc4b5b408a3 SHA256 2b41b52b000bbfc85c357a6f1a9856e2321623333db533a8cc54b2adc932a213
AUX calculate-install-2.2.14-radeon_composite.patch 757 RMD160 b297d3b5219487c34f6039886584c33be6885375 SHA1 32203607f3608b093dd3086f1c7f3cb3de1c220d SHA256 61c70287dd07c7022b972f0f75efb25d944b410b100355b43eecf0a36ea0f6f5
DIST calculate-install-2.2.13.tar.bz2 65828 RMD160 0b50979db3186197dd69e1ddfdf966dc5e8fcb30 SHA1 f45a6ca338d3b5f2182afb201b07b19745a781c2 SHA256 f7598a4b96cc2dc0ffa8048b8c1a3e1989519fce4d2c9aaf66b58bd74a28ff5f
DIST calculate-install-2.2.14.tar.bz2 65743 RMD160 56a98ad3e493c521d186c1966af19c97c026ef76 SHA1 f2c88b351c0bdb1d92ca28c3aa96e5cb2164d3c9 SHA256 0a4bce2b5ad5c719d99abad7dd0df0b59afdbf30a71bef51aa5b75f3eba0451d
EBUILD calculate-install-2.2.13.ebuild 718 RMD160 662a5b741beb15638712cc93ae08028e2c7005ae SHA1 faba34b9d1b0f501a39fdb5fa0c5a59fa8e1b25c SHA256 078c73816488478a771939b80a7f82b5c263a58306a7f09e57963779ab42338f
EBUILD calculate-install-2.2.14-r1.ebuild 868 RMD160 a3d16d797646684c4476865222df75f38a89f185 SHA1 1153cda0d034948604845139d9a9267c82bf7c8f SHA256 067b62c778e7c63f6045689528de825826a57cd14556597a804c0543e19cf135
EBUILD calculate-install-2.2.14-r2.ebuild 837 RMD160 cd58c2316ca689d41fa6b9a37d75d5b64b601544 SHA1 6073c4f1c921ab29ac4a1dd4dc150882f83cb35e SHA256 992dad0513e2745b5dcdf88faaa6b73d75ce77c53f9dd380d8404953ab315e6d
EBUILD calculate-install-2.2.14-r3.ebuild 928 RMD160 ff28aa64b78be480a1a1a280e380b8d8492ebe32 SHA1 4692bc6d1e58a80500b87c0aa02507b3610dfd67 SHA256 a699eafc5e9ab1ea9d304bff5d85935de8e533f913a975ed4f4fadbb996cf8a2
EBUILD calculate-install-2.2.14.ebuild 718 RMD160 b73a1880d3bf4ce1714f3b688d9bbe4996c1d219 SHA1 444e79db083b8e5216482ac89176f1de73e5523f SHA256 fb7bf36afe643ba61d0fe13bfac95bb8ecac6445dd4567e870f5a24527dfc297
EBUILD calculate-install-2.2.9999.ebuild 595 RMD160 8f9b9a14fed39ded9c2a9d9343aa4e892d620172 SHA1 09aff28bdaa486868e2caddc7911732a905336ee SHA256 534e6c6e465177e269ce7beed96dab08a124878591088c1bf38095e855ca1180
MISC ChangeLog 20702 RMD160 c06089673608c662a7f874bf486e05d8a67e1caa SHA1 438c7f4d6f47f54c5340fc6e779f9ef40c893e8e SHA256 0af8e65a521fd0c42197f4dd2d9f2e13f52b490ddca7cc32d014960bbfa0cbda
MISC ChangeLog 20935 RMD160 0098b5413e89febd78fb137f83e916a2ad6b2f89 SHA1 5443ea3bc09006531e18454bac8a54268b7e8b6b SHA256 1cbab3997b0c67580affe1da2798a9d676e6ea13beb3098f4ceea87c968ac69a
MISC metadata.xml 310 RMD160 769e4f17a9354da6b168b72a5d65d978f65bf6dd SHA1 83aaae376052d69c7327e880cf028ebc0dea608b SHA256 c29d3efc676d8308872920db5223c78469db86ac236b5d45c3ee98ceb8fca846

@ -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 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.14
app-portage/layman
!minimal? ( sys-boot/grub
sys-apps/gptfdisk
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# backport
epatch "${FILESDIR}/calculate-install-2.2.14-backport.patch"
# fix syntax error
epatch "${FILESDIR}/calculate-install-2.2.14-fix_syntax_error.patch"
}
pkg_postinst() {
einfo "For configure calculate-install perform:"
einfo " cl-install --install"
}

@ -0,0 +1,19 @@
commit ced1bb293ba3a5368a0f570a4b4d099764b051e6
Author: Mike Hiretsky <mh@calculate.ru>
Date: Thu May 5 16:11:12 2011 +0400
Fix syntax error (HP server)
diff --git a/pym/cl_fill_install.py b/pym/cl_fill_install.py
index d328583..fbb071f 100644
--- a/pym/cl_fill_install.py
+++ b/pym/cl_fill_install.py
@@ -188,7 +188,7 @@ class fillVars(object, glob_attr):
disk_hash[dev]['grub'] = "%d,%d" % \
(int(devicesHash[match.groups()[0]]['map']),
int(match.groups()[1])-1)
- elif metch.groups()[2] in devicesHash:
+ elif match.groups()[2] in devicesHash:
disk_hash[dev]['grub'] = "%d,%d" % \
(int(devicesHash[match.groups()[2]]['map']),
int(match.groups()[3])-1)

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

@ -6,6 +6,7 @@ EBUILD calculate-utilities-2.2.14-r3.ebuild 840 RMD160 30b86a7b261ea59de54b77da4
EBUILD calculate-utilities-2.2.14-r4.ebuild 840 RMD160 2485ad3ef4ac93a6787851fcdf50160de8e0849f SHA1 ddd8725be55d2363d827ddba01d323b6d9930535 SHA256 3fbe0a1f0c729608a0f6eb3cda2af7304b4513fa829c04eeef23393bd7b2c4e1
EBUILD calculate-utilities-2.2.14-r5.ebuild 840 RMD160 8e65da0cc97d58ff745d96f0d9f4c11534c947c3 SHA1 6f93d1aafcea6d983ac2d9ae1f27f8613deb2905 SHA256 9183f6252c96e225bd38edbebe79b85d3c3d5fb2cefa8dd0dbe96d68c7dd5482
EBUILD calculate-utilities-2.2.14-r6.ebuild 840 RMD160 57fa4d2c9f584231b0cc0de80a8c042bb1558be4 SHA1 13ac883058bcbaa93818bd66284f1858dd2f17ed SHA256 443fae617e813cf8e60ac4a9768af28c8ece1ad37ee9ce0f4a0fd3246f679002
EBUILD calculate-utilities-2.2.14-r7.ebuild 840 RMD160 458ccc8bdbbfa8dab41deeb4b77b85c31b36ac98 SHA1 594a5c6e10132eb0366ec6ebd8866e04d9b6436f SHA256 7c884c712de0c269284e834f50cf2501c42d490bd41a90513770ef24f909b496
EBUILD calculate-utilities-2.2.14.ebuild 829 RMD160 ca16f926dbac23f8a83595b70723e07b362a3c06 SHA1 e952c7e4909082540bbf3ca1bc745a223880116a SHA256 8ce1c42a0a19e39d7db7b4e944f59b867d9f3c44c71df6ea3573dae9de83a7d5
EBUILD calculate-utilities-2.2.9999.ebuild 840 RMD160 0c7324a9ed480118ac19f62b162c9ee62c25f964 SHA1 7dadab1430ed147334ed7e9b4fcc86dc99e25d56 SHA256 f3ee28f9f765e7302c83eb4a15a09bdf066f09e6b40e34f6d52157a946df5e66
MISC ChangeLog 7675 RMD160 faab99f903b5c073e6d65fa9417adeb6643da7c7 SHA1 f987c530dbb8feea84256ec2115d5bc6b4588f46 SHA256 fad69e2c0ab64e1dcbd8165d4f0e70403064965445711ad209e1c6a3558d1610
MISC ChangeLog 7855 RMD160 b05ce5326525a27d9eb32527e9e57af425245dd7 SHA1 c9d015b2d129b72c73bcf7b3b01dc6a202052188 SHA256 14f01b380568facbb1da48d580a35f64e06a925b29a8d27b3ce9b23c6f6cb8e6

@ -0,0 +1,35 @@
# 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.14-r3
=sys-apps/calculate-templates-2.2.14-r3
=sys-apps/calculate-lib-2.2.14-r1
cl_assemble? ( =sys-apps/calculate-assemble-2.2.14 )
cl_builder? ( =sys-apps/calculate-builder-2.2.14-r3 )
cl_client? ( =sys-apps/calculate-client-2.2.14 )
cl_desktop? ( =sys-apps/calculate-desktop-2.2.14 )
cl_installgui? ( =app-misc/calculate-install-gui-2.2.14 )
cl_server? ( =sys-apps/calculate-server-2.1.13-r1 )
"
Loading…
Cancel
Save