Fix calculate-lib for pkginst

atratsevskiy
parent 4cb2664afd
commit 87c774e94e

@ -1,6 +1,7 @@
AUX calculate-lib-2.1.11-fix_getip.patch 6335 SHA256 b54e6353b18a312e42e3f3d17b1d45efa9f433fef6bbf48c4eed237a4bb829d8 SHA512 aa9bb1fd818af8321bcf3a7dd681f2fd4976819267e14d627aaffe7f788813b1a85579f6868defb056934f62ce8307f1effee72258fee06915b565f02ab80bb4 WHIRLPOOL c1dbdca583293743a5c7e6407ebfe5e62b3a58c44cd9a29571b6138dd7741a21edcf8819e893692f1362cf142f4fe21f08e3aa4da670c183648722af101cce39
AUX calculate-lib-2.1.11-fix_xpath.patch 329 SHA256 9e5674cd5fccea9c2242eb2ffaa829a1446a5bd16c6ba877760175960b0971cb SHA512 4ebd5806c0b57bb636ee8f958ecd13a18d5c660b5657fa0ae1c84707999ef453afa082e9f08fa0e95ab13a1be2952f4d996a15579ee125852205619497b06d51 WHIRLPOOL 8b0aaea3595c5830c5cabd5fbfaaed85cf6da73f1e3988e15dd6a175e1f59f87364d74f8273da5e0385de10f9f3a9e50588509a52ed45a17a5b2756a9eb963b9
AUX calculate-lib-2.2.29-fix_funcPkg.patch 1829 SHA256 3cb85b18119392ef7a903d7c3382f792f528235c14a7e9b2f71c703c339869fb SHA512 9bb7d9a2dd8829380460de9163524172af88297a038c9f8a9ff521e5f9abffc62b77fa3d83d9f875120797cb090ecc7e08d9495a1c4a9da2e4c8f4d987f6a160 WHIRLPOOL 2117c3c992d5d5e62b218ef673468c3ad22607e009793276185b61a60dd547ad14eca4d84583033d94f322eed0a69206d19e1337e52957f5cb0b1cec409ffbe3
AUX calculate-lib-3.0.0-accelerate_package_configure.patch 990 SHA256 13fcd2df016b1a6dbf37c8e4e0948a2cc141d53c36d2482c90e2569e83e7ddb9 SHA512 b30f50c9465746e3bcd1064e3330397ef1937cea1f828535f5b5991c9439be664aba8fd73c3e84194393f6b22660548c02820779f15028620013a895e08f18e5 WHIRLPOOL dffa37b0f8590682c5c338cb31ac5c560a0510d7f191b344496653e9ec76097773a4beb5dadee950470678fa71d50a8c099f47b9adac4376b8e96170c996b878
AUX calculate-lib-3.0.0-fix_variables.patch 3431 SHA256 2ddf6bf1c277dbd9765d78589e89d95ad942489b22958e6ae93d3f1d1cfbeacb SHA512 7c7953fcd88207dea7b463371a6579e6270bfbad41bd6028e9298c1d89759a0adebc91ed5387e0a55fba35539ab8699c1fc20d2109c6101f13c6950072325fbd WHIRLPOOL f96bdf6482b049db5ff6d6d5e9cb6e5a95960047f61df049260e74951ec4e13304506216453aecb6c1fa288032f5ec753c3db9041e6168790321ce338c8ba877
AUX calculate-lib-3.0.0-r1.patch 2983 SHA256 bef063b3b4f77157cf1d002a41467d3758d9c6d8687c75bdb9dd6e35f17a994d SHA512 4ad78c447ed696c27f4a706f441392e81bb30fe5426dbb48411a13df5bf9102719fe8848bdee74430f0187eb8b2719f7a8b8883289d93bd7e35753b3a3d39a0d WHIRLPOOL 3f33f46e666054bd6d6c3e2f8e35a7c18d6c500cfd7c3bf6bb6d3db2a101ab5f333d164506e82b82c78ea07c6627617c93ffc62435a9fb8f5c8159af397a4afc
DIST calculate-lib-2.1.11.tar.bz2 61687 SHA256 62976c08d4fb4810389ace6f5a99abb5a962f6c8d9053ff943d0669480fb5599 SHA512 e3bc2168a55367cf19ad3a27921b53e5e845643238bf171209ab29752c91b5d4d338a2120774764ac1c79abd93f2deff8680f8faa1407940984ea9fd6a199e67 WHIRLPOOL 0ced92ea493dd8db02b0ae1514ebbb51ee76dc6f441b4a38c984c39da2121fb81dd1f2e840c4c5b71a117a12817a2a269d85676288202aa9801f69727e3338dc
@ -12,6 +13,7 @@ EBUILD calculate-lib-2.2.29-r2.ebuild 907 SHA256 2a6717b1e0fc15152866d44556eac6d
EBUILD calculate-lib-2.2.9999.ebuild 741 SHA256 49daa77ce88484438f3afbd1af7d3391589bdc9eed1e42dd61e123e9ee51260f SHA512 0ff0d6757afd4375888e956ac5195139ee59b889c87dc513ebb7fce9f28010e238a2b8d7e41cdc089cefb4860d971a262a369a615255645cd6746fa48fb5a9a2 WHIRLPOOL e50ed9e774f4c614c91497c1ca53a915f109cc587fe2244eb620afbddbdd70c57fb565a8a3fd60c3b392374c6349d6561f9ceb715808c07384cfda8eda9b8653
EBUILD calculate-lib-3.0.0-r1.ebuild 797 SHA256 b4c446e6824ca8426cf3b94bd174f04310a50374923f697884db80e5b7ca5e17 SHA512 249e11041e4da9ec988dd409d94d711d3a9b3ec8dea81f979484747817ad381faae7c1febe0fbdaacedfc8f2d50da1226837f0c4942e59896bf1c10c1184356a WHIRLPOOL d7531ac8823c7563520ba2293b155c5e526f88b8262f624ec8378661e4ce669db78ee1d3c5fd6297213a43930927b0364a95d4f9c28fea0940141b4e93d55826
EBUILD calculate-lib-3.0.0-r2.ebuild 876 SHA256 4223d10b987a9e9881ab7abbec85e5e783ac14f722111b3d7acea54c529bf2fd SHA512 427de25237b2615c576d8e2280b4195b78f2842427bd73552cd6af7a84854370f15d640cce016e084343472acd61408f96fda0e7855ec1de3c74d6433f381d34 WHIRLPOOL 2ebac0c80133df53779812c45ecaf1396b92710192c29a5295d95af5844f3df655c452d8a09a916855c52952fd31bbc28203fbc9a7439ba7c9a74d9797311ba7
EBUILD calculate-lib-3.0.0-r3.ebuild 998 SHA256 14bffde5023e6f02b30652af6089fe6e66b105e8776b021ca6cad76bc035d542 SHA512 85a5a1197d9c09247ecb6cd832578a492d9d08c969781ba460b225b51d2a90dae494f903bdb0d39c5208bec4c346fc4b921ca55a457220751180ea7d377522fb WHIRLPOOL 14dbc41434bac12688e8669097a65639761944b29368af4c289c671e230166238ff3125c11502d54f0c89e37b99ad33499cb05e2cdb7b4bd11d5db968ea3031f
EBUILD calculate-lib-3.0.0.ebuild 690 SHA256 c89c29f5de3f70146e98f15035366506933f03e8a5066b1ad55aeccbebdeae2c SHA512 a7277c2e5fa64a5e5840be7fc8d3df9a31f41926386c5fe6a9bed31eeed6321af5881c218d9ce7eeb12aee518edb682b438e10397dcb815cc63645100430e43e WHIRLPOOL 8f19e4d46381e26fec81e20fa35599f4658b3891d6372c921a8b1354ad3b1821ea9c78f71caebf54610e0b5aacfb6e6ded018e155e1979322406a0ac1e823d09
EBUILD calculate-lib-3.0.9999.ebuild 719 SHA256 5de5bc693735cbf24c7ceeb9882ed338c9cb186b5ea6be18e279d2102ec4dac3 SHA512 896352c27de758e598940c4d447d162911aba3c5e5650a447b10a5b96fc16615917caba5113aba4a3cd8b2e71c382d4089ebe568567c35c9068f116dee236262 WHIRLPOOL 1d78117009ec3c84d1e93a2f8f2df2c313c6b178832135fe5353e04ddc141e72185962ac29ded1eefd058eefbb20e0f81305eb659dfaafcda45f1614b40da63f
MISC ChangeLog 29678 SHA256 2d3176ee3c60fb474f938b05f6118e17b06f600a6a654def33754f15c32e78e2 SHA512 7f8039d00f0a4cfffe9d4a016ce451a51586d92c195693c24dc3c3498a4133c138dce3a6bf687ee64c9e613eafbe7807199dae515b221aab329490770e7ea1a3 WHIRLPOOL f0859381bfc90c257cf02aee15392776a612b25d1299a3703fa091aedce9bfc0dcfe8dba42265de3bd2e904cd122a62c9f21622fd189a4c32bf088f7ec8e9307

@ -0,0 +1,40 @@
# 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"
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
sys-fs/lvm2
sys-fs/mdadm
dev-python/pyinotify
sys-apps/file[python]"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# changes
epatch "${FILESDIR}/calculate-lib-3.0.0-r1.patch"
# fix variables
epatch "${FILESDIR}/calculate-lib-3.0.0-fix_variables.patch"
# accelerate apply templates on pkg_preinst
epatch "${FILESDIR}/calculate-lib-3.0.0-accelerate_package_configure.patch"
}

@ -0,0 +1,20 @@
diff --git a/calculate/lib/cl_template.py b/calculate/lib/cl_template.py
index 5547101..e906e60 100644
--- a/calculate/lib/cl_template.py
+++ b/calculate/lib/cl_template.py
@@ -3954,10 +3954,11 @@ re.M|re.S)
self.cltObj.allTemplates = self.allTemplates
self.numberAllTemplates(self.allTemplates)
# Обрабатываем шаблоны
- for dirTemplate in dirsTemplatesExists:
- if self.scanningTemplates(dirTemplate,
- skipTemplates=skipTemplates) is False:
- return False
+ if not os.environ.get("EBUILD_PHASE",""):
+ for dirTemplate in dirsTemplatesExists:
+ if self.scanningTemplates(dirTemplate,
+ skipTemplates=skipTemplates) is False:
+ return False
if self.cltObj:
# Созданные директории
self.cltObj.createdDirs = self.createdDirs

@ -10,6 +10,7 @@ EBUILD calculate-utilities-3.0.0-r5.ebuild 610 SHA256 dacf058b30e96af33df007ef1d
EBUILD calculate-utilities-3.0.0-r6.ebuild 610 SHA256 9635803a381a3d5b70ef5bd2d194f6b8c59d5c58793e45e1fd7cd5a5e7cfa9da SHA512 0868c019076c440efdce7787779bd71d948c30f0257b027f634d796438c6c750a4dc4864b51f7dd83552867f3728cfbc8e7dfcfaee879ddd0c6099037bc4c752 WHIRLPOOL 89c447f6213580d806c4815279651ace916aece9ae99b4acda4ab5a94b6799938269d40dc16878990a1180c4025eece2768e2df16911fa1701f55b1b159de5df
EBUILD calculate-utilities-3.0.0-r7.ebuild 610 SHA256 a272175f495e4256dc65a3cc4bee7c4e21f66cc5f2705508486777e68b300f6d SHA512 38e21a5f9c2a205799c4b93923339aa17ddebdeb59ea8ca59414d4b72fbad012b547ac35fd4f6cb984996197727e507e4922eff6b026b13c081be235a170aef4 WHIRLPOOL 29948834f516e9c346c2ab2dc5d6f3271f9d8371d9024189ef391ff8338139c947f3b3b6a1234372cfb3264e9b9b140730f89cc2c0aa3f5932e846d914aa3992
EBUILD calculate-utilities-3.0.0-r8.ebuild 610 SHA256 063bd6863534895384ce084109d446f1448ac638d41c46af3cfed188201837ee SHA512 a6206fe80ac4604956aa60cd6cc88cb40271c6e7b685840674ab836b43570b4989a54185c83a0e1a13cd3e02ffd1acb48f1cd8cd29a5a72614c03a6b81dc306d WHIRLPOOL 7a6e4c62af4147d596395951ed86827bb9a0613d9e918f64b220cf2c35766e555ddafc1f165f2345a134ff46c8d34bea6300a22ea95afb446d6ac125819efa96
EBUILD calculate-utilities-3.0.0-r9.ebuild 610 SHA256 1dff3ca461fb15cfe5cf2d9484ba5991a3bdbc17d0211628d28951b5897cc151 SHA512 70d5198d4c34451702fd6fae2c0f7696ce4d7427c37cffbb3d26e08ba8e1a7cf30419e7423720afa8e5f5e01953291937cf21c25de379baa6752d572d01ae352 WHIRLPOOL 2ab09225782cd1ea659850e613fd55d32dad34f866cfcf2617c78a0599ccf59e2a2d50cdf06d4bf22ff2e5943ee151d40b111ecfd15d40a71c58ba8acf145a04
EBUILD calculate-utilities-3.0.0.ebuild 595 SHA256 0b9aeeb84105488a72bf2ed1f8874ada0524e5be004f7fd197cda5158b99da1c SHA512 b89198e5290ac66a4a18d344f77ebc773ae4af977005dd96cd2eb22f125d6035970d698957cfb848d56734e1cc8a2d8ecd5e65b501421ab7153481a501f473a8 WHIRLPOOL 99579fc6b3170695e0db58d432a932ea117c35a9fd2b0896d5018f6b5ab8c25c270e039a343d877214897c546ab891c6f862422d5c170d6f7282841abcd947f6
EBUILD calculate-utilities-3.0.9999.ebuild 552 SHA256 d6519794625722093224801b703a0363929a034a1189b46a2c01cc2327138e59 SHA512 6dbb450db2ab1003a79ff32878c8928f93f53f0af7c46707d073dcff4f2befebc9fbcf5085b396fa4625735c2a987f041c4345884edde0924c1bc14c5d3f92c8 WHIRLPOOL 8403f0072318a3e425df82cb5480df941854044f0d6b04280a6ad1b9bdc1beff907127df44aaecd2818cdcf8399a9463c64a08bcfc34583bac4f8317d9294758
MISC ChangeLog 38731 SHA256 7e70a0bc1f3b34c0011f3874773a698a4bb96eb6d3dad10903575156bb8578bc SHA512 2de466ea990b9eac702b81fd097c3f5d06d1f4db1a4bd1d1b7380b45e551f6fd62c16564ecfc810246157d3ef1113ae373041580e70981d44752e50ed6134bc0 WHIRLPOOL 5ca0cee1ad0e9419f91ec11a9629b9a29db9fcbed4f5ae0aef1f8a2170ff58112c8580d61884c56ee410a0abc201fa8f4419cea35077fc8bb84e733f6fa6f4db

@ -0,0 +1,24 @@
# 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_console"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-3.0.0-r6
=sys-apps/calculate-i18n-3.0.0
=sys-apps/calculate-lib-3.0.0-r3
=sys-apps/calculate-core-3.0.0-r2
cl_consolegui? ( =sys-apps/calculate-console-gui-3.0.0-r2 )
cl_console? ( =sys-apps/calculate-console-3.0.0-r1 )
"
Loading…
Cancel
Save