parent
667e77bef6
commit
5c099342ef
@ -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="x86 amd64"
|
||||
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_beta2-r2.patch"
|
||||
}
|
@ -0,0 +1,73 @@
|
||||
diff --git calculate/lib/cl_template.py calculate/lib/cl_template.py
|
||||
index 55527cd..1da632a 100644
|
||||
--- calculate/lib/cl_template.py
|
||||
+++ calculate/lib/cl_template.py
|
||||
@@ -4039,6 +4039,12 @@ gettext -d cl_template "$*"
|
||||
"""
|
||||
return True
|
||||
|
||||
+ def templateModify(self,filesApl):
|
||||
+ """
|
||||
+ Files which created by apping templates
|
||||
+ """
|
||||
+ return True
|
||||
+
|
||||
def fixNameFileConfig(self,origfilename):
|
||||
"""Support ._cfg0000 files for postinst"""
|
||||
if self.objVar.Get('cl_ebuild_phase') != 'postinst':
|
||||
@@ -4229,6 +4235,8 @@ gettext -d cl_template "$*"
|
||||
self.cltObj.numberProcessTempl = self.allTemplates
|
||||
# метод показывающий номер clt шаблона
|
||||
self.cltObj.numberProcessTemplates = self.numberProcessTemplates
|
||||
+ # метод показывающий номер clt шаблона
|
||||
+ self.cltObj.templateModify = self.templateModify
|
||||
# общее количество шаблонов
|
||||
self.allTemplates += self.cltObj.allTemplates
|
||||
self.cltObj.allTemplates = self.allTemplates
|
||||
@@ -4399,6 +4407,7 @@ gettext -d cl_template "$*"
|
||||
nameEnvFile = os.path.basename(nameFileConfig)
|
||||
self.functObj.timeConfigsIni[nameEnvFile] = float(time.time())
|
||||
self.filesApply += filesApl
|
||||
+ self.templateModify(filesApl)
|
||||
if filesApl:
|
||||
self._addFile(filesApl)
|
||||
return True
|
||||
@@ -5693,6 +5702,7 @@ class templateClt(scanDirectoryClt, Template):
|
||||
nameEnvFile = os.path.basename(nameFileConfig)
|
||||
self.functObj.timeConfigsIni[nameEnvFile] = float(time.time())
|
||||
self.filesApply += filesApl
|
||||
+ self.templateModify(filesApl)
|
||||
return nameFileConfig
|
||||
else:
|
||||
return True
|
||||
@@ -6109,6 +6119,7 @@ class ProgressTemplate(Template):
|
||||
Template.__init__(self, *args, **kwargs)
|
||||
self.setValueCallback = setValueCallback
|
||||
self.value = None
|
||||
+ self.firstValue = True
|
||||
|
||||
def numberAllTemplates(self, number):
|
||||
self.maximum = number
|
||||
@@ -6121,3 +6132,8 @@ class ProgressTemplate(Template):
|
||||
self.setValueCallback(min(100,max(0,value)))
|
||||
self.value = value
|
||||
return True
|
||||
+
|
||||
+ def templateModify(self,filesApl):
|
||||
+ if self.firstValue and hasattr(self,"onFirstValue"):
|
||||
+ self.onFirstValue()
|
||||
+ self.firstValue = False
|
||||
diff --git calculate/lib/variables/hardware.py calculate/lib/variables/hardware.py
|
||||
index d2f4111..2fe6b9d 100644
|
||||
--- calculate/lib/variables/hardware.py
|
||||
+++ calculate/lib/variables/hardware.py
|
||||
@@ -94,7 +94,8 @@ class VariableHrLaptop(ReadonlyVariable):
|
||||
boardVendor = '/sys/class/dmi/id/board_vendor'
|
||||
notebookChassis = ['1','8','10']
|
||||
if readFile(chassisType).strip() in notebookChassis:
|
||||
- return readFile(boardVendor).strip().split(" ")[0] or "unknown"
|
||||
+ return (readFile(boardVendor).strip().split(" ")[0]).lower() or \
|
||||
+ "unknown"
|
||||
return ""
|
||||
|
||||
class VariableHrLaptopModel(ReadonlyVariable):
|
@ -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.1_beta2-r4
|
||||
=sys-apps/calculate-i18n-3.1.1_beta2
|
||||
=sys-apps/calculate-lib-3.1.1_beta2-r2
|
||||
=sys-apps/calculate-core-3.1.1_beta2-r3
|
||||
=sys-apps/calculate-update-3.1.1_beta2
|
||||
cl_client? ( =sys-apps/calculate-client-3.1.1_beta2 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-3.1.1_beta2 )
|
||||
cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.1_beta2 )
|
||||
cl_console? ( =sys-apps/calculate-console-3.1.1_beta2 )
|
||||
"
|
Loading…
Reference in new issue