parent
7ba9fa5603
commit
4c70323034
@ -0,0 +1,33 @@
|
|||||||
|
# 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
|
||||||
|
http://mirror.yandex.ru/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.2.0
|
||||||
|
dev-python/dbus-python
|
||||||
|
virtual/python-imaging
|
||||||
|
dev-python/pyside[script]"
|
||||||
|
RDEPEND="${DEPEND}"
|
||||||
|
|
||||||
|
src_unpack() {
|
||||||
|
unpack "${A}"
|
||||||
|
cd "${S}"
|
||||||
|
|
||||||
|
# apply revision changes
|
||||||
|
epatch "${FILESDIR}/calculate-console-gui-3.2.0-r1.patch"
|
||||||
|
}
|
@ -0,0 +1,13 @@
|
|||||||
|
diff --git consolegui/application/ConnectionTabs.py consolegui/application/ConnectionTabs.py
|
||||||
|
index a2a5d16..0b78251 100644
|
||||||
|
--- consolegui/application/ConnectionTabs.py
|
||||||
|
+++ consolegui/application/ConnectionTabs.py
|
||||||
|
@@ -237,7 +237,7 @@ def parse():
|
||||||
|
parser.add_argument(
|
||||||
|
'--skip-options', action='store_true',
|
||||||
|
dest='skip_options', default=False,
|
||||||
|
- help=_('run method without options'))
|
||||||
|
+ help=_('run the method without options'))
|
||||||
|
parser.add_argument(
|
||||||
|
'-p', '--port', type=int, dest='port',
|
||||||
|
help=_('port number'))
|
@ -0,0 +1,30 @@
|
|||||||
|
# Copyright 1999-2012 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: $
|
||||||
|
|
||||||
|
EAPI="3"
|
||||||
|
SUPPORT_PYTHON_ABIS="1"
|
||||||
|
PYTHON_DEPEND="2:2.7"
|
||||||
|
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
|
||||||
|
|
||||||
|
inherit distutils eutils
|
||||||
|
|
||||||
|
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2
|
||||||
|
http://mirror.yandex.ru/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.2.0"
|
||||||
|
RDEPEND="${DEPEND}"
|
||||||
|
|
||||||
|
src_unpack() {
|
||||||
|
unpack "${A}"
|
||||||
|
cd "${S}"
|
||||||
|
|
||||||
|
# apply revision changes
|
||||||
|
epatch "${FILESDIR}/calculate-console-3.2.0-r1.patch"
|
||||||
|
}
|
@ -0,0 +1,13 @@
|
|||||||
|
diff --git console/application/methods_func.py console/application/methods_func.py
|
||||||
|
index 8c53dab..5b6b292 100644
|
||||||
|
--- console/application/methods_func.py
|
||||||
|
+++ console/application/methods_func.py
|
||||||
|
@@ -67,7 +67,7 @@ def parse():
|
||||||
|
dest='pid_res', help=_("view the result of the process"))
|
||||||
|
parser.add_argument(
|
||||||
|
'--keep-result', action='store_true', default=False,
|
||||||
|
- dest='keep_result', help=_("keep the cache of the relevant "
|
||||||
|
+ dest='keep_result', help=_("keep the cache of the "
|
||||||
|
"process results"))
|
||||||
|
parser.add_argument(
|
||||||
|
'--pid-kill', type=int, metavar = 'PID',
|
@ -0,0 +1,52 @@
|
|||||||
|
# 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
|
||||||
|
http://mirror.yandex.ru/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.2.0
|
||||||
|
>=dev-python/soaplib-1.0
|
||||||
|
!minimal? ( dev-python/sudsds
|
||||||
|
net-libs/dslib
|
||||||
|
dev-python/pyopenssl
|
||||||
|
dev-libs/openssl
|
||||||
|
=dev-python/m2crypto-0.21.1-r1
|
||||||
|
dev-python/cherrypy )"
|
||||||
|
RDEPEND="${DEPEND}"
|
||||||
|
|
||||||
|
pkg_preinst() {
|
||||||
|
dosym /usr/sbin/cl-core /usr/sbin/cl-core-setup
|
||||||
|
dosym /usr/sbin/cl-core /usr/sbin/cl-core-patch
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_postinst() {
|
||||||
|
einfo "For autoconfigure calculate-core for adminuser perform:"
|
||||||
|
einfo " cl-core --bootstrap <username>"
|
||||||
|
einfo "For run calculate-core perform:"
|
||||||
|
einfo " /etc/init.d/calculate-core start"
|
||||||
|
einfo "Add calcualte core to autorun:"
|
||||||
|
einfo " rc-update add calculate-core boot"
|
||||||
|
}
|
||||||
|
|
||||||
|
src_unpack() {
|
||||||
|
unpack "${A}"
|
||||||
|
cd "${S}"
|
||||||
|
|
||||||
|
# apply revision changes
|
||||||
|
epatch "${FILESDIR}/calculate-core-3.2.0-r2.patch"
|
||||||
|
}
|
@ -0,0 +1,29 @@
|
|||||||
|
diff --git core/server/func.py core/server/func.py
|
||||||
|
index 5a6b964..b06ff53 100644
|
||||||
|
--- core/server/func.py
|
||||||
|
+++ core/server/func.py
|
||||||
|
@@ -1706,9 +1706,9 @@ class WsdlMeta(type):
|
||||||
|
if kwargs["groups"]:
|
||||||
|
def group(*args,**kwargs):
|
||||||
|
if isinstance(kwargs.get('normal',()), (unicode, str)):
|
||||||
|
- raise DataVarsError(_("Wrong normal varaiable list"))
|
||||||
|
+ raise DataVarsError(_("Wrong normal varaiables list"))
|
||||||
|
if isinstance(kwargs.get('expert',()), (unicode, str)):
|
||||||
|
- raise DataVarsError(_("Wrong expert varaiable list"))
|
||||||
|
+ raise DataVarsError(_("Wrong expert varaiables list"))
|
||||||
|
for gr in kwargs['groups']:
|
||||||
|
gr(group)
|
||||||
|
if not dv:
|
||||||
|
diff --git core/server/gen_pid.py core/server/gen_pid.py
|
||||||
|
index e0915da..865d991 100644
|
||||||
|
--- core/server/gen_pid.py
|
||||||
|
+++ core/server/gen_pid.py
|
||||||
|
@@ -65,7 +65,7 @@ def clear_finished_pids(clVars):
|
||||||
|
d = pickle.load(open(pidfile))
|
||||||
|
if path.exists(path.join("/proc", str(d['os_pid']))):
|
||||||
|
continue
|
||||||
|
- except (ValueError, KeyError, EOFError, OSError):
|
||||||
|
+ except BaseException:
|
||||||
|
pass
|
||||||
|
with ignore(OSError):
|
||||||
|
os.unlink(pidfile)
|
@ -1,11 +1,13 @@
|
|||||||
AUX calculate-i18n-3.2.0-r1.patch 379 SHA256 4bd21766a6cb05c5e99e4d3b69acf5990b025ac91d50361f92c70aaa7172d453 SHA512 66fae6b57aa1e5e3cabe99b7c480600174317eb0aa746ab0baa6149ab7b700a93ca5b62f41bbee1004661483be9efc5e7bca6238ad20a20590179e51af1d0031 WHIRLPOOL 03652e78789d21b03848cf49f6ca2fd1410ba2475514db08aee7b46ee1bd6da553a30949b2d7845d608e78564c0fd1632d5fd08cd2374dd81d8adc9470d3bffc
|
AUX calculate-i18n-3.2.0-r1.patch 379 SHA256 4bd21766a6cb05c5e99e4d3b69acf5990b025ac91d50361f92c70aaa7172d453 SHA512 66fae6b57aa1e5e3cabe99b7c480600174317eb0aa746ab0baa6149ab7b700a93ca5b62f41bbee1004661483be9efc5e7bca6238ad20a20590179e51af1d0031 WHIRLPOOL 03652e78789d21b03848cf49f6ca2fd1410ba2475514db08aee7b46ee1bd6da553a30949b2d7845d608e78564c0fd1632d5fd08cd2374dd81d8adc9470d3bffc
|
||||||
AUX calculate-i18n-3.2.0-r2.patch 1292 SHA256 bcef98bfffce2f9488f1dd3c5597a078d866d41b4e04024428bd2b7ad4cc17ae SHA512 c0fe9f239b30f34c6a8d29d6db7f566cb56a6e209f50b88f1b96d0cf45378bb6ff3a8fa2106b7a91f9b3ed510b7f3ab49b71bba4c1bf323fed889161218f60bf WHIRLPOOL 1d6c00616f10787335a3c29f2076030ef686321bd82be2ec50598a38af7a1bf062433bdd34b9c965aaed897b847f52d31df53beea80824fcc7d429904580b29d
|
AUX calculate-i18n-3.2.0-r2.patch 1292 SHA256 bcef98bfffce2f9488f1dd3c5597a078d866d41b4e04024428bd2b7ad4cc17ae SHA512 c0fe9f239b30f34c6a8d29d6db7f566cb56a6e209f50b88f1b96d0cf45378bb6ff3a8fa2106b7a91f9b3ed510b7f3ab49b71bba4c1bf323fed889161218f60bf WHIRLPOOL 1d6c00616f10787335a3c29f2076030ef686321bd82be2ec50598a38af7a1bf062433bdd34b9c965aaed897b847f52d31df53beea80824fcc7d429904580b29d
|
||||||
|
AUX calculate-i18n-3.2.0-r3.patch 87141 SHA256 04d3cc5ab6466ea3a598b3f7b0b507a1d6f96bd35d36c216b05182fec3d2fb79 SHA512 91102776db5f0e2e8962e6a06c03d831a52e2f2efec40df8f4941c84e8d883a2c1b4a6c4cbdc3fd92d9d220280ddd2669e5175b5c5866255a21227d8a4ab1fed WHIRLPOOL a015d1d4790588bb1b84eaa6445b149ed75c7baa5033402e2ed39727e7df694962cc4e0d96698974d492cd8548017867ed9b1becbf915a68f27c4fac79492364
|
||||||
DIST calculate-i18n-2.2.32.tar.bz2 34059 SHA256 cd21ff9dd1f429327a8651691e44dc1a1b37f48705962ff4c61e53605ebe4b14 SHA512 377ae5a67b6b4a86b947a5b7465a3704ccecca9bbdacf3d8e0040190689d0e312d48d2e7824883ab9e787e1bcad0b3c61ba553ac33ccee1fe5e27c7b0e419844 WHIRLPOOL 215727ec25d0f79ad5a35994562ee8ca621242fcfeeec2c905411203883593cb3eb60a2671747c3addc736524673000ea399cd0be73e4cf818f6af53788e5b2a
|
DIST calculate-i18n-2.2.32.tar.bz2 34059 SHA256 cd21ff9dd1f429327a8651691e44dc1a1b37f48705962ff4c61e53605ebe4b14 SHA512 377ae5a67b6b4a86b947a5b7465a3704ccecca9bbdacf3d8e0040190689d0e312d48d2e7824883ab9e787e1bcad0b3c61ba553ac33ccee1fe5e27c7b0e419844 WHIRLPOOL 215727ec25d0f79ad5a35994562ee8ca621242fcfeeec2c905411203883593cb3eb60a2671747c3addc736524673000ea399cd0be73e4cf818f6af53788e5b2a
|
||||||
DIST calculate-i18n-3.2.0.tar.bz2 130580 SHA256 f2243ce8eff9afe7813bd02026c5c88604db572e6786554f4cca27afaf4c21b3 SHA512 a0f18c0766a58920cf023dbc833508c4a2ac3ce8bdae059e68807ac424002aeec670a4e077649de7d27ee419043e637f3bf545eba752d0c95925d9e9d0d58c84 WHIRLPOOL caf472008539152423ac6979c8cda24213b09cc0e2663b86a0ab83b1a15ff30ac86551c627c17eb00360dbed1324a63b7e7220e103bf383a0730a516ba5cd90e
|
DIST calculate-i18n-3.2.0.tar.bz2 130580 SHA256 f2243ce8eff9afe7813bd02026c5c88604db572e6786554f4cca27afaf4c21b3 SHA512 a0f18c0766a58920cf023dbc833508c4a2ac3ce8bdae059e68807ac424002aeec670a4e077649de7d27ee419043e637f3bf545eba752d0c95925d9e9d0d58c84 WHIRLPOOL caf472008539152423ac6979c8cda24213b09cc0e2663b86a0ab83b1a15ff30ac86551c627c17eb00360dbed1324a63b7e7220e103bf383a0730a516ba5cd90e
|
||||||
EBUILD calculate-i18n-2.2.32.ebuild 832 SHA256 09ea7ff84e6c8d265f85ccaa6916ade59d7709de1270b31cfd2c722505e71375 SHA512 b742cf1ae95b29bf6eb8de5d44bfac3cac490d1ec082cbda8579d038a2a01db262a51e63b132dbba0a36b0e57e06d5bba2ae552ae8273cfddd28a6441847c2c7 WHIRLPOOL 064cbae668f2d8f9a7d02eea6f69be12aafa2620d07429a86529e419b5fb2e7bc330aeef93bb00c7d931820c36ef33ce56413bda86c3b35aa43c38ff973e147f
|
EBUILD calculate-i18n-2.2.32.ebuild 832 SHA256 09ea7ff84e6c8d265f85ccaa6916ade59d7709de1270b31cfd2c722505e71375 SHA512 b742cf1ae95b29bf6eb8de5d44bfac3cac490d1ec082cbda8579d038a2a01db262a51e63b132dbba0a36b0e57e06d5bba2ae552ae8273cfddd28a6441847c2c7 WHIRLPOOL 064cbae668f2d8f9a7d02eea6f69be12aafa2620d07429a86529e419b5fb2e7bc330aeef93bb00c7d931820c36ef33ce56413bda86c3b35aa43c38ff973e147f
|
||||||
EBUILD calculate-i18n-2.2.9999.ebuild 770 SHA256 2c38668205a788dd9d1ed413eba96a4f628a14e6f6c7a1ba8718bbcb0842a1ca SHA512 4ddb81ebd5b5c488d7eaad86172394d502e965f5348594054ba104bf706b830987e8f57b60893898e5167184eba1b0b108a683c954c8f80498665fe069504810 WHIRLPOOL 8c0063a90e103e6bf34d4be221aeb086703688830fe3179dbd177750cb179432ec2055886330f99ba8eada65abe97fc805da90ed9f257f8c87d7384611fa677d
|
EBUILD calculate-i18n-2.2.9999.ebuild 770 SHA256 2c38668205a788dd9d1ed413eba96a4f628a14e6f6c7a1ba8718bbcb0842a1ca SHA512 4ddb81ebd5b5c488d7eaad86172394d502e965f5348594054ba104bf706b830987e8f57b60893898e5167184eba1b0b108a683c954c8f80498665fe069504810 WHIRLPOOL 8c0063a90e103e6bf34d4be221aeb086703688830fe3179dbd177750cb179432ec2055886330f99ba8eada65abe97fc805da90ed9f257f8c87d7384611fa677d
|
||||||
EBUILD calculate-i18n-3.2.0-r1.ebuild 782 SHA256 b1c0544805946632141f3ee7c3683d5248e5f2cff4080dcc3e7bd57a08544c85 SHA512 64fe77c32297ae8973028438152c4cc49a664c69a91962c538ea4b7bfc44a57cbcbe89498792e675b1e2721c200f18cb525bdd108d961266c5a15ed1afda09e2 WHIRLPOOL 94c3025b19e36a1ea08bef9b58ac3f3d826dea1b15f702cebfc52b3600735d71c0fb07544b36e65752cfa0d58c0868482b5ff921a43c109b5176c67821d478e5
|
EBUILD calculate-i18n-3.2.0-r1.ebuild 782 SHA256 b1c0544805946632141f3ee7c3683d5248e5f2cff4080dcc3e7bd57a08544c85 SHA512 64fe77c32297ae8973028438152c4cc49a664c69a91962c538ea4b7bfc44a57cbcbe89498792e675b1e2721c200f18cb525bdd108d961266c5a15ed1afda09e2 WHIRLPOOL 94c3025b19e36a1ea08bef9b58ac3f3d826dea1b15f702cebfc52b3600735d71c0fb07544b36e65752cfa0d58c0868482b5ff921a43c109b5176c67821d478e5
|
||||||
EBUILD calculate-i18n-3.2.0-r2.ebuild 782 SHA256 197a6d86cd3372c9960062e042610c700abb21e22b1e69dff03d5c260bdffded SHA512 ddb16492bbee9d06b75b217ba3087db609912bab7ed00379957ccf91fa9f004a4a4951efac406b3acc3766e9092ac98821aa8e767f0d4e5fb171049e8c4e1144 WHIRLPOOL a6ba992464f24bfed0eb4ef49bf978e8bd1f95c62bf8a72cba2bbfc91efa495c54b4d792094108e44b0307f9d6d75fc471314f635e94b239ab20fe48ec7cec70
|
EBUILD calculate-i18n-3.2.0-r2.ebuild 782 SHA256 197a6d86cd3372c9960062e042610c700abb21e22b1e69dff03d5c260bdffded SHA512 ddb16492bbee9d06b75b217ba3087db609912bab7ed00379957ccf91fa9f004a4a4951efac406b3acc3766e9092ac98821aa8e767f0d4e5fb171049e8c4e1144 WHIRLPOOL a6ba992464f24bfed0eb4ef49bf978e8bd1f95c62bf8a72cba2bbfc91efa495c54b4d792094108e44b0307f9d6d75fc471314f635e94b239ab20fe48ec7cec70
|
||||||
|
EBUILD calculate-i18n-3.2.0-r3.ebuild 782 SHA256 c7dda3b2dd4a14219d3d75445a12c43cb0feda493644c11ca057729f6d1e127a SHA512 29328416ebd2a821a5c6dfdfbd6ed44e27eae63270f24ac651fcc3f05fd78a9ed6df144d6482017bd6953d331366c18be4241b42c7b43f51ef49e84a2bfbb300 WHIRLPOOL c12e69fcfb431c21d78fb079f61da0166263baa9823cfb8e7a5b3c880730e84033b7b8e6adf6c4f99876d503309567eb7b9ed67c9947d2436c469bff0af54b94
|
||||||
EBUILD calculate-i18n-3.2.9999.ebuild 583 SHA256 aa60c513b0f672aa9618bfd8099fefaf49fa5ef9b24ee2645356da69563032fa SHA512 14b87ddb0f910e1b983ef465efdc56347abe01d4cdc11d6d81d593a2e65dcba1b79357d37952d7aa7f800fad8d30592db2e337d0fc6ca9807bdba618aff48528 WHIRLPOOL 14a1c4f1ef646aee28934e820763bd149e37860cce1ee34ac2229742980ec178fc43ba284b59a2f71a740cfa8e48ff7658a613b03eb0f84d4a10cefdd65450da
|
EBUILD calculate-i18n-3.2.9999.ebuild 583 SHA256 aa60c513b0f672aa9618bfd8099fefaf49fa5ef9b24ee2645356da69563032fa SHA512 14b87ddb0f910e1b983ef465efdc56347abe01d4cdc11d6d81d593a2e65dcba1b79357d37952d7aa7f800fad8d30592db2e337d0fc6ca9807bdba618aff48528 WHIRLPOOL 14a1c4f1ef646aee28934e820763bd149e37860cce1ee34ac2229742980ec178fc43ba284b59a2f71a740cfa8e48ff7658a613b03eb0f84d4a10cefdd65450da
|
||||||
MISC ChangeLog 6384 SHA256 effc6918170f5331b649c7c25ccbbc971a71320be1be056da843adff998c5054 SHA512 5cca782e736ad7b526e434e7f4e1a3ed32bebf98704fda17751f3a8aa8b94896a2864f12edd4aa3fafdbc567db8282efa6355b2313cc119b275b87a756991d31 WHIRLPOOL e24811fac9e15f95144c27b27ae2509effcb3359aa24a9338ec88faffbe0588049367ac3fb8e2c9d823a1e259b1cac3c8503124aa161a9be598a209adffab56e
|
MISC ChangeLog 6384 SHA256 effc6918170f5331b649c7c25ccbbc971a71320be1be056da843adff998c5054 SHA512 5cca782e736ad7b526e434e7f4e1a3ed32bebf98704fda17751f3a8aa8b94896a2864f12edd4aa3fafdbc567db8282efa6355b2313cc119b275b87a756991d31 WHIRLPOOL e24811fac9e15f95144c27b27ae2509effcb3359aa24a9338ec88faffbe0588049367ac3fb8e2c9d823a1e259b1cac3c8503124aa161a9be598a209adffab56e
|
||||||
MISC metadata.xml 276 SHA256 a2312171d1cbfac41a263c0be692d3d12cfa3aab51979af64487824ae674bc2c SHA512 245463edebeceaa340b3e908e9d9a867be6468f00a1f1371b0c81c34e8f0adab2fa0985a2d47bcea7ae222bc481a4da934b8c1386ea664caed110058fb5cbf03 WHIRLPOOL 6b92e6af676bdd0f173df32a5751a16b88c39e8d10f16b7c8867d18a3c4cb4a44938231c315d9e76c8995cb68a8680e858bd984e6649a4470e03d594a0e23ba2
|
MISC metadata.xml 276 SHA256 a2312171d1cbfac41a263c0be692d3d12cfa3aab51979af64487824ae674bc2c SHA512 245463edebeceaa340b3e908e9d9a867be6468f00a1f1371b0c81c34e8f0adab2fa0985a2d47bcea7ae222bc481a4da934b8c1386ea664caed110058fb5cbf03 WHIRLPOOL 6b92e6af676bdd0f173df32a5751a16b88c39e8d10f16b7c8867d18a3c4cb4a44938231c315d9e76c8995cb68a8680e858bd984e6649a4470e03d594a0e23ba2
|
||||||
|
@ -0,0 +1,32 @@
|
|||||||
|
# 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
|
||||||
|
http://mirror.yandex.ru/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.2.0"
|
||||||
|
|
||||||
|
DEPEND="sys-devel/gettext
|
||||||
|
${RDEPEND}"
|
||||||
|
|
||||||
|
src_unpack() {
|
||||||
|
unpack "${A}"
|
||||||
|
cd "${S}"
|
||||||
|
|
||||||
|
# apply revision changes
|
||||||
|
epatch "${FILESDIR}/calculate-i18n-3.2.0-r3.patch"
|
||||||
|
}
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,38 @@
|
|||||||
|
# Copyright 1999-2012 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: $
|
||||||
|
|
||||||
|
EAPI="3"
|
||||||
|
SUPPORT_PYTHON_ABIS="1"
|
||||||
|
PYTHON_DEPEND="2:2.7"
|
||||||
|
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
|
||||||
|
|
||||||
|
inherit distutils eutils
|
||||||
|
|
||||||
|
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2
|
||||||
|
http://mirror.yandex.ru/calculate/calculate3/${PN}/${P}.tar.bz2"
|
||||||
|
|
||||||
|
DESCRIPTION="The library for Calculate 3"
|
||||||
|
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||||
|
LICENSE="Apache-2.0"
|
||||||
|
SLOT="3"
|
||||||
|
KEYWORDS="amd64 x86"
|
||||||
|
IUSE="minimal"
|
||||||
|
DEPEND="!minimal? ( dev-python/py-smbpasswd )
|
||||||
|
>=dev-python/pyxml-0.8
|
||||||
|
sys-apps/iproute2
|
||||||
|
sys-apps/pciutils
|
||||||
|
dev-python/progressbar
|
||||||
|
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.2.0-r2.patch"
|
||||||
|
}
|
@ -0,0 +1,26 @@
|
|||||||
|
diff --git calculate/lib/utils/files.py calculate/lib/utils/files.py
|
||||||
|
index b9d4497..09b496a 100644
|
||||||
|
--- calculate/lib/utils/files.py
|
||||||
|
+++ calculate/lib/utils/files.py
|
||||||
|
@@ -114,8 +114,7 @@ class process:
|
||||||
|
stdin=kwarg["stdin"].getStdout
|
||||||
|
self.stdout = kwarg.get("stdout",PIPE)
|
||||||
|
self.envdict = kwarg.get("envdict",os.environ.copy())
|
||||||
|
- if "lang" in kwarg:
|
||||||
|
- self.envdict["LANG"] = kwarg.get('lang')
|
||||||
|
+ self.envdict["LANG"] = kwarg.get('lang','C')
|
||||||
|
self.langc = "langc" in kwarg
|
||||||
|
|
||||||
|
self.stderr = kwarg.get("stderr",PIPE)
|
||||||
|
diff --git calculate/lib/variables/env.py calculate/lib/variables/env.py
|
||||||
|
index 6493ff8..d492827 100644
|
||||||
|
--- calculate/lib/variables/env.py
|
||||||
|
+++ calculate/lib/variables/env.py
|
||||||
|
@@ -445,6 +445,6 @@ class VariableClMakeProfile(Variable):
|
||||||
|
if not val:
|
||||||
|
raise VariableError(
|
||||||
|
_("Failed to detect the system profile.") + " " +
|
||||||
|
- _("Select profile by command {cmd}").format(
|
||||||
|
+ _("Select the profile with command {cmd}").format(
|
||||||
|
cmd="cl-update-profile"))
|
||||||
|
return val
|
@ -1,5 +1,7 @@
|
|||||||
AUX calculate-update-3.2.0-r1.patch 615 SHA256 f23a7719ff81dbf9db43d183919e5b89b3f4313cf61e01911cf0d1c839fbb365 SHA512 a43b438db59c56768faa6b5981cc66f707db48882f962fffe8eab692ef4175cbe3dd7e32d1023eb7e29b0038ed971a1aaffeb236f595760d2211a60570b6f850 WHIRLPOOL b0aef347aa74d45d09d91f406404ce31023775884dccd820567f28d5312d02e05a4ab42015a5714ef433b1927c6351d075302428a6dfda945af99bc24c2cdcce
|
AUX calculate-update-3.2.0-r1.patch 615 SHA256 f23a7719ff81dbf9db43d183919e5b89b3f4313cf61e01911cf0d1c839fbb365 SHA512 a43b438db59c56768faa6b5981cc66f707db48882f962fffe8eab692ef4175cbe3dd7e32d1023eb7e29b0038ed971a1aaffeb236f595760d2211a60570b6f850 WHIRLPOOL b0aef347aa74d45d09d91f406404ce31023775884dccd820567f28d5312d02e05a4ab42015a5714ef433b1927c6351d075302428a6dfda945af99bc24c2cdcce
|
||||||
|
AUX calculate-update-3.2.0-r2.patch 3794 SHA256 4a4b92feaf6378b2a7ec0894734498a04f8900b4ee5e959a0070bec335ef4fc1 SHA512 8eec5864b821cc44bb8274704c6117ce03fd452638829b7fec5d9415330cecb52525666e6612506945309311ffe4ec497a1b75101398ee0e9d68c2da408197c0 WHIRLPOOL 49c6c45b4d69f58c32eaba2c4f1d707aac39303739d30bddfadc2db4e55cf68029dbaf4e828973e46dea4d451894e20d9faa8213730a57e8795b020d1a7d6ee2
|
||||||
DIST calculate-update-3.2.0.tar.bz2 32349 SHA256 c4c9cc506c61754a74b7f77e5cee641a7ac8a92109b092abf595ddb77868ed05 SHA512 707cd753ad73e59ac3016177d7f3a52a7614be0b85a7b64d0e47858541ce7d9e75531f55cf3169c3734e4bcb8e2ab145a3acdaad1e8b656ee356cb87f7624767 WHIRLPOOL d2a0bfc8d8f756584fdb8c67a1bd950659210de441f8e2cf77cec6416d90a3aaad95bdd42d901fc2b9ce50ee82b9f3c66c6ff2122c4a0250f04d8bb86abf7c7d
|
DIST calculate-update-3.2.0.tar.bz2 32349 SHA256 c4c9cc506c61754a74b7f77e5cee641a7ac8a92109b092abf595ddb77868ed05 SHA512 707cd753ad73e59ac3016177d7f3a52a7614be0b85a7b64d0e47858541ce7d9e75531f55cf3169c3734e4bcb8e2ab145a3acdaad1e8b656ee356cb87f7624767 WHIRLPOOL d2a0bfc8d8f756584fdb8c67a1bd950659210de441f8e2cf77cec6416d90a3aaad95bdd42d901fc2b9ce50ee82b9f3c66c6ff2122c4a0250f04d8bb86abf7c7d
|
||||||
EBUILD calculate-update-3.2.0-r1.ebuild 928 SHA256 c22729f5023dd736233da7b9b44c0fa08419cbc9d101882e656e1abce58d0e2a SHA512 5d4af2f04b8056a82c20acbe3ee6b806509de64a6b1d81e0d05891e5884c251d6d722e2c461845f8aa72a3c2825949a0d1826df94fc33477675e232633f6f5f0 WHIRLPOOL 4b005ff507181534570ae716885ea81fd144f0442cc22011d21c99c1833514bcf0727da681f3076caa1feaa090d240de32d6c508ace4e048796bbade3bf9e358
|
EBUILD calculate-update-3.2.0-r1.ebuild 928 SHA256 c22729f5023dd736233da7b9b44c0fa08419cbc9d101882e656e1abce58d0e2a SHA512 5d4af2f04b8056a82c20acbe3ee6b806509de64a6b1d81e0d05891e5884c251d6d722e2c461845f8aa72a3c2825949a0d1826df94fc33477675e232633f6f5f0 WHIRLPOOL 4b005ff507181534570ae716885ea81fd144f0442cc22011d21c99c1833514bcf0727da681f3076caa1feaa090d240de32d6c508ace4e048796bbade3bf9e358
|
||||||
|
EBUILD calculate-update-3.2.0-r2.ebuild 928 SHA256 f59f97158c16cabc512273b24e4084a92e3af20d791cdfdd140a68d6e0662890 SHA512 b5c44be7de87d731de53735c110f897babc59f2fbdad09cb46bcc82223034793c6af09d17e855b4a74d74c6580afb0fb1467bfc9e9ab46896b73369c4fc142ec WHIRLPOOL f87c355e2908bd1774a59504376e9806d835d4b9c3aada6ee01c1a3eef3d61d5d89fd01b6dad0d1a86f8ba5e220ebb9dffee39b5a8adb3e028262c1e2433c7b5
|
||||||
EBUILD calculate-update-3.2.9999.ebuild 520 SHA256 13be99f26482c5ef9097b758b66c25024df1850963b1c7dbacab71bd50ea4815 SHA512 7b077570676855b0cc3fa87ec329f14d2a94cf90bebab80ab03e9b0711f21fa7c578e8c063d05bc07e32031b48c342523a2344f06face54af455d885a9a8836a WHIRLPOOL 8443a7028edec83ccd6a870116b5fadc1b22e668e0df179bed9e4be06307f0c37834eed788e5ae620d619e6a6ca1dc09ed75fccd6cd0e4e46c77f480077189af
|
EBUILD calculate-update-3.2.9999.ebuild 520 SHA256 13be99f26482c5ef9097b758b66c25024df1850963b1c7dbacab71bd50ea4815 SHA512 7b077570676855b0cc3fa87ec329f14d2a94cf90bebab80ab03e9b0711f21fa7c578e8c063d05bc07e32031b48c342523a2344f06face54af455d885a9a8836a WHIRLPOOL 8443a7028edec83ccd6a870116b5fadc1b22e668e0df179bed9e4be06307f0c37834eed788e5ae620d619e6a6ca1dc09ed75fccd6cd0e4e46c77f480077189af
|
||||||
MISC metadata.xml 274 SHA256 90e473fd86cfea0413c6716c7dbbf79b686276fcd1ebe41e5ce60116335f825c SHA512 81d626411cde5b4f6d3fba8f9848e11aa981a0b300eae59f0a473738b2612b2c356d7c3933cee6c2e15f09515c0be39bc6a3175a877fe318f39a704540516588 WHIRLPOOL 90b28551a43fda86643748748b25743df29d292b865b0a8ad338f4386eae7dc5232b54d539c286c4a7004fb194f783450441fdf09654739962da4d1cf7725bae
|
MISC metadata.xml 274 SHA256 90e473fd86cfea0413c6716c7dbbf79b686276fcd1ebe41e5ce60116335f825c SHA512 81d626411cde5b4f6d3fba8f9848e11aa981a0b300eae59f0a473738b2612b2c356d7c3933cee6c2e15f09515c0be39bc6a3175a877fe318f39a704540516588 WHIRLPOOL 90b28551a43fda86643748748b25743df29d292b865b0a8ad338f4386eae7dc5232b54d539c286c4a7004fb194f783450441fdf09654739962da4d1cf7725bae
|
||||||
|
@ -0,0 +1,39 @@
|
|||||||
|
# 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
|
||||||
|
http://mirror.yandex.ru/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.2.0
|
||||||
|
~sys-apps/calculate-install-3.2.0
|
||||||
|
dev-python/pexpect"
|
||||||
|
|
||||||
|
RDEPEND="${DEPEND}"
|
||||||
|
|
||||||
|
pkg_preinst() {
|
||||||
|
dosym /usr/sbin/cl-core /usr/sbin/cl-update
|
||||||
|
dosym /usr/sbin/cl-core /usr/sbin/cl-update-profile
|
||||||
|
}
|
||||||
|
|
||||||
|
src_unpack() {
|
||||||
|
unpack "${A}"
|
||||||
|
cd "${S}"
|
||||||
|
|
||||||
|
# apply revision changes
|
||||||
|
epatch "${FILESDIR}/calculate-update-3.2.0-r2.patch"
|
||||||
|
}
|
@ -0,0 +1,85 @@
|
|||||||
|
diff --git update/update.py update/update.py
|
||||||
|
index b1eda94..c2eb158 100644
|
||||||
|
--- update/update.py
|
||||||
|
+++ update/update.py
|
||||||
|
@@ -128,7 +128,7 @@ class Update:
|
||||||
|
Проверить по расписанию необходимость запуска команды
|
||||||
|
"""
|
||||||
|
if not status:
|
||||||
|
- self.printWARNING(_("Update autocheck is not enabled"))
|
||||||
|
+ self.printWARNING(_("Updates autocheck is not enabled"))
|
||||||
|
return False
|
||||||
|
line = EmergeLog(EmergeLogNamedTask("schedule")).get_last_time()
|
||||||
|
re_interval = re.compile("^(\d+)\s*(hours?|days?|weeks?)?", re.I)
|
||||||
|
@@ -150,7 +150,7 @@ class Update:
|
||||||
|
linetime = line.partition(":")[0]
|
||||||
|
if linetime.isdigit():
|
||||||
|
if (time.time() - int(linetime)) < (est - 10 * MINUTE):
|
||||||
|
- self.printWARNING(_("Update time is not yet come"))
|
||||||
|
+ self.printWARNING(_("Please wait for the update time"))
|
||||||
|
return False
|
||||||
|
self.mark_schedule()
|
||||||
|
return True
|
||||||
|
diff --git update/utils/cl_setup_update.py update/utils/cl_setup_update.py
|
||||||
|
index 730baf4..e2e2943 100644
|
||||||
|
--- update/utils/cl_setup_update.py
|
||||||
|
+++ update/utils/cl_setup_update.py
|
||||||
|
@@ -32,8 +32,8 @@ class ClSetupUpdateAction(Action):
|
||||||
|
# ошибки, которые отображаются без подробностей
|
||||||
|
native_error = (FilesError, UpdateError, GitError)
|
||||||
|
|
||||||
|
- successMessage = __("Updates autocheck settings configured!")
|
||||||
|
- failedMessage = __("Failed to configure the updates autocheck settings!")
|
||||||
|
+ successMessage = __("Updates autocheck configured!")
|
||||||
|
+ failedMessage = __("Failed to configure the updates autocheck procedure!")
|
||||||
|
interruptMessage = __("Configuration manually interrupted")
|
||||||
|
|
||||||
|
|
||||||
|
diff --git update/variables/update.py update/variables/update.py
|
||||||
|
index 06d5df8..3c0e1ee 100644
|
||||||
|
--- update/variables/update.py
|
||||||
|
+++ update/variables/update.py
|
||||||
|
@@ -800,7 +800,7 @@ class VariableClUpdateProfileSystem(Variable):
|
||||||
|
if not dv.Get('os_linux_name'):
|
||||||
|
raise VariableError()
|
||||||
|
except (DataVarsError, VariableError) as e:
|
||||||
|
- raise VariableError(_("Profile is not Calculate"))
|
||||||
|
+ raise VariableError(_("The selected profile is not Calculate"))
|
||||||
|
else:
|
||||||
|
raise VariableError(_("Wrong Calculate profile"))
|
||||||
|
|
||||||
|
@@ -871,8 +871,8 @@ class VariableClUpdateProfileSyncSet(Variable):
|
||||||
|
opt = ["-s", "--sync"]
|
||||||
|
|
||||||
|
def init(self):
|
||||||
|
- self.label = _("Synchronize repositories")
|
||||||
|
- self.help = _("synchronize repositories")
|
||||||
|
+ self.label = _("Repositories to be synchronized")
|
||||||
|
+ self.help = _("repositories to be synchronized")
|
||||||
|
|
||||||
|
|
||||||
|
class VariableClUpdateAutocheckSet(Variable):
|
||||||
|
@@ -916,8 +916,8 @@ class VariableClUpdateAutocheckScheduleSet(Variable):
|
||||||
|
opt = ["--schedule"]
|
||||||
|
|
||||||
|
def init(self):
|
||||||
|
- self.label = _("Consider auto-check schedule")
|
||||||
|
- self.help = "consider auto-check schedule"
|
||||||
|
+ self.label = _("Consider the autocheck schedule")
|
||||||
|
+ self.help = _("consider the autocheck schedule")
|
||||||
|
|
||||||
|
class VariableClUpdateKernelVersion(ReadonlyVariable):
|
||||||
|
"""
|
||||||
|
diff --git update/wsdl_update.py update/wsdl_update.py
|
||||||
|
index 6f95581..fea9c45 100644
|
||||||
|
--- update/wsdl_update.py
|
||||||
|
+++ update/wsdl_update.py
|
||||||
|
@@ -86,7 +86,7 @@ class Wsdl(WsdlBase):
|
||||||
|
# категория метода
|
||||||
|
'category': __('Update'),
|
||||||
|
# заголовок метода
|
||||||
|
- 'title': __("Update the Profile"),
|
||||||
|
+ 'title': __("Change the Profile"),
|
||||||
|
# иконка для графической консоли
|
||||||
|
'image': 'preferences-system',
|
||||||
|
# метод присутствует в графической консоли
|
@ -0,0 +1,26 @@
|
|||||||
|
# Copyright 1999-2011 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: $
|
||||||
|
|
||||||
|
EAPI=4
|
||||||
|
|
||||||
|
DESCRIPTION="Calculate Utilities meta package"
|
||||||
|
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||||
|
SRC_URI=""
|
||||||
|
|
||||||
|
LICENSE="Apache-2.0"
|
||||||
|
SLOT="3"
|
||||||
|
KEYWORDS="amd64 x86"
|
||||||
|
IUSE="cl_consolegui cl_client cl_desktop cl_console"
|
||||||
|
|
||||||
|
RDEPEND="${RDEPEND}
|
||||||
|
=sys-apps/calculate-install-3.2.0
|
||||||
|
=sys-apps/calculate-i18n-3.2.0-r3
|
||||||
|
=sys-apps/calculate-lib-3.2.0-r2
|
||||||
|
=sys-apps/calculate-core-3.2.0-r2
|
||||||
|
=sys-apps/calculate-update-3.2.0-r2
|
||||||
|
cl_client? ( =sys-apps/calculate-client-3.2.0 )
|
||||||
|
cl_desktop? ( =sys-apps/calculate-desktop-3.2.0 )
|
||||||
|
cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.0-r1 )
|
||||||
|
cl_console? ( =sys-apps/calculate-console-3.2.0-r1 )
|
||||||
|
"
|
Loading…
Reference in new issue