calculate
/
calculate-overlay
6
1
Fork 2
Code Issues Pull Requests 2 Releases Wiki Activity

Remove beta2

Browse Source
atratsevskiy
Хирецкий Михаил 12 years ago
parent 072053921f
commit fe64c99f46
83 changed files with 0 additions and 6653 deletions
Show Stats Download Patch File Download Diff File

30
sys-apps/calculate-client/calculate-client-3.1.1_beta2.ebuild
Unescape View File

@ -1,30 +0,0 @@
# 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 setting and storing the user account in the domain"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-desktop-3.1.1_beta2
!<sys-apps/calculate-client-3.1.0_alpha2
>=dev-python/python-ldap-2.0[ssl]
>=sys-auth/pam_ldap-180[ssl]
>=sys-auth/nss_ldap-239
>=sys-apps/keyexec-0.1.2
sys-apps/keyutils
sys-auth/pam_keystore
dev-lang/swig"
RDEPEND="${DEPEND}"

24
sys-apps/calculate-console-gui/calculate-console-gui-3.1.1_beta2.ebuild
Unescape View File

@ -1,24 +0,0 @@
# 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="Qt gui console client for WSDL Calculate 3"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-core-3.1.1_beta2
dev-python/dbus-python
dev-python/imaging
dev-python/pyside[script]"
RDEPEND="${DEPEND}"

21
sys-apps/calculate-console/calculate-console-3.1.1_beta2.ebuild
Unescape View File

@ -1,21 +0,0 @@
# 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="Console client for WSDL Calculate 3"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-core-3.1.1_beta2"
RDEPEND="${DEPEND}"

49
sys-apps/calculate-core/calculate-core-3.1.1_beta2-r1.ebuild
Unescape View File

@ -1,49 +0,0 @@
# 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.1_beta2
>=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_beta2-r1.patch"
}

49
sys-apps/calculate-core/calculate-core-3.1.1_beta2-r2.ebuild
Unescape View File

@ -1,49 +0,0 @@
# 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.1_beta2
>=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_beta2-r2.patch"
}

49
sys-apps/calculate-core/calculate-core-3.1.1_beta2-r3.ebuild
Unescape View File

@ -1,49 +0,0 @@
# 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.1_beta2
>=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_beta2-r3.patch"
}

49
sys-apps/calculate-core/calculate-core-3.1.1_beta2-r4.ebuild
Unescape View File

@ -1,49 +0,0 @@
# 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.1_beta2
>=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_beta2-r4.patch"
}

49
sys-apps/calculate-core/calculate-core-3.1.1_beta2-r5.ebuild
Unescape View File

@ -1,49 +0,0 @@
# 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.1_beta2
>=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_beta2-r5.patch"
}

49
sys-apps/calculate-core/calculate-core-3.1.1_beta2-r6.ebuild
Unescape View File

@ -1,49 +0,0 @@
# 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.1_beta2
>=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_beta2-r6.patch"
}

49
sys-apps/calculate-core/calculate-core-3.1.1_beta2-r7.ebuild
Unescape View File

@ -1,49 +0,0 @@
# 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.1_beta2
>=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_beta2-r7.patch"
}

49
sys-apps/calculate-core/calculate-core-3.1.1_beta2-r8.ebuild
Unescape View File

@ -1,49 +0,0 @@
# 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.1_beta2
>=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_beta2-r8.patch"
}

42
sys-apps/calculate-core/calculate-core-3.1.1_beta2.ebuild
Unescape View File

@ -1,42 +0,0 @@
# 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.1_beta2
>=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"
}

21
sys-apps/calculate-core/files/calculate-core-3.1.1_beta2-r1.patch
Unescape View File

@ -1,21 +0,0 @@
diff --git core/server/replace_class.py core/server/replace_class.py
index d476d06..e3dd65c 100644
--- core/server/replace_class.py
+++ core/server/replace_class.py
@@ -29,6 +29,7 @@ from methods_func import getErrorOnParam
from func import shortTraceback
from fcntl import ioctl
from array import array
+import threading
from calculate.lib.cl_print import color_print
from calculate.lib.datavars import VariableError
from calculate.lib.cl_lang import setLocalTranslate
@@ -40,6 +41,8 @@ class replaceClass():
def startprocess (self, sid, target=None, method=None, method_name=None, \
auto_delete=False, args_proc = {}):
""" start process """
+ curThread = threading.currentThread()
+ curThread.lang = os.environ["LANG"]
com = target(self.no_progress,self.gui_progress,self.gui_warning)
if hasattr (com.__class__.__bases__[1], '__init__'):
com.__class__.__bases__[1].__init__(com)

22
sys-apps/calculate-core/files/calculate-core-3.1.1_beta2-r2.patch
Unescape View File

@ -1,22 +0,0 @@
diff --git core/server/replace_class.py core/server/replace_class.py
index d476d06..392e29c 100644
--- core/server/replace_class.py
+++ core/server/replace_class.py
@@ -29,6 +29,7 @@ from methods_func import getErrorOnParam
from func import shortTraceback
from fcntl import ioctl
from array import array
+import threading
from calculate.lib.cl_print import color_print
from calculate.lib.datavars import VariableError
from calculate.lib.cl_lang import setLocalTranslate
@@ -40,6 +41,9 @@ class replaceClass():
def startprocess (self, sid, target=None, method=None, method_name=None, \
auto_delete=False, args_proc = {}):
""" start process """
+ if "LANG" in os.environ:
+ curThread = threading.currentThread()
+ curThread.lang = os.environ["LANG"]
com = target(self.no_progress,self.gui_progress,self.gui_warning)
if hasattr (com.__class__.__bases__[1], '__init__'):
com.__class__.__bases__[1].__init__(com)

111
sys-apps/calculate-core/files/calculate-core-3.1.1_beta2-r3.patch
Unescape View File

@ -1,111 +0,0 @@
diff --git core/server/replace_class.py core/server/replace_class.py
index d476d06..392e29c 100644
--- core/server/replace_class.py
+++ core/server/replace_class.py
@@ -29,6 +29,7 @@ from methods_func import getErrorOnParam
from func import shortTraceback
from fcntl import ioctl
from array import array
+import threading
from calculate.lib.cl_print import color_print
from calculate.lib.datavars import VariableError
from calculate.lib.cl_lang import setLocalTranslate
@@ -40,6 +41,9 @@ class replaceClass():
def startprocess (self, sid, target=None, method=None, method_name=None, \
auto_delete=False, args_proc = {}):
""" start process """
+ if "LANG" in os.environ:
+ curThread = threading.currentThread()
+ curThread.lang = os.environ["LANG"]
com = target(self.no_progress,self.gui_progress,self.gui_warning)
if hasattr (com.__class__.__bases__[1], '__init__'):
com.__class__.__bases__[1].__init__(com)
diff --git core/server/setup_package.py core/server/setup_package.py
index cb9838e..6b48b73 100644
--- core/server/setup_package.py
+++ core/server/setup_package.py
@@ -177,10 +177,7 @@ class updateUserConfigs(shareUpdateConfigs):
dictPakkages = {}
listIndex = []
mergeProgram = "calculate-utilities"
- self.startTask(_("Users configuring the {nameProgram} package by "
- "Calculate utilities").format(
- nameProgram=nameProgram),
- progress=True)
+ firstValue = True
for userName in xUsers:
clVars.Set("cl_root_path", '/', True)
clVars.Set("ur_login", userName, True)
@@ -199,7 +196,15 @@ class updateUserConfigs(shareUpdateConfigs):
self.setProgress,
clVars, cltObj = False,
printWarning=False)
+ clTempl.onFirstValue = lambda *args: \
+ self.startTask(
+ _("User configuring the {nameProgram} package by "
+ "Calculate Utilities").format(
+ nameProgram=nameProgram),
+ progress=True)
+ clTempl.firstValue = firstValue
dirsFiles = clTempl.applyTemplates()
+ firstValue = clTempl.firstValue
if dirsFiles is False:
self.printERROR(\
_("Error using templates for the user %s")\
@@ -218,7 +223,7 @@ class updateUserConfigs(shareUpdateConfigs):
self.endTask()
if dictPakkages:
for calcPkg in listIndex:
- self.printSUCCESS(_("Calculate utilities have changed files")\
+ self.printSUCCESS(_("Calculate Utilities have changed files")\
+":")
for userName, configFiles in dictPakkages[calcPkg]:
self.printSUCCESS(" "*2 + _("User %s")%userName + ":")
@@ -346,16 +351,16 @@ class updateSystemConfigs(shareUpdateConfigs):
clTempl = False
#for mergeProgram in filter(None,mergePrograms):
mergeProgram = "calculate-utilities"
- if variables.Get('cl_ebuild_phase') == "preinst":
- self.startTask(_("Package configuring the {nameProgram} package by "
- "Calculate utilities").format(
- nameProgram=nameProgram),
- progress=True)
- else:
- self.startTask(_("System configuring for {nameProgram} package by "
- "Calculate utilities").format(
- nameProgram=nameProgram),
- progress=True)
+ #if variables.Get('cl_ebuild_phase') == "preinst":
+ # self.startTask(_("Package configuring the {nameProgram} package by "
+ # "Calculate Utilities").format(
+ # nameProgram=nameProgram),
+ # progress=True)
+ #else:
+ # self.startTask(_("System configuring for {nameProgram} package by "
+ # "Calculate Utilities").format(
+ # nameProgram=nameProgram),
+ # progress=True)
clVars.Set("cl_root_path", configPath, True)
if variables.Get('cl_core_pkg_root_set') == 'on':
clVars.Set("cl_root_path_next", '/', True)
@@ -390,6 +395,11 @@ class updateSystemConfigs(shareUpdateConfigs):
printERROR=self.printERROR,
printWARNING=self.printWARNING,
printWarning=False)
+ clTempl.onFirstValue = lambda *args: \
+ self.startTask(_("System configuring for {nameProgram} package by "
+ "Calculate Utilities").format(
+ nameProgram=nameProgram),
+ progress=True)
dirsFiles = clTempl.applyTemplates()
# fix CONTENTS pkg file
cfgs = getCfgFiles()
@@ -454,7 +464,7 @@ class updateSystemConfigs(shareUpdateConfigs):
if dictPakkages:
reGrey = re.compile(r"\._cfg\d{4}_")
for calcPkg in listIndex:
- self.SUCCESS(_("Calculate utilities have changed files")+":")
+ self.SUCCESS(_("Calculate Utilities have changed files")+":")
for nameF in dictPakkages[calcPkg]:
nameFile = nameF.partition(configPath)[2]
if nameFile:

121
sys-apps/calculate-core/files/calculate-core-3.1.1_beta2-r4.patch
Unescape View File

@ -1,121 +0,0 @@
diff --git core/server/replace_class.py core/server/replace_class.py
index d476d06..5a41c08 100644
--- core/server/replace_class.py
+++ core/server/replace_class.py
@@ -29,6 +29,7 @@ from methods_func import getErrorOnParam
from func import shortTraceback
from fcntl import ioctl
from array import array
+import threading
from calculate.lib.cl_print import color_print
from calculate.lib.datavars import VariableError
from calculate.lib.cl_lang import setLocalTranslate
@@ -40,6 +41,9 @@ class replaceClass():
def startprocess (self, sid, target=None, method=None, method_name=None, \
auto_delete=False, args_proc = {}):
""" start process """
+ if "LANG" in os.environ:
+ curThread = threading.currentThread()
+ curThread.lang = os.environ["LANG"]
com = target(self.no_progress,self.gui_progress,self.gui_warning)
if hasattr (com.__class__.__bases__[1], '__init__'):
com.__class__.__bases__[1].__init__(com)
@@ -433,6 +437,9 @@ def call_method(metaObject, args, unknown_args, colorPrint):
if i in parse(True).parse_known_args()[1]:
_print (_('Unknown parameter'), i)
return 1
+ else:
+ _print (_('Unknown argument'), i)
+ return 1
param_object, steps = collect_object(None, param_object, view, args,
stdin_passwd=stdin_passwd)
diff --git core/server/setup_package.py core/server/setup_package.py
index cb9838e..6b48b73 100644
--- core/server/setup_package.py
+++ core/server/setup_package.py
@@ -177,10 +177,7 @@ class updateUserConfigs(shareUpdateConfigs):
dictPakkages = {}
listIndex = []
mergeProgram = "calculate-utilities"
- self.startTask(_("Users configuring the {nameProgram} package by "
- "Calculate utilities").format(
- nameProgram=nameProgram),
- progress=True)
+ firstValue = True
for userName in xUsers:
clVars.Set("cl_root_path", '/', True)
clVars.Set("ur_login", userName, True)
@@ -199,7 +196,15 @@ class updateUserConfigs(shareUpdateConfigs):
self.setProgress,
clVars, cltObj = False,
printWarning=False)
+ clTempl.onFirstValue = lambda *args: \
+ self.startTask(
+ _("User configuring the {nameProgram} package by "
+ "Calculate Utilities").format(
+ nameProgram=nameProgram),
+ progress=True)
+ clTempl.firstValue = firstValue
dirsFiles = clTempl.applyTemplates()
+ firstValue = clTempl.firstValue
if dirsFiles is False:
self.printERROR(\
_("Error using templates for the user %s")\
@@ -218,7 +223,7 @@ class updateUserConfigs(shareUpdateConfigs):
self.endTask()
if dictPakkages:
for calcPkg in listIndex:
- self.printSUCCESS(_("Calculate utilities have changed files")\
+ self.printSUCCESS(_("Calculate Utilities have changed files")\
+":")
for userName, configFiles in dictPakkages[calcPkg]:
self.printSUCCESS(" "*2 + _("User %s")%userName + ":")
@@ -346,16 +351,16 @@ class updateSystemConfigs(shareUpdateConfigs):
clTempl = False
#for mergeProgram in filter(None,mergePrograms):
mergeProgram = "calculate-utilities"
- if variables.Get('cl_ebuild_phase') == "preinst":
- self.startTask(_("Package configuring the {nameProgram} package by "
- "Calculate utilities").format(
- nameProgram=nameProgram),
- progress=True)
- else:
- self.startTask(_("System configuring for {nameProgram} package by "
- "Calculate utilities").format(
- nameProgram=nameProgram),
- progress=True)
+ #if variables.Get('cl_ebuild_phase') == "preinst":
+ # self.startTask(_("Package configuring the {nameProgram} package by "
+ # "Calculate Utilities").format(
+ # nameProgram=nameProgram),
+ # progress=True)
+ #else:
+ # self.startTask(_("System configuring for {nameProgram} package by "
+ # "Calculate Utilities").format(
+ # nameProgram=nameProgram),
+ # progress=True)
clVars.Set("cl_root_path", configPath, True)
if variables.Get('cl_core_pkg_root_set') == 'on':
clVars.Set("cl_root_path_next", '/', True)
@@ -390,6 +395,11 @@ class updateSystemConfigs(shareUpdateConfigs):
printERROR=self.printERROR,
printWARNING=self.printWARNING,
printWarning=False)
+ clTempl.onFirstValue = lambda *args: \
+ self.startTask(_("System configuring for {nameProgram} package by "
+ "Calculate Utilities").format(
+ nameProgram=nameProgram),
+ progress=True)
dirsFiles = clTempl.applyTemplates()
# fix CONTENTS pkg file
cfgs = getCfgFiles()
@@ -454,7 +464,7 @@ class updateSystemConfigs(shareUpdateConfigs):
if dictPakkages:
reGrey = re.compile(r"\._cfg\d{4}_")
for calcPkg in listIndex:
- self.SUCCESS(_("Calculate utilities have changed files")+":")
+ self.SUCCESS(_("Calculate Utilities have changed files")+":")
for nameF in dictPakkages[calcPkg]:
nameFile = nameF.partition(configPath)[2]
if nameFile:

134
sys-apps/calculate-core/files/calculate-core-3.1.1_beta2-r5.patch
Unescape View File

@ -1,134 +0,0 @@
diff --git core/server/replace_class.py core/server/replace_class.py
index d476d06..5a41c08 100644
--- core/server/replace_class.py
+++ core/server/replace_class.py
@@ -29,6 +29,7 @@ from methods_func import getErrorOnParam
from func import shortTraceback
from fcntl import ioctl
from array import array
+import threading
from calculate.lib.cl_print import color_print
from calculate.lib.datavars import VariableError
from calculate.lib.cl_lang import setLocalTranslate
@@ -40,6 +41,9 @@ class replaceClass():
def startprocess (self, sid, target=None, method=None, method_name=None, \
auto_delete=False, args_proc = {}):
""" start process """
+ if "LANG" in os.environ:
+ curThread = threading.currentThread()
+ curThread.lang = os.environ["LANG"]
com = target(self.no_progress,self.gui_progress,self.gui_warning)
if hasattr (com.__class__.__bases__[1], '__init__'):
com.__class__.__bases__[1].__init__(com)
@@ -433,6 +437,9 @@ def call_method(metaObject, args, unknown_args, colorPrint):
if i in parse(True).parse_known_args()[1]:
_print (_('Unknown parameter'), i)
return 1
+ else:
+ _print (_('Unknown argument'), i)
+ return 1
param_object, steps = collect_object(None, param_object, view, args,
stdin_passwd=stdin_passwd)
diff --git core/server/setup_package.py core/server/setup_package.py
index cb9838e..6b48b73 100644
--- core/server/setup_package.py
+++ core/server/setup_package.py
@@ -177,10 +177,7 @@ class updateUserConfigs(shareUpdateConfigs):
dictPakkages = {}
listIndex = []
mergeProgram = "calculate-utilities"
- self.startTask(_("Users configuring the {nameProgram} package by "
- "Calculate utilities").format(
- nameProgram=nameProgram),
- progress=True)
+ firstValue = True
for userName in xUsers:
clVars.Set("cl_root_path", '/', True)
clVars.Set("ur_login", userName, True)
@@ -199,7 +196,15 @@ class updateUserConfigs(shareUpdateConfigs):
self.setProgress,
clVars, cltObj = False,
printWarning=False)
+ clTempl.onFirstValue = lambda *args: \
+ self.startTask(
+ _("User configuring the {nameProgram} package by "
+ "Calculate Utilities").format(
+ nameProgram=nameProgram),
+ progress=True)
+ clTempl.firstValue = firstValue
dirsFiles = clTempl.applyTemplates()
+ firstValue = clTempl.firstValue
if dirsFiles is False:
self.printERROR(\
_("Error using templates for the user %s")\
@@ -218,7 +223,7 @@ class updateUserConfigs(shareUpdateConfigs):
self.endTask()
if dictPakkages:
for calcPkg in listIndex:
- self.printSUCCESS(_("Calculate utilities have changed files")\
+ self.printSUCCESS(_("Calculate Utilities have changed files")\
+":")
for userName, configFiles in dictPakkages[calcPkg]:
self.printSUCCESS(" "*2 + _("User %s")%userName + ":")
@@ -346,16 +351,16 @@ class updateSystemConfigs(shareUpdateConfigs):
clTempl = False
#for mergeProgram in filter(None,mergePrograms):
mergeProgram = "calculate-utilities"
- if variables.Get('cl_ebuild_phase') == "preinst":
- self.startTask(_("Package configuring the {nameProgram} package by "
- "Calculate utilities").format(
- nameProgram=nameProgram),
- progress=True)
- else:
- self.startTask(_("System configuring for {nameProgram} package by "
- "Calculate utilities").format(
- nameProgram=nameProgram),
- progress=True)
+ #if variables.Get('cl_ebuild_phase') == "preinst":
+ # self.startTask(_("Package configuring the {nameProgram} package by "
+ # "Calculate Utilities").format(
+ # nameProgram=nameProgram),
+ # progress=True)
+ #else:
+ # self.startTask(_("System configuring for {nameProgram} package by "
+ # "Calculate Utilities").format(
+ # nameProgram=nameProgram),
+ # progress=True)
clVars.Set("cl_root_path", configPath, True)
if variables.Get('cl_core_pkg_root_set') == 'on':
clVars.Set("cl_root_path_next", '/', True)
@@ -390,6 +395,11 @@ class updateSystemConfigs(shareUpdateConfigs):
printERROR=self.printERROR,
printWARNING=self.printWARNING,
printWarning=False)
+ clTempl.onFirstValue = lambda *args: \
+ self.startTask(_("System configuring for {nameProgram} package by "
+ "Calculate Utilities").format(
+ nameProgram=nameProgram),
+ progress=True)
dirsFiles = clTempl.applyTemplates()
# fix CONTENTS pkg file
cfgs = getCfgFiles()
@@ -454,7 +464,7 @@ class updateSystemConfigs(shareUpdateConfigs):
if dictPakkages:
reGrey = re.compile(r"\._cfg\d{4}_")
for calcPkg in listIndex:
- self.SUCCESS(_("Calculate utilities have changed files")+":")
+ self.SUCCESS(_("Calculate Utilities have changed files")+":")
for nameF in dictPakkages[calcPkg]:
nameFile = nameF.partition(configPath)[2]
if nameFile:
diff --git scripts/calculate-core scripts/calculate-core
index ef10337..4971d22 100644
--- scripts/calculate-core
+++ scripts/calculate-core
@@ -30,7 +30,7 @@ start() {
start-stop-daemon --background --start --quiet --pidfile /var/run/cl_core.pid \
--exec /usr/sbin/cl-core -- --pid-file /var/run/cl_core.pid --start
- for waiting in 0.1 0.2 0.5 1
+ for waiting in 0.1 0.2 0.5 1 2 4
do
[[ -f /var/run/cl_core.pid ]] && [[ -d /proc/`cat /var/run/cl_core.pid` ]] && break
sleep $waiting

143
sys-apps/calculate-core/files/calculate-core-3.1.1_beta2-r6.patch
Unescape View File

@ -1,143 +0,0 @@
diff --git core/server/replace_class.py core/server/replace_class.py
index d476d06..5a41c08 100644
--- core/server/replace_class.py
+++ core/server/replace_class.py
@@ -29,6 +29,7 @@ from methods_func import getErrorOnParam
from func import shortTraceback
from fcntl import ioctl
from array import array
+import threading
from calculate.lib.cl_print import color_print
from calculate.lib.datavars import VariableError
from calculate.lib.cl_lang import setLocalTranslate
@@ -40,6 +41,9 @@ class replaceClass():
def startprocess (self, sid, target=None, method=None, method_name=None, \
auto_delete=False, args_proc = {}):
""" start process """
+ if "LANG" in os.environ:
+ curThread = threading.currentThread()
+ curThread.lang = os.environ["LANG"]
com = target(self.no_progress,self.gui_progress,self.gui_warning)
if hasattr (com.__class__.__bases__[1], '__init__'):
com.__class__.__bases__[1].__init__(com)
@@ -433,6 +437,9 @@ def call_method(metaObject, args, unknown_args, colorPrint):
if i in parse(True).parse_known_args()[1]:
_print (_('Unknown parameter'), i)
return 1
+ else:
+ _print (_('Unknown argument'), i)
+ return 1
param_object, steps = collect_object(None, param_object, view, args,
stdin_passwd=stdin_passwd)
diff --git core/server/setup_package.py core/server/setup_package.py
index cb9838e..f768bac 100644
--- core/server/setup_package.py
+++ core/server/setup_package.py
@@ -104,6 +104,8 @@ class ChainProgressTemplate(cl_template.ProgressTemplate):
def changeMergePackage(self,packages):
self.endTask()
+ packages = filter(isPkgInstalled,
+ packages)
self.startTask(_("Configuring dependent packages: %s")%
",".join(packages),progress=True)
return True
@@ -177,10 +179,7 @@ class updateUserConfigs(shareUpdateConfigs):
dictPakkages = {}
listIndex = []
mergeProgram = "calculate-utilities"
- self.startTask(_("Users configuring the {nameProgram} package by "
- "Calculate utilities").format(
- nameProgram=nameProgram),
- progress=True)
+ firstValue = True
for userName in xUsers:
clVars.Set("cl_root_path", '/', True)
clVars.Set("ur_login", userName, True)
@@ -199,7 +198,15 @@ class updateUserConfigs(shareUpdateConfigs):
self.setProgress,
clVars, cltObj = False,
printWarning=False)
+ clTempl.onFirstValue = lambda *args: \
+ self.startTask(
+ _("User configuring the {nameProgram} package by "
+ "Calculate Utilities").format(
+ nameProgram=nameProgram),
+ progress=True)
+ clTempl.firstValue = firstValue
dirsFiles = clTempl.applyTemplates()
+ firstValue = clTempl.firstValue
if dirsFiles is False:
self.printERROR(\
_("Error using templates for the user %s")\
@@ -218,7 +225,7 @@ class updateUserConfigs(shareUpdateConfigs):
self.endTask()
if dictPakkages:
for calcPkg in listIndex:
- self.printSUCCESS(_("Calculate utilities have changed files")\
+ self.printSUCCESS(_("Calculate Utilities have changed files")\
+":")
for userName, configFiles in dictPakkages[calcPkg]:
self.printSUCCESS(" "*2 + _("User %s")%userName + ":")
@@ -346,16 +353,16 @@ class updateSystemConfigs(shareUpdateConfigs):
clTempl = False
#for mergeProgram in filter(None,mergePrograms):
mergeProgram = "calculate-utilities"
- if variables.Get('cl_ebuild_phase') == "preinst":
- self.startTask(_("Package configuring the {nameProgram} package by "
- "Calculate utilities").format(
- nameProgram=nameProgram),
- progress=True)
- else:
- self.startTask(_("System configuring for {nameProgram} package by "
- "Calculate utilities").format(
- nameProgram=nameProgram),
- progress=True)
+ #if variables.Get('cl_ebuild_phase') == "preinst":
+ # self.startTask(_("Package configuring the {nameProgram} package by "
+ # "Calculate Utilities").format(
+ # nameProgram=nameProgram),
+ # progress=True)
+ #else:
+ # self.startTask(_("System configuring for {nameProgram} package by "
+ # "Calculate Utilities").format(
+ # nameProgram=nameProgram),
+ # progress=True)
clVars.Set("cl_root_path", configPath, True)
if variables.Get('cl_core_pkg_root_set') == 'on':
clVars.Set("cl_root_path_next", '/', True)
@@ -390,6 +397,11 @@ class updateSystemConfigs(shareUpdateConfigs):
printERROR=self.printERROR,
printWARNING=self.printWARNING,
printWarning=False)
+ clTempl.onFirstValue = lambda *args: \
+ self.startTask(_("System configuring for {nameProgram} package by "
+ "Calculate Utilities").format(
+ nameProgram=nameProgram),
+ progress=True)
dirsFiles = clTempl.applyTemplates()
# fix CONTENTS pkg file
cfgs = getCfgFiles()
@@ -454,7 +466,7 @@ class updateSystemConfigs(shareUpdateConfigs):
if dictPakkages:
reGrey = re.compile(r"\._cfg\d{4}_")
for calcPkg in listIndex:
- self.SUCCESS(_("Calculate utilities have changed files")+":")
+ self.SUCCESS(_("Calculate Utilities have changed files")+":")
for nameF in dictPakkages[calcPkg]:
nameFile = nameF.partition(configPath)[2]
if nameFile:
diff --git scripts/calculate-core scripts/calculate-core
index ef10337..4971d22 100644
--- scripts/calculate-core
+++ scripts/calculate-core
@@ -30,7 +30,7 @@ start() {
start-stop-daemon --background --start --quiet --pidfile /var/run/cl_core.pid \
--exec /usr/sbin/cl-core -- --pid-file /var/run/cl_core.pid --start
- for waiting in 0.1 0.2 0.5 1
+ for waiting in 0.1 0.2 0.5 1 2 4
do
[[ -f /var/run/cl_core.pid ]] && [[ -d /proc/`cat /var/run/cl_core.pid` ]] && break
sleep $waiting

152
sys-apps/calculate-core/files/calculate-core-3.1.1_beta2-r7.patch
Unescape View File

@ -1,152 +0,0 @@
diff --git core/server/replace_class.py core/server/replace_class.py
index d476d06..5a41c08 100644
--- core/server/replace_class.py
+++ core/server/replace_class.py
@@ -29,6 +29,7 @@ from methods_func import getErrorOnParam
from func import shortTraceback
from fcntl import ioctl
from array import array
+import threading
from calculate.lib.cl_print import color_print
from calculate.lib.datavars import VariableError
from calculate.lib.cl_lang import setLocalTranslate
@@ -40,6 +41,9 @@ class replaceClass():
def startprocess (self, sid, target=None, method=None, method_name=None, \
auto_delete=False, args_proc = {}):
""" start process """
+ if "LANG" in os.environ:
+ curThread = threading.currentThread()
+ curThread.lang = os.environ["LANG"]
com = target(self.no_progress,self.gui_progress,self.gui_warning)
if hasattr (com.__class__.__bases__[1], '__init__'):
com.__class__.__bases__[1].__init__(com)
@@ -433,6 +437,9 @@ def call_method(metaObject, args, unknown_args, colorPrint):
if i in parse(True).parse_known_args()[1]:
_print (_('Unknown parameter'), i)
return 1
+ else:
+ _print (_('Unknown argument'), i)
+ return 1
param_object, steps = collect_object(None, param_object, view, args,
stdin_passwd=stdin_passwd)
diff --git core/server/setup_package.py core/server/setup_package.py
index cb9838e..d474ca8 100644
--- core/server/setup_package.py
+++ core/server/setup_package.py
@@ -104,6 +104,8 @@ class ChainProgressTemplate(cl_template.ProgressTemplate):
def changeMergePackage(self,packages):
self.endTask()
+ packages = filter(isPkgInstalled,
+ packages)
self.startTask(_("Configuring dependent packages: %s")%
",".join(packages),progress=True)
return True
@@ -177,10 +179,7 @@ class updateUserConfigs(shareUpdateConfigs):
dictPakkages = {}
listIndex = []
mergeProgram = "calculate-utilities"
- self.startTask(_("Users configuring the {nameProgram} package by "
- "Calculate utilities").format(
- nameProgram=nameProgram),
- progress=True)
+ firstValue = True
for userName in xUsers:
clVars.Set("cl_root_path", '/', True)
clVars.Set("ur_login", userName, True)
@@ -199,7 +198,15 @@ class updateUserConfigs(shareUpdateConfigs):
self.setProgress,
clVars, cltObj = False,
printWarning=False)
+ clTempl.onFirstValue = lambda *args: \
+ self.startTask(
+ _("User configuring the {nameProgram} package by "
+ "Calculate Utilities").format(
+ nameProgram=nameProgram),
+ progress=True)
+ clTempl.firstValue = firstValue
dirsFiles = clTempl.applyTemplates()
+ firstValue = clTempl.firstValue
if dirsFiles is False:
self.printERROR(\
_("Error using templates for the user %s")\
@@ -218,7 +225,7 @@ class updateUserConfigs(shareUpdateConfigs):
self.endTask()
if dictPakkages:
for calcPkg in listIndex:
- self.printSUCCESS(_("Calculate utilities have changed files")\
+ self.printSUCCESS(_("Calculate Utilities have changed files")\
+":")
for userName, configFiles in dictPakkages[calcPkg]:
self.printSUCCESS(" "*2 + _("User %s")%userName + ":")
@@ -346,16 +353,16 @@ class updateSystemConfigs(shareUpdateConfigs):
clTempl = False
#for mergeProgram in filter(None,mergePrograms):
mergeProgram = "calculate-utilities"
- if variables.Get('cl_ebuild_phase') == "preinst":
- self.startTask(_("Package configuring the {nameProgram} package by "
- "Calculate utilities").format(
- nameProgram=nameProgram),
- progress=True)
- else:
- self.startTask(_("System configuring for {nameProgram} package by "
- "Calculate utilities").format(
- nameProgram=nameProgram),
- progress=True)
+ #if variables.Get('cl_ebuild_phase') == "preinst":
+ # self.startTask(_("Package configuring the {nameProgram} package by "
+ # "Calculate Utilities").format(
+ # nameProgram=nameProgram),
+ # progress=True)
+ #else:
+ # self.startTask(_("System configuring for {nameProgram} package by "
+ # "Calculate Utilities").format(
+ # nameProgram=nameProgram),
+ # progress=True)
clVars.Set("cl_root_path", configPath, True)
if variables.Get('cl_core_pkg_root_set') == 'on':
clVars.Set("cl_root_path_next", '/', True)
@@ -390,6 +397,11 @@ class updateSystemConfigs(shareUpdateConfigs):
printERROR=self.printERROR,
printWARNING=self.printWARNING,
printWarning=False)
+ clTempl.onFirstValue = lambda *args: \
+ self.startTask(_("System configuring for {nameProgram} package by "
+ "Calculate Utilities").format(
+ nameProgram=nameProgram),
+ progress=True)
dirsFiles = clTempl.applyTemplates()
# fix CONTENTS pkg file
cfgs = getCfgFiles()
@@ -454,7 +466,7 @@ class updateSystemConfigs(shareUpdateConfigs):
if dictPakkages:
reGrey = re.compile(r"\._cfg\d{4}_")
for calcPkg in listIndex:
- self.SUCCESS(_("Calculate utilities have changed files")+":")
+ self.SUCCESS(_("Calculate Utilities have changed files")+":")
for nameF in dictPakkages[calcPkg]:
nameFile = nameF.partition(configPath)[2]
if nameFile:
@@ -526,7 +538,7 @@ class PackageUpdater(updateSystemConfigs,updateUserConfigs):
category = dv.Get('cl_core_pkg_category')
nameProgram = dv.Get('cl_core_pkg_name')
# define that category/nameProgram installed
- if dv.Get('cl_ebuild_phase') == 'prerm':
+ if dv.Get('cl_ebuild_phase') in ('prerm','postrm'):
version = ""
dictVer = {slot:version}
cl_template.templateFunction.installProg.update(\
diff --git scripts/calculate-core scripts/calculate-core
index ef10337..4971d22 100644
--- scripts/calculate-core
+++ scripts/calculate-core
@@ -30,7 +30,7 @@ start() {
start-stop-daemon --background --start --quiet --pidfile /var/run/cl_core.pid \
--exec /usr/sbin/cl-core -- --pid-file /var/run/cl_core.pid --start
- for waiting in 0.1 0.2 0.5 1
+ for waiting in 0.1 0.2 0.5 1 2 4
do
[[ -f /var/run/cl_core.pid ]] && [[ -d /proc/`cat /var/run/cl_core.pid` ]] && break
sleep $waiting

174
sys-apps/calculate-core/files/calculate-core-3.1.1_beta2-r8.patch
Unescape View File

@ -1,174 +0,0 @@
diff --git core/server/post_request.py core/server/post_request.py
index 7a0b257..096e337 100644
--- core/server/post_request.py
+++ core/server/post_request.py
@@ -118,7 +118,7 @@ def serv_get_client_cert (req_id, request, data_path, client_certbase, \
# See each line
for line in t.splitlines():
# and each word in line
- words = line.split()
+ words = line.split(' ')
if not words:
continue
if words[0] == req_id:
@@ -257,7 +257,7 @@ def serv_get_server_request (req_id, request, data_path, serv_certbase, \
# See each line
for line in t.splitlines():
# and each word in line
- words = line.split()
+ words = line.split(' ')
if words[0] == req_id:
curThread = threading.currentThread()
ip = curThread.REMOTE_ADDR
diff --git core/server/replace_class.py core/server/replace_class.py
index d476d06..5a41c08 100644
--- core/server/replace_class.py
+++ core/server/replace_class.py
@@ -29,6 +29,7 @@ from methods_func import getErrorOnParam
from func import shortTraceback
from fcntl import ioctl
from array import array
+import threading
from calculate.lib.cl_print import color_print
from calculate.lib.datavars import VariableError
from calculate.lib.cl_lang import setLocalTranslate
@@ -40,6 +41,9 @@ class replaceClass():
def startprocess (self, sid, target=None, method=None, method_name=None, \
auto_delete=False, args_proc = {}):
""" start process """
+ if "LANG" in os.environ:
+ curThread = threading.currentThread()
+ curThread.lang = os.environ["LANG"]
com = target(self.no_progress,self.gui_progress,self.gui_warning)
if hasattr (com.__class__.__bases__[1], '__init__'):
com.__class__.__bases__[1].__init__(com)
@@ -433,6 +437,9 @@ def call_method(metaObject, args, unknown_args, colorPrint):
if i in parse(True).parse_known_args()[1]:
_print (_('Unknown parameter'), i)
return 1
+ else:
+ _print (_('Unknown argument'), i)
+ return 1
param_object, steps = collect_object(None, param_object, view, args,
stdin_passwd=stdin_passwd)
diff --git core/server/setup_package.py core/server/setup_package.py
index cb9838e..d474ca8 100644
--- core/server/setup_package.py
+++ core/server/setup_package.py
@@ -104,6 +104,8 @@ class ChainProgressTemplate(cl_template.ProgressTemplate):
def changeMergePackage(self,packages):
self.endTask()
+ packages = filter(isPkgInstalled,
+ packages)
self.startTask(_("Configuring dependent packages: %s")%
",".join(packages),progress=True)
return True
@@ -177,10 +179,7 @@ class updateUserConfigs(shareUpdateConfigs):
dictPakkages = {}
listIndex = []
mergeProgram = "calculate-utilities"
- self.startTask(_("Users configuring the {nameProgram} package by "
- "Calculate utilities").format(
- nameProgram=nameProgram),
- progress=True)
+ firstValue = True
for userName in xUsers:
clVars.Set("cl_root_path", '/', True)
clVars.Set("ur_login", userName, True)
@@ -199,7 +198,15 @@ class updateUserConfigs(shareUpdateConfigs):
self.setProgress,
clVars, cltObj = False,
printWarning=False)
+ clTempl.onFirstValue = lambda *args: \
+ self.startTask(
+ _("User configuring the {nameProgram} package by "
+ "Calculate Utilities").format(
+ nameProgram=nameProgram),
+ progress=True)
+ clTempl.firstValue = firstValue
dirsFiles = clTempl.applyTemplates()
+ firstValue = clTempl.firstValue
if dirsFiles is False:
self.printERROR(\
_("Error using templates for the user %s")\
@@ -218,7 +225,7 @@ class updateUserConfigs(shareUpdateConfigs):
self.endTask()
if dictPakkages:
for calcPkg in listIndex:
- self.printSUCCESS(_("Calculate utilities have changed files")\
+ self.printSUCCESS(_("Calculate Utilities have changed files")\
+":")
for userName, configFiles in dictPakkages[calcPkg]:
self.printSUCCESS(" "*2 + _("User %s")%userName + ":")
@@ -346,16 +353,16 @@ class updateSystemConfigs(shareUpdateConfigs):
clTempl = False
#for mergeProgram in filter(None,mergePrograms):
mergeProgram = "calculate-utilities"
- if variables.Get('cl_ebuild_phase') == "preinst":
- self.startTask(_("Package configuring the {nameProgram} package by "
- "Calculate utilities").format(
- nameProgram=nameProgram),
- progress=True)
- else:
- self.startTask(_("System configuring for {nameProgram} package by "
- "Calculate utilities").format(
- nameProgram=nameProgram),
- progress=True)
+ #if variables.Get('cl_ebuild_phase') == "preinst":
+ # self.startTask(_("Package configuring the {nameProgram} package by "
+ # "Calculate Utilities").format(
+ # nameProgram=nameProgram),
+ # progress=True)
+ #else:
+ # self.startTask(_("System configuring for {nameProgram} package by "
+ # "Calculate Utilities").format(
+ # nameProgram=nameProgram),
+ # progress=True)
clVars.Set("cl_root_path", configPath, True)
if variables.Get('cl_core_pkg_root_set') == 'on':
clVars.Set("cl_root_path_next", '/', True)
@@ -390,6 +397,11 @@ class updateSystemConfigs(shareUpdateConfigs):
printERROR=self.printERROR,
printWARNING=self.printWARNING,
printWarning=False)
+ clTempl.onFirstValue = lambda *args: \
+ self.startTask(_("System configuring for {nameProgram} package by "
+ "Calculate Utilities").format(
+ nameProgram=nameProgram),
+ progress=True)
dirsFiles = clTempl.applyTemplates()
# fix CONTENTS pkg file
cfgs = getCfgFiles()
@@ -454,7 +466,7 @@ class updateSystemConfigs(shareUpdateConfigs):
if dictPakkages:
reGrey = re.compile(r"\._cfg\d{4}_")
for calcPkg in listIndex:
- self.SUCCESS(_("Calculate utilities have changed files")+":")
+ self.SUCCESS(_("Calculate Utilities have changed files")+":")
for nameF in dictPakkages[calcPkg]:
nameFile = nameF.partition(configPath)[2]
if nameFile:
@@ -526,7 +538,7 @@ class PackageUpdater(updateSystemConfigs,updateUserConfigs):
category = dv.Get('cl_core_pkg_category')
nameProgram = dv.Get('cl_core_pkg_name')
# define that category/nameProgram installed
- if dv.Get('cl_ebuild_phase') == 'prerm':
+ if dv.Get('cl_ebuild_phase') in ('prerm','postrm'):
version = ""
dictVer = {slot:version}
cl_template.templateFunction.installProg.update(\
diff --git scripts/calculate-core scripts/calculate-core
index ef10337..4971d22 100644
--- scripts/calculate-core
+++ scripts/calculate-core
@@ -30,7 +30,7 @@ start() {
start-stop-daemon --background --start --quiet --pidfile /var/run/cl_core.pid \
--exec /usr/sbin/cl-core -- --pid-file /var/run/cl_core.pid --start
- for waiting in 0.1 0.2 0.5 1
+ for waiting in 0.1 0.2 0.5 1 2 4
do
[[ -f /var/run/cl_core.pid ]] && [[ -d /proc/`cat /var/run/cl_core.pid` ]] && break
sleep $waiting

30
sys-apps/calculate-i18n/calculate-i18n-3.1.1_beta2-r1.ebuild
Unescape View File

@ -1,30 +0,0 @@
# 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 utilities for assembling tasks of Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
RDEPEND=">=sys-apps/calculate-lib-3.1.1_beta2"
DEPEND="sys-devel/gettext
${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-i18n-3.1.1_beta2-r1.patch"
}

30
sys-apps/calculate-i18n/calculate-i18n-3.1.1_beta2-r2.ebuild
Unescape View File

@ -1,30 +0,0 @@
# 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 utilities for assembling tasks of Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
RDEPEND=">=sys-apps/calculate-lib-3.1.1_beta2"
DEPEND="sys-devel/gettext
${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-i18n-3.1.1_beta2-r2.patch"
}

23
sys-apps/calculate-i18n/calculate-i18n-3.1.1_beta2.ebuild
Unescape View File

@ -1,23 +0,0 @@
# 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 utilities for assembling tasks of Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
RDEPEND=">=sys-apps/calculate-lib-3.1.1_beta2"
DEPEND="sys-devel/gettext
${DEPEND}"

1142
sys-apps/calculate-i18n/files/calculate-i18n-3.1.1_beta2-r1.patch
View File

File diff suppressed because it is too large Load Diff

1151
sys-apps/calculate-i18n/files/calculate-i18n-3.1.1_beta2-r2.patch
View File

File diff suppressed because it is too large Load Diff

44
sys-apps/calculate-install/calculate-install-3.1.1_beta2-r1.ebuild
Unescape View File

@ -1,44 +0,0 @@
# 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 installation Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
IUSE="pxe minimal"
DEPEND="~sys-apps/calculate-core-3.1.1_beta2
!<sys-apps/calculate-install-2.2.29
app-portage/layman
!app-misc/livecd-tools
sys-apps/iproute2[-minimal]
!minimal? ( sys-boot/grub
sys-apps/gptfdisk
>=sys-apps/util-linux-2.19.1
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )
pxe? ( sys-apps/calculate-server
net-ftp/tftp-hpa
net-misc/dhcp
net-fs/nfs-utils )"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-install-3.1.1_beta2-r1.patch"
}

44
sys-apps/calculate-install/calculate-install-3.1.1_beta2-r10.ebuild
Unescape View File

@ -1,44 +0,0 @@
# 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 installation Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
IUSE="pxe minimal"
DEPEND="~sys-apps/calculate-core-3.1.1_beta2
!<sys-apps/calculate-install-2.2.29
app-portage/layman
!app-misc/livecd-tools
sys-apps/iproute2[-minimal]
!minimal? ( sys-boot/grub
sys-apps/gptfdisk
>=sys-apps/util-linux-2.19.1
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )
pxe? ( sys-apps/calculate-server
net-ftp/tftp-hpa
net-misc/dhcp
net-fs/nfs-utils )"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-install-3.1.1_beta2-r10.patch"
}

44
sys-apps/calculate-install/calculate-install-3.1.1_beta2-r11.ebuild
Unescape View File

@ -1,44 +0,0 @@
# 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 installation Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
IUSE="pxe minimal"
DEPEND="~sys-apps/calculate-core-3.1.1_beta2
!<sys-apps/calculate-install-2.2.29
app-portage/layman
!app-misc/livecd-tools
sys-apps/iproute2[-minimal]
!minimal? ( sys-boot/grub
sys-apps/gptfdisk
>=sys-apps/util-linux-2.19.1
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )
pxe? ( sys-apps/calculate-server
net-ftp/tftp-hpa
net-misc/dhcp
net-fs/nfs-utils )"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-install-3.1.1_beta2-r11.patch"
}

44
sys-apps/calculate-install/calculate-install-3.1.1_beta2-r2.ebuild
Unescape View File

@ -1,44 +0,0 @@
# 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 installation Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
IUSE="pxe minimal"
DEPEND="~sys-apps/calculate-core-3.1.1_beta2
!<sys-apps/calculate-install-2.2.29
app-portage/layman
!app-misc/livecd-tools
sys-apps/iproute2[-minimal]
!minimal? ( sys-boot/grub
sys-apps/gptfdisk
>=sys-apps/util-linux-2.19.1
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )
pxe? ( sys-apps/calculate-server
net-ftp/tftp-hpa
net-misc/dhcp
net-fs/nfs-utils )"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-install-3.1.1_beta2-r2.patch"
}

44
sys-apps/calculate-install/calculate-install-3.1.1_beta2-r3.ebuild
Unescape View File

@ -1,44 +0,0 @@
# 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 installation Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
IUSE="pxe minimal"
DEPEND="~sys-apps/calculate-core-3.1.1_beta2
!<sys-apps/calculate-install-2.2.29
app-portage/layman
!app-misc/livecd-tools
sys-apps/iproute2[-minimal]
!minimal? ( sys-boot/grub
sys-apps/gptfdisk
>=sys-apps/util-linux-2.19.1
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )
pxe? ( sys-apps/calculate-server
net-ftp/tftp-hpa
net-misc/dhcp
net-fs/nfs-utils )"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-install-3.1.1_beta2-r3.patch"
}

44
sys-apps/calculate-install/calculate-install-3.1.1_beta2-r4.ebuild
Unescape View File

@ -1,44 +0,0 @@
# 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 installation Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
IUSE="pxe minimal"
DEPEND="~sys-apps/calculate-core-3.1.1_beta2
!<sys-apps/calculate-install-2.2.29
app-portage/layman
!app-misc/livecd-tools
sys-apps/iproute2[-minimal]
!minimal? ( sys-boot/grub
sys-apps/gptfdisk
>=sys-apps/util-linux-2.19.1
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )
pxe? ( sys-apps/calculate-server
net-ftp/tftp-hpa
net-misc/dhcp
net-fs/nfs-utils )"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-install-3.1.1_beta2-r4.patch"
}

44
sys-apps/calculate-install/calculate-install-3.1.1_beta2-r5.ebuild
Unescape View File

@ -1,44 +0,0 @@
# 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 installation Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
IUSE="pxe minimal"
DEPEND="~sys-apps/calculate-core-3.1.1_beta2
!<sys-apps/calculate-install-2.2.29
app-portage/layman
!app-misc/livecd-tools
sys-apps/iproute2[-minimal]
!minimal? ( sys-boot/grub
sys-apps/gptfdisk
>=sys-apps/util-linux-2.19.1
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )
pxe? ( sys-apps/calculate-server
net-ftp/tftp-hpa
net-misc/dhcp
net-fs/nfs-utils )"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-install-3.1.1_beta2-r5.patch"
}

44
sys-apps/calculate-install/calculate-install-3.1.1_beta2-r6.ebuild
Unescape View File

@ -1,44 +0,0 @@
# 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 installation Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
IUSE="pxe minimal"
DEPEND="~sys-apps/calculate-core-3.1.1_beta2
!<sys-apps/calculate-install-2.2.29
app-portage/layman
!app-misc/livecd-tools
sys-apps/iproute2[-minimal]
!minimal? ( sys-boot/grub
sys-apps/gptfdisk
>=sys-apps/util-linux-2.19.1
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )
pxe? ( sys-apps/calculate-server
net-ftp/tftp-hpa
net-misc/dhcp
net-fs/nfs-utils )"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-install-3.1.1_beta2-r6.patch"
}

44
sys-apps/calculate-install/calculate-install-3.1.1_beta2-r7.ebuild
Unescape View File

@ -1,44 +0,0 @@
# 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 installation Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
IUSE="pxe minimal"
DEPEND="~sys-apps/calculate-core-3.1.1_beta2
!<sys-apps/calculate-install-2.2.29
app-portage/layman
!app-misc/livecd-tools
sys-apps/iproute2[-minimal]
!minimal? ( sys-boot/grub
sys-apps/gptfdisk
>=sys-apps/util-linux-2.19.1
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )
pxe? ( sys-apps/calculate-server
net-ftp/tftp-hpa
net-misc/dhcp
net-fs/nfs-utils )"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-install-3.1.1_beta2-r7.patch"
}

44
sys-apps/calculate-install/calculate-install-3.1.1_beta2-r8.ebuild
Unescape View File

@ -1,44 +0,0 @@
# 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 installation Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
IUSE="pxe minimal"
DEPEND="~sys-apps/calculate-core-3.1.1_beta2
!<sys-apps/calculate-install-2.2.29
app-portage/layman
!app-misc/livecd-tools
sys-apps/iproute2[-minimal]
!minimal? ( sys-boot/grub
sys-apps/gptfdisk
>=sys-apps/util-linux-2.19.1
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )
pxe? ( sys-apps/calculate-server
net-ftp/tftp-hpa
net-misc/dhcp
net-fs/nfs-utils )"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-install-3.1.1_beta2-r8.patch"
}

44
sys-apps/calculate-install/calculate-install-3.1.1_beta2-r9.ebuild
Unescape View File

@ -1,44 +0,0 @@
# 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 installation Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
IUSE="pxe minimal"
DEPEND="~sys-apps/calculate-core-3.1.1_beta2
!<sys-apps/calculate-install-2.2.29
app-portage/layman
!app-misc/livecd-tools
sys-apps/iproute2[-minimal]
!minimal? ( sys-boot/grub
sys-apps/gptfdisk
>=sys-apps/util-linux-2.19.1
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )
pxe? ( sys-apps/calculate-server
net-ftp/tftp-hpa
net-misc/dhcp
net-fs/nfs-utils )"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-install-3.1.1_beta2-r9.patch"
}

37
sys-apps/calculate-install/calculate-install-3.1.1_beta2.ebuild
Unescape View File

@ -1,37 +0,0 @@
# 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 installation Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
IUSE="pxe minimal"
DEPEND="~sys-apps/calculate-core-3.1.1_beta2
!<sys-apps/calculate-install-2.2.29
app-portage/layman
!app-misc/livecd-tools
sys-apps/iproute2[-minimal]
!minimal? ( sys-boot/grub
sys-apps/gptfdisk
>=sys-apps/util-linux-2.19.1
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )
pxe? ( sys-apps/calculate-server
net-ftp/tftp-hpa
net-misc/dhcp
net-fs/nfs-utils )"
RDEPEND="${DEPEND}"

15
sys-apps/calculate-install/files/calculate-install-3.1.1_beta2-r1.patch
Unescape View File

@ -1,15 +0,0 @@
diff --git data/calculate data/calculate
index 1ec60b3..a8aaba1 100644
--- data/calculate
+++ data/calculate
@@ -142,6 +142,10 @@ start() {
touch /* /bin/* /sbin/*
udevadm trigger --action="add" --subsystem-match=net
fi
+ if [[ $roottype != "livecd ]]
+ then
+ start-stop-daemon --background --start --quiet --exec /usr/bin/eix-checkout
+ fi
/sbin/rc-update --update
return 0

143
sys-apps/calculate-install/files/calculate-install-3.1.1_beta2-r10.patch
Unescape View File

@ -1,143 +0,0 @@
diff --git data/calculate data/calculate
index 1ec60b3..dc36f4c 100644
--- data/calculate
+++ data/calculate
@@ -142,6 +142,10 @@ start() {
touch /* /bin/* /sbin/*
udevadm trigger --action="add" --subsystem-match=net
fi
+ if [[ $roottype != "livecd" ]]
+ then
+ /usr/bin/eix-checkout &>/dev/null &
+ fi
/sbin/rc-update --update
return 0
diff --git install/cl_distr.py install/cl_distr.py
index 9dcdcb3..2dd8c6c 100644
--- install/cl_distr.py
+++ install/cl_distr.py
@@ -132,7 +132,7 @@ class Distributive(object):
elif "Squashfs filesystem" in ftype:
return SquashDistributive(filename)
elif path.isdir(filename):
- if path.exists(path.join(filename,"livecd")):
+ if path.isfile(path.join(filename,"livecd")):
return IsoDistributive(filename)
else:
return DirectoryDistributive(filename)
diff --git install/cl_install.py install/cl_install.py
index c42e0a7..daf7042 100644
--- install/cl_install.py
+++ install/cl_install.py
@@ -20,6 +20,8 @@ import sys
import time
from os import path
from StringIO import StringIO
+from random import choice
+import string
from time import sleep
from subprocess import PIPE,STDOUT
from shutil import copy2
@@ -601,6 +603,7 @@ class Install(color_print):
self.cleanInitrd()
self.endTask("")
+ self.remountNTFS()
# join templates
self.startTask(_("Updating the configuration"),progress=True)
self.applyTemplates(targetDistr.getDirectory(),
@@ -661,6 +664,7 @@ class Install(color_print):
setupType).capitalize(),progress=True)
else:
self.startTask(_("System configuration"),progress=True)
+ refreshLVM()
res = self.applyTemplatesStartup()
self.endTask()
if setupType and self.clVars.Get('cl_setup') == 'network':
@@ -784,3 +788,39 @@ class Install(color_print):
self.prepareBoot(self.targetDistr)
self.endTask()
return True
+
+ def rndString(self):
+ """Get random string with len 8 char"""
+ return "".join([choice(string.ascii_letters+string.digits)
+ for i in xrange(0,8)])
+
+ def _getFreeDirectory(self,directory):
+ """
+ Get free directory name
+ """
+ newDirectoryName = directory
+ while path.exists(newDirectoryName):
+ newDirectoryName = "%s.%s"%(directory,self.rndString())
+ return newDirectoryName
+
+ def remountNTFS(self):
+ """
+ Remount NTFS partitions
+ """
+ for disk in self.clVars.Select('os_disk_dev',
+ where='os_disk_format',like='ntfs'):
+ mountDir = self._getFreeDirectory('/var/lib/calculate/mount.test')
+ try:
+ os.mkdir(mountDir)
+ except:
+ continue
+ if process('/bin/mount',disk,mountDir).success():
+ for i in (0.2,0.5,1,2):
+ if process('/bin/umount',mountDir).success():
+ break
+ else:
+ self.printWARNING(_("Unable umount %s")%mountDir)
+ try:
+ os.rmdir(mountDir)
+ except:
+ self.printWARNING(_("Unable remove directory %s")%mountDir)
diff --git install/variables/X11.py install/variables/X11.py
index 22b99f2..ea1d29f 100644
--- install/variables/X11.py
+++ install/variables/X11.py
@@ -207,6 +207,8 @@ class VariableOsInstallX11Composite(VideoVariable):
if self.Get('os_install_x11_video_drv') in defaultCompositeOn:
defaultComposite = "on"
+ elif self.Get('hr_virtual') == 'vmware':
+ defaultComposite = "on"
else:
defaultComposite = "off"
if self.Get('os_install_x11_video_drv') == self.Get('os_x11_video_drv'):
diff --git install/variables/action.py install/variables/action.py
index d704e74..5416223 100644
--- install/variables/action.py
+++ install/variables/action.py
@@ -32,7 +32,8 @@ class VariableAcInstallMerge(ActionVariable):
if cl_action in ("system","merge") and \
self.Get('os_install_root_type') != 'flash' and \
self.Get('os_install_pxe') == 'off' and \
- self.Get('cl_live') == 'off':
+ self.Get('cl_live') == 'off' or \
+ cl_action in ("sync",) and self.Get('cl_merge_pkg'):
return "on"
return "off"
@@ -47,7 +48,8 @@ class VariableAcInstallLive(ActionVariable):
def action(self,cl_action):
if cl_action in ("system","merge") and \
self.Get('os_install_root_type') != 'flash' and \
- self.Get('os_install_pxe') == 'off':
+ self.Get('os_install_pxe') == 'off' or \
+ cl_action in ("sync",) and self.Get('cl_merge_pkg'):
return "on"
return "off"
@@ -97,6 +99,7 @@ class VariableAcInstallUnmerge(ActionVariable):
Action variable which has value "up" on prerm ebuild phase
"""
def action(self,cl_action):
- if cl_action == "merge" and self.Get('cl_ebuild_phase') == 'prerm':
+ if cl_action == "merge" and \
+ self.Get('cl_ebuild_phase') in ('prerm','postrm'):
return "on"
return "off"

157
sys-apps/calculate-install/files/calculate-install-3.1.1_beta2-r11.patch
Unescape View File

@ -1,157 +0,0 @@
diff --git data/calculate data/calculate
index 1ec60b3..dc36f4c 100644
--- data/calculate
+++ data/calculate
@@ -142,6 +142,10 @@ start() {
touch /* /bin/* /sbin/*
udevadm trigger --action="add" --subsystem-match=net
fi
+ if [[ $roottype != "livecd" ]]
+ then
+ /usr/bin/eix-checkout &>/dev/null &
+ fi
/sbin/rc-update --update
return 0
diff --git install/cl_distr.py install/cl_distr.py
index 9dcdcb3..2dd8c6c 100644
--- install/cl_distr.py
+++ install/cl_distr.py
@@ -132,7 +132,7 @@ class Distributive(object):
elif "Squashfs filesystem" in ftype:
return SquashDistributive(filename)
elif path.isdir(filename):
- if path.exists(path.join(filename,"livecd")):
+ if path.isfile(path.join(filename,"livecd")):
return IsoDistributive(filename)
else:
return DirectoryDistributive(filename)
diff --git install/cl_install.py install/cl_install.py
index c42e0a7..daf7042 100644
--- install/cl_install.py
+++ install/cl_install.py
@@ -20,6 +20,8 @@ import sys
import time
from os import path
from StringIO import StringIO
+from random import choice
+import string
from time import sleep
from subprocess import PIPE,STDOUT
from shutil import copy2
@@ -601,6 +603,7 @@ class Install(color_print):
self.cleanInitrd()
self.endTask("")
+ self.remountNTFS()
# join templates
self.startTask(_("Updating the configuration"),progress=True)
self.applyTemplates(targetDistr.getDirectory(),
@@ -661,6 +664,7 @@ class Install(color_print):
setupType).capitalize(),progress=True)
else:
self.startTask(_("System configuration"),progress=True)
+ refreshLVM()
res = self.applyTemplatesStartup()
self.endTask()
if setupType and self.clVars.Get('cl_setup') == 'network':
@@ -784,3 +788,39 @@ class Install(color_print):
self.prepareBoot(self.targetDistr)
self.endTask()
return True
+
+ def rndString(self):
+ """Get random string with len 8 char"""
+ return "".join([choice(string.ascii_letters+string.digits)
+ for i in xrange(0,8)])
+
+ def _getFreeDirectory(self,directory):
+ """
+ Get free directory name
+ """
+ newDirectoryName = directory
+ while path.exists(newDirectoryName):
+ newDirectoryName = "%s.%s"%(directory,self.rndString())
+ return newDirectoryName
+
+ def remountNTFS(self):
+ """
+ Remount NTFS partitions
+ """
+ for disk in self.clVars.Select('os_disk_dev',
+ where='os_disk_format',like='ntfs'):
+ mountDir = self._getFreeDirectory('/var/lib/calculate/mount.test')
+ try:
+ os.mkdir(mountDir)
+ except:
+ continue
+ if process('/bin/mount',disk,mountDir).success():
+ for i in (0.2,0.5,1,2):
+ if process('/bin/umount',mountDir).success():
+ break
+ else:
+ self.printWARNING(_("Unable umount %s")%mountDir)
+ try:
+ os.rmdir(mountDir)
+ except:
+ self.printWARNING(_("Unable remove directory %s")%mountDir)
diff --git install/variables/X11.py install/variables/X11.py
index 22b99f2..ea1d29f 100644
--- install/variables/X11.py
+++ install/variables/X11.py
@@ -207,6 +207,8 @@ class VariableOsInstallX11Composite(VideoVariable):
if self.Get('os_install_x11_video_drv') in defaultCompositeOn:
defaultComposite = "on"
+ elif self.Get('hr_virtual') == 'vmware':
+ defaultComposite = "on"
else:
defaultComposite = "off"
if self.Get('os_install_x11_video_drv') == self.Get('os_x11_video_drv'):
diff --git install/variables/action.py install/variables/action.py
index d704e74..5416223 100644
--- install/variables/action.py
+++ install/variables/action.py
@@ -32,7 +32,8 @@ class VariableAcInstallMerge(ActionVariable):
if cl_action in ("system","merge") and \
self.Get('os_install_root_type') != 'flash' and \
self.Get('os_install_pxe') == 'off' and \
- self.Get('cl_live') == 'off':
+ self.Get('cl_live') == 'off' or \
+ cl_action in ("sync",) and self.Get('cl_merge_pkg'):
return "on"
return "off"
@@ -47,7 +48,8 @@ class VariableAcInstallLive(ActionVariable):
def action(self,cl_action):
if cl_action in ("system","merge") and \
self.Get('os_install_root_type') != 'flash' and \
- self.Get('os_install_pxe') == 'off':
+ self.Get('os_install_pxe') == 'off' or \
+ cl_action in ("sync",) and self.Get('cl_merge_pkg'):
return "on"
return "off"
@@ -97,6 +99,7 @@ class VariableAcInstallUnmerge(ActionVariable):
Action variable which has value "up" on prerm ebuild phase
"""
def action(self,cl_action):
- if cl_action == "merge" and self.Get('cl_ebuild_phase') == 'prerm':
+ if cl_action == "merge" and \
+ self.Get('cl_ebuild_phase') in ('prerm','postrm'):
return "on"
return "off"
diff --git install/variables/disk.py install/variables/disk.py
index 9ca8a8b..ccbdc17 100644
--- install/variables/disk.py
+++ install/variables/disk.py
@@ -1470,7 +1470,8 @@ class VariableOsInstallMbr(LocationHelper,Variable):
# search /boot device or / device, by priority /boot,/
if bootDevice:
return bootDevice
- return self.Select('os_device_dev',where='os_device_type',eq='hdd')
+ return [self.Select('os_device_dev',where='os_device_type',eq='hdd',
+ limit=1)]
def choice(self):
deviceParentMap = dict(self.ZipVars('os_device_dev','os_device_name'))

15
sys-apps/calculate-install/files/calculate-install-3.1.1_beta2-r2.patch
Unescape View File

@ -1,15 +0,0 @@
diff --git data/calculate data/calculate
index 1ec60b3..c393dae 100644
--- data/calculate
+++ data/calculate
@@ -142,6 +142,10 @@ start() {
touch /* /bin/* /sbin/*
udevadm trigger --action="add" --subsystem-match=net
fi
+ if [[ $roottype != "livecd" ]]
+ then
+ start-stop-daemon --background --start --quiet --exec /usr/bin/eix-checkout
+ fi
/sbin/rc-update --update
return 0

15
sys-apps/calculate-install/files/calculate-install-3.1.1_beta2-r3.patch
Unescape View File

@ -1,15 +0,0 @@
diff --git data/calculate data/calculate
index 1ec60b3..dc36f4c 100644
--- data/calculate
+++ data/calculate
@@ -142,6 +142,10 @@ start() {
touch /* /bin/* /sbin/*
udevadm trigger --action="add" --subsystem-match=net
fi
+ if [[ $roottype != "livecd" ]]
+ then
+ /usr/bin/eix-checkout &>/dev/null &
+ fi
/sbin/rc-update --update
return 0

28
sys-apps/calculate-install/files/calculate-install-3.1.1_beta2-r4.patch
Unescape View File

@ -1,28 +0,0 @@
diff --git data/calculate data/calculate
index 1ec60b3..dc36f4c 100644
--- data/calculate
+++ data/calculate
@@ -142,6 +142,10 @@ start() {
touch /* /bin/* /sbin/*
udevadm trigger --action="add" --subsystem-match=net
fi
+ if [[ $roottype != "livecd" ]]
+ then
+ /usr/bin/eix-checkout &>/dev/null &
+ fi
/sbin/rc-update --update
return 0
diff --git install/variables/action.py install/variables/action.py
index d704e74..16f57da 100644
--- install/variables/action.py
+++ install/variables/action.py
@@ -97,6 +97,7 @@ class VariableAcInstallUnmerge(ActionVariable):
Action variable which has value "up" on prerm ebuild phase
"""
def action(self,cl_action):
- if cl_action == "merge" and self.Get('cl_ebuild_phase') == 'prerm':
+ if cl_action == "merge" and \
+ self.Get('cl_ebuild_phase') in ('prerm','postrm'):
return "on"
return "off"

80
sys-apps/calculate-install/files/calculate-install-3.1.1_beta2-r5.patch
Unescape View File

@ -1,80 +0,0 @@
diff --git data/calculate data/calculate
index 1ec60b3..dc36f4c 100644
--- data/calculate
+++ data/calculate
@@ -142,6 +142,10 @@ start() {
touch /* /bin/* /sbin/*
udevadm trigger --action="add" --subsystem-match=net
fi
+ if [[ $roottype != "livecd" ]]
+ then
+ /usr/bin/eix-checkout &>/dev/null &
+ fi
/sbin/rc-update --update
return 0
diff --git install/cl_install.py install/cl_install.py
index c42e0a7..e65b50b 100644
--- install/cl_install.py
+++ install/cl_install.py
@@ -601,6 +601,7 @@ class Install(color_print):
self.cleanInitrd()
self.endTask("")
+ self.remountNTFS()
# join templates
self.startTask(_("Updating the configuration"),progress=True)
self.applyTemplates(targetDistr.getDirectory(),
@@ -661,6 +662,7 @@ class Install(color_print):
setupType).capitalize(),progress=True)
else:
self.startTask(_("System configuration"),progress=True)
+ refreshLVM()
res = self.applyTemplatesStartup()
self.endTask()
if setupType and self.clVars.Get('cl_setup') == 'network':
@@ -784,3 +786,31 @@ class Install(color_print):
self.prepareBoot(self.targetDistr)
self.endTask()
return True
+
+ def _getFreeDirectory(self,directory):
+ """
+ Get free directory name
+ """
+ newDirectoryName = directory
+ while path.exists(newDirectoryName):
+ newDirectoryName = "%s.%s"%(directory,self.rndString())
+ return newDirectoryName
+
+ def remountNTFS(self):
+ """
+ Remount NTFS partitions
+ """
+ for disk in self.clVars.Select('os_disk_dev',
+ where='os_disk_format',like='ntfs'):
+ mountDir = self._getFreeDirectory('/var/lib/calculate/mount.test')
+ try:
+ os.mkdir(mountDir)
+ except:
+ continue
+ if process('/bin/mount',disk,mountDir).success():
+ if process('/bin/umount',mountDir).failed():
+ self.printWARNING(_("Unable umount %s")%mountDir)
+ try:
+ os.rmdir(mountDir)
+ except:
+ self.printWARNING(_("Unable remove directory %s")%mountDir)
diff --git install/variables/action.py install/variables/action.py
index d704e74..16f57da 100644
--- install/variables/action.py
+++ install/variables/action.py
@@ -97,6 +97,7 @@ class VariableAcInstallUnmerge(ActionVariable):
Action variable which has value "up" on prerm ebuild phase
"""
def action(self,cl_action):
- if cl_action == "merge" and self.Get('cl_ebuild_phase') == 'prerm':
+ if cl_action == "merge" and \
+ self.Get('cl_ebuild_phase') in ('prerm','postrm'):
return "on"
return "off"

93
sys-apps/calculate-install/files/calculate-install-3.1.1_beta2-r6.patch
Unescape View File

@ -1,93 +0,0 @@
diff --git data/calculate data/calculate
index 1ec60b3..dc36f4c 100644
--- data/calculate
+++ data/calculate
@@ -142,6 +142,10 @@ start() {
touch /* /bin/* /sbin/*
udevadm trigger --action="add" --subsystem-match=net
fi
+ if [[ $roottype != "livecd" ]]
+ then
+ /usr/bin/eix-checkout &>/dev/null &
+ fi
/sbin/rc-update --update
return 0
diff --git install/cl_distr.py install/cl_distr.py
index 9dcdcb3..2dd8c6c 100644
--- install/cl_distr.py
+++ install/cl_distr.py
@@ -132,7 +132,7 @@ class Distributive(object):
elif "Squashfs filesystem" in ftype:
return SquashDistributive(filename)
elif path.isdir(filename):
- if path.exists(path.join(filename,"livecd")):
+ if path.isfile(path.join(filename,"livecd")):
return IsoDistributive(filename)
else:
return DirectoryDistributive(filename)
diff --git install/cl_install.py install/cl_install.py
index c42e0a7..e65b50b 100644
--- install/cl_install.py
+++ install/cl_install.py
@@ -601,6 +601,7 @@ class Install(color_print):
self.cleanInitrd()
self.endTask("")
+ self.remountNTFS()
# join templates
self.startTask(_("Updating the configuration"),progress=True)
self.applyTemplates(targetDistr.getDirectory(),
@@ -661,6 +662,7 @@ class Install(color_print):
setupType).capitalize(),progress=True)
else:
self.startTask(_("System configuration"),progress=True)
+ refreshLVM()
res = self.applyTemplatesStartup()
self.endTask()
if setupType and self.clVars.Get('cl_setup') == 'network':
@@ -784,3 +786,31 @@ class Install(color_print):
self.prepareBoot(self.targetDistr)
self.endTask()
return True
+
+ def _getFreeDirectory(self,directory):
+ """
+ Get free directory name
+ """
+ newDirectoryName = directory
+ while path.exists(newDirectoryName):
+ newDirectoryName = "%s.%s"%(directory,self.rndString())
+ return newDirectoryName
+
+ def remountNTFS(self):
+ """
+ Remount NTFS partitions
+ """
+ for disk in self.clVars.Select('os_disk_dev',
+ where='os_disk_format',like='ntfs'):
+ mountDir = self._getFreeDirectory('/var/lib/calculate/mount.test')
+ try:
+ os.mkdir(mountDir)
+ except:
+ continue
+ if process('/bin/mount',disk,mountDir).success():
+ if process('/bin/umount',mountDir).failed():
+ self.printWARNING(_("Unable umount %s")%mountDir)
+ try:
+ os.rmdir(mountDir)
+ except:
+ self.printWARNING(_("Unable remove directory %s")%mountDir)
diff --git install/variables/action.py install/variables/action.py
index d704e74..16f57da 100644
--- install/variables/action.py
+++ install/variables/action.py
@@ -97,6 +97,7 @@ class VariableAcInstallUnmerge(ActionVariable):
Action variable which has value "up" on prerm ebuild phase
"""
def action(self,cl_action):
- if cl_action == "merge" and self.Get('cl_ebuild_phase') == 'prerm':
+ if cl_action == "merge" and \
+ self.Get('cl_ebuild_phase') in ('prerm','postrm'):
return "on"
return "off"

116
sys-apps/calculate-install/files/calculate-install-3.1.1_beta2-r7.patch
Unescape View File

@ -1,116 +0,0 @@
diff --git data/calculate data/calculate
index 1ec60b3..dc36f4c 100644
--- data/calculate
+++ data/calculate
@@ -142,6 +142,10 @@ start() {
touch /* /bin/* /sbin/*
udevadm trigger --action="add" --subsystem-match=net
fi
+ if [[ $roottype != "livecd" ]]
+ then
+ /usr/bin/eix-checkout &>/dev/null &
+ fi
/sbin/rc-update --update
return 0
diff --git install/cl_distr.py install/cl_distr.py
index 9dcdcb3..2dd8c6c 100644
--- install/cl_distr.py
+++ install/cl_distr.py
@@ -132,7 +132,7 @@ class Distributive(object):
elif "Squashfs filesystem" in ftype:
return SquashDistributive(filename)
elif path.isdir(filename):
- if path.exists(path.join(filename,"livecd")):
+ if path.isfile(path.join(filename,"livecd")):
return IsoDistributive(filename)
else:
return DirectoryDistributive(filename)
diff --git install/cl_install.py install/cl_install.py
index c42e0a7..e65b50b 100644
--- install/cl_install.py
+++ install/cl_install.py
@@ -601,6 +601,7 @@ class Install(color_print):
self.cleanInitrd()
self.endTask("")
+ self.remountNTFS()
# join templates
self.startTask(_("Updating the configuration"),progress=True)
self.applyTemplates(targetDistr.getDirectory(),
@@ -661,6 +662,7 @@ class Install(color_print):
setupType).capitalize(),progress=True)
else:
self.startTask(_("System configuration"),progress=True)
+ refreshLVM()
res = self.applyTemplatesStartup()
self.endTask()
if setupType and self.clVars.Get('cl_setup') == 'network':
@@ -784,3 +786,31 @@ class Install(color_print):
self.prepareBoot(self.targetDistr)
self.endTask()
return True
+
+ def _getFreeDirectory(self,directory):
+ """
+ Get free directory name
+ """
+ newDirectoryName = directory
+ while path.exists(newDirectoryName):
+ newDirectoryName = "%s.%s"%(directory,self.rndString())
+ return newDirectoryName
+
+ def remountNTFS(self):
+ """
+ Remount NTFS partitions
+ """
+ for disk in self.clVars.Select('os_disk_dev',
+ where='os_disk_format',like='ntfs'):
+ mountDir = self._getFreeDirectory('/var/lib/calculate/mount.test')
+ try:
+ os.mkdir(mountDir)
+ except:
+ continue
+ if process('/bin/mount',disk,mountDir).success():
+ if process('/bin/umount',mountDir).failed():
+ self.printWARNING(_("Unable umount %s")%mountDir)
+ try:
+ os.rmdir(mountDir)
+ except:
+ self.printWARNING(_("Unable remove directory %s")%mountDir)
diff --git install/variables/action.py install/variables/action.py
index d704e74..344527f 100644
--- install/variables/action.py
+++ install/variables/action.py
@@ -32,8 +32,11 @@ class VariableAcInstallMerge(ActionVariable):
if cl_action in ("system","merge") and \
self.Get('os_install_root_type') != 'flash' and \
self.Get('os_install_pxe') == 'off' and \
- self.Get('cl_live') == 'off':
+ self.Get('cl_live') == 'off' or \
+ cl_action in ("sync",) and self.Get('cl_merge_pkg'):
+ print "ON"
return "on"
+ print "OFF"
return "off"
class VariableAcInstallLive(ActionVariable):
@@ -47,7 +50,8 @@ class VariableAcInstallLive(ActionVariable):
def action(self,cl_action):
if cl_action in ("system","merge") and \
self.Get('os_install_root_type') != 'flash' and \
- self.Get('os_install_pxe') == 'off':
+ self.Get('os_install_pxe') == 'off' or \
+ cl_action in ("sync",) and self.Get('cl_merge_pkg'):
return "on"
return "off"
@@ -97,6 +101,7 @@ class VariableAcInstallUnmerge(ActionVariable):
Action variable which has value "up" on prerm ebuild phase
"""
def action(self,cl_action):
- if cl_action == "merge" and self.Get('cl_ebuild_phase') == 'prerm':
+ if cl_action == "merge" and \
+ self.Get('cl_ebuild_phase') in ('prerm','postrm'):
return "on"
return "off"

113
sys-apps/calculate-install/files/calculate-install-3.1.1_beta2-r8.patch
Unescape View File

@ -1,113 +0,0 @@
diff --git data/calculate data/calculate
index 1ec60b3..dc36f4c 100644
--- data/calculate
+++ data/calculate
@@ -142,6 +142,10 @@ start() {
touch /* /bin/* /sbin/*
udevadm trigger --action="add" --subsystem-match=net
fi
+ if [[ $roottype != "livecd" ]]
+ then
+ /usr/bin/eix-checkout &>/dev/null &
+ fi
/sbin/rc-update --update
return 0
diff --git install/cl_distr.py install/cl_distr.py
index 9dcdcb3..2dd8c6c 100644
--- install/cl_distr.py
+++ install/cl_distr.py
@@ -132,7 +132,7 @@ class Distributive(object):
elif "Squashfs filesystem" in ftype:
return SquashDistributive(filename)
elif path.isdir(filename):
- if path.exists(path.join(filename,"livecd")):
+ if path.isfile(path.join(filename,"livecd")):
return IsoDistributive(filename)
else:
return DirectoryDistributive(filename)
diff --git install/cl_install.py install/cl_install.py
index c42e0a7..e65b50b 100644
--- install/cl_install.py
+++ install/cl_install.py
@@ -601,6 +601,7 @@ class Install(color_print):
self.cleanInitrd()
self.endTask("")
+ self.remountNTFS()
# join templates
self.startTask(_("Updating the configuration"),progress=True)
self.applyTemplates(targetDistr.getDirectory(),
@@ -661,6 +662,7 @@ class Install(color_print):
setupType).capitalize(),progress=True)
else:
self.startTask(_("System configuration"),progress=True)
+ refreshLVM()
res = self.applyTemplatesStartup()
self.endTask()
if setupType and self.clVars.Get('cl_setup') == 'network':
@@ -784,3 +786,31 @@ class Install(color_print):
self.prepareBoot(self.targetDistr)
self.endTask()
return True
+
+ def _getFreeDirectory(self,directory):
+ """
+ Get free directory name
+ """
+ newDirectoryName = directory
+ while path.exists(newDirectoryName):
+ newDirectoryName = "%s.%s"%(directory,self.rndString())
+ return newDirectoryName
+
+ def remountNTFS(self):
+ """
+ Remount NTFS partitions
+ """
+ for disk in self.clVars.Select('os_disk_dev',
+ where='os_disk_format',like='ntfs'):
+ mountDir = self._getFreeDirectory('/var/lib/calculate/mount.test')
+ try:
+ os.mkdir(mountDir)
+ except:
+ continue
+ if process('/bin/mount',disk,mountDir).success():
+ if process('/bin/umount',mountDir).failed():
+ self.printWARNING(_("Unable umount %s")%mountDir)
+ try:
+ os.rmdir(mountDir)
+ except:
+ self.printWARNING(_("Unable remove directory %s")%mountDir)
diff --git install/variables/action.py install/variables/action.py
index d704e74..5416223 100644
--- install/variables/action.py
+++ install/variables/action.py
@@ -32,7 +32,8 @@ class VariableAcInstallMerge(ActionVariable):
if cl_action in ("system","merge") and \
self.Get('os_install_root_type') != 'flash' and \
self.Get('os_install_pxe') == 'off' and \
- self.Get('cl_live') == 'off':
+ self.Get('cl_live') == 'off' or \
+ cl_action in ("sync",) and self.Get('cl_merge_pkg'):
return "on"
return "off"
@@ -47,7 +48,8 @@ class VariableAcInstallLive(ActionVariable):
def action(self,cl_action):
if cl_action in ("system","merge") and \
self.Get('os_install_root_type') != 'flash' and \
- self.Get('os_install_pxe') == 'off':
+ self.Get('os_install_pxe') == 'off' or \
+ cl_action in ("sync",) and self.Get('cl_merge_pkg'):
return "on"
return "off"
@@ -97,6 +99,7 @@ class VariableAcInstallUnmerge(ActionVariable):
Action variable which has value "up" on prerm ebuild phase
"""
def action(self,cl_action):
- if cl_action == "merge" and self.Get('cl_ebuild_phase') == 'prerm':
+ if cl_action == "merge" and \
+ self.Get('cl_ebuild_phase') in ('prerm','postrm'):
return "on"
return "off"

130
sys-apps/calculate-install/files/calculate-install-3.1.1_beta2-r9.patch
Unescape View File

@ -1,130 +0,0 @@
diff --git data/calculate data/calculate
index 1ec60b3..dc36f4c 100644
--- data/calculate
+++ data/calculate
@@ -142,6 +142,10 @@ start() {
touch /* /bin/* /sbin/*
udevadm trigger --action="add" --subsystem-match=net
fi
+ if [[ $roottype != "livecd" ]]
+ then
+ /usr/bin/eix-checkout &>/dev/null &
+ fi
/sbin/rc-update --update
return 0
diff --git install/cl_distr.py install/cl_distr.py
index 9dcdcb3..2dd8c6c 100644
--- install/cl_distr.py
+++ install/cl_distr.py
@@ -132,7 +132,7 @@ class Distributive(object):
elif "Squashfs filesystem" in ftype:
return SquashDistributive(filename)
elif path.isdir(filename):
- if path.exists(path.join(filename,"livecd")):
+ if path.isfile(path.join(filename,"livecd")):
return IsoDistributive(filename)
else:
return DirectoryDistributive(filename)
diff --git install/cl_install.py install/cl_install.py
index c42e0a7..daf7042 100644
--- install/cl_install.py
+++ install/cl_install.py
@@ -20,6 +20,8 @@ import sys
import time
from os import path
from StringIO import StringIO
+from random import choice
+import string
from time import sleep
from subprocess import PIPE,STDOUT
from shutil import copy2
@@ -601,6 +603,7 @@ class Install(color_print):
self.cleanInitrd()
self.endTask("")
+ self.remountNTFS()
# join templates
self.startTask(_("Updating the configuration"),progress=True)
self.applyTemplates(targetDistr.getDirectory(),
@@ -661,6 +664,7 @@ class Install(color_print):
setupType).capitalize(),progress=True)
else:
self.startTask(_("System configuration"),progress=True)
+ refreshLVM()
res = self.applyTemplatesStartup()
self.endTask()
if setupType and self.clVars.Get('cl_setup') == 'network':
@@ -784,3 +788,39 @@ class Install(color_print):
self.prepareBoot(self.targetDistr)
self.endTask()
return True
+
+ def rndString(self):
+ """Get random string with len 8 char"""
+ return "".join([choice(string.ascii_letters+string.digits)
+ for i in xrange(0,8)])
+
+ def _getFreeDirectory(self,directory):
+ """
+ Get free directory name
+ """
+ newDirectoryName = directory
+ while path.exists(newDirectoryName):
+ newDirectoryName = "%s.%s"%(directory,self.rndString())
+ return newDirectoryName
+
+ def remountNTFS(self):
+ """
+ Remount NTFS partitions
+ """
+ for disk in self.clVars.Select('os_disk_dev',
+ where='os_disk_format',like='ntfs'):
+ mountDir = self._getFreeDirectory('/var/lib/calculate/mount.test')
+ try:
+ os.mkdir(mountDir)
+ except:
+ continue
+ if process('/bin/mount',disk,mountDir).success():
+ for i in (0.2,0.5,1,2):
+ if process('/bin/umount',mountDir).success():
+ break
+ else:
+ self.printWARNING(_("Unable umount %s")%mountDir)
+ try:
+ os.rmdir(mountDir)
+ except:
+ self.printWARNING(_("Unable remove directory %s")%mountDir)
diff --git install/variables/action.py install/variables/action.py
index d704e74..5416223 100644
--- install/variables/action.py
+++ install/variables/action.py
@@ -32,7 +32,8 @@ class VariableAcInstallMerge(ActionVariable):
if cl_action in ("system","merge") and \
self.Get('os_install_root_type') != 'flash' and \
self.Get('os_install_pxe') == 'off' and \
- self.Get('cl_live') == 'off':
+ self.Get('cl_live') == 'off' or \
+ cl_action in ("sync",) and self.Get('cl_merge_pkg'):
return "on"
return "off"
@@ -47,7 +48,8 @@ class VariableAcInstallLive(ActionVariable):
def action(self,cl_action):
if cl_action in ("system","merge") and \
self.Get('os_install_root_type') != 'flash' and \
- self.Get('os_install_pxe') == 'off':
+ self.Get('os_install_pxe') == 'off' or \
+ cl_action in ("sync",) and self.Get('cl_merge_pkg'):
return "on"
return "off"
@@ -97,6 +99,7 @@ class VariableAcInstallUnmerge(ActionVariable):
Action variable which has value "up" on prerm ebuild phase
"""
def action(self,cl_action):
- if cl_action == "merge" and self.Get('cl_ebuild_phase') == 'prerm':
+ if cl_action == "merge" and \
+ self.Get('cl_ebuild_phase') in ('prerm','postrm'):
return "on"
return "off"

35
sys-apps/calculate-lib/calculate-lib-3.1.1_beta2-r1.ebuild
Unescape View File

@ -1,35 +0,0 @@
# 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-r1.patch"
}

35
sys-apps/calculate-lib/calculate-lib-3.1.1_beta2-r2.ebuild
Unescape View File

@ -1,35 +0,0 @@
# 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"
}

35
sys-apps/calculate-lib/calculate-lib-3.1.1_beta2-r3.ebuild
Unescape View File

@ -1,35 +0,0 @@
# 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-r3.patch"
}

35
sys-apps/calculate-lib/calculate-lib-3.1.1_beta2-r4.ebuild
Unescape View File

@ -1,35 +0,0 @@
# 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-r4.patch"
}

35
sys-apps/calculate-lib/calculate-lib-3.1.1_beta2-r5.ebuild
Unescape View File

@ -1,35 +0,0 @@
# 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-r5.patch"
}

35
sys-apps/calculate-lib/calculate-lib-3.1.1_beta2-r6.ebuild
Unescape View File

@ -1,35 +0,0 @@
# 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-r6.patch"
}

28
sys-apps/calculate-lib/calculate-lib-3.1.1_beta2.ebuild
Unescape View File

@ -1,28 +0,0 @@
# 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}"

59
sys-apps/calculate-lib/files/calculate-lib-3.1.1_beta2-r1.patch
Unescape View File

@ -1,59 +0,0 @@
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

73
sys-apps/calculate-lib/files/calculate-lib-3.1.1_beta2-r2.patch
Unescape View File

@ -1,73 +0,0 @@
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):

105
sys-apps/calculate-lib/files/calculate-lib-3.1.1_beta2-r3.patch
Unescape View File

@ -1,105 +0,0 @@
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/utils/device.py calculate/lib/utils/device.py
index 50351bc..1ae7a07 100644
--- calculate/lib/utils/device.py
+++ calculate/lib/utils/device.py
@@ -385,9 +385,11 @@ def refreshLVM():
if vgscan and vgchange and lvchange:
process(vgscan).success()
- process(vgchange,'-ay','--refresh').success()
+ process(vgchange,'-ay').success()
+ process(vgchange,'--refresh').success()
for group in getLvmGroups():
- process(lvchange,'-ay','--refresh',group).success()
+ process(lvchange,'-ay',group).success()
+ process(lvchange,'--refresh',group).success()
def refreshUdev():
"""Run command which refresh information about device in udev"""
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):
diff --git calculate/lib/variables/user.py calculate/lib/variables/user.py
index 835a780..d53cdd7 100644
--- calculate/lib/variables/user.py
+++ calculate/lib/variables/user.py
@@ -84,7 +84,8 @@ class VariableUrLogin(Variable,LdapHelper):
self.label = _("User name")
def choice(self):
- return [""]+list(set(self.getLdapUserlist()+getPasswdUsers()))
+ return [""]+sorted(list(set(
+ self.getLdapUserlist()+getPasswdUsers())))
def check(self,value):
"""Does user exist"""

115
sys-apps/calculate-lib/files/calculate-lib-3.1.1_beta2-r4.patch
Unescape View File

@ -1,115 +0,0 @@
diff --git calculate/lib/cl_template.py calculate/lib/cl_template.py
index 55527cd..9193278 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
@@ -4273,7 +4281,8 @@ gettext -d cl_template "$*"
self.cltObj.filterApplyTemplates[filename].append(pkg)
if not self.cltObj.applyTemplates():
return False
- if self.objVar.Get('cl_merge_pkg') and \
+ if (self.objVar.Get('cl_merge_pkg') or \
+ self.objVar.Get('cl_action') == "sync") and \
self.objVar.Get('cl_merge_pkg_new'):
self.objVar.Set('cl_root_path',
self.objVar.Get('cl_root_path_next'),force=True)
@@ -4399,6 +4408,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 +5703,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 +6120,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 +6133,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/utils/device.py calculate/lib/utils/device.py
index 50351bc..1ae7a07 100644
--- calculate/lib/utils/device.py
+++ calculate/lib/utils/device.py
@@ -385,9 +385,11 @@ def refreshLVM():
if vgscan and vgchange and lvchange:
process(vgscan).success()
- process(vgchange,'-ay','--refresh').success()
+ process(vgchange,'-ay').success()
+ process(vgchange,'--refresh').success()
for group in getLvmGroups():
- process(lvchange,'-ay','--refresh',group).success()
+ process(lvchange,'-ay',group).success()
+ process(lvchange,'--refresh',group).success()
def refreshUdev():
"""Run command which refresh information about device in udev"""
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):
diff --git calculate/lib/variables/user.py calculate/lib/variables/user.py
index 835a780..d53cdd7 100644
--- calculate/lib/variables/user.py
+++ calculate/lib/variables/user.py
@@ -84,7 +84,8 @@ class VariableUrLogin(Variable,LdapHelper):
self.label = _("User name")
def choice(self):
- return [""]+list(set(self.getLdapUserlist()+getPasswdUsers()))
+ return [""]+sorted(list(set(
+ self.getLdapUserlist()+getPasswdUsers())))
def check(self,value):
"""Does user exist"""

142
sys-apps/calculate-lib/files/calculate-lib-3.1.1_beta2-r5.patch
Unescape View File

@ -1,142 +0,0 @@
diff --git calculate/lib/cl_template.py calculate/lib/cl_template.py
index 55527cd..6662c25 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
@@ -4273,13 +4281,15 @@ gettext -d cl_template "$*"
self.cltObj.filterApplyTemplates[filename].append(pkg)
if not self.cltObj.applyTemplates():
return False
- if self.objVar.Get('cl_merge_pkg') and \
+ if (self.objVar.Get('cl_merge_pkg') or \
+ self.objVar.Get('cl_action') == "sync") and \
self.objVar.Get('cl_merge_pkg_new'):
self.objVar.Set('cl_root_path',
self.objVar.Get('cl_root_path_next'),force=True)
self.recalculateBaseDir()
self.objVar.Set('cl_merge_pkg_pass',list(
set(self.objVar.Get('cl_merge_pkg_pass'))|
+ set(self.objVar.Get('cl_merge_pkg'))|
set(self.objVar.Get('cl_merge_pkg_new'))),force=True)
self.objVar.Set('cl_merge_pkg',
self.objVar.Get('cl_merge_pkg_new'),force=True)
@@ -4399,6 +4409,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
@@ -4537,7 +4548,8 @@ gettext -d cl_template "$*"
wrongPkg + ": " + nameFileTemplate)
for pkg in mergePkgs:
if not pkg in self.objVar.Get('cl_merge_pkg_new') and \
- not pkg in self.objVar.Get('cl_merge_pkg_pass'):
+ not pkg in self.objVar.Get('cl_merge_pkg_pass') and \
+ not pkg in self.objVar.Get('cl_merge_pkg'):
self.objVar.Get('cl_merge_pkg_new').append(pkg)
# Пропускаем директорию
@@ -4824,7 +4836,8 @@ gettext -d cl_template "$*"
wrongPkg + ": " + nameFileTemplate)
for pkg in mergePkgs:
if not pkg in self.objVar.Get('cl_merge_pkg_new') and \
- not pkg in self.objVar.Get('cl_merge_pkg_pass'):
+ not pkg in self.objVar.Get('cl_merge_pkg_pass') and \
+ not pkg in self.objVar.Get('cl_merge_pkg'):
self.objVar.Get('cl_merge_pkg_new').append(pkg)
# Родительская директория
@@ -5693,6 +5706,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 +6123,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 +6136,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/utils/device.py calculate/lib/utils/device.py
index 50351bc..1ae7a07 100644
--- calculate/lib/utils/device.py
+++ calculate/lib/utils/device.py
@@ -385,9 +385,11 @@ def refreshLVM():
if vgscan and vgchange and lvchange:
process(vgscan).success()
- process(vgchange,'-ay','--refresh').success()
+ process(vgchange,'-ay').success()
+ process(vgchange,'--refresh').success()
for group in getLvmGroups():
- process(lvchange,'-ay','--refresh',group).success()
+ process(lvchange,'-ay',group).success()
+ process(lvchange,'--refresh',group).success()
def refreshUdev():
"""Run command which refresh information about device in udev"""
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):
diff --git calculate/lib/variables/user.py calculate/lib/variables/user.py
index 835a780..d53cdd7 100644
--- calculate/lib/variables/user.py
+++ calculate/lib/variables/user.py
@@ -84,7 +84,8 @@ class VariableUrLogin(Variable,LdapHelper):
self.label = _("User name")
def choice(self):
- return [""]+list(set(self.getLdapUserlist()+getPasswdUsers()))
+ return [""]+sorted(list(set(
+ self.getLdapUserlist()+getPasswdUsers())))
def check(self,value):
"""Does user exist"""

162
sys-apps/calculate-lib/files/calculate-lib-3.1.1_beta2-r6.patch
Unescape View File

@ -1,162 +0,0 @@
diff --git calculate/lib/cl_template.py calculate/lib/cl_template.py
index 55527cd..6662c25 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
@@ -4273,13 +4281,15 @@ gettext -d cl_template "$*"
self.cltObj.filterApplyTemplates[filename].append(pkg)
if not self.cltObj.applyTemplates():
return False
- if self.objVar.Get('cl_merge_pkg') and \
+ if (self.objVar.Get('cl_merge_pkg') or \
+ self.objVar.Get('cl_action') == "sync") and \
self.objVar.Get('cl_merge_pkg_new'):
self.objVar.Set('cl_root_path',
self.objVar.Get('cl_root_path_next'),force=True)
self.recalculateBaseDir()
self.objVar.Set('cl_merge_pkg_pass',list(
set(self.objVar.Get('cl_merge_pkg_pass'))|
+ set(self.objVar.Get('cl_merge_pkg'))|
set(self.objVar.Get('cl_merge_pkg_new'))),force=True)
self.objVar.Set('cl_merge_pkg',
self.objVar.Get('cl_merge_pkg_new'),force=True)
@@ -4399,6 +4409,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
@@ -4537,7 +4548,8 @@ gettext -d cl_template "$*"
wrongPkg + ": " + nameFileTemplate)
for pkg in mergePkgs:
if not pkg in self.objVar.Get('cl_merge_pkg_new') and \
- not pkg in self.objVar.Get('cl_merge_pkg_pass'):
+ not pkg in self.objVar.Get('cl_merge_pkg_pass') and \
+ not pkg in self.objVar.Get('cl_merge_pkg'):
self.objVar.Get('cl_merge_pkg_new').append(pkg)
# Пропускаем директорию
@@ -4824,7 +4836,8 @@ gettext -d cl_template "$*"
wrongPkg + ": " + nameFileTemplate)
for pkg in mergePkgs:
if not pkg in self.objVar.Get('cl_merge_pkg_new') and \
- not pkg in self.objVar.Get('cl_merge_pkg_pass'):
+ not pkg in self.objVar.Get('cl_merge_pkg_pass') and \
+ not pkg in self.objVar.Get('cl_merge_pkg'):
self.objVar.Get('cl_merge_pkg_new').append(pkg)
# Родительская директория
@@ -5693,6 +5706,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 +6123,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 +6136,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/utils/device.py calculate/lib/utils/device.py
index 50351bc..1ae7a07 100644
--- calculate/lib/utils/device.py
+++ calculate/lib/utils/device.py
@@ -385,9 +385,11 @@ def refreshLVM():
if vgscan and vgchange and lvchange:
process(vgscan).success()
- process(vgchange,'-ay','--refresh').success()
+ process(vgchange,'-ay').success()
+ process(vgchange,'--refresh').success()
for group in getLvmGroups():
- process(lvchange,'-ay','--refresh',group).success()
+ process(lvchange,'-ay',group).success()
+ process(lvchange,'--refresh',group).success()
def refreshUdev():
"""Run command which refresh information about device in udev"""
diff --git calculate/lib/variables/hardware.py calculate/lib/variables/hardware.py
index d2f4111..8305014 100644
--- calculate/lib/variables/hardware.py
+++ calculate/lib/variables/hardware.py
@@ -71,14 +71,17 @@ class VariableHrVirtual(ReadonlyVariable):
"""
def get(self):
- # TODO: need test in virtual machine
virtSysDict = {'VirtualBox':'virtualbox',
'VMware':'vmware',
'Qumranet':'qemu'}
reVirtInfo = re.compile("|".join(virtSysDict.keys()))
devices = lspci(reVirtInfo.search)
for device in devices.values():
- return virtSysDict[reVirtInfo.search(device['name']).group()]
+ nameRes = reVirtInfo.search(device['name'])
+ if not nameRes:
+ nameRes = reVirtInfo.search(device['vendor'])
+ if nameRes:
+ return virtSysDict[nameRes.group()]
return ""
class VariableHrLaptop(ReadonlyVariable):
@@ -94,7 +97,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):
diff --git calculate/lib/variables/user.py calculate/lib/variables/user.py
index 835a780..d53cdd7 100644
--- calculate/lib/variables/user.py
+++ calculate/lib/variables/user.py
@@ -84,7 +84,8 @@ class VariableUrLogin(Variable,LdapHelper):
self.label = _("User name")
def choice(self):
- return [""]+list(set(self.getLdapUserlist()+getPasswdUsers()))
+ return [""]+sorted(list(set(
+ self.getLdapUserlist()+getPasswdUsers())))
def check(self,value):
"""Does user exist"""

24
sys-apps/calculate-update/calculate-update-3.1.1_beta2.ebuild
Unescape View File

@ -1,24 +0,0 @@
# 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="amd64 x86"
IUSE=""
DEPEND="~sys-apps/calculate-core-3.1.1_beta2
~sys-apps/calculate-install-3.1.1_beta2"
RDEPEND="${DEPEND}"

26
sys-apps/calculate-utilities/calculate-utilities-3.1.1_beta2-r1.ebuild
Unescape View File

@ -1,26 +0,0 @@
# 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-r1
=sys-apps/calculate-i18n-3.1.1_beta2
=sys-apps/calculate-lib-3.1.1_beta2
=sys-apps/calculate-core-3.1.1_beta2-r1
=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 )
"

26
sys-apps/calculate-utilities/calculate-utilities-3.1.1_beta2-r10.ebuild
Unescape View File

@ -1,26 +0,0 @@
# 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-r6
=sys-apps/calculate-i18n-3.1.1_beta2-r1
=sys-apps/calculate-lib-3.1.1_beta2-r3
=sys-apps/calculate-core-3.1.1_beta2-r4
=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 )
"

26
sys-apps/calculate-utilities/calculate-utilities-3.1.1_beta2-r11.ebuild
Unescape View File

@ -1,26 +0,0 @@
# 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-r6
=sys-apps/calculate-i18n-3.1.1_beta2-r1
=sys-apps/calculate-lib-3.1.1_beta2-r3
=sys-apps/calculate-core-3.1.1_beta2-r5
=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 )
"

26
sys-apps/calculate-utilities/calculate-utilities-3.1.1_beta2-r12.ebuild
Unescape View File

@ -1,26 +0,0 @@
# 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-r7
=sys-apps/calculate-i18n-3.1.1_beta2-r1
=sys-apps/calculate-lib-3.1.1_beta2-r4
=sys-apps/calculate-core-3.1.1_beta2-r5
=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 )
"

26
sys-apps/calculate-utilities/calculate-utilities-3.1.1_beta2-r13.ebuild
Unescape View File

@ -1,26 +0,0 @@
# 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-r7
=sys-apps/calculate-i18n-3.1.1_beta2-r2
=sys-apps/calculate-lib-3.1.1_beta2-r4
=sys-apps/calculate-core-3.1.1_beta2-r5
=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 )
"

26
sys-apps/calculate-utilities/calculate-utilities-3.1.1_beta2-r14.ebuild
Unescape View File

@ -1,26 +0,0 @@
# 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-r8
=sys-apps/calculate-i18n-3.1.1_beta2-r2
=sys-apps/calculate-lib-3.1.1_beta2-r4
=sys-apps/calculate-core-3.1.1_beta2-r5
=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 )
"

26
sys-apps/calculate-utilities/calculate-utilities-3.1.1_beta2-r15.ebuild
Unescape View File

@ -1,26 +0,0 @@
# 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-r9
=sys-apps/calculate-i18n-3.1.1_beta2-r2
=sys-apps/calculate-lib-3.1.1_beta2-r5
=sys-apps/calculate-core-3.1.1_beta2-r6
=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 )
"

26
sys-apps/calculate-utilities/calculate-utilities-3.1.1_beta2-r16.ebuild
Unescape View File

@ -1,26 +0,0 @@
# 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-r9
=sys-apps/calculate-i18n-3.1.1_beta2-r2
=sys-apps/calculate-lib-3.1.1_beta2-r5
=sys-apps/calculate-core-3.1.1_beta2-r7
=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 )
"

26
sys-apps/calculate-utilities/calculate-utilities-3.1.1_beta2-r17.ebuild
Unescape View File

@ -1,26 +0,0 @@
# 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-r9
=sys-apps/calculate-i18n-3.1.1_beta2-r2
=sys-apps/calculate-lib-3.1.1_beta2-r6
=sys-apps/calculate-core-3.1.1_beta2-r7
=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 )
"

26
sys-apps/calculate-utilities/calculate-utilities-3.1.1_beta2-r18.ebuild
Unescape View File

@ -1,26 +0,0 @@
# 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-r10
=sys-apps/calculate-i18n-3.1.1_beta2-r2
=sys-apps/calculate-lib-3.1.1_beta2-r6
=sys-apps/calculate-core-3.1.1_beta2-r7
=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 )
"

26
sys-apps/calculate-utilities/calculate-utilities-3.1.1_beta2-r19.ebuild
Unescape View File

@ -1,26 +0,0 @@
# 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-r10
=sys-apps/calculate-i18n-3.1.1_beta2-r2
=sys-apps/calculate-lib-3.1.1_beta2-r6
=sys-apps/calculate-core-3.1.1_beta2-r8
=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 )
"

26
sys-apps/calculate-utilities/calculate-utilities-3.1.1_beta2-r2.ebuild
Unescape View File

@ -1,26 +0,0 @@
# 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-r2
=sys-apps/calculate-i18n-3.1.1_beta2
=sys-apps/calculate-lib-3.1.1_beta2
=sys-apps/calculate-core-3.1.1_beta2-r1
=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 )
"

26
sys-apps/calculate-utilities/calculate-utilities-3.1.1_beta2-r20.ebuild
Unescape View File

@ -1,26 +0,0 @@
# 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-r11
=sys-apps/calculate-i18n-3.1.1_beta2-r2
=sys-apps/calculate-lib-3.1.1_beta2-r6
=sys-apps/calculate-core-3.1.1_beta2-r8
=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 )
"

26
sys-apps/calculate-utilities/calculate-utilities-3.1.1_beta2-r3.ebuild
Unescape View File

@ -1,26 +0,0 @@
# 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-r2
=sys-apps/calculate-i18n-3.1.1_beta2
=sys-apps/calculate-lib-3.1.1_beta2
=sys-apps/calculate-core-3.1.1_beta2-r2
=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 )
"

26
sys-apps/calculate-utilities/calculate-utilities-3.1.1_beta2-r4.ebuild
Unescape View File

@ -1,26 +0,0 @@
# 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-r3
=sys-apps/calculate-i18n-3.1.1_beta2
=sys-apps/calculate-lib-3.1.1_beta2
=sys-apps/calculate-core-3.1.1_beta2-r2
=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 )
"

26
sys-apps/calculate-utilities/calculate-utilities-3.1.1_beta2-r5.ebuild
Unescape View File

@ -1,26 +0,0 @@
# 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
=sys-apps/calculate-core-3.1.1_beta2-r2
=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 )
"

26
sys-apps/calculate-utilities/calculate-utilities-3.1.1_beta2-r6.ebuild
Unescape View File

@ -1,26 +0,0 @@
# 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-r1
=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 )
"

26
sys-apps/calculate-utilities/calculate-utilities-3.1.1_beta2-r7.ebuild
Unescape View File

@ -1,26 +0,0 @@
# 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 )
"

26
sys-apps/calculate-utilities/calculate-utilities-3.1.1_beta2-r8.ebuild
Unescape View File

@ -1,26 +0,0 @@
# 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-r5
=sys-apps/calculate-i18n-3.1.1_beta2
=sys-apps/calculate-lib-3.1.1_beta2-r3
=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 )
"

26
sys-apps/calculate-utilities/calculate-utilities-3.1.1_beta2-r9.ebuild
Unescape View File

@ -1,26 +0,0 @@
# 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-r5
=sys-apps/calculate-i18n-3.1.1_beta2-r1
=sys-apps/calculate-lib-3.1.1_beta2-r3
=sys-apps/calculate-core-3.1.1_beta2-r4
=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 )
"

26
sys-apps/calculate-utilities/calculate-utilities-3.1.1_beta2.ebuild
Unescape View File

@ -1,26 +0,0 @@
# 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
=sys-apps/calculate-i18n-3.1.1_beta2
=sys-apps/calculate-lib-3.1.1_beta2
=sys-apps/calculate-core-3.1.1_beta2
=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 )
"
Write Preview
Loading…
Cancel
Save