atratsevskiy
parent 12d16431ec
commit a63c1afb73

@ -19,6 +19,7 @@ AUX calculate-lib-3.1.0_beta1_fix_import_env.patch 1468 SHA256 baec3176dd66c5011
AUX calculate-lib-3.1.1_alpha1-r1.patch 686 SHA256 e7972851fa90b0715ea6c39a82933ef99c40216c1d1e22e6e0979f7d848f931e SHA512 8158d2f2bb51228777994b1ffc433c7ccd9d6168647b815ac4704522b6db56dc186314e59546a540dc521f8c6076b2b13a51ef4f8472e26ad1cc2657255c3566 WHIRLPOOL 7f2a45af360cda4f09d2ccc3b9194ceb431e4737f546b2d0e75a78b5380a3dae7ead701c8bda3a552ed95b70ee6d60ead1e57ba8679d2b1590e95382323e7d01
AUX calculate-lib-3.1.1_alpha1-r2.patch 20456 SHA256 124535f503cf4ace75fd6715285a9a65a66e49286af64e11d3e06672335ec301 SHA512 0e62bd4c09ad92245fc0b20c919c21889063d30d59794666e68d86430935c70f2a692993d980332028381e5ad8f6819830dad7be72a50e8be1189d5b5394b9ad WHIRLPOOL 749994e5ef1bc2abbcba09ac6b53ea38ba03011d2828e0a6dc3851bd30709949f520b22e6e8782faeac069ab53b0a01d50e48fd8e939129d20a5cc38b5f10466
AUX calculate-lib-3.1.1_alpha2-r1.patch 1801 SHA256 e0fa0a7db2cd8d8fe290d04cbd60062d9fc1eba227fc31ab29f685913297e885 SHA512 0633f1428b8dea596748685ea2eda3f1d3c0dfbd1b358d83bf57b4d13660429d7ebb23f0db5bc4041f972559d09d7e162fa0bdd2f78708888d65214bb9cf7ba4 WHIRLPOOL 7fc2dc36d793f1db3468826f5f0b4e8c36d8f4a94d9fefbabcfca346d02b061ffdbcf36ed8b24d7c8844ff1bf4e2572a5e1d328752912458e2099beec8db4b57
AUX calculate-lib-3.1.1_alpha2-r2.patch 2386 SHA256 2e4616804916e9054fe51e799ecd4a355d8b3ce404c91328b45c4ee2a53be561 SHA512 0c0b49e7c43de8655e6df49805e4cf8e4ee621f6b7f134cc42dc5ac4be4a753f16036c0d7db4763a81ff620a9d3145b892b2c3b47f5863929c0ddf0e8db585e5 WHIRLPOOL 5d6017a88a0a4a12ca4d85a572452ba8ca6dd80292dc009ff3768d4dfbdc39b32b3c293f7df9ffbc3a83cfdb5b412a579b1e80064b2e8ab5163834dacad6304f
DIST calculate-lib-2.1.11.tar.bz2 61687 SHA256 62976c08d4fb4810389ace6f5a99abb5a962f6c8d9053ff943d0669480fb5599 SHA512 e3bc2168a55367cf19ad3a27921b53e5e845643238bf171209ab29752c91b5d4d338a2120774764ac1c79abd93f2deff8680f8faa1407940984ea9fd6a199e67 WHIRLPOOL 0ced92ea493dd8db02b0ae1514ebbb51ee76dc6f441b4a38c984c39da2121fb81dd1f2e840c4c5b71a117a12817a2a269d85676288202aa9801f69727e3338dc
DIST calculate-lib-2.2.29.tar.bz2 120378 SHA256 fc79bf29059ffb1519b6356cba34ebecb2e8c3222a29735f479254c371d363a3 SHA512 dc3c2c20cf0c5389b412b0cd2cba316b3d2367e981e147b3a94b6502ba329b598c7ccad5cd3462b3d7e884d05574c99b0e2e39df63e51d22221b86b783cb0925 WHIRLPOOL b3cdf6010c48d7a86a9f5a0c72effa8f0cc8ec0186fa28977132211dcaa5a3fe4a20ad3ec0b556478a9def1dc0e7c15404e3ab38080f986a4620634ee6570462
DIST calculate-lib-2.2.30.tar.bz2 120055 SHA256 a5aa07e5c5e02d27a8b9fad8c0e4bd0562d40d7a2753c2b57a18d99bd0dd6cb2 SHA512 7e8920f5fd855f05aba6576d5e4751ecf71a3e4107b46671d9a4be8557e1dd616adefad728b6a9ca87656dca6fd17d52bce41462b7fc906d20118e97607f1b1b WHIRLPOOL 0e8441484ee7d91c9926ab2deed8357272fecb2156e5dad45f865f6b13aff6c43868323dececc859ce7824bedd8794cec25b857be30afa83c44a81bcbcf510d2
@ -72,6 +73,7 @@ EBUILD calculate-lib-3.1.1_alpha1-r1.ebuild 821 SHA256 4434ac4458f216b9b574dce1f
EBUILD calculate-lib-3.1.1_alpha1-r2.ebuild 821 SHA256 f4a95b57d23ebdeba3974c141d30a04dd47c86f006de242b84703bba8c62ae33 SHA512 ea1f703d80a02ddc6d3567bdc06dad7a3416a48f2b53703f96183c5250489190868c7d504d2b25c63bbfc8bc16ceea20edf13a4e4affc2ecf999e62080896776 WHIRLPOOL c7db539b8a1e16f3366e5b9fd4832fa2cec01ae32168dea6d4ec8abf1681443339985a69a2aaf3abbaab131bf656569daf39ff1f7786e27afc45daff9cc55716
EBUILD calculate-lib-3.1.1_alpha1.ebuild 681 SHA256 6a6332013e5a56db775c6490b63b60f959528660b0982e6a414f1614c0b0ffa5 SHA512 19a71823543fe843a05a548207509ee4dcffa784c61e23c56cf17d2c651effbfc63914beb03f0977b804c5cc647407eecdcbdaed4d7478783bec46eee72a50fb WHIRLPOOL 5ffd414c804671057fe2a7a2176999eee0a75574a5043332d3c01f08b93635773800e6b5d9901993e4fbf7f95d175659d621be9231d08f8bdada2654e45f8e1d
EBUILD calculate-lib-3.1.1_alpha2-r1.ebuild 821 SHA256 1189d428581e6cde80b3a0877a2d9d7d3523fdefc12f9773a478f7d61356e740 SHA512 2f581be467423fe4f91d41113e61404c4deb9aab5471a55820df6ffc45466f28a1b499c92ca321762219ca4abf11b48ee132b0597206ffe6f060455b8cd8daba WHIRLPOOL ca708e8742d835c3a86f442588217997f20340982817ce3e7ca4e10f9621ba0cebe1d369e8413a763a12e4932e2970f127cd8cb4903a03a12eaeeae79d02590d
EBUILD calculate-lib-3.1.1_alpha2-r2.ebuild 821 SHA256 cd223474f7f4cd3c87f1cf6d75f7fda61fd6d33461e27f3a753710b7217840a7 SHA512 48a12926e36b8513b9feb1444f95f3b9ed80fac69329e9f0f17c97e42cab4cb11f44f1d678a6690e4a68268c07d8dad48b5cd05b04f7ac0034ce82e748dfe24c WHIRLPOOL 0d14e28c63383bfaeabf59d87d891d3a32ca4b9fd4e88af0743d27af24e1198781a2b435ab62be7c609f3debbad3b57fed8cde0a58d5a8890bbbed0a19bbdb80
EBUILD calculate-lib-3.1.1_alpha2.ebuild 681 SHA256 6a6332013e5a56db775c6490b63b60f959528660b0982e6a414f1614c0b0ffa5 SHA512 19a71823543fe843a05a548207509ee4dcffa784c61e23c56cf17d2c651effbfc63914beb03f0977b804c5cc647407eecdcbdaed4d7478783bec46eee72a50fb WHIRLPOOL 5ffd414c804671057fe2a7a2176999eee0a75574a5043332d3c01f08b93635773800e6b5d9901993e4fbf7f95d175659d621be9231d08f8bdada2654e45f8e1d
EBUILD calculate-lib-3.1.9999.ebuild 708 SHA256 a1d64b7f014831bf6b0a38928d53cb55758b7a12e5f3e98fffd28025ffacbce1 SHA512 3873859a791941d421e2338b437521955da383ce986408f1a951305e2dd75a1a4f771c9ec2caa096c5c8ea6a1776d6d0ed99e025ffa786ba029cafdbadfa439b WHIRLPOOL 5ac1a10b53f810ab527a0ebe52bc87e8397e61375cf6e0acbed89d8f6b8385e72bf234e0fdce479c3a3f1652bb6e520710ce9356750a97d644c0db0a33f6facb
MISC ChangeLog 29851 SHA256 16ca15c794bce78eefc487ed372c3d4960078fbd4c5fe4524211688d0146ef97 SHA512 be6bdf290f391529dce0deb67bf9d367e42e407601dd581f7c08d082399b5860cff2a76d4d64dd876154d51e84f34499db06c715145ac64f78d168aae7e78dbf WHIRLPOOL 2561ccd1eefe3423d97c67aff5c0fe6c8ca624e527fb885b042c8e812194bb1635d7e7d7d86c534562eb780c6b9144d92e24893f2d0696cf8a34a6a912a45788

@ -0,0 +1,35 @@
# 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=""
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}"
# apply revision changes
epatch "${FILESDIR}/calculate-lib-3.1.1_alpha2-r2.patch"
}

@ -0,0 +1,49 @@
diff --git calculate/lib/cl_template.py calculate/lib/cl_template.py
index 24ad307..08f796f 100644
--- calculate/lib/cl_template.py
+++ calculate/lib/cl_template.py
@@ -2799,6 +2799,36 @@ class templateFunction(_error, _warning, _shareTemplate, _shareTermsFunction):
else:
return ""
+ def funcPkgw(self, funArgv, resS, localVars, textTemplateTmp, nameTemp):
+ """Функция шаблона pkgw(), возвращает аргумент если программа установлена"""
+ # Название программы
+ import time
+ t = time.time()
+ nameProg = funArgv.replace(" ","")
+ origProg = nameProg
+ # Замена функции в тексте шаблона
+ replace = ""
+ if "/" in nameProg:
+ category, spl, nameProg = nameProg.partition("/")
+ nameProg, spl, slot = nameProg.partition(":")
+ if not category in self.installCategory:
+ self.getInstallPkgGentoo(category=category)
+ self.installCategory.append(category)
+ replace = self.pkg(nameProg, slot=slot or None)
+ else:
+ if not self.flagAllPkgScan:
+ self.getInstallPkgGentoo()
+ templateFunction.flagAllPkgScan = True
+ nameProg,spl,slot = nameProg.partition(":")
+ replace = self.pkg(nameProg,
+ slot=slot)
+ if replace:
+ replace = origProg
+ textTemplateTmp = textTemplateTmp[:resS.start()] + replace +\
+ textTemplateTmp[resS.end():]
+ print "TIME",time.time() -t
+ return textTemplateTmp
+
def funcPkg(self, funArgv, resS, localVars, textTemplateTmp, nameTemp):
"""Функция шаблона pkg(), выдает номер версии программы"""
# Название программы
@@ -2810,6 +2840,7 @@ class templateFunction(_error, _warning, _shareTemplate, _shareTermsFunction):
nameProg, spl, slot = nameProg.partition(":")
if not category in self.installCategory:
self.getInstallPkgGentoo(category=category)
+ self.installCategory.append(category)
replace = self.pkg(nameProg, slot=slot or None)
else:
if not self.flagAllPkgScan:

@ -80,6 +80,7 @@ EBUILD calculate-utilities-3.1.1_alpha2-r1.ebuild 806 SHA256 97f192e6d4915d4e78b
EBUILD calculate-utilities-3.1.1_alpha2-r2.ebuild 812 SHA256 a3f7e50a7d5e7ee612a797b144bb99deb8c4a6a5d52e53fe9db026f834e46bae SHA512 14aa168f9a77d5a1fe099e5fbe04c48287b5524bf099180f7d62739f9ce113358ed092ae50d2cd019dbd9cf6ccc643491accf6fcbf3963355ec8e3976ec230d7 WHIRLPOOL a7c7a8c12436ac1fc0847872c8ed2bfe4be49aec8d896ca7b52cfc08d8f0ca1625d0ad7485932b219f01cb3332d949991c713c090fba14dd42e95354620d996c
EBUILD calculate-utilities-3.1.1_alpha2-r3.ebuild 812 SHA256 0487e98bdecdd898deb5226b0d65aef9b34f5c0338865484718fece5afb2e59f SHA512 22d698366844041accad94a7464f9f9bdfaf137328ae628e7e37ecf080293f2b472fabceca1098ad5a09254430e01b44fb01ae2e20dd5c6f53abfe1cb97f4722 WHIRLPOOL faddda116dca5eaa52c6b9d505923cae96382f7f39d1921d1c84816af484f08b7e9da856b9514e8133cd8f8daa74782930223a14a3f90222a76cbf691bd159ba
EBUILD calculate-utilities-3.1.1_alpha2-r4.ebuild 815 SHA256 12c8d2ca9c3813aaa2ac0f831ea5b362c99adc09b3018070c143f681ede69c70 SHA512 42d207ebffddf00d5863bde87ca4ddf247df4032ade14cdb488ea78aa47a45fd2f4933fe8dd1d8bf1e8ce590feaeba032643c65cd5fbb309b6f33ba3e503a5cb WHIRLPOOL 1d41a910d291f246fec99376c3be44abf51829cab9ff2067ff2f5e1a15bfe16691f9013ba5aeee5a0d549ef880249de0b472538df8acc6798f276358e0da911f
EBUILD calculate-utilities-3.1.1_alpha2-r5.ebuild 815 SHA256 9564585c5246c43680f53cde260fd42778e1623d51c379b2d5c27590f7173297 SHA512 944e6d28beccbb82a3b633f93b8c6beb93b24554619e27feb1fefeef28364e78e8294ebd776e144cd8e5d8c80708f1fb6168c2ee49b0bd04eb2e2ddf42366bcf WHIRLPOOL b5cdbe8e5588b430818da660c1faa9445c2d271e7530b59b68829ea90454f7579f5eb530d7f09b5ff739874f2701262f10f247f04cc4b9e062f5396b0ec615eb
EBUILD calculate-utilities-3.1.1_alpha2.ebuild 803 SHA256 53958a1bbe7d32ce748f6b28e38e9c72f98a8af00d9351583452a33863ed79d5 SHA512 f00e42a7c2bd52162c448d5f927409f7d35f593e93ea6a964bdda169f2f0663420c433d5ec8e123b3e8e39b248f7e34459d09c1008f8f1b77cd9fbf7631b2ef3 WHIRLPOOL ad34c29f862404f9c41caedecee41587420f87058296783ae8ab0e954f7e2012ab0f9658a46f698c12ba7e8723b34b6d01b3ea62ec4f769e45448f03b38e9266
EBUILD calculate-utilities-3.1.9999.ebuild 800 SHA256 9de4807341cb552ef8d4f702e9c4a0ca10c52c9d532cc2eb741cea29b92f09b5 SHA512 b35ed4d49c4943a5ad375e646bece419271900c50301153408b30dede0fe834e098baaa42a21c130730c0bc32ba09decc588277da6782d2010c18c9d8df679ae WHIRLPOOL 78e2c5ee8ef8356c4fc0275f920177778925278cad78585ed37c08048241f775030e59a0ced0696fba6379741fe865dc339d190c46b5f2173097328a73c64a24
MISC ChangeLog 38731 SHA256 7e70a0bc1f3b34c0011f3874773a698a4bb96eb6d3dad10903575156bb8578bc SHA512 2de466ea990b9eac702b81fd097c3f5d06d1f4db1a4bd1d1b7380b45e551f6fd62c16564ecfc810246157d3ef1113ae373041580e70981d44752e50ed6134bc0 WHIRLPOOL 5ca0cee1ad0e9419f91ec11a9629b9a29db9fcbed4f5ae0aef1f8a2170ff58112c8580d61884c56ee410a0abc201fa8f4419cea35077fc8bb84e733f6fa6f4db

@ -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=""
IUSE="cl_consolegui cl_client cl_desktop cl_console"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-3.1.1_alpha2-r3
=sys-apps/calculate-i18n-3.1.1_alpha2
=sys-apps/calculate-lib-3.1.1_alpha2-r2
=sys-apps/calculate-core-3.1.1_alpha2
=sys-apps/calculate-update-3.1.1_alpha2-r1
cl_client? ( =sys-apps/calculate-client-3.1.1_alpha2 )
cl_desktop? ( =sys-apps/calculate-desktop-3.1.1_alpha2-r1 )
cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.1_alpha2 )
cl_console? ( =sys-apps/calculate-console-3.1.1_alpha2 )
"
Loading…
Cancel
Save