parent
f0388f2dc7
commit
6a4642fab9
@ -0,0 +1,49 @@
|
||||
# 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 WSDL core for Calculate 3"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS=""
|
||||
IUSE="minimal"
|
||||
|
||||
DEPEND="~sys-apps/calculate-lib-3.1.1_alpha2
|
||||
>=dev-python/soaplib-1.0
|
||||
!minimal? ( dev-python/sudsds
|
||||
net-libs/dslib
|
||||
dev-python/pyopenssl
|
||||
dev-libs/openssl
|
||||
dev-python/m2crypto
|
||||
dev-python/cherrypy )"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
pkg_preinst() {
|
||||
dosym /usr/sbin/cl-core /usr/sbin/cl-core-setup
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "For autoconfigure calculate-core for adminuser perform:"
|
||||
einfo " cl-core --bootstrap <username>"
|
||||
einfo "For run calculate-core perform:"
|
||||
einfo " /etc/init.d/calculate-core start"
|
||||
einfo "Add calcualte core to autorun:"
|
||||
einfo " rc-update add calculate-core boot"
|
||||
}
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-core-3.1.1_alpha2-r1.patch"
|
||||
}
|
||||
@ -0,0 +1,13 @@
|
||||
diff --git core/server/setup_package.py core/server/setup_package.py
|
||||
index 2111b8d..366f061 100644
|
||||
--- core/server/setup_package.py
|
||||
+++ core/server/setup_package.py
|
||||
@@ -456,7 +456,7 @@ class updateSystemConfigs(shareUpdateConfigs):
|
||||
self.copyConfigFiles(configPath,variables.Get('cl_config_protect'))
|
||||
if clTempl and clTempl.getWarning():
|
||||
for warn in clTempl.getWarning().split("\n"):
|
||||
- self.SUCCESS(warn)
|
||||
+ self.WARNING(warn)
|
||||
return True
|
||||
|
||||
class PackageUpdater(updateSystemConfigs,updateUserConfigs):
|
||||
@ -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-r7.patch"
|
||||
}
|
||||
@ -0,0 +1,208 @@
|
||||
diff --git calculate/lib/cl_template.py calculate/lib/cl_template.py
|
||||
index 24ad307..d39555a 100644
|
||||
--- calculate/lib/cl_template.py
|
||||
+++ calculate/lib/cl_template.py
|
||||
@@ -2181,6 +2181,10 @@ class _file(_error):
|
||||
F_CONF = open (nameFileConfig, "r+")
|
||||
except:
|
||||
try:
|
||||
+ if os.path.isdir(nameFileConfig):
|
||||
+ self.setWarning(_("unable to open the directory as file:")
|
||||
+ + nameFileConfig)
|
||||
+ return False
|
||||
F_CONF = open(nameFileConfig, "w+")
|
||||
except:
|
||||
self.setError(_("unable to open the file:")
|
||||
@@ -2799,6 +2803,33 @@ class templateFunction(_error, _warning, _shareTemplate, _shareTermsFunction):
|
||||
else:
|
||||
return ""
|
||||
|
||||
+ def funcPkgw(self, funArgv, resS, localVars, textTemplateTmp, nameTemp):
|
||||
+ """Функция шаблона pkgw(), возвращает аргумент если программа установлена"""
|
||||
+ # Название программы
|
||||
+ 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():]
|
||||
+ return textTemplateTmp
|
||||
+
|
||||
def funcPkg(self, funArgv, resS, localVars, textTemplateTmp, nameTemp):
|
||||
"""Функция шаблона pkg(), выдает номер версии программы"""
|
||||
# Название программы
|
||||
@@ -2810,6 +2841,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:
|
||||
@@ -2894,6 +2926,31 @@ class templateFunction(_error, _warning, _shareTemplate, _shareTermsFunction):
|
||||
textTemplateTmp[resS.end():]
|
||||
return textTemplateTmp
|
||||
|
||||
+ def funcIn(self, funArgv, resS, localVars, textTemplateTmp, nameTemp):
|
||||
+ """
|
||||
+ Function in for check value in variable
|
||||
+ """
|
||||
+ terms = funArgv.replace(" ","").split(",")
|
||||
+ # Название локальной переменной
|
||||
+ nameLocVar = terms[0]
|
||||
+ flagFoundVar = False
|
||||
+ try:
|
||||
+ value = self.objVar.Get(nameLocVar)
|
||||
+ flagFoundVar = True
|
||||
+ except:
|
||||
+ pass
|
||||
+ if flagFoundVar:
|
||||
+ if value in terms[1:]:
|
||||
+ replace = "1"
|
||||
+ else:
|
||||
+ replace = ""
|
||||
+ else:
|
||||
+ self.raiseErrTemplate(_("error: variable %s does not exist")\
|
||||
+ %str(nameLocVar))
|
||||
+ textTemplateTmp = textTemplateTmp[:resS.start()] + replace +\
|
||||
+ textTemplateTmp[resS.end():]
|
||||
+ return textTemplateTmp
|
||||
+
|
||||
def funcPush(self, funArgv, resS, localVars, textTemplateTmp, nameTemp):
|
||||
"""локальная функция записывает значение переменной
|
||||
|
||||
@@ -3658,7 +3715,8 @@ re.M|re.S)
|
||||
|
||||
def executeTemplate(self, code, execPath):
|
||||
"""Execute template"""
|
||||
- p = process(execPath,lang=self.objVar.Get('os_locale_locale'))
|
||||
+ p = process(execPath,lang=self.objVar.Get('os_locale_locale'),
|
||||
+ envdict=os.environ)
|
||||
if "/bin/bash" in code.partition('\n')[0]:
|
||||
p.write("""function translate() {
|
||||
gettext -d cl_template "$*"
|
||||
@@ -4281,6 +4339,11 @@ gettext -d cl_template "$*"
|
||||
self.getApplyHeadDir(newDir, dirInfoFile, opt)
|
||||
if createdDirs:
|
||||
self.createdDirs += createdDirs
|
||||
+ if os.path.isfile(pathDir):
|
||||
+ self.setWarning(_("{dirpath} is file").format(dirpath=pathDir))
|
||||
+ self.setWarning(_("templates in {tempath} is skipped"
|
||||
+ ).format(tempath=path))
|
||||
+ return None
|
||||
if objHeadDir:
|
||||
return pathDir, objHeadDir
|
||||
else:
|
||||
@@ -5052,7 +5115,7 @@ gettext -d cl_template "$*"
|
||||
|
||||
def fileIsUtf(self, fileName):
|
||||
"""Проверяет файл на кодировку UTF-8"""
|
||||
- if os.path.exists(fileName):
|
||||
+ if os.path.isfile(fileName):
|
||||
FD = open(os.path.abspath(fileName))
|
||||
newTemplate = FD.read()
|
||||
FD.close()
|
||||
@@ -5060,7 +5123,8 @@ gettext -d cl_template "$*"
|
||||
newTemplate.decode("UTF-8")
|
||||
except:
|
||||
return False
|
||||
- return True
|
||||
+ return True
|
||||
+ return False
|
||||
|
||||
def joinTemplate(self, nameFileTemplate, nameFileConfig, optFile={}):
|
||||
"""Объединения шаблона и конф. файла
|
||||
diff --git calculate/lib/datavars.py calculate/lib/datavars.py
|
||||
index 02b1d4a..1791281 100644
|
||||
--- calculate/lib/datavars.py
|
||||
+++ calculate/lib/datavars.py
|
||||
@@ -33,9 +33,9 @@ from types import StringTypes
|
||||
|
||||
def addStdConfig(fileLst,prefix='/'):
|
||||
stdPath = path.join(prefix,
|
||||
- "/var/lib/layman/calculate/profiles/calculate.env")
|
||||
+ "var/lib/layman/calculate/profiles/calculate.env")
|
||||
if not stdPath in map(os.path.abspath,fileLst):
|
||||
- return fileLst + [stdPath]
|
||||
+ return [stdPath] + fileLst
|
||||
return fileLst
|
||||
|
||||
def itemgetter(*args,**kwargs):
|
||||
@@ -757,9 +757,10 @@ class SimpleDataVars:
|
||||
searchProfile(iniFile,'calculate.env'),prefix=self.systemRoot),""))
|
||||
else:
|
||||
config = cl_template.iniParser(iniFile)
|
||||
+ importVars = config.getAreaVars("main")
|
||||
for varname in self.allVars.keys():
|
||||
if not varname in self.cache:
|
||||
- val = self.unserialize("string",config.getVar('main',varname))
|
||||
+ val = self.unserialize("string",importVars.get(varname,''))
|
||||
if val:
|
||||
self.cache[varname] = val.encode('utf-8')
|
||||
|
||||
diff --git calculate/lib/format/world.py calculate/lib/format/world.py
|
||||
index 69bfc4f..7d93488 100644
|
||||
--- calculate/lib/format/world.py
|
||||
+++ calculate/lib/format/world.py
|
||||
@@ -22,7 +22,7 @@ class world(objShare):
|
||||
"""Класс для обработки конфигурационного файла типа procmail
|
||||
|
||||
"""
|
||||
- _comment = ""
|
||||
+ _comment = "#"
|
||||
configName = "world"
|
||||
configVersion = "0.1"
|
||||
sepFields = "\n"
|
||||
@@ -66,15 +66,15 @@ class world(objShare):
|
||||
for k in txtLines:
|
||||
textLine = k + endtxtLines[z]
|
||||
z += 1
|
||||
- #findComment = self.reComment.search(textLine)
|
||||
+ findComment = self.reComment.search(textLine)
|
||||
if not textLine.strip():
|
||||
field.br = textLine
|
||||
fields.append(field)
|
||||
field = fieldData()
|
||||
- #elif findComment:
|
||||
- # field.comment = textLine
|
||||
- # fields.append(field)
|
||||
- # field = fieldData()
|
||||
+ elif findComment:
|
||||
+ field.comment = textLine
|
||||
+ fields.append(field)
|
||||
+ field = fieldData()
|
||||
else:
|
||||
pars = textLine.strip()
|
||||
field.name = pars
|
||||
diff --git calculate/lib/variables/linux.py calculate/lib/variables/linux.py
|
||||
index be3bbb2..e3e6bdd 100644
|
||||
--- calculate/lib/variables/linux.py
|
||||
+++ calculate/lib/variables/linux.py
|
||||
@@ -240,8 +240,9 @@ class LinuxDataVars(SimpleDataVars):
|
||||
VariableOsLinuxBuild(systemRoot=systemRoot))
|
||||
makeprofile = path.join(systemRoot,'etc/make.profile')
|
||||
if os.path.exists(makeprofile):
|
||||
- inifile = path.join('/etc',os.readlink('/etc/make.profile'))
|
||||
- self.flIniFileFrom(makeprofile)
|
||||
+ inifile = path.join(systemRoot,'etc',
|
||||
+ os.readlink(path.join(systemRoot,'etc/make.profile')))
|
||||
+ self.flIniFileFrom(inifile)
|
||||
inifile = "etc/calculate/calculate.env"
|
||||
self.flIniFileFrom(path.join(systemRoot,inifile))
|
||||
iniFile = "etc/calculate/calculate3.env"
|
||||
@ -1,12 +1,14 @@
|
||||
AUX calculate-update-3.1.1_alpha1-r1.patch 618 SHA256 c0cb0c41a01602fea0dd05981abcad310dbdeabf4fe92d2134f70cf38be92f80 SHA512 6490fcbfe58122f199ea9be593baa88632c0eb7ac431589c5263514f305b59238391284772d9967ea048c1db3bdea309bf57772dd7be9bac7e7c083eebe7243d WHIRLPOOL 5f090b031dd48db1b5314006d7547e8747fada181e4f7eb11c8e47d1a34c072ffd86b44c86f15a19d95567f3e8f467276902679b62886d9c010f79fb2f36bbdc
|
||||
AUX calculate-update-3.1.1_alpha1-r2.patch 618 SHA256 c0cb0c41a01602fea0dd05981abcad310dbdeabf4fe92d2134f70cf38be92f80 SHA512 6490fcbfe58122f199ea9be593baa88632c0eb7ac431589c5263514f305b59238391284772d9967ea048c1db3bdea309bf57772dd7be9bac7e7c083eebe7243d WHIRLPOOL 5f090b031dd48db1b5314006d7547e8747fada181e4f7eb11c8e47d1a34c072ffd86b44c86f15a19d95567f3e8f467276902679b62886d9c010f79fb2f36bbdc
|
||||
AUX calculate-update-3.1.1_alpha2-r1.patch 517 SHA256 aaa1667dd1a62628d4034a7736415bfd48afac330a9a28f58881f2c1254e460e SHA512 faa36e2d68c47f4291cf26630aebb1f5c2d14a43bb6ebf26f49d61bb95311d2f38d4236bf25f82ae123b4ef076edcd20067067d8cf0e93e81bd5a47e00c65a54 WHIRLPOOL abac0ddf34f09828832457f1102136f7bb9460bcbf0f37d8fba20adff4d20bbc626545bfa557e450d6b1fe995d2ea94cf841bf007745dbc9512f04ff8a40c7a5
|
||||
AUX calculate-update-3.1.1_alpha2-r2.patch 1456 SHA256 1b939d15006b1354713d9acdab42ab1600c44c82132937257687d4eaa9aaea1f SHA512 01106d1bd4c1c40e62089ffec552af7be800bced006d22e84596c4e953be073b06b64ddb1e2e2bced10352c564cc12206653d59fd361b2a667fb8a45f7ddca69 WHIRLPOOL 865ad110b9e20298fd8df27c8ad54f7500f88998e955b9d33e6aae84c1504420392a95bd3d2a25e826521e2c75d3ce41c40ac1e14aa803cbcc3de8679e33ada3
|
||||
DIST calculate-update-3.1.1_alpha1.tar.bz2 6862 SHA256 2919eff63d2c0dcacd9012a27be2b513a3d610154087840e18840b5118b8899a SHA512 361612066cbf8dd09c40dcd76b3098890442b3e65887fe9c95951cc8c54282e24ad13ee65d6c7f074dab6afef9d7f359a4c4459b2beec3d82970e5d344254d84 WHIRLPOOL 90e536ace678c2f5e11aa464941e2897611aa71c848c19e80956095b87b393d44599cdd7a95faac2edc7c95feb790012bd4e866f51eb5ccf24eeb51c6fff9937
|
||||
DIST calculate-update-3.1.1_alpha2.tar.bz2 6859 SHA256 99c8593dc5a0e7fe7cb317ebaae93704d56f728fa6d689ca998ded0146e8ff23 SHA512 b2a9fc1c9f41601dbc407786ddb4b46ea1bfd0f1a25eb7eb22b86f8176187c3a5f059d1305574d725059e2903ffa37fd9ad876f6f54e448dc337e1d578485f72 WHIRLPOOL e86f6b1f89c01db2a46701fb7e7e0dcc5e8e29b548adc117c45dfd5b106f6054957b064a86da9beb66c38f3bc4054798266af2d316843d4c3047e098dc7ea487
|
||||
EBUILD calculate-update-3.1.1_alpha1-r1.ebuild 695 SHA256 931e8ce6f0cc5207e1b0d03ccc97e4cfa147c7928b8550bdd09f46f34df05076 SHA512 e37d6af5b18e3378645a86c51d50e686c9f000e1845e40799d62fba032d357599800b0475a035d1ef3996e6bfb2ab026f4596c9604e6c38bf299662ea4e93a90 WHIRLPOOL 95bb0da3deeb990865ba9e4a91cf1d99f7ebd27ad7524678e4c1765fc454cae7b13364e9d4f5ceced509fd07e8856bbf529391e26f0023efab6f38eff053b4e2
|
||||
EBUILD calculate-update-3.1.1_alpha1-r2.ebuild 552 SHA256 b6b59aa56455d808e4ffe81848a9323cb1b54b44aee84852a566129f980c93bd SHA512 20f8fefe66e3f78ac04fcb4ceab1a4f117d8fa3c929be32ed2fea609c85e00614b7ca7410700018d85cf9b71d3fa5cf43abcd5e4598dbfe398300d77184b8f84 WHIRLPOOL 01d62b1bdc8e2556f4983b221e9fd6fcc1ef8148eb78b512741d02049c9c8644c291578495b5719bfc3e199cf24b884b0eafabc37fe370a744d1666fd0d9e3e9
|
||||
EBUILD calculate-update-3.1.1_alpha1.ebuild 552 SHA256 1dca36fe27b9663848f82d88d8184b3e6a45d6dc3bd9d6ad624716895a2e1f83 SHA512 c4c8a7581198242d95f5997db116526a50cc7c87e70a0acc83978a871ead28cedee76f3cc6d3b4fb6b2aa983d64adbbe3aa373b61c47d907485a40d4b6806119 WHIRLPOOL 48da369410fed49486738225bf9453e97b18135ace67260ef12509ff972db21b750bdc3f544c515d1853e646d473296681e6b18c7f914067aa2f354cb6da4e3b
|
||||
EBUILD calculate-update-3.1.1_alpha2-r1.ebuild 695 SHA256 2fab43b2c30c857cf5d7786661f111bb78f36577a55558fa23e63d35de877cc7 SHA512 6a511a8bb4f0b171b26f8c303e0c69a417cd0e205a72db92f9a8b36f13a22e72e40333f2360643ad1840338e77509093b9a26643747b2bfd7500c8f577fca9c7 WHIRLPOOL f366ef88b08816f1b55bb7245782e4569bb89eff0d8393523ba6f8d50bfe8c479ca95e8199a1cbd6c2e828963e0c85ec8895413eb0d038f5e59fbed9b21bdf8d
|
||||
EBUILD calculate-update-3.1.1_alpha2-r2.ebuild 695 SHA256 c3882d25978764e6d302a59fa9807765e333ec48325817b1fc0fbd2d57cbe44a SHA512 4ae571441735f32ce3784d2a30381213e6fcc50b04f4fc3f821d0fa84f4fa957fea07c18416eb25a48bbb664ac93031a8f190a1257929fcccd0673246bc76117 WHIRLPOOL d6342b9a0096d1063e6b96762f31b116f50ca78450c7147be13a7673a50cc1eff31f3440d7e681c4fd94e9a73fb5fdbd6d1f531ff40d8813d4b16d9e392a4b31
|
||||
EBUILD calculate-update-3.1.1_alpha2.ebuild 552 SHA256 b6b59aa56455d808e4ffe81848a9323cb1b54b44aee84852a566129f980c93bd SHA512 20f8fefe66e3f78ac04fcb4ceab1a4f117d8fa3c929be32ed2fea609c85e00614b7ca7410700018d85cf9b71d3fa5cf43abcd5e4598dbfe398300d77184b8f84 WHIRLPOOL 01d62b1bdc8e2556f4983b221e9fd6fcc1ef8148eb78b512741d02049c9c8644c291578495b5719bfc3e199cf24b884b0eafabc37fe370a744d1666fd0d9e3e9
|
||||
EBUILD calculate-update-3.1.9999.ebuild 530 SHA256 f014911ae52c1eadd9615ab1a2c930eb79aab49f509260bd6573eb3985ce2ec8 SHA512 3523efdb19b9646a0d1dba6d6a4664393d07f9aa666392d355b4596cb1bca8cd80a62bbd7f6db7029c1173ebb2a16e9cf168cea1d7f2c051ba8838c86c234454 WHIRLPOOL a394a23a0277b40cc2e7242b08750638434c3b6bf0f340fec923f90e738618b1cc0e223e327484f95d24f7637e8bebec6dff4b6385b731376f6f8cc8897caf79
|
||||
MISC metadata.xml 288 SHA256 9ea2bfebe4ac64765041ad92dda5b8f22f5597a4e560458f98996b00b0393b8a SHA512 88886b3e137bcf7038cc4985b786523dfac1c127aff84ad682b919d92b2c51b0b8d8f97ff60e7239a2ef49ec40fb5dcc41a59cb428ed346f1e44044ecd75b698 WHIRLPOOL d4eb5ba4901e10fe9cf440c63a8a9a59b5e6620004306eec3cd162cf902a89510460774a8c407816bf15033062dc8f96a334e7f873801bc6bcd73edeb833f36b
|
||||
|
||||
@ -0,0 +1,30 @@
|
||||
# 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 program of update Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS=""
|
||||
IUSE=""
|
||||
|
||||
DEPEND="~sys-apps/calculate-core-3.1.1_alpha2"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-update-3.1.1_alpha2-r2.patch"
|
||||
}
|
||||
@ -0,0 +1,35 @@
|
||||
diff --git update/cl_update.py update/cl_update.py
|
||||
index f6f83a6..67ec6cb 100644
|
||||
--- update/cl_update.py
|
||||
+++ update/cl_update.py
|
||||
@@ -55,13 +55,15 @@ class Update:
|
||||
self.closeClTemplate()
|
||||
self.clVars.Set("cl_chroot_path","/", True)
|
||||
self.clTempl = ProgressTemplate(self.setProgress,self.clVars,
|
||||
- cltObj=False)
|
||||
+ cltObj=False,
|
||||
+ printSUCCESS=self.printSUCCESS,
|
||||
+ printWARNING=self.printWARNING,
|
||||
+ printERROR=self.printERROR)
|
||||
dirsFiles = self.clTempl.applyTemplates()
|
||||
if self.clTempl.getError():
|
||||
self.printERROR(self.clTempl.getError().strip())
|
||||
return False
|
||||
else:
|
||||
- print dirsFiles
|
||||
return dirsFiles
|
||||
|
||||
def initVars(self,datavars=None):
|
||||
diff --git update/cl_wsdl_update.py update/cl_wsdl_update.py
|
||||
index 784dcff..c3b4a13 100644
|
||||
--- update/cl_wsdl_update.py
|
||||
+++ update/cl_wsdl_update.py
|
||||
@@ -53,7 +53,7 @@ class Wsdl:
|
||||
"""
|
||||
@rpc(Integer, UpdateInfo, _returns = Array(ReturnedMessage))
|
||||
@core_method(category=__('Update'),title=__('Update world'),
|
||||
- image='preferences-desktop',
|
||||
+ image='software-properties,preferences-desktop',
|
||||
gui=True,command='cl-update',
|
||||
rights=['update'])
|
||||
def update(self, sid, info):
|
||||
@ -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-r7
|
||||
=sys-apps/calculate-core-3.1.1_alpha2-r1
|
||||
=sys-apps/calculate-update-3.1.1_alpha2-r2
|
||||
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…
Reference in new issue