Исправленя для утилит

atratsevskiy
Mike Khiretskiy 10 years ago
parent d203e7f4f0
commit fdb0251858

@ -10,6 +10,7 @@ AUX calculate-lib-2.2.31-iso_UEFI.patch 1462 SHA256 1e376b916768c40fd523939e737e
AUX calculate-lib-2.2.32-fix_iso_x86.patch 1002 SHA256 cdb67f8274c4ab43e3d8e441793c9ad00d45f6c7c11821114b875da8d65d42b6 SHA512 a7bf65d630667494a2cd75ba85797f8ad4ac88fdec23c757bfb30cd07e3333ef7539a3661c8a18a700982a830662b51b25f0b45aa7d9c4f42cb0a647d11ce937 WHIRLPOOL 0e04fa1d752698b9a3bdbe1301c7abe39464baa09812b3d741bacddbe2fa110098f4d18f0e71ec2b4a2c2824b3ab1f3c8cdf135470f3cee6343351410360e315
AUX calculate-lib-2.2.32-r2.patch 1002 SHA256 cdb67f8274c4ab43e3d8e441793c9ad00d45f6c7c11821114b875da8d65d42b6 SHA512 a7bf65d630667494a2cd75ba85797f8ad4ac88fdec23c757bfb30cd07e3333ef7539a3661c8a18a700982a830662b51b25f0b45aa7d9c4f42cb0a647d11ce937 WHIRLPOOL 0e04fa1d752698b9a3bdbe1301c7abe39464baa09812b3d741bacddbe2fa110098f4d18f0e71ec2b4a2c2824b3ab1f3c8cdf135470f3cee6343351410360e315
AUX calculate-lib-3.1.9-r14.patch 23190 SHA256 28deb3f5b6f818a7be6541b29d77291a0950c0b98c2a4b4de3a37e74ba2042a0 SHA512 4cbdc6b105ff598baf8ec9676cb8d436b3ef67f6c8649984bbf8434611c5503f25ac117e82001897fac7ff5bcc3bb15f3d7bb3167e7c42fa48206f4c84428d97 WHIRLPOOL 819af8d9d82534885e5af621593c8f315e9d38b1fd26c92bc45f8550a2800bfce2c30df3c9accda7e03f77ef1827907b7530d0589a17ff7109f6c029869464e0
AUX calculate-lib-3.2.0-r1.patch 585 SHA256 d472126ce0913f7b55950270cc1a012c3de8d19ce91662df4fe7b45203fdc0c2 SHA512 c950f98fcb1b3bd2d3b90ee87b379d389147c280bc227302f016845dd4db64b2588a08c1cc07bdaf6fe6ec03c747800c2fdbefb0fcf2df145dc4a8cd9fca3d71 WHIRLPOOL 7637be3fa4de9ecebf4fa7ba5448207bc0b4a0d1fa497b0751d6c4412d037b24fdd6b61e491604c44e2971a880cd8c15884d0dc81e77fe1ce1151b123e64509a
AUX calculate-lib-3.2.0_alpha11-r1.patch 5012 SHA256 5be83ffcccc7335a5dbb009a0a6110dd8dd8a9afd03e4a74c0ecaff6306132d1 SHA512 c4478dc2b308c17b3c9e466c011e7caa69a95ef3c676bf3087d37927c2a3067f14d5ab786fc719b7f127b0da1b8e1cb3da5a9b8b53b64332894bd5e820416fd9 WHIRLPOOL fb00c3f9bf5afdd501c13b38f57415cef29aed5079cdf44cfe234d0203bf27f3b44e748cd8d1e335548932750af2faf5bcc328f138c09110d63f473c8ba44395
AUX calculate-lib-3.2.0_alpha12-r1.patch 655 SHA256 451860a2986d7f8b72a5158fa597a5883dd78d0a70e754b3acf8879fb2e38eff SHA512 24e282416c898308d2dd2dd924d0bb2bc325a03cca6d13709a171eb86b9a9bba90958bde8fef1a926c44b8a8647e6486e1570d077cdbe77e775dfec0b8e6ab46 WHIRLPOOL 505e13050a0a0b76abdc98f99f6c80624e56288c8bd62a0e06814b6dc759c5aa21ccefbdfec915f6e1d070c58ea2bc9d8377110df6f13b8145fa781b4b3a08f4
AUX calculate-lib-3.2.0_alpha12-r2.patch 1219 SHA256 d101a72ce979f2be55fb293240a0aefbbb921bc25332b16f01a857e3705167da SHA512 0a688fdec53f7f308872347cb56550e186eceffb1c2d21cc2083753fd21cf78fe25b04067a168ec800d9c947cfcbca64c7d599d53a5e90acbf3bfd9da747503f WHIRLPOOL 98321a51376d17619c9f0feb93ee95a9ccfea5d32d8f82621c87869765e3eef5c22318bd7ab8dc8eaf35ba5cdbc9ef862734cafb7fff956dfa0646bfbf9b3433
@ -37,6 +38,7 @@ EBUILD calculate-lib-2.2.32.ebuild 835 SHA256 de709a93e83848e4aeb462b0c585eebbd5
EBUILD calculate-lib-2.2.9999.ebuild 730 SHA256 ce7f2300859687d4f6c50948438bee8a8cb407fd7de56c5c48e0aba846ee6774 SHA512 789179018d82ef7c9a5428de20f529e6071380174d1e417c3a4463859d4b9ceca2a2d4ae078dbe309b976541cfba81a30348a77b6b37089b9597b862d4a45fd8 WHIRLPOOL 380084a24bf396c79fd198e1ad51d2457dcbcc5d3b59420f3794d067949cf7951766a880639bd54399f371ed0961163a03f8ea8a5e2483e512243d57408251be
EBUILD calculate-lib-3.1.9-r14.ebuild 890 SHA256 70895acb768534c094c5c0cf73b9b6d117de07fcc57c1b331b7ba6910a1c1940 SHA512 a8722797a526535c5a68a1c131712f7e944712508d58d4a5564fdcf08dedbe9b24198b2fb6a421c5edb0ba9286d63f9dbc15913cb8968002a5ee42ea359a6a50 WHIRLPOOL 0910b06a2d8e803ea6b7af16aa382fabbfa56bcdeefea382d7e71c6a0210274e495207de4fdfdeea6bf0f8cd169b00bf0ef4f7d83947eb50d5de58d940ad1f78
EBUILD calculate-lib-3.1.9999.ebuild 708 SHA256 a1d64b7f014831bf6b0a38928d53cb55758b7a12e5f3e98fffd28025ffacbce1 SHA512 3873859a791941d421e2338b437521955da383ce986408f1a951305e2dd75a1a4f771c9ec2caa096c5c8ea6a1776d6d0ed99e025ffa786ba029cafdbadfa439b WHIRLPOOL 5ac1a10b53f810ab527a0ebe52bc87e8397e61375cf6e0acbed89d8f6b8385e72bf234e0fdce479c3a3f1652bb6e520710ce9356750a97d644c0db0a33f6facb
EBUILD calculate-lib-3.2.0-r1.ebuild 913 SHA256 538c5d7f69cd9a782718c8beaccd50b033ec210668ffd128fbed50dcb3c3f42a SHA512 e9826c6e9733295f14d805dc77794ba6380bf686306ed5802644c56f1fa4d45b83ce3fbd7918f8df077eae3784545407fec553904729207f6016c0f721c2082f WHIRLPOOL f1691bbdf3871cbd24b4c6d7c3e439984d0c45871677937b32fda95f79dfc0f3690f43bd7a70bfdba191bb671b18b6f9ae7d149b3b22540847dbe6f856fdb66b
EBUILD calculate-lib-3.2.0.ebuild 779 SHA256 d9ea13ff27cd50b309c1410811a74f8c7e0a64fa7eb0671d16dd868cda9e2f0c SHA512 097f9ac684fddd8fd7e5fd6f9398c6dfb65c69beef6ae8bcdd972253ef20b90b5d03430a2ede3df5fc33913c05875acfb64a9b6b6488cb715b6a725576489ec6 WHIRLPOOL 21098a18aeef4330d207ab17cc6b2b93f8b647783f41335cc1a852949a7716faf36ad7ad6eb952abf9da0a59170479fdb3f5ea85f0a00f9072cf7beb15c1d4e4
EBUILD calculate-lib-3.2.0_alpha11-r1.ebuild 923 SHA256 74b41c68e3349dc5fa0894ffc77c628fa1b383bb469b18f85125fd91b6a63945 SHA512 36212fd87a4e5f1372cea7877c8348cc708041dca3482fe80ce0a0249980923043f990780858623f3a810e773849043bd2fd0487193623e72b3790948505b57b WHIRLPOOL 60befc336c17308b1d4ca0ebef16aaeeb57dba816ac7f645c6719d03aeb765b04e5b4980bc4739b41372b52aa1b9fd4dc06b228f1acf07014aa3888ea8b145b5
EBUILD calculate-lib-3.2.0_alpha12-r1.ebuild 921 SHA256 18b368a0f6747ccc7bbca328e31e1e24fc579616b939f1dbadf14f51df524c3e SHA512 4048a95f4a8d6b63a39e1996ebf400862fdc07478a14d8dd578305824a0cfe31924cfc5394a47e2acb00e024f1f9b2607137158b70157951c5fd074995be471b WHIRLPOOL bf39d807a4743ef94d670f8e9b35f4ea458b2bc4a63686a5738b5ee9bff183d4c97ea6229218328e28f9a71d9ee7783ec7845380d9c6c20f0ec3bde6e5a1c06f

@ -0,0 +1,38 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
PYTHON_DEPEND="2:2.7"
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2
http://mirror.yandex.ru/calculate/calculate3/${PN}/${P}.tar.bz2"
DESCRIPTION="The library for Calculate 3"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="!minimal? ( dev-python/py-smbpasswd )
>=dev-python/pyxml-0.8
sys-apps/iproute2
sys-apps/pciutils
dev-python/progressbar
sys-fs/lvm2
sys-fs/mdadm
dev-python/pyinotify
sys-apps/file[python]"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-lib-3.2.0-r1.patch"
}

@ -0,0 +1,14 @@
diff --git calculate/lib/utils/files.py calculate/lib/utils/files.py
index b9d4497..09b496a 100644
--- calculate/lib/utils/files.py
+++ calculate/lib/utils/files.py
@@ -114,8 +114,7 @@ class process:
stdin=kwarg["stdin"].getStdout
self.stdout = kwarg.get("stdout",PIPE)
self.envdict = kwarg.get("envdict",os.environ.copy())
- if "lang" in kwarg:
- self.envdict["LANG"] = kwarg.get('lang')
+ self.envdict["LANG"] = kwarg.get('lang','C')
self.langc = "langc" in kwarg
self.stderr = kwarg.get("stderr",PIPE)

@ -11,6 +11,7 @@ EBUILD calculate-utilities-2.2.9999.ebuild 831 SHA256 630a2373531bdbda2cac289c82
EBUILD calculate-utilities-3.1.9-r34.ebuild 772 SHA256 843d57c3732232408adfdc60e09b53599d5afca31bb9ef303cec5697c45f78cf SHA512 9aefe0888d9357fbef0cf7e7807f48c3e965a15e30170481b793880a42780d2588fb9f2e3407f214c88b18917c705fc12c896e64f606b08f3e4c8487324005e8 WHIRLPOOL 3778616d8139d3011f115518e694a5d6517a8febbda8b1296578170b266a7e1017d45cc07ebd4c87c9108f2eaa4beab802b1015a3f29f9677222fc9e1d98869c
EBUILD calculate-utilities-3.1.9-r35.ebuild 772 SHA256 48db29b3896b1a83da98b01e4a355f1781b004068bbf003d7c156f1065bf65b8 SHA512 fe4aa3c7c5546a4277356bf9da736c45bab953913cf7dce7275e8348c1d255d7c9292e8df6481cf52345de577427998e6f5a7df824f85d1c81feedca819abc4b WHIRLPOOL d6c39c1f458eb2fad7fe052e60bb0dc72e93192d4caa0fcc3d39ef8f22ea395e9cb6c99ad70d3c71f76a5c19163aeb502156ebb30b27d2d9230d1a1edcaa4b00
EBUILD calculate-utilities-3.1.9999.ebuild 800 SHA256 9de4807341cb552ef8d4f702e9c4a0ca10c52c9d532cc2eb741cea29b92f09b5 SHA512 b35ed4d49c4943a5ad375e646bece419271900c50301153408b30dede0fe834e098baaa42a21c130730c0bc32ba09decc588277da6782d2010c18c9d8df679ae WHIRLPOOL 78e2c5ee8ef8356c4fc0275f920177778925278cad78585ed37c08048241f775030e59a0ced0696fba6379741fe865dc339d190c46b5f2173097328a73c64a24
EBUILD calculate-utilities-3.2.0-r1.ebuild 752 SHA256 f3e20b2cb4218e215cdb99287c20b5ee0cbf0bdc4e265ef5c4a817054728535f SHA512 697bb4028c62dd53301163e6d932f2023a96013bcc7b179f53141ff460548c1b2c9ab079d5b3b2080ce3bf4c2d436653c44b1bbdbfb5c4b8bda0863a679ffc56 WHIRLPOOL ecd0d785c77d0482328d6da090ec8e0bd905ad19698f15c69d0a7132d955861710d07a45951424760b12315264208e394429b85c00dab241320fb981f2b04e6a
EBUILD calculate-utilities-3.2.0.ebuild 749 SHA256 dfbdd98f194a8aa314df2e4070ec684ea346498550fd324c8c900a09791dcd15 SHA512 f2d1cd58dfd3b4949959c515b6a13e0c668b0d0639a1c2ad506e74707dcac80d0e4364fbbdc84a06308e555a3e008a16329266a84d433e6abe2c330ae863a7d4 WHIRLPOOL eec82999f6aee54350df74bdfae439d53a92a6b2d4d6a8bbb4cd56351dec63ae62f102788acb9a4c5e140c55c48c4f357ad571d318d3bd4f970d3e997e0a57af
EBUILD calculate-utilities-3.2.0_alpha11-r4.ebuild 844 SHA256 0bbb15587365a1e0626a43e9a3ec8e3b63da4f38b35cc75bef4a3b526130509b SHA512 c42433f911ea2a2a131b6f415daca5002cc0b19958acdbd4adc052c80b9925890f17597aae4790e5b5ee5424849a89bff0c664a65a0d95aeea6622e6edc4f64a WHIRLPOOL 893135657836ed0fb39b7a1e0c967ff0ccecd61c2dced11bb3764c82087241c113f7e5728417313aa30005a86223d01ad67082945ebfa88a857e01d1e864d5e8
EBUILD calculate-utilities-3.2.0_alpha11-r5.ebuild 842 SHA256 b300ecbbeb548f28f2896a3b6f4699fd4004a1e7a37b92e2dd2c8bf611df025e SHA512 15b63707e7e123778bb905f5a5dcb76dddd415ac0db96ba7c25978ffe774f127c4a971f6dfe1509daa1052d59ee42248d4d4b5f084f770b05e06ef35a63a44f3 WHIRLPOOL 6cffc5b13bf05267b681c1c32b96703150c2375cf05abc300ece9c9849afe50f2f2f6364eac344cd402ce6f1b12767501665b0f10c5ba1ab07f8989c533f1560

@ -0,0 +1,26 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=4
DESCRIPTION="Calculate Utilities meta package"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
SRC_URI=""
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
IUSE="cl_consolegui cl_client cl_desktop cl_console"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-3.2.0
=sys-apps/calculate-i18n-3.2.0
=sys-apps/calculate-lib-3.2.0-r1
=sys-apps/calculate-core-3.2.0
=sys-apps/calculate-update-3.2.0
cl_client? ( =sys-apps/calculate-client-3.2.0 )
cl_desktop? ( =sys-apps/calculate-desktop-3.2.0 )
cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.0 )
cl_console? ( =sys-apps/calculate-console-3.2.0 )
"
Loading…
Cancel
Save