parent
81043e1123
commit
d0a84f50bc
@ -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-r3.patch"
|
||||
}
|
||||
@ -0,0 +1,70 @@
|
||||
diff --git update/cl_update.py update/cl_update.py
|
||||
index f6f83a6..cc9f362 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):
|
||||
@@ -90,4 +92,3 @@ class Update:
|
||||
"""
|
||||
self.initVars(datavars)
|
||||
return bool(self.applyTemplates())
|
||||
- return True
|
||||
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):
|
||||
diff --git update/variables/update.py update/variables/update.py
|
||||
index 33f3763..e8034d3 100644
|
||||
--- update/variables/update.py
|
||||
+++ update/variables/update.py
|
||||
@@ -39,17 +39,21 @@ class VariableClUpdateWorld(Variable):
|
||||
List of action update world, rebuild world,
|
||||
"""
|
||||
type = "choice"
|
||||
- opt = ["--world"]
|
||||
+ opt = ["--(action)-world"]
|
||||
value = ""
|
||||
syntax = "--{choice}-world"
|
||||
metavalue = 'ACTION'
|
||||
+ untrusted = True
|
||||
|
||||
def init(self):
|
||||
self.help = "'update' - " +_("update world file") + \
|
||||
",\n'rebuild' - "+ _("rebuild world file")
|
||||
- self.label = _("World")
|
||||
+ self.label = _("World action")
|
||||
+
|
||||
+ def check(self,value):
|
||||
+ if not value:
|
||||
+ raise VariableError(_("Select action with world"))
|
||||
|
||||
def choice(self):
|
||||
- return [("",_("None")),
|
||||
- ("update",_("Update world")),
|
||||
+ return [("update",_("Update world")),
|
||||
("rebuild","Rebuild world")]
|
||||
@ -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-r4
|
||||
=sys-apps/calculate-i18n-3.1.1_alpha2-r1
|
||||
=sys-apps/calculate-lib-3.1.1_alpha2-r12
|
||||
=sys-apps/calculate-core-3.1.1_alpha2-r3
|
||||
=sys-apps/calculate-update-3.1.1_alpha2-r3
|
||||
cl_client? ( =sys-apps/calculate-client-3.1.1_alpha2 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-3.1.1_alpha2-r2 )
|
||||
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