parent
3ee5671558
commit
6979978116
@ -0,0 +1,38 @@
|
||||
# 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="amd64 x86"
|
||||
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}"
|
||||
|
||||
# accelerate apply templates on pkg_preinst
|
||||
epatch "${FILESDIR}/calculate-lib-3.0.1-accelerate_package_configure.patch"
|
||||
# fix posible infinite recursion
|
||||
epatch "${FILESDIR}/calculate-lib-3.0.1-fix_invalidate_recursion.patch"
|
||||
}
|
||||
@ -0,0 +1,36 @@
|
||||
diff --git a/calculate/lib/datavars.py b/calculate/lib/datavars.py
|
||||
index 835b649..c84e3af 100644
|
||||
--- a/calculate/lib/datavars.py
|
||||
+++ b/calculate/lib/datavars.py
|
||||
@@ -391,15 +391,22 @@ class Variable:
|
||||
force : boolean=False
|
||||
Drop value also for after manual set
|
||||
"""
|
||||
- if force or not self.wasSet:
|
||||
- self.wasSet = False
|
||||
- self.invalid = True
|
||||
- for var in self.reqVars:
|
||||
- var.invalidate()
|
||||
- for var in self.reqCheck:
|
||||
- var.untrusted = True
|
||||
- self.reqVars = []
|
||||
- self.reqCheck = []
|
||||
+ # fix possible infinite recursion on invalidating
|
||||
+ if not self.processInvalidate and (force or not self.wasSet):
|
||||
+ try:
|
||||
+ # mark variable that in invalidation now
|
||||
+ self.processInvalidate = True
|
||||
+ self.wasSet = False
|
||||
+ self.invalid = True
|
||||
+ for var in self.reqVars:
|
||||
+ var.invalidate()
|
||||
+ for var in self.reqCheck:
|
||||
+ var.untrusted = True
|
||||
+ self.reqVars = []
|
||||
+ self.reqCheck = []
|
||||
+ finally:
|
||||
+ # unmark process invalidate
|
||||
+ self.processInvalidate = False
|
||||
|
||||
@classmethod
|
||||
def isTrue(self,value):
|
||||
@ -0,0 +1,24 @@
|
||||
# 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_console"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
=sys-apps/calculate-install-3.0.1-r3
|
||||
=sys-apps/calculate-i18n-3.0.1
|
||||
=sys-apps/calculate-lib-3.0.1-r2
|
||||
=sys-apps/calculate-core-3.0.1
|
||||
cl_consolegui? ( =sys-apps/calculate-console-gui-3.0.1 )
|
||||
cl_console? ( =sys-apps/calculate-console-3.0.1 )
|
||||
"
|
||||
|
||||
Loading…
Reference in new issue