parent
1aaf078ff2
commit
37b8d6e0fc
@ -0,0 +1,51 @@
|
||||
# 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="amd64 x86"
|
||||
IUSE="minimal"
|
||||
|
||||
DEPEND="~sys-apps/calculate-lib-3.1.7
|
||||
>=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
|
||||
dosym /usr/sbin/cl-core /usr/sbin/cl-core-patch
|
||||
}
|
||||
|
||||
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.7-r2.patch"
|
||||
}
|
@ -0,0 +1,51 @@
|
||||
diff --git core/server/func.py core/server/func.py
|
||||
index fdee9d5..be7c323 100644
|
||||
--- core/server/func.py
|
||||
+++ core/server/func.py
|
||||
@@ -1659,7 +1659,7 @@ class WsdlBase:
|
||||
def clearDataVars(func):
|
||||
def wrapper(*args,**kwargs):
|
||||
try:
|
||||
- func(*args,**kwargs)
|
||||
+ return func(*args,**kwargs)
|
||||
finally:
|
||||
WsdlMeta.closeDataVars()
|
||||
return wrapper
|
||||
diff --git core/utils/cl_core_setup.py core/utils/cl_core_setup.py
|
||||
index 7d84869..117dfa3 100644
|
||||
--- core/utils/cl_core_setup.py
|
||||
+++ core/utils/cl_core_setup.py
|
||||
@@ -66,6 +66,7 @@ class ClCoreSetupAction(Action):
|
||||
'cl_template_path_use,cl_ebuild_phase,'
|
||||
'cl_template_clt_set)',
|
||||
'condition':lambda dv:(dv.Get('cl_core_pkg_desktop_set') == 'on' and
|
||||
+ dv.isModuleInstalled('desktop') and
|
||||
not dv.Get('cl_ebuild_phase') in ("preinst","prerm"))
|
||||
}
|
||||
]
|
||||
diff --git core/utils/cl_core_variables.py core/utils/cl_core_variables.py
|
||||
index 38c3dfd..d0c5ef3 100644
|
||||
--- core/utils/cl_core_variables.py
|
||||
+++ core/utils/cl_core_variables.py
|
||||
@@ -31,7 +31,7 @@ class ClCoreVariables(Action):
|
||||
native_error = (FilesError,DataVarsError,VariableError)
|
||||
successMessage = None
|
||||
failedMessage = None
|
||||
- interruptMessage = __("Setting manually interrupted")
|
||||
+ interruptMessage = __("Variables modification manually interrupted")
|
||||
|
||||
tasks = [
|
||||
{'name':'write_vars',
|
||||
diff --git core/variables/certificate.py core/variables/certificate.py
|
||||
index a9efbb5..4511ff6 100644
|
||||
--- core/variables/certificate.py
|
||||
+++ core/variables/certificate.py
|
||||
@@ -165,7 +165,7 @@ class VariableClCertPerms(Variable):
|
||||
return results
|
||||
|
||||
def uncompatible(self):
|
||||
- return _('You can not change the certificate certificate')
|
||||
+ return _('You can not change the certificate permissions')
|
||||
|
||||
class VariableClCertGroups(Variable):
|
||||
"""
|
@ -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.1.7-r1
|
||||
=sys-apps/calculate-i18n-3.1.7
|
||||
=sys-apps/calculate-lib-3.1.7
|
||||
=sys-apps/calculate-core-3.1.7-r2
|
||||
=sys-apps/calculate-update-3.1.7
|
||||
cl_client? ( =sys-apps/calculate-client-3.1.7-r1 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-3.1.7-r1 )
|
||||
cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.7 )
|
||||
cl_console? ( =sys-apps/calculate-console-3.1.7 )
|
||||
"
|
Loading…
Reference in new issue