Update for fix calculate-lib.

atratsevskiy
Mike Hiretsky 14 years ago
parent 2f369f68f4
commit b2fd49f725

@ -2,6 +2,13 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-lib-2.2.11-r2 (16 Mar 2011)
16 Mar 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+calculate-lib-2.2.11-r2.ebuild,
+files/calculate-lib-2.2.11-fix_C_locale.patch:
Update for bugfix.
*calculate-lib-2.2.11-r1 (15 Mar 2011)
15 Mar 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

@ -1,4 +1,5 @@
AUX calculate-lib-2.2.11-dialog_fix.patch 849 RMD160 cc13018cafddffc603718e788ea77f50882b75d9 SHA1 249f378b1037865d3f084e0e3be3b0f372a92007 SHA256 381f93dce6dae156d9ff743dce5133cc91d1a70cdd0b1fa488d77d5e43d6287b
AUX calculate-lib-2.2.11-fix_C_locale.patch 707 RMD160 a453baa97fb5044a3993c3fb966ae20956086b50 SHA1 6da63f41bead7ab6fe160f124dca32a9f25d2a33 SHA256 2d4fce242b036ccfadd6d6e759e8598c50c48f7875e4b881cbe90e91d3967373
AUX calculate-lib-2.2.8-file.patch 747 RMD160 8a1f90c822eaefac69b67aa6999a1dc8c2b51b9f SHA1 aeded1b0587785145f4e62f3e81a2726e7c4312d SHA256 45ce03a248d8bec22bbdf006ce607809761304d255467e687242f9423c8413a4
AUX lib_i18n_path.patch 1114 RMD160 6e561c46e91105f4e7686678771da21e8f3685a2 SHA1 b58e8906104b4b9d1a1bd8ecb6959767cad2d329 SHA256 2913821d3c069612485e6dd7fb0e71bc06e5061054309ad9ed6bac29eee732f2
DIST calculate-lib-2.1.8.tar.bz2 61178 RMD160 4a4ed063a9b4d3b82723f5f6eb046c97ad9fcda1 SHA1 93eb20057afff6e98c409388e1259a3ad078bb7a SHA256 ef8e315001663da7a45e69b82dc7c158fb0e10bd567efa95bf8a654ed441144a
@ -9,11 +10,12 @@ DIST calculate-lib-2.2.9.tar.bz2 107111 RMD160 f21c8d3e5c82262fa78b256b527238624
EBUILD calculate-lib-2.1.8-r1.ebuild 730 RMD160 a3e9d20526f3078d1f1dc8894a3ac88a090cf968 SHA1 6bc25d2449e5f54df3675311ff5211bc00dcf907 SHA256 764f5b146cc9064de5e1c920ec88b0b91c5fb696c73c853435c7f7750b8bf0db
EBUILD calculate-lib-2.2.10.ebuild 659 RMD160 6bf71a6e491b03fa7004b4262ac1aaf1b98c0146 SHA1 e1aaa25934b34818e09b31d5c2882b62b5938c27 SHA256 922bb1fbbe56c741e6b52db280076ea6ea0ca65c7e25a9affc123c628f175c6c
EBUILD calculate-lib-2.2.11-r1.ebuild 790 RMD160 78411067872f5c699694574ca88c8e0c2a6b903f SHA1 4b9c63c4e85e76ed761e3d310e4f44edf42d2e17 SHA256 dbf4ceeb3eea90ab53f9ed024181bc2dd2bc4a86bcccebe7d5fe9692982f2619
EBUILD calculate-lib-2.2.11-r2.ebuild 869 RMD160 eee9363f02d2c9dd412a1b1e8be6730567f93a13 SHA1 8c1f8e65b90bd24436e80c4f465fb80821067919 SHA256 e178b8450311d0b7b0a01cad04a154c6ecc79964f6960cafaadb343d5ebae7e3
EBUILD calculate-lib-2.2.11.ebuild 659 RMD160 5bbfbf8cb6a1a875167536d5fb9e479100693491 SHA1 1cc43efc5441fc5623ca0303733f9cf9c9df9f4d SHA256 9956424e3bce8306394566c5574f1cf97f5ce1518be0c9802c5e49453f1ab3d6
EBUILD calculate-lib-2.2.8-r1.ebuild 791 RMD160 6da62f71058eb75f572cad1689930f2c4d41a6b0 SHA1 c10a3216c348b68875840b32ebf5643c4290ab2b SHA256 ea1e44f5741fe037e6f5f200fb933fe680ca0f27f8b6e9a7a093a787e754a3c9
EBUILD calculate-lib-2.2.8.ebuild 658 RMD160 1e08d25d084eb8a60bb45b80f3f98fb2063f47db SHA1 02d3e988e9bce9ae3b0b7b69d1428f7eb667ab88 SHA256 c3b23f9dd4113dab95eeffc16dbf78fbb44b65e73da7c735536a78de76169467
EBUILD calculate-lib-2.2.9.ebuild 658 RMD160 7f696222a88d3c3f952aa60dddfbc67d9bd9f004 SHA1 cecd92452665a63c431409775041be09658636fc SHA256 484378652007048d8c91bc189db46b7c54f41d26dddc25c281b2310876ef7606
EBUILD calculate-lib-2.2.9999.ebuild 592 RMD160 e559e7ccafdb150093a055b4f90bf33666ab796c SHA1 752fe9e05ce1380af9a44bf5e81a56dc00f36506 SHA256 f4cf5511cca3007b735cf98871ee72442c6bf677be63349058d1bb029a4b1abf
EBUILD calculate-lib-9999.ebuild 476 RMD160 e510e0aa98b7f6da9acc37197073cac0d5d6a47f SHA1 393c416fcfd77d6c05aea8932a7a1e3805aa926d SHA256 a9eee592ec352db7852e93ad33249072307051d3bda6cfdcd034ea9b96747578
MISC ChangeLog 16438 RMD160 93713e9ba5dc924e532a70d84a4f285df5b2ba94 SHA1 8a6cc898107c40648e7e73b3f95c161a0405eac4 SHA256 51f9ad8f3ce28df21e3778448b478dd5a00d031f65b4d73ceaec4904ec2b6e96
MISC ChangeLog 16645 RMD160 6da5c5c8233ae15eaccb7890934d00aeeaabc2fd SHA1 10c5de6a310e4164009d7ec4d00d9b4c729b94ca SHA256 7424d518a4d9e070fe6db6e429e3b64b48b13856200f6332a9d060a6a745cb45
MISC metadata.xml 303 RMD160 774b65ed76939d6878496ad6ef6451849bdced05 SHA1 7d08569697a290ede98c88ab59db3cdc3037bd15 SHA256 181519d9679fd9aee9a7a9806733a50728d3da0b1e0ad54f31499200f7f5c6ec

@ -0,0 +1,34 @@
# Copyright 1999-2011 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 library for Calculate 2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="2.2"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="~sys-apps/calculate-templates-2.2.11
!<sys-apps/calculate-lib-2.1.8-r1
!=sys-apps/calculate-lib-2.1.9
!=sys-apps/calculate-lib-2.1.10
!minimal? ( dev-python/py-smbpasswd )
>=dev-python/pyxml-0.8
sys-apps/file[python]"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# dialog yes/no fix patch
epatch "${FILESDIR}/calculate-lib-2.2.11-dialog_fix.patch"
# fix C locale
epatch "${FILESDIR}/calculate-lib-2.2.11-fix_C_locale.patch"
}

@ -0,0 +1,19 @@
commit 1ad2a516b2522cec2d3c757dfc6eed7c8a3eee1e
Author: Mike Hiretsky <mh@calculate.ru>
Date: Wed Mar 16 11:27:32 2011 +0300
Fix locale by default.
diff --git a/pym/cl_fill.py b/pym/cl_fill.py
index a72bc34..1d7b9b4 100644
--- a/pym/cl_fill.py
+++ b/pym/cl_fill.py
@@ -342,7 +342,7 @@ class fillVars(varsShare):
localeVal = self.getValueFromConfig('/etc/env.d/02locale','LANG')
if locale.isValueInFieldExists('locale',localeVal):
return localeVal
- if os.environ.has_key("LANG"):
+ if os.environ.has_key("LANG") and os.environ["LANG"] != "C":
return os.environ["LANG"]
return locale.getFieldByLang("locale","default")

@ -2,6 +2,12 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-utilities-2.2.11-r5 (16 Mar 2011)
16 Mar 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+calculate-utilities-2.2.11-r5.ebuild:
Update for lib.
*calculate-utilities-2.2.11-r4 (15 Mar 2011)
15 Mar 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

@ -6,7 +6,8 @@ EBUILD calculate-utilities-2.2.11-r1.ebuild 829 RMD160 260e7ed1151cad1dab49ddf11
EBUILD calculate-utilities-2.2.11-r2.ebuild 838 RMD160 43ad7dfe977f15fddfb39b104b67a456f7187194 SHA1 4f54338fc12f944156471b40ea59ec4c463f1fbb SHA256 4f5c0cbc4eadbbc1c613faf7f1a415fb44ec307d9c0ba86d60d3f5c51a4f8624
EBUILD calculate-utilities-2.2.11-r3.ebuild 838 RMD160 2d6f06edfb4b8ae990de037d36671515be94621c SHA1 bdc608e19767b136ecc9d8d47192918d9570134d SHA256 5f6f008ac2507e3d5c856ee0b54353950c2fb358a332828eb2cb7d615309135b
EBUILD calculate-utilities-2.2.11-r4.ebuild 838 RMD160 fbe23d73151e2046bb32a3729fd481ed649e1b6e SHA1 e2c9d14c46fa1697baa2af92fe4932251a0933aa SHA256 518f74c91afd4a0d351cfd292b27a55e95e09ad3ec9aefc87e1feb973657112a
EBUILD calculate-utilities-2.2.11-r5.ebuild 838 RMD160 c32c1bd91766864412cc91e664deea08c4364585 SHA1 568040ef8a78b10935c202464b5fd9fa8ddac417 SHA256 027dc8e16b98832d419e76d92bd93583e5697928b492baae8ad0f5dffa6afd4a
EBUILD calculate-utilities-2.2.11.ebuild 826 RMD160 a31f207212f4f45ed7339ebcfd025411daf8216e SHA1 59774fb8683f84cc80412bf55de399f4458ba0ed SHA256 8cd64cf7717d97b29536a908f7a52b4269a095e9474a24c0e67e12295918152a
EBUILD calculate-utilities-2.2.9-r1.ebuild 827 RMD160 403b1ade7438d0d1a2558af3c1f4825cad47f026 SHA1 b4215902dd5550f1af37516984eafc0f7b5356da SHA256 76076e498268e58e52dc85940cc565c6e960f4db118e12ee438356c1512e5087
EBUILD calculate-utilities-2.2.9.ebuild 827 RMD160 c62546891ead80e1cac33429ddb43cdf5dace57f SHA1 106ad4656826622e6e18c00146f79d312782c654 SHA256 a564a96b6b56dd528f827a2b6815432c1ea0e7c856d6896506bc2871aa5c8e3b
MISC ChangeLog 1854 RMD160 01279b87abcbad74adcead892e538e9feabda1dd SHA1 c163092c18bcdb8fc213a386acf3a1f3c2c2cc27 SHA256 e2e073cdc058eea2321a075777c0dfaa28196e503c1bda7bcf9c0509330bd7eb
MISC ChangeLog 2020 RMD160 19611e9bc5becea069eccd51a0ff27cb9d3639ad SHA1 5d7258187173a07707a3b8f0040d7e296f8e7e8f SHA256 fb9cb2033552f721ae162f2020b2f75b1895f460ef763526b0d3b61081a52ee2

@ -0,0 +1,36 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=2
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.11
=sys-apps/calculate-templates-2.2.11-r3
=sys-apps/calculate-lib-2.2.11-r2
cl_assemble? ( =sys-apps/calculate-assemble-2.2.11-r1 )
cl_builder? ( =sys-apps/calculate-builder-2.2.11-r1 )
cl_client? ( =sys-apps/calculate-client-2.2.11 )
cl_desktop? ( =sys-apps/calculate-desktop-2.2.11 )
cl_installgui? ( =app-misc/calculate-install-gui-2.2.11 )
cl_server? ( =sys-apps/calculate-server-2.1.13 )
"
Loading…
Cancel
Save