kuraga
/
calculate-overlay
forked from calculate/calculate-overlay
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Утилиты 3.2.2

Browse Source
master
Mike Khiretskiy 10 years ago
parent 49120fb5cc
commit 1f02e10de4
94 changed files with 53 additions and 5113 deletions
Show Stats Download Patch File Download Diff File

5
sys-apps/calculate-client/Manifest
Unescape View File

@ -1,6 +1,3 @@
DIST calculate-client-3.2.0.tar.bz2 30819 SHA256 e1e5c016ace3bdc0d3ea14fe62079b00587b89a716f88626aedffc8237842397 SHA512 9bc0fe9bde9011e5909b2fd79b34c6b2d2e31e0028bf8183dfb781d6cbbb7fb32ad0b202654f67e0ec6ec88050bf16b86fe126d070c140a18c9358a804d7b897 WHIRLPOOL d8de6f382e2a0e8147983ef7a27eee5308728d75b2dd6c9af4a006d6067b3a57aebdb8db20bcaa6bca77150594d4d42a4909a6784c9478401981d0369381e022
DIST calculate-client-3.2.1.tar.bz2 30810 SHA256 a298727eb0d16b018a79055c1f238096479cb25cd86473080a3f5a0c04685191 SHA512 3112e2758838719afdeaf14a790c3f4cc3d608ae967019d0356ba68e5af4c4a42135a6dd588d5422988ac997798ba6bc2a76cd14b366fe9c2afe7575a19214f5 WHIRLPOOL 5c0b6d467da82b5c0b0360bd55df41e53a4a3a0db01dca5defff54ab254379dd3d13c9715c28e30646f73209283d7d9e4f939819a4a7859988f29b046039750b
DIST calculate-client-3.2.2_beta1.tar.bz2 30154 SHA256 245444264040b92da445d4e1b1150e7070774d9d2a62e8ea6e4761d02b719f9a SHA512 cacd70033463a7e2e5cd27f49c13ac1161fce71a779ab3a572391efe3523f68bd4a9ed3a1feafa1ec64351de75beb532be3e500bce0f867b5313f190ec294615 WHIRLPOOL 42dc06e1a5749ec3f9e6dd9f85867f84a129460f4c2130f183465c4f9584ce4c83f921c174699384714ca67a4595c75b6de5c3dbd3856de1bc38a8e0ae698c3e
DIST calculate-client-3.2.2_beta2.tar.bz2 30150 SHA256 cb65a45cd74e0536af95dc4d84961881601015361703e6b5c3c00ae7d5fdac87 SHA512 68385028ce595882661e8969a3cdcc5dd592e883d00eb72520d912eea9e4aa35bf7522a83c5109171e78da47e7811433b4c6276fe6321cf0e16f816536536cbe WHIRLPOOL fd1ca4c05536fd9d51898e59f5029f03cd387f3cf9cf78edf19e4e8ed4cf95b248881b6712095fc3245ab7bfe1ddc22e5a7d2483690e341f4a43e97b8e54b51d
DIST calculate-client-3.2.2_beta3.tar.bz2 30143 SHA256 2dbc38a37ce9a256ab7a6b8ee194d5d76124f0de8ed2ab82d284cce45776f824 SHA512 1295e6f7d6ec9464b829d0d9c0b5624783ef0f4f4d88008af24b891107a02e6098f3813b34d2185f7e766b3872b266987fe6ad8f99d22e9ac7684d837b27b785 WHIRLPOOL 04dd6869c87d279e6095dd1458891480375cac255f95d84c27577f44cba88a08b70ab8c760149c518e33c8e40ecf06e435adfa1cf21fc92f366f93b02b905102
DIST calculate-client-3.2.2_beta4.tar.bz2 30149 SHA256 6aac7dcea862f56a53fa71cc51b88e35500d36242bb49be648d0c67c821383ab SHA512 ee70fef4706c82f820457a9d6befc20128db236c33c8ba54a1d80293942bec0d7ca88727762a0499fba946755b630f45a2b292278dd8d316fb701747039dcb4b WHIRLPOOL 9e85c6c905237d22825fac8a1cc7e182c95dc40a51776b009da1b0af4b270aa39406a3be51729c9e7b9b13366bac9b3020d4f8bd0d468605453f04565991d4fe
DIST calculate-client-3.2.2.tar.bz2 30113 SHA256 c6a71437b2ba057d21864460ef37ec4670f302a6acb9184bcf1a71f7848ae5a7 SHA512 66a4372e616f9f8a10c49db7f564d93f29fb704716e8ac515663f7bd9fe5d78b4e5a9b93128252a269d4776052a2df102a35b65561f2f72a7d36e6ca6731e2a0 WHIRLPOOL 7474129ed973744fc8b264a7e0b956efc55da4310938d52ab2832d6df0cafae4e0a328e4ed749c555d4daaa89c80d03ac038c09d4b98b486c343eee466390b82

4
sys-apps/calculate-client/calculate-client-3.2.2_beta1.ebuild → sys-apps/calculate-client/calculate-client-3.2.2.ebuild
Unescape View File

@ -14,9 +14,9 @@ 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"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-desktop-3.2.2_beta1
DEPEND="~sys-apps/calculate-desktop-3.2.2
!<sys-apps/calculate-client-3.1.0
>=dev-python/python-ldap-2.0[ssl]
>=sys-auth/pam_ldap-180[ssl]

33
sys-apps/calculate-client/calculate-client-3.2.2_beta2.ebuild
Unescape View File

@ -1,33 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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 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.2.2_beta2
!<sys-apps/calculate-client-3.1.0
>=dev-python/python-ldap-2.0[ssl]
>=sys-auth/pam_ldap-180[ssl]
>=sys-auth/nss_ldap-239
sys-apps/keyutils
sys-auth/pam_keystore
sys-auth/pam_client
dev-lang/swig"
RDEPEND="${DEPEND}"
python_install() {
distutils-r1_python_install --install-scripts=/usr/sbin
}

33
sys-apps/calculate-client/calculate-client-3.2.2_beta3.ebuild
Unescape View File

@ -1,33 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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 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.2.2_beta3
!<sys-apps/calculate-client-3.1.0
>=dev-python/python-ldap-2.0[ssl]
>=sys-auth/pam_ldap-180[ssl]
>=sys-auth/nss_ldap-239
sys-apps/keyutils
sys-auth/pam_keystore
sys-auth/pam_client
dev-lang/swig"
RDEPEND="${DEPEND}"
python_install() {
distutils-r1_python_install --install-scripts=/usr/sbin
}

41
sys-apps/calculate-client/calculate-client-3.2.2_beta4-r1.ebuild
Unescape View File

@ -1,41 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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 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.2.2_beta4
!<sys-apps/calculate-client-3.1.0
>=dev-python/python-ldap-2.0[ssl]
>=sys-auth/pam_ldap-180[ssl]
>=sys-auth/nss_ldap-239
sys-apps/keyutils
sys-auth/pam_keystore
sys-auth/pam_client
dev-lang/swig"
RDEPEND="${DEPEND}"
python_install() {
distutils-r1_python_install --install-scripts=/usr/sbin
}
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-client-3.2.2_beta4-r1.patch"
}

33
sys-apps/calculate-client/calculate-client-3.2.2_beta4.ebuild
Unescape View File

@ -1,33 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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 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.2.2_beta4
!<sys-apps/calculate-client-3.1.0
>=dev-python/python-ldap-2.0[ssl]
>=sys-auth/pam_ldap-180[ssl]
>=sys-auth/nss_ldap-239
sys-apps/keyutils
sys-auth/pam_keystore
sys-auth/pam_client
dev-lang/swig"
RDEPEND="${DEPEND}"
python_install() {
distutils-r1_python_install --install-scripts=/usr/sbin
}

12
sys-apps/calculate-client/files/calculate-client-3.2.2_beta4-r1.patch
Unescape View File

@ -1,12 +0,0 @@
diff --git pym/client/client.py pym/client/client.py
index c636f32..7a4cff6 100644
--- pym/client/client.py
+++ pym/client/client.py
@@ -559,6 +559,7 @@ class Client(commandServer, encrypt, Desktop):
env=os.environ, shell=True)
# прочитать в конвеер
fileReader(archFile, pipe.stdin, archiveSize)
+ self.endTask()
ret = pipe.wait()
pipe.stdout.close()
pipe.stderr.close()

5
sys-apps/calculate-console-gui/Manifest
Unescape View File

@ -1,6 +1,3 @@
DIST calculate-console-gui-3.2.0.tar.bz2 433806 SHA256 3b3c837e3655d0b8ea3925030082f648529ca03a68e30cd5106e416c7e776042 SHA512 463dc3c03b1cdcdcf3885382014e9d1a5f8f85f4fe34faa3c0a60d21cc152fa0c19864b481cc487e505aad48b720b439a26e6de99e31d4e7a9491c18a1fb0624 WHIRLPOOL 6d53cce32bd64bf17fce084550ab2e9ad86014672613e25a342e0b298d6e10dcd58130845c9c6c77e0f90cf63d8ea50d99d5784c6a980832c4b86d8a7349ef3e
DIST calculate-console-gui-3.2.1.tar.bz2 433843 SHA256 8c219e7770066cc8ca054e2c3531d409db44820e7c25b4ae05120faf09af88c8 SHA512 f07022d09982d47ee07837b5982af8d32aed8be60de79ec70ef49a0a5255076f36b379be073473d99dd815961980accb76d8d6f19882f1db6ec46eab71474194 WHIRLPOOL 8faf6e506b953990c9d586c85d31ce50a91a04f1c57a4c87edf769462e48a2a58e6faa458e87312bbb3aae8166f33413703d0796966e6150b1bf383e7bff10e3
DIST calculate-console-gui-3.2.2_beta1.tar.bz2 433662 SHA256 cabef9b297ece75df89c291a4b2a081895fa9fdd97d7ee86e9e9e82a06ef98ba SHA512 da5f6f332645e79ba26acceabe1bbda80b93ea4ed35611ea8d60d51fe21617c586a56dc4dea002ce1d6ac2c48a9339f69c169f0c5d581af8ac6691b1a757f5a8 WHIRLPOOL efb262b24e9fd8f107c0195ad630abcb3dd66d60f87bd3237e26bacd8154342468aec32bb5c3ea440d4ac32ad2d9f6f2def5257396515208f8408bc146409c0d
DIST calculate-console-gui-3.2.2_beta2.tar.bz2 421620 SHA256 615d8045f05261ef427515b11e4a08016afec04ee5314e9afe83b37d252cbdcd SHA512 bea2e665ca9cfce39a27d676be6174fe3e6ec60c2fb1c991b23a5ebf1cd8020dd52d42865105fb8a46bd36356be767301d9be6ca388646a3760ca684cad973a8 WHIRLPOOL 85ec4571780bc4e4fdce8f59b25b9f0819615fd6dc0def736ee283541f58682929328049f74baa5cfd0e2fc1669457024cc41e9ae2b669d9d6b4e090384ae05f
DIST calculate-console-gui-3.2.2_beta3.tar.bz2 421621 SHA256 d0e33641bfa49c74f8362e576a688d339a3607e0b0e226293f5a923056a653c3 SHA512 f73b73fd51a4ac71b9f3b583bc64eb4531b3ba6edff97eddc6e2ce35a75e225d2cae317eeef97a2e80a50ab129ca34c18408a00b0c6d35f93cf098e5f9ea39b3 WHIRLPOOL ad558ebd5c17edcad738337eca93ffeddcef6cece5fb033ca308008917c8956730e2740593ffad00c8583e003be55497ccc58768fccde093b0c18db14b80df92
DIST calculate-console-gui-3.2.2_beta4.tar.bz2 421582 SHA256 52de08d3f5cc06577ea6553b8df25b44b1cdce70eaea0a0dd5c0c0034060abc8 SHA512 167cbd4161ab4200a0009c273441eb630163f5e8b4b4f2b02736839de3ed03a5dcfb7b01bab3532e17f4cf55435da3a3fde2416784a5f012b045919af2c92a92 WHIRLPOOL f1efb5784e0a0ff9a03ce5d617684503bca3cda70ac6f9c6e61ac9474edb3d4b9d9f9a25c6d2469e3b2c0629a82142216e68b659511cf6a23038ba692d4aa2be
DIST calculate-console-gui-3.2.2.tar.bz2 421884 SHA256 470e8148dac8ed0576101b104ffc4f3822f0ed23fae386c922184d731a0d5a4d SHA512 f1ed58235d9c490505af26124be56029bfbc85c581714ec948964949c20801e4627e3be6a20dd029f7a09c2f6f88a3f6b6567c41a365e49718ffaf4e8d6483cf WHIRLPOOL 624db873474bf6955207c7e97005ed4c1f0dc19e960f6711c071e704085f9dc2e92b07288fc107a2932eee096e1e2b2649b263b9c059d5568345d54a17f75ab8

4
sys-apps/calculate-console-gui/calculate-console-gui-3.2.2_beta1.ebuild → sys-apps/calculate-console-gui/calculate-console-gui-3.2.2.ebuild
Unescape View File

@ -14,9 +14,9 @@ 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"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-core-3.2.2_beta1
DEPEND="~sys-apps/calculate-core-3.2.2
dev-python/dbus-python
virtual/python-imaging
dev-python/pyside[script]"

23
sys-apps/calculate-console-gui/calculate-console-gui-3.2.2_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="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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.2_beta2
dev-python/dbus-python
virtual/python-imaging
dev-python/pyside[script]"
RDEPEND="${DEPEND}"

23
sys-apps/calculate-console-gui/calculate-console-gui-3.2.2_beta3.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="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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.2_beta3
dev-python/dbus-python
virtual/python-imaging
dev-python/pyside[script]"
RDEPEND="${DEPEND}"

31
sys-apps/calculate-console-gui/calculate-console-gui-3.2.2_beta4-r1.ebuild
Unescape View File

@ -1,31 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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.2_beta4
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.2_beta4-r1.patch"
}

31
sys-apps/calculate-console-gui/calculate-console-gui-3.2.2_beta4-r2.ebuild
Unescape View File

@ -1,31 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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.2_beta4
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.2_beta4-r2.patch"
}

23
sys-apps/calculate-console-gui/calculate-console-gui-3.2.2_beta4.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="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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.2_beta4
dev-python/dbus-python
virtual/python-imaging
dev-python/pyside[script]"
RDEPEND="${DEPEND}"

47
sys-apps/calculate-console-gui/files/calculate-console-gui-3.2.2_beta4-r1.patch
Unescape View File

@ -1,47 +0,0 @@
diff --git pym/consolegui/application/helpwidget.py pym/consolegui/application/helpwidget.py
index e4d4a86..35e1b27 100755
--- pym/consolegui/application/helpwidget.py
+++ pym/consolegui/application/helpwidget.py
@@ -17,19 +17,23 @@
from PySide import QtGui, QtCore
from more import LabelWordWrap, show_msg
import datetime
+from calculate.lib.datavars import DataVars
_('The user should not be root')
class HelpWgt(QtGui.QWidget):
def __init__(self, parent):
QtGui.QWidget.__init__(self)
+ clVars = DataVars()
+ clVars.flIniFile()
cur_year = str(datetime.date.today().year)
copy_right = "&copy;"
motto = 'Easy Linux from the Source.<br>'
- help_text = '%s v%s. \n' %(parent.ClientObj.Name, \
- parent.ClientObj.Version) + \
- _('Makes part of Calculate Utilities 3.0.0') + '<br>' + \
- _('Company') + ' Calculate %s 2007-%s' %(copy_right,cur_year)
+ help_text = ('%s v%s. \n' %(parent.ClientObj.Name,
+ parent.ClientObj.Version) +
+ _('Makes part of Calculate Utilities %s')%clVars.Get('cl_ver')
+ + '<br>' +
+ _('Company') + ' Calculate %s 2007-%s' %(copy_right,cur_year))
html_help = ("<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.0//EN' "
"'http://www.w3.org/TR/REC-html40/strict.dtd'>"
@@ -38,12 +42,12 @@ class HelpWgt(QtGui.QWidget):
helpLabel = LabelWordWrap(html_help, self)
helpLabel.setContentsMargins(10,10,10,5)
- company_name = _('Company website')
+ company_name = _('Developer:') + " " + _("Calculate company")
company_site = 'http://www.calculate.ru'
distr_name = _('Distribution website')
distr_site = 'http://www.calculate-linux.org'
linkLabel = LabelWordWrap(company_name + \
- ": <br><a href='http://www.calculate.ru'>" + \
+ "<br><a href='http://www.calculate.ru'>" + \
company_site + "</a><br><br>" + distr_name+ \
": <br><a href='http://www.calculate-linux.org'>" + \
distr_site + "</a>", self)

62
sys-apps/calculate-console-gui/files/calculate-console-gui-3.2.2_beta4-r2.patch
Unescape View File

@ -1,62 +0,0 @@
diff --git pym/consolegui/application/Box.py pym/consolegui/application/Box.py
index 787c4c3..3261923 100755
--- pym/consolegui/application/Box.py
+++ pym/consolegui/application/Box.py
@@ -408,10 +408,6 @@ class MainWgt(QtGui.QMainWindow):
# translate
msgBox.button(msgBox.Yes).setText(_('Yes'))
msgBox.button(msgBox.No).setText(_('No'))
- if QtGui.QIcon.hasThemeIcon('dialog-close'):
- msgBox.button(msgBox.No).setIcon \
- (QtGui.QIcon.fromTheme('dialog-close'))
-
msgBox.button(msgBox.Cancel).setText(_('Cancel'))
msgBox.setDefaultButton(QMessageBox.Cancel)
diff --git pym/consolegui/application/helpwidget.py pym/consolegui/application/helpwidget.py
index e4d4a86..35e1b27 100755
--- pym/consolegui/application/helpwidget.py
+++ pym/consolegui/application/helpwidget.py
@@ -17,19 +17,23 @@
from PySide import QtGui, QtCore
from more import LabelWordWrap, show_msg
import datetime
+from calculate.lib.datavars import DataVars
_('The user should not be root')
class HelpWgt(QtGui.QWidget):
def __init__(self, parent):
QtGui.QWidget.__init__(self)
+ clVars = DataVars()
+ clVars.flIniFile()
cur_year = str(datetime.date.today().year)
copy_right = "&copy;"
motto = 'Easy Linux from the Source.<br>'
- help_text = '%s v%s. \n' %(parent.ClientObj.Name, \
- parent.ClientObj.Version) + \
- _('Makes part of Calculate Utilities 3.0.0') + '<br>' + \
- _('Company') + ' Calculate %s 2007-%s' %(copy_right,cur_year)
+ help_text = ('%s v%s. \n' %(parent.ClientObj.Name,
+ parent.ClientObj.Version) +
+ _('Makes part of Calculate Utilities %s')%clVars.Get('cl_ver')
+ + '<br>' +
+ _('Company') + ' Calculate %s 2007-%s' %(copy_right,cur_year))
html_help = ("<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.0//EN' "
"'http://www.w3.org/TR/REC-html40/strict.dtd'>"
@@ -38,12 +42,12 @@ class HelpWgt(QtGui.QWidget):
helpLabel = LabelWordWrap(html_help, self)
helpLabel.setContentsMargins(10,10,10,5)
- company_name = _('Company website')
+ company_name = _('Developer:') + " " + _("Calculate company")
company_site = 'http://www.calculate.ru'
distr_name = _('Distribution website')
distr_site = 'http://www.calculate-linux.org'
linkLabel = LabelWordWrap(company_name + \
- ": <br><a href='http://www.calculate.ru'>" + \
+ "<br><a href='http://www.calculate.ru'>" + \
company_site + "</a><br><br>" + distr_name+ \
": <br><a href='http://www.calculate-linux.org'>" + \
distr_site + "</a>", self)

5
sys-apps/calculate-console/Manifest
Unescape View File

@ -1,6 +1,3 @@
DIST calculate-console-3.2.0.tar.bz2 24617 SHA256 355e1a5e533f33a950eb30d8d82def02723c8d56deb83c2056b559069ac36cc0 SHA512 9652843eef23416fb186e79d3c2645609dca65b2c5befd17077afe84573ef84c510c97d360412f6386d719cd35d573bf06d9ce46ef185343895f86135026748f WHIRLPOOL b90e2a89d0c564ddd0c0bf7b23438d4b8c55fb35b16d0919880a56d5e361aea457b26c5d05fd0ab498a7e276570fefc6abb113d6f29a2adbcbb76de67e8dafff
DIST calculate-console-3.2.1.tar.bz2 24606 SHA256 3866d71b86957ce19a9deea1034f16d0ad4fc4b43eefcb4c56e9623b0cca2216 SHA512 fd3059dfc0e7674ff108b79bab485c1b61f0f811dcbe30b9e6823f6748e6fc1a9deca9aaa290afddf1c615c2392d5a70a02eeb0f5c111dfcb5aecb4e4edc0531 WHIRLPOOL 14119d2012d921f95ce8bccf6cbf54fb18f2413d0e6eea7b2906b1b436f15e340bbf80d30d88a330c990544c066215545beda24e63bcbb0d43a33a58f93a4046
DIST calculate-console-3.2.2_beta1.tar.bz2 24349 SHA256 ca5e3a23275300fc455640ef6c9d1f4a3c3b7775c974d3fb7bc44993f8cbf45d SHA512 42238a53a12dd1ca974b09fd603c2ac1a9e0f7dbc63178c0b2af0b7da5bf314dff0b6a8e03ebb90079d0292b7e76c528d514e95171b69fd9251f9c15d784667e WHIRLPOOL ac8d2904811ada6ae3c77a0db505c746a5891407ef1123ef6b5e7503c4fdb5538af230bc855ba77c3443bdadb1670a26a170c33f9b11df083bd44cbf2b3b0ed8
DIST calculate-console-3.2.2_beta2.tar.bz2 24379 SHA256 b6f7680218f071a4fbf4ae0c6e6ddd69a5bd8ca20226da5f764847e0eec01564 SHA512 8aa95bd61d69d84e6ee647bad3de8134148e7a595afb83434a0f81af879fe59189aa3e5797ec7da491f1b67fca62ba52322b220b86586c2a44a66bdbca30ef26 WHIRLPOOL 5dd3610bb33f35cd85c577ffe228c1b85bed10ce1b47fa63dddec38cf17185b0794750c15f9dd8ce95140e5793ed1be346663d3ed22f7519fc8121c756eb8ecd
DIST calculate-console-3.2.2_beta3.tar.bz2 24374 SHA256 1215c4428216ab8230a2aa88e2e0f55c05e24cd394fa6f287f65474d9d44e755 SHA512 729ad0222b89fae4dfc28aef81d4f8bd63bdb46560e1960efcef65caeabf2cb3ebbd073b83a11e0adc9d10d27db302c8d59f8db62eda1b46d566add176b07cec WHIRLPOOL 2d30e38acce3c6fd61b14507f5a4ca6485d1965dc99ce311bd25276b40403a63c55d43df2fb05bfdb7ed43009a61daadc50935c1d09cd50efe12971e199c1d38
DIST calculate-console-3.2.2_beta4.tar.bz2 24347 SHA256 1be04b31151de7417937cb0696f138a0396f0c8077d808b813cc72b5126d25b1 SHA512 23d61d3b5ee854d95109fe34ec2eb6702a716c4686db6637929466ea8c9f14457f9fb17a8aafb43be17815fb6983b08547b828067b47e5446c1e947a7f3f20af WHIRLPOOL 367d8789081fbb2e0e244cbd095d91e08c94ec63a1ee3879e55b51b5e1bfba8590019f7b08380524e8c90fef2c6c63dcd5aa0529f17019feaddd8dc06531c93c
DIST calculate-console-3.2.2.tar.bz2 24354 SHA256 9b991969675f5319659ef74b90ea1083f81abbd8a68289094f928bc41738fd23 SHA512 8356b4dfca3daa75cd7340bd01963968896c3ec93f7b226a890bba78e6eaba40d04363ffb7c6808d5c0644d37c48e422cfc1c67f05ee3efc17028f2f4ad09eb2 WHIRLPOOL 8bf86e77a40bf6eb3a537484ad7bcb024bc5ba398214c59108fec5255e6953298e726e8ebc2fbad953ebd28161f10147f338c2d6d8eed7cfb18c2b7d29341d87

4
sys-apps/calculate-console/calculate-console-3.2.2_beta1.ebuild → sys-apps/calculate-console/calculate-console-3.2.2.ebuild
Unescape View File

@ -14,7 +14,7 @@ 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"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-core-3.2.2_beta1"
DEPEND="~sys-apps/calculate-core-3.2.2"
RDEPEND="${DEPEND}"

20
sys-apps/calculate-console/calculate-console-3.2.2_beta2.ebuild
Unescape View File

@ -1,20 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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.2_beta2"
RDEPEND="${DEPEND}"

20
sys-apps/calculate-console/calculate-console-3.2.2_beta3.ebuild
Unescape View File

@ -1,20 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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.2_beta3"
RDEPEND="${DEPEND}"

20
sys-apps/calculate-console/calculate-console-3.2.2_beta4.ebuild
Unescape View File

@ -1,20 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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.2_beta4"
RDEPEND="${DEPEND}"

5
sys-apps/calculate-core/Manifest
Unescape View File

@ -1,6 +1,3 @@
DIST calculate-core-3.2.0.tar.bz2 88676 SHA256 fe8cc96b58851bb272c4c6c8107c73227f5825e0b86791b94e4ea2fd3a6e4ba3 SHA512 16c0c2241555221e7f8e3438035155eda193af17fc7d21329a174b4c9d4628e96db86124449be22aa3925ee7543e07937db99b45fa93933e2cc8cd7e50b91aec WHIRLPOOL 604397a7d7efdbf7d291b01445ed2f57883ac92a17ab99958131cec961e92215f85d8a6faaf5567f56eb6b92c657877efcb486423f6235ef32281bc3a41edce1
DIST calculate-core-3.2.1.tar.bz2 88805 SHA256 fadab61861b409ef577dff94508228e5831d9783647a6d832f1b5334d8f09143 SHA512 7d53375821f8ecb80350426ed7863e42dfe51134a290e16e6400827d6591a03d251337e18ce9a82c87eeb37c62b2dce6ba9a4c5be26dfe204ac50fa2fbef1fc9 WHIRLPOOL ed2cf6e9bba3fb8e661994189fa5bd76aeabce1b8bc27c18dd1bfb8d258768a0cc3b3ed9974072c42e21b653aa26a8fb39b78ecf964a878fba19a61b9c9bd923
DIST calculate-core-3.2.2_beta1.tar.bz2 87991 SHA256 66529e2e675aef845f5dc2adf502d426c5a6f9ae15de8fffa3958de0f85c8625 SHA512 a73677fe99cd922c790138c1202a849466aaa30e34c1f81482dd4d1f9261ca13b9ae4c71fd1e23368f94f4d41d9068a48ee7e7fbaf16f500d59f3d75ac09ef5a WHIRLPOOL 2f28f238cee1248e3456ae0da7cb37b28e35f2f9aeb1bcbd52158da0bb3b3ba9e76e90a8efe4e104a1d0942d7f75f112991d9fde94dbec7546f9b826f7bba95a
DIST calculate-core-3.2.2_beta2.tar.bz2 87966 SHA256 95de1d83cdae64ec7c0dc6e2fa5d43cf6bd03951e4ec29574ad7d471b7e98319 SHA512 1f5958d564109c6558a77e03587fe6e56b5b83c21fd58160f5ae1170e8ed05f6b1696a92d493dcab48ec1d84b42b8edccea6af644c497782507350f0b971c0b5 WHIRLPOOL 93fd82728b7046a26cb473d8c48548a9293f0a06c1dc2cd62a92cc529a7cfc729428a6d9dfd915a27444e5bcbe5b9230d64591c80b7f0982a21c7a26ca0bfe7b
DIST calculate-core-3.2.2_beta3.tar.bz2 87923 SHA256 4aa716b5e6c8254587c65db102b5748eadcd70367a171e08ab107dee533162a3 SHA512 04dd317490cdd01cceb88f78c66d5ab3427f84029d1c70ac1d72b36d631c7e2510269d8274585965381934d59ebd47ce82cb893eb9273ee5c133310f73729edc WHIRLPOOL 68e570983109d9e64db4e88ab312fa0bd72d9e0892db32dacbd026160402dcfdd657e1b4becc867a5e53ac2e92072656e5750f4f0ee6c5cdfd09b919a8c71588
DIST calculate-core-3.2.2_beta4.tar.bz2 88063 SHA256 331f54ebdad56de2004bde8bf0bf8cfcef4d92aa4070e45f057e957e06cd4993 SHA512 98041f31db87c27c804ed3115d34d32759212403b4d7427f1c040f366f199e30f21a8d7f9f4566b5d6e5fc3c43c7d85f2f467b265000e1be16a684419aeab3d5 WHIRLPOOL f0a917c66b0fce78a381cf12e7ada13a7c86c3d02727617ac45ac602da4753f308c70b7864f9535981e523e44c264c499ad98ca86c07c5f0a45a20d3cccfbbf7
DIST calculate-core-3.2.2.tar.bz2 89086 SHA256 a07634caa40a9c58f38303dcdd43e380ef08012899cfcbf5edeaab91791c3492 SHA512 5cb3a3ffd4026efbffb8d5d9a5d585e0c55e66c99dbac9cc58be0d41bb170414a1653be1cd06a3c43bf22e11dac187f35f34515060460643cacbb5a125684fc0 WHIRLPOOL 21112915ffd7762690a1ec86d40d5a98a173525a423b22f850a44168c8697afca198e50f6cf0bd4e6f36529269867551ac1a4723eb5d494ed385a6b254e7f989

4
sys-apps/calculate-core/calculate-core-3.2.2_beta1.ebuild → sys-apps/calculate-core/calculate-core-3.2.2.ebuild
Unescape View File

@ -14,10 +14,10 @@ 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"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="~sys-apps/calculate-lib-3.2.2_beta1
DEPEND="~sys-apps/calculate-lib-3.2.2
>=dev-python/soaplib-1.0
!minimal? ( dev-python/sudsds
net-libs/dslib

43
sys-apps/calculate-core/calculate-core-3.2.2_beta2.ebuild
Unescape View File

@ -1,43 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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.2_beta2
>=dev-python/soaplib-1.0
!minimal? ( dev-python/sudsds
net-libs/dslib
dev-python/pyopenssl
dev-libs/openssl
=dev-python/m2crypto-0.21.1-r2
dev-python/cherrypy )"
RDEPEND="${DEPEND}"
pkg_preinst() {
distutils-r1_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"
}

43
sys-apps/calculate-core/calculate-core-3.2.2_beta3.ebuild
Unescape View File

@ -1,43 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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.2_beta3
>=dev-python/soaplib-1.0
!minimal? ( dev-python/sudsds
net-libs/dslib
dev-python/pyopenssl
dev-libs/openssl
=dev-python/m2crypto-0.21.1-r2
dev-python/cherrypy )"
RDEPEND="${DEPEND}"
pkg_preinst() {
distutils-r1_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"
}

51
sys-apps/calculate-core/calculate-core-3.2.2_beta4-r1.ebuild
Unescape View File

@ -1,51 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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.2_beta4
>=dev-python/soaplib-1.0
!minimal? ( dev-python/sudsds
net-libs/dslib
dev-python/pyopenssl
dev-libs/openssl
=dev-python/m2crypto-0.21.1-r2
dev-python/cherrypy )"
RDEPEND="${DEPEND}"
pkg_preinst() {
distutils-r1_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.2_beta4-r1.patch"
}

51
sys-apps/calculate-core/calculate-core-3.2.2_beta4-r2.ebuild
Unescape View File

@ -1,51 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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.2_beta4
>=dev-python/soaplib-1.0
!minimal? ( dev-python/sudsds
net-libs/dslib
dev-python/pyopenssl
dev-libs/openssl
=dev-python/m2crypto-0.21.1-r2
dev-python/cherrypy )"
RDEPEND="${DEPEND}"
pkg_preinst() {
distutils-r1_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.2_beta4-r2.patch"
}

43
sys-apps/calculate-core/calculate-core-3.2.2_beta4.ebuild
Unescape View File

@ -1,43 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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.2_beta4
>=dev-python/soaplib-1.0
!minimal? ( dev-python/sudsds
net-libs/dslib
dev-python/pyopenssl
dev-libs/openssl
=dev-python/m2crypto-0.21.1-r2
dev-python/cherrypy )"
RDEPEND="${DEPEND}"
pkg_preinst() {
distutils-r1_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"
}

17
sys-apps/calculate-core/files/calculate-core-3.2.2_beta4-r1.patch
Unescape View File

@ -1,17 +0,0 @@
diff --git pym/core/server/func.py pym/core/server/func.py
index b6941d3..ec404b4 100644
--- pym/core/server/func.py
+++ pym/core/server/func.py
@@ -62,7 +62,11 @@ class CommonMethods:
out = []
orig,data = data
data = data[FIRST]
- if self.clVars.Get('cl_autoupdate_set') == 'on':
+
+ origdata = readFile(orig)
+ newdata = readFile(data[CFGFNAME])
+ if (self.clVars.Get('cl_autoupdate_set') == 'on' or
+ origdata == newdata):
answ = "use new"
else:
for i,s in enumerate(list(process("diff","-Nu",

304
sys-apps/calculate-core/files/calculate-core-3.2.2_beta4-r2.patch
Unescape View File

@ -1,304 +0,0 @@
diff --git pym/core/server/baseClass.py pym/core/server/baseClass.py
index 03963ad..8461ccd 100644
--- pym/core/server/baseClass.py
+++ pym/core/server/baseClass.py
@@ -156,6 +156,8 @@ class Basic (DefinitionBase) :
sys.stdout.flush()
import time
# Waiting for closing
+ for pid in self.process_pid.keys():
+ os.kill(self.process_pid[pid].pid, 2)
while True:
num_active_process = 0
for pid in self.process_pid.keys():
diff --git pym/core/server/func.py pym/core/server/func.py
index b6941d3..fab39d5 100644
--- pym/core/server/func.py
+++ pym/core/server/func.py
@@ -62,7 +62,11 @@ class CommonMethods:
out = []
orig,data = data
data = data[FIRST]
- if self.clVars.Get('cl_autoupdate_set') == 'on':
+
+ origdata = readFile(orig)
+ newdata = readFile(data[CFGFNAME])
+ if (self.clVars.Get('cl_autoupdate_set') == 'on' or
+ origdata == newdata):
answ = "use new"
else:
for i,s in enumerate(list(process("diff","-Nu",
@@ -1106,12 +1110,14 @@ class CoreWsdl():
def writeFile(self):
""" write data in file """
from baseClass import Basic
+ from calculate.core.server.gen_pid import ProcessMode
if not os.path.exists(Basic.pids):
makeDirectory(Basic.pids)
pid_file = path.join(Basic.pids, '%d.pid' % self.pid)
try:
with open(pid_file, 'w') as f:
d = {'name': self.process_dict['method_name'],
+ 'mode': ProcessMode.CoreDaemon,
'os_pid': os.getpid(),
'status': self.process_dict['status']}
pickle.dump(d, f)
diff --git pym/core/server/gen_pid.py pym/core/server/gen_pid.py
index 865d991..2b313cf 100644
--- pym/core/server/gen_pid.py
+++ pym/core/server/gen_pid.py
@@ -30,6 +30,10 @@ class ProcessStatus:
NotFound = 3
Paused = 4
+class ProcessMode:
+ CoreDaemon = "core"
+ LocalCall = "local"
+
def search_worked_process(method_name, clVars,
statuses=(ProcessStatus.Worked,)):
@@ -45,7 +49,7 @@ def search_worked_process(method_name, clVars,
for pidfile in listDirectory(pids, fullPath=True):
try:
status = pickle.load(open(pidfile))
- if (status['name'] == method_name and
+ if ((method_name is None or status['name'] == method_name) and
status['status'] in statuses):
if path.exists(path.join("/proc", str(status['os_pid']))):
yield status['os_pid']
@@ -54,6 +58,30 @@ def search_worked_process(method_name, clVars,
return list(generator())
+def get_pid_info(clVars, statuses=(ProcessStatus.Worked,)):
+ """
+ Получить информацию о процессах
+ """
+ def generator():
+ pids = clVars.Get('core.cl_core_pids_path')
+ for pidfile in listDirectory(pids, fullPath=True):
+ try:
+ status = pickle.load(open(pidfile))
+ if (status['status'] in statuses):
+ if path.exists(path.join("/proc", str(status['os_pid']))):
+ yield status
+ except (socket.error, ValueError, KeyError, EOFError, OSError):
+ pass
+
+ return list(generator())
+
+ #try:
+ # pidfile = path.join(pids,str(pid))
+ # status = pickle.load(open(pidfile))
+ # return status
+ #except (socket.error, ValueError, IOError, KeyError, EOFError, OSError):
+ # return None
+
def clear_finished_pids(clVars):
"""
diff --git pym/core/server/local_call.py pym/core/server/local_call.py
index 5e6a3df..3a471e5 100644
--- pym/core/server/local_call.py
+++ pym/core/server/local_call.py
@@ -114,6 +114,7 @@ class LocalCall(object):
def writeFile(self):
""" write data in file """
+ from calculate.core.server.gen_pid import ProcessMode
if os.getuid():
return
pid = os.getpid()
@@ -127,6 +128,7 @@ class LocalCall(object):
try:
with open(pid_file, 'w') as f:
d = {'name': self.method_name,
+ 'mode': ProcessMode.LocalCall,
'os_pid': pid,
'status': self.method_status}
pickle.dump(d, f)
diff --git pym/core/setup_package.py pym/core/setup_package.py
index 3285b52..0cffb90 100644
--- pym/core/setup_package.py
+++ pym/core/setup_package.py
@@ -23,6 +23,8 @@ import time
import re
from calculate.core.datavars import DataVarsCore,DataVars
+from calculate.core.server.gen_pid import (search_worked_process, get_pid_info,
+ ProcessMode)
from calculate.lib.datavars import Variable
from calculate.lib.cl_log import log
from calculate.lib import datavars
@@ -31,6 +33,7 @@ from calculate.lib.utils.files import (runOsCommand,scanDirectory,
from calculate.lib.utils.common import getPasswdUsers,getTupleVersion
from calculate.lib.utils.portage import isPkgInstalled,reVerSplitToPV
from calculate.lib.utils.content import getCfgFiles,PkgContents
+from calculate.lib.utils.colortext import get_color_print
import pwd
import glob
from calculate.lib.utils.files import getModeFile
@@ -108,6 +111,8 @@ class UpdateConfigs(UpdateLogger):
"""
Обновить настройки пакета в пользовательских профилях
"""
+ def init(self):
+ self.color_print = get_color_print()
def getXUsers(self):
"""
@@ -287,6 +292,40 @@ class UpdateConfigs(UpdateLogger):
clTempl.applyTemplates()
return True
+ def checkRunning(self):
+ """
+ Проверить наличие запущенных процессов в cl-core
+ """
+ from calculate.core.server.loaded_methods import LoadedMethods
+ cur_pid = os.getpid()
+ pid_list = [pid for pid in get_pid_info(self.clVars)
+ if (pid.get("mode",'') == ProcessMode.CoreDaemon and
+ pid.get("os_pid",'') != cur_pid)]
+ if pid_list:
+ _print = self.color_print
+ method_names = {value[0]:value[2] for key,value in
+ LoadedMethods.conMethods.items()}
+ self.printSUCCESS(
+ _("Calculate core is executing follow tasks now"))
+ mult = _print.bold("*")
+ for pid in pid_list:
+ name = pid['name']
+ method_name = method_names.get(name, name)
+ self.printDefault(
+ "&nbsp;{mult} {title} ({name})".format(mult=mult,
+ title = method_name, name=name))
+ answer = self.askConfirm(
+ _("Would you like to terminate these tasks?"), "no")
+ if answer == "no":
+ raise KeyboardInterrupt
+ return True
+
+ def restartService(self, service_name):
+ """
+ Перезапустить указанный сервис
+ """
+ os.system('/etc/init.d/%s restart &>/dev/null &'%service_name)
+ return True
class PackageUpdater(UpdateConfigs): #,updateUserConfigs):
def __init__(self):
diff --git pym/core/utils/cl_core_restart.py pym/core/utils/cl_core_restart.py
new file mode 100644
index 0000000..6c165b3
--- /dev/null
+++ pym/core/utils/cl_core_restart.py
@@ -0,0 +1,51 @@
+#-*- coding: utf-8 -*-
+
+# Copyright 2013 Calculate Ltd. http://www.calculate-linux.org
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import sys
+from calculate.core.server.func import Action,Tasks
+from calculate.lib.cl_lang import setLocalTranslate,getLazyLocalTranslate
+from calculate.lib.datavars import VariableError
+from calculate.lib.cl_template import TemplatesError
+from calculate.lib.utils.files import FilesError
+
+setLocalTranslate('cl_core3',sys.modules[__name__])
+__ = getLazyLocalTranslate(_)
+
+class ClCoreRestartAction(Action):
+ """
+ Действие для настройки параметров видео
+ """
+ # ошибки, которые отображаются без подробностей
+ native_error = (FilesError, TemplatesError,VariableError)
+
+ successMessage = __("Action successfully completed!")
+ failedMessage = __("Failed to perform action!")
+ interruptMessage = __("Action manually interrupted")
+
+ def __init__(self):
+ # список задач для дейсвия
+ self.tasks = [
+ {'name':'check_running',
+ # проверить запущенные процессы
+ 'method':'UpdateConfigs.checkRunning()',
+ },
+ {'name':'restart',
+ # перезапустить calculate-core
+ 'message': _("Restarting calculate-core"),
+ 'method':'UpdateConfigs.restartService("calculate-core")',
+ }]
+
+ Action.__init__(self)
diff --git pym/core/wsdl_core.py pym/core/wsdl_core.py
index 5a57911..6c4e675 100644
--- pym/core/wsdl_core.py
+++ pym/core/wsdl_core.py
@@ -39,6 +39,7 @@ from calculate.core.utils.cl_core_request import (ClCoreRequestShow,
from calculate.core.utils.cl_core_variables import (ClCoreVariables,
ClCoreVariablesShow)
from calculate.core.utils.cl_core_custom import ClCoreCustomAction
+from calculate.core.utils.cl_core_restart import ClCoreRestartAction
class Wsdl(WsdlBase):
methods = [
@@ -126,7 +127,7 @@ class Wsdl(WsdlBase):
# идентификатор метода
'method_name':"core_dispatch",
# категория метода
- 'category':__('Update'),
+ 'category':__('Update '),
# заголовок метода
'title':__("Update settings"),
# иконка для графической консоли
@@ -610,4 +611,33 @@ class Wsdl(WsdlBase):
'cl_templates_locate',
'cl_dispatch_conf'),
next_label=_("Perform"))]},
- ]
+ #
+ # перезапустить сервис calculate core
+ #
+ {
+ # идентификатор метода
+ 'method_name':"core_restart",
+ # категория метода
+ 'category':__('Update '),
+ # заголовок метода
+ 'title':__("Restart calculate-core"),
+ # иконка для графической консоли
+ 'image':'view-refresh',
+ # метод в графической консоли
+ 'gui':True,
+ # консольная команда
+ 'command':'cl-core-restart',
+ # права для запуска метода
+ 'rights':['configure'],
+ # объект содержащий модули для действия
+ 'logic':{'UpdateConfigs':setup_package.UpdateConfigs},
+ # описание действия
+ 'action':ClCoreRestartAction,
+ # объект переменных
+ 'datavars':"core",
+ 'native_error':(VariableError,DataVarsError),
+ # значения по умолчанию для переменных этого метода
+ 'setvars':{'cl_action!':'restart'},
+ # описание груп (список лямбда функций)
+ 'groups':[]}
+ ]

5
sys-apps/calculate-desktop/Manifest
Unescape View File

@ -1,6 +1,3 @@
DIST calculate-desktop-3.2.0.tar.bz2 16957 SHA256 9acf916b6a1e929d58dd27df03f507a1a8f35187b6b312fe92d7bc0ee352f8ed SHA512 7abca6341776bc23849088cfc6f045365d2a788ef7d4be50f5e209ac73955015e510b68a46dfee35e46d6333be9474add46bf8de330ed4f49222b12fefaf0aa1 WHIRLPOOL 881e22d6a29d3233d28f83c6614f9b8fb56fce656e88eb7dc82122eb5596ca23fe4f5424b3e3119b68acd513ca47a834de47c9c988a7e9ac9c17bc95ca8d7984
DIST calculate-desktop-3.2.1.tar.bz2 16978 SHA256 1cc35c6eb161273b3b012cf7d8cb6fffcdd4250d770719620085b363409708b2 SHA512 770155acf37816d7e18444abd6b6126e6cd05f211a3126513699071bcf6c587a15d2063a49ae3c0d18b98a7a34ab5f0d79f28d35e950047f3f6321d90cfcc53b WHIRLPOOL db59af95af2f84d79042d68cbb173767be7e7812d82b636697ea04e7e1a1baaa3a0e1faf97e3d7d1df367b317154f61a34ff6f53e3a7c359200061bc051df462
DIST calculate-desktop-3.2.2_beta1.tar.bz2 17045 SHA256 8845077716b4a476242e1201e82fc79bc5683fe59806bff66d171cfe5f3dd974 SHA512 812494e63785e5d5e7c27aed66d61655da86c583a4115b1d96596bc24156ad8afe616c879c507b231512ad68a6fdda4f16ca7f25489e9cd1a139979a8ff43233 WHIRLPOOL 800cb849209a4081536b2a368fb43a8c7db2519d73a050bf8b8f95333cd1d6ff4ddea69b0a1b16eb43c720a10f352dd67924675502240cd77ee3eba8b0426dfd
DIST calculate-desktop-3.2.2_beta2.tar.bz2 17050 SHA256 d3b85b32a57152c6b662696f1e78c19c41c7065e0dd27ede39154971675697d7 SHA512 fe3ef99691c62ceda3231c853928ee446d40f80d8fa9551b57c2ad6841cef8a110a7311009ea22783a2282018e5202d5734e548be767fbf0772d5b0ed3640482 WHIRLPOOL 9f93e20968eef87d2c3583c0f8ce39ee6118df938d1f5a83d8a2dbe890978cabaf65911bd616c78f914c34050c5dcdee59f1ab162b1f7dc692183a678fcebf34
DIST calculate-desktop-3.2.2_beta3.tar.bz2 17069 SHA256 6b514bfc38dd143bf31d6e423de530ad8ceb30096218238243b2bf8a604f5b0f SHA512 0e12b8bbed2e7df961d1cf3e63a502e0ddb7384710a374ce20c03571a1bd90d4d032abfd75011509ec000cbd486c57571954e064109fc4dd2a27d62a02679394 WHIRLPOOL 222e7d06a6419c212f5e6fccccaedab511aa16bf28efbe1af171a62f814a73219452f4fd32303fc163590751ab6946f5ac5b129a4dbced701a241bfbcdecf9c0
DIST calculate-desktop-3.2.2_beta4.tar.bz2 17082 SHA256 b8990d70e88321baf7c92bdcf176080284a70bec86dd5086b6432248a6d4b6e6 SHA512 31bd725506dd84b8f69c9639b59ef4ca60eadb6033f3625130511763281f4c811ee85f8dbef95aee1d24f012558f6f5cff31cb1147ba2dbaebaa29f3d5866004 WHIRLPOOL 3dc2da8ec3b751d38eb54c29c7721b32190dba85c146473b8f8a57ced0de29b3ad2fd3dc90a0d47a05c168d596657225ec9a698b201c05d23bdf5d5587631471
DIST calculate-desktop-3.2.2.tar.bz2 17047 SHA256 8f6af2f1ce35028954c7ac700739c7c51ef5ae09826abecc802632f1ab684e3b SHA512 b72c0720228897ac94c7cf2c1c7eafbe67483a51c9792b24a838b57103540e2c77a38030a3392fe671b641d0782eb1a3525423df00641f8598df52b89bc88ec8 WHIRLPOOL 872022f28050c47ef33ec35e9f8aefb99cd9016904d96224c17777ec310ad4b2baa04223979df1eef6307b0c3d0fcd2c3dcab82397b8480738ea6bedd60f1f4a

4
sys-apps/calculate-desktop/calculate-desktop-3.2.2_beta1.ebuild → sys-apps/calculate-desktop/calculate-desktop-3.2.2.ebuild
Unescape View File

@ -14,10 +14,10 @@ DESCRIPTION="The program of the desktop configuration Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 x86"
IUSE=""
DEPEND="~sys-apps/calculate-core-3.2.2_beta1
DEPEND="~sys-apps/calculate-core-3.2.2
>=dev-python/python-ldap-2.0[ssl]
media-gfx/feh
x11-apps/xmessage

29
sys-apps/calculate-desktop/calculate-desktop-3.2.2_beta2.ebuild
Unescape View File

@ -1,29 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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 the desktop configuration 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.2_beta2
>=dev-python/python-ldap-2.0[ssl]
media-gfx/feh
x11-apps/xmessage
!<sys-apps/calculate-desktop-3.1.0_alpha1
sys-apps/keyutils
sys-auth/pam_keystore
sys-auth/pam_client
dev-lang/swig"
RDEPEND="${DEPEND}"

29
sys-apps/calculate-desktop/calculate-desktop-3.2.2_beta3.ebuild
Unescape View File

@ -1,29 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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 the desktop configuration 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.2_beta3
>=dev-python/python-ldap-2.0[ssl]
media-gfx/feh
x11-apps/xmessage
!<sys-apps/calculate-desktop-3.1.0_alpha1
sys-apps/keyutils
sys-auth/pam_keystore
sys-auth/pam_client
dev-lang/swig"
RDEPEND="${DEPEND}"

29
sys-apps/calculate-desktop/calculate-desktop-3.2.2_beta4.ebuild
Unescape View File

@ -1,29 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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 the desktop configuration 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.2_beta4
>=dev-python/python-ldap-2.0[ssl]
media-gfx/feh
x11-apps/xmessage
!<sys-apps/calculate-desktop-3.1.0_alpha1
sys-apps/keyutils
sys-auth/pam_keystore
sys-auth/pam_client
dev-lang/swig"
RDEPEND="${DEPEND}"

5
sys-apps/calculate-i18n/Manifest
Unescape View File

@ -1,7 +1,4 @@
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.1.tar.bz2 132140 SHA256 63f061e9e15e47d22d1e6dfc9ea0952af89d710e7e67869d67f7b1944acc5ace SHA512 9f0ff6d3fcb8ae929b70e9dabf87784d1768f0cbf90ab1b952e671beb31e1a3b1feb56b9b28896599cf87c7d0a57f377bcfd9839e1247fbad33c23bf900b009d WHIRLPOOL 4f9c09e59a916c9f6cdd817867b4165225bc5e9c3f4e09ad0ab41187b9f6efe9c8fe44f777625c48cd526d6f58bc0f49c1a45c4f9aa3c3c79e63b3451397c676
DIST calculate-i18n-3.2.2_beta1.tar.bz2 132264 SHA256 08db14c54051c93aabf3cc98cea971b24d5901ff4e47a833d10b24ebdd127329 SHA512 394df6cdac0ab8b1cd59cb840fa313a24886df2fd90d991039b647a62d6443e2d94b4fec45150a038db4fabf12201ce906eb0dcb22b669f0e77f46cdd46d1710 WHIRLPOOL 011680049448b0aaeae5d41e5202e6f6998a2d7e615fc4e01a2fbc900b8165d38f4a9fe17b1c76581a6236592b841da24769b05a70dc16989983d95218d19160
DIST calculate-i18n-3.2.2_beta2.tar.bz2 132202 SHA256 b571847f2a885cf53290d934e716b3d8f7d2ef037a2f801c7b216c4c30aa693e SHA512 a6e7ff6c9ead63dca8ede949928d283ae822536baaaa279e336dc19eaba32956ff63b81d2ec455dee1c5cf7f04ee9c65ed3dcc5f4024bf202331433ba209f2e2 WHIRLPOOL 17525b882305204ff38dee56daa062674116c06ca2898ea8b1255913013a3aac6089085ad371e1b19faf5c5984768811bd4f221d5f9c4c097fa9046c51ba7b4d
DIST calculate-i18n-3.2.2_beta3.tar.bz2 132431 SHA256 a8064e96e404305eccf5841bf264829677437d5a56c6572f845efd4445b8b318 SHA512 f422b56cb63c9ce31fffbba1a39f2c130b04bf1f004e35451aeeee632fdc6fbb9cbb50ec72eccbea659d307571478b46a4679dfbc7794641e1a1c8cdcccf7978 WHIRLPOOL 70cb26513622881e0cfe00edfdcb9e9f0a9d9bd7b21bd70fbe9e4d6036bba7a1831fa48b4e9b6e6338e8037efd8373b5108482d599e48cc01cfc059628d63b86
DIST calculate-i18n-3.2.2_beta4.tar.bz2 132387 SHA256 a779a3c1a768c95dad27f47b18a789f184a479d834ff337f8db16ece92e7662d SHA512 e15105ae7b10f9693f0e4089391bd4682116e98c4467a6f110b241e6e3e9ca692765bbeafcd1436c3b8bd9de8dd4941eb3219db5b820ccc9bdba500ed75a31c7 WHIRLPOOL 1d9ef1799b70c3855d52622314bc84008d0a4bb7831393f497578cfa6b31593731c808b8388d55cb299c1b7205f419648affa3a51af583040e4f8475d6c9ff3e
DIST calculate-i18n-3.2.2.tar.bz2 132474 SHA256 fa277dff40052af1609908669e41f2ebd6ff5dce4490423d67b73d02e5297e07 SHA512 301ba163a931fbabcf8c12c699464bdb8de9a099373d2b2f321c130d28657d29a7c17f6a006c52a21e5b0f6357fb52ca3474a61c57605a29a0852a4685a00644 WHIRLPOOL aabe5902f6ae7178e1717a7fba3e917d36e9a9f3f8e960382847d0e8e2b783e8cbd609d1cb73a5de3b637771515c4d5d7ac54ca84e78b1bebe7b045509ddbd50

4
sys-apps/calculate-i18n/calculate-i18n-3.2.2_beta1.ebuild → sys-apps/calculate-i18n/calculate-i18n-3.2.2.ebuild
Unescape View File

@ -14,9 +14,9 @@ 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"
KEYWORDS="amd64 x86"
RDEPEND=">=sys-apps/calculate-lib-3.2.2_beta1"
RDEPEND=">=sys-apps/calculate-lib-3.2.2"
DEPEND="sys-devel/gettext
${RDEPEND}"

30
sys-apps/calculate-i18n/calculate-i18n-3.2.2_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="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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.2_beta2"
DEPEND="sys-devel/gettext
${RDEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-i18n-3.2.2_beta2-r1.patch"
}

22
sys-apps/calculate-i18n/calculate-i18n-3.2.2_beta2.ebuild
Unescape View File

@ -1,22 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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.2_beta2"
DEPEND="sys-devel/gettext
${RDEPEND}"

22
sys-apps/calculate-i18n/calculate-i18n-3.2.2_beta3.ebuild
Unescape View File

@ -1,22 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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.2_beta3"
DEPEND="sys-devel/gettext
${RDEPEND}"

30
sys-apps/calculate-i18n/calculate-i18n-3.2.2_beta4-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="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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.2_beta4"
DEPEND="sys-devel/gettext
${RDEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-i18n-3.2.2_beta4-r1.patch"
}

22
sys-apps/calculate-i18n/calculate-i18n-3.2.2_beta4.ebuild
Unescape View File

@ -1,22 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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.2_beta4"
DEPEND="sys-devel/gettext
${RDEPEND}"

214
sys-apps/calculate-i18n/files/calculate-i18n-3.2.2_beta2-r1.patch
Unescape View File

@ -1,214 +0,0 @@
diff --git ru/cl_lib3.po ru/cl_lib3.po
index 3460990..a8fa16c 100644
--- ru/cl_lib3.po
+++ ru/cl_lib3.po
@@ -195,9 +195,6 @@ msgstr "Пример:"
msgid "undefined variable: "
msgstr "не определена переменная:"
-msgid "No such templates directory"
-msgstr "Не найдена директория шаблонов"
-
msgid "Failed to execute"
msgstr "Не удалось выполнить"
@@ -458,6 +455,39 @@ msgstr "Команда не найдена '%s'"
msgid "Failed to copy '%(src)s' to '%(dst)s'"
msgstr "Не удалось скопировать '%(src)s' в '%(dst)s'"
+msgid "Repository {path} is not a directory"
+msgstr "Репозиторий {path} не является директорией"
+
+msgid "Repository {path} is not Git"
+msgstr "Репозиторий {path} не является Git репозиторием"
+
+msgid "The Git tool is not found"
+msgstr "Утилита Git не найдена"
+
+msgid "Branch {branch} not found in repository {url}"
+msgstr "Ветка {branch} не найдена в {url} репозитории"
+
+msgid "Failed to clone repository {url}"
+msgstr "Не удалось клонировать {url} репозиторий"
+
+msgid "Failed to update the repository in {rpath}"
+msgstr "Не удалось обновить репозиторий в {rpath}"
+
+msgid "Wrong repository in the {rpath} directory"
+msgstr "Не правильный репозиторий в {rpath} директории"
+
+msgid "Failed to get the repository status for {rpath}"
+msgstr "Не удалось получить состояние репозитория в {rpath} директории"
+
+msgid "Failed to clean the {rpath} repository"
+msgstr "Не удалось очистить {rpath} репозиторий"
+
+msgid "Branch {branch} not found in repository {rpath}"
+msgstr "Ветка {branch} не найдена в {rpath} репозитории"
+
+msgid "Failed to change branch to {branch} in the {rpath} repository"
+msgstr "Не удалось сменить ветку на {branch} в {rpath} репозитории"
+
msgid "New password"
msgstr "Новый пароль"
diff --git ru/cl_update3.po ru/cl_update3.po
index cf2fd77..f1b8d74 100644
--- ru/cl_update3.po
+++ ru/cl_update3.po
@@ -159,6 +159,9 @@ msgstr "Вы хотите установить эти пакеты?"
msgid "Would you like to unmerge these packages?"
msgstr "Вы хотите удалить эти пакеты?"
+msgid "Failed to use new profile. Try again."
+msgstr "Не удалось установить профиль. Попытайтесь еще раз."
+
msgid "Wrong profile"
msgstr "Неправильный профиль"
@@ -240,12 +243,6 @@ msgstr "Перемещение метаданных"
msgid "Updating the eix cache"
msgstr "Обновление кэша eix"
-msgid "Fixing the settings"
-msgstr "Исправление настроек"
-
-msgid "Updating configuration files"
-msgstr "Обновление конфигурационных файлов"
-
msgid "Synchronization finished"
msgstr "Синхронизация завершена"
@@ -255,6 +252,15 @@ msgstr "Настройка профиля"
msgid "Switching to profile {cl_update_profile_system}"
msgstr "Переключение на {cl_update_profile_system} профиль"
+msgid "Fixing the settings"
+msgstr "Исправление настроек"
+
+msgid "The system is being configured"
+msgstr "Конфигурирование системы"
+
+msgid "Updating configuration files"
+msgstr "Обновление конфигурационных файлов"
+
msgid "Update manually interrupted"
msgstr "Обновление прервано пользователем"
@@ -264,11 +270,8 @@ msgstr "Проверка обновлений"
msgid "Calculating dependencies"
msgstr "Вычисление зависимостей"
-msgid "Updating Portage"
-msgstr "Обновление Portage"
-
-msgid "Updating {0}"
-msgstr "Обновление {0}"
+msgid "Updating packages"
+msgstr "Обновление пакетов"
msgid "Updating Python"
msgstr "Обновление Python"
@@ -285,9 +288,6 @@ msgstr ""
"Поиск и пересборка пакетов и Perl header файлов, повреждённых при обновлении "
"Perl"
-msgid "Updating packages"
-msgstr "Обновление пакетов"
-
msgid "Cleaning the system from needless packages"
msgstr "Очистка системы от ненужных пакетов"
@@ -327,17 +327,17 @@ msgstr "Не удалось настроить параметры автопро
msgid "Configuration manually interrupted"
msgstr "Настройка прервана пользователем"
-msgid "rebuild package list"
-msgstr "переформировать список пакетов"
+msgid "rebuild system packages list"
+msgstr "переформировать список пакетов системы"
-msgid "append profile package list"
+msgid "append profile system packages list"
msgstr "добавить список пакетов профиля"
-msgid "update package list"
-msgstr "обновить список пакетов"
+msgid "update system packages list"
+msgstr "обновить список пакетов системы"
-msgid "Package list"
-msgstr "Список пакетов"
+msgid "System packages list"
+msgstr "Список пакетов системы"
msgid "Rebuild"
msgstr "Переформировать"
@@ -457,6 +457,33 @@ msgstr "Название дистрибутива"
msgid "Used repositories"
msgstr "Используемые репозитории"
+msgid "Overlay templates"
+msgstr "Шаблоны оверлея"
+
+msgid "Local templates"
+msgstr "Локальные шаблоны"
+
+msgid "Calculate overlay templates"
+msgstr "Шаблоны оверлея Calculate"
+
+msgid "Distribution templates"
+msgstr "Шаблоны дистрибутива"
+
+msgid "Remote templates"
+msgstr "Удалённые шаблоны"
+
+msgid "clt templates"
+msgstr "clt шаблоны"
+
+msgid "Templates location"
+msgstr "Местонахождение шаблонов"
+
+msgid "select location for templates %s"
+msgstr "выбор местонахождения шаблонов %s"
+
+msgid "%s overlay templates"
+msgstr "Шаблоны %s оверлея"
+
msgid "Name"
msgstr "Название"
@@ -505,17 +532,17 @@ msgstr "Вы должны указать профиль"
msgid "Repository variables were not configured for the profile"
msgstr "В профиле не настроены переменные репозитория"
+msgid "Overlay %s not specified in cl_update_rep_name"
+msgstr "Оверлей %s не указан в переменной cl_update_rep_name"
+
msgid "The selected profile is not Calculate"
msgstr "Профиль не Calculate"
msgid "Wrong Calculate profile"
msgstr "Неправильный Calculate профиль"
-msgid "Repositories to be synchronized"
-msgstr "Синхронизируемые репозитории"
-
-msgid "repositories to be synchronized"
-msgstr "синхронизируемые репозитории"
+msgid "Update the cache"
+msgstr "Обновить кэш"
msgid "Automatically check updates"
msgstr "Автоматически проверять обновления"
@@ -544,8 +571,8 @@ msgstr "Учитывать график автопроверки"
msgid "consider the autocheck schedule"
msgstr "учитывать график автопроверки"
-msgid "Emerge like package list"
+msgid "Emerge like packages list"
msgstr "Список пакетов в формате emerge"
-msgid "display package list in emerge format"
+msgid "display packages list in emerge format"
msgstr "отобразить список пакетов в emerge формате"

51
sys-apps/calculate-i18n/files/calculate-i18n-3.2.2_beta4-r1.patch
Unescape View File

@ -1,51 +0,0 @@
diff --git ru/cl_core3.po ru/cl_core3.po
index c06c4f4..efa08b8 100644
--- ru/cl_core3.po
+++ ru/cl_core3.po
@@ -28,8 +28,8 @@ msgstr "Выполнить"
msgid "Patch"
msgstr "Патч"
-msgid "Update"
-msgstr "Обновить"
+msgid "Update "
+msgstr "Обновление "
msgid "Update settings"
msgstr "Обновление настроек"
diff --git ru/cl_update3.po ru/cl_update3.po
index 2e81192..1a4556e 100644
--- ru/cl_update3.po
+++ ru/cl_update3.po
@@ -141,8 +141,8 @@ msgstr "Не удалось установить профиль: %s"
msgid "Failed to move the profile: %s"
msgstr "Не удалось переместить профиль: %s"
-msgid "Update"
-msgstr "Обновить"
+msgid "Update "
+msgstr "Обновление "
msgid "Update the System"
msgstr "Обновление системы"
@@ -168,8 +168,8 @@ msgstr "Установить профиль"
msgid "Configuration"
msgstr "Настройка "
-msgid "Updates"
-msgstr "Обновление"
+msgid "The Update Check"
+msgstr "Проверка обновлений"
msgid "Updates autocheck settings"
msgstr "Параметры автопроверки обновлений"
@@ -315,6 +315,9 @@ msgstr "Переформировать"
msgid "Merge"
msgstr "Объединить"
+msgid "Update"
+msgstr "Обновить"
+
msgid "Rebuild world"
msgstr "переформировать world файл"

5
sys-apps/calculate-install/Manifest
Unescape View File

@ -1,6 +1,3 @@
DIST calculate-install-3.2.0.tar.bz2 79564 SHA256 ee045038718677c9535b0e6eef687c3230ea428872f36a2d829346c331863603 SHA512 933a94a15a0c4a8b65809c568590bdfc55900f61dbbec872f1c9fa173a8eb0d5bf3ebdd72ac751713c14a9af50ab8f36feb166a4b9a71748159d96d1e621c8ce WHIRLPOOL f227abc52c450ddd2e08abc2f21283c6c4189d2616f1c044b0a1f86b587bda79b84338841e71c3a16db192a68b0f79929b39f84381564dfc9c840e7f8e7b6c67
DIST calculate-install-3.2.1.tar.bz2 79337 SHA256 c7f9416c947ff8a1f1b78e7d370dc78365c376450482758ad4f4fd45aafe8151 SHA512 4483707d1c1dca46ef751bba1c82467ef875f6f87d628bca25057364abe51c4a4af5655ade3da046a7e8a2456114519bc6e0d5eccd13dc734310807e93fa0cb3 WHIRLPOOL ec1beab93c75dcf26b17647f0f89407996c1162f40750b904c4c358c8b35695e08f3e58c2031bf17778ad0924628964696d98bc459cef9cebda6c5202f2c754c
DIST calculate-install-3.2.2_beta1.tar.bz2 78250 SHA256 a02ac4c5587cf2dc7a47a78c5c98f04b7622743e460be95273ce637c3b6bbe51 SHA512 5c14b4d909428faf1b557c6ecc06016d2b1ac9650bb71d86a8cd39b11e6f36102e3cbcb1e91214a4d9ecc7445d66780606cc1eca310fc5a3c5185288f2bc1b73 WHIRLPOOL 02874ba0dcdb30b75294544a062f215dfa0cf30e96d8d6d8a628ac2df49da4dc5db4b237e71eb283c6f6471a00159f0b2a4cd38aa79267a1f04d6809a7d5afe8
DIST calculate-install-3.2.2_beta2.tar.bz2 78216 SHA256 c348ccf1cf5495c8aee648ddba00e4ff167455b682fa57fc4ac08d53c01a7fdd SHA512 d3cf533d5774c7338c77c73f3a5c45bae9211aaf38d32738141be396dc8dc12708da9029e23b3fbbd8c7baa0bb0ab64ba20eba1ea1a3df2f9e6ff672fd98f550 WHIRLPOOL a3318218f368e32b943c367a3fae2581b1d1e3e80aa3c1c27eef1ab13f770638d0ddb70c4c6b36a50cd896050006fc436dc0f6bcb7ea07aa126e5a0ad9a2979c
DIST calculate-install-3.2.2_beta3.tar.bz2 78205 SHA256 c950627805bb040b1390385b73bd78d53e2ec1febe5b6f7a18be7fbdb4084032 SHA512 8cbcc8d2ab08114ae599504f197c882d6124a66a44e17165ecd76659d8bd0ff5293e07148703f3d935646253712f7397566f365fac111fd8efaaba29b66e6044 WHIRLPOOL 8e013d2153a25cacf841eaa393d52799fd06aa3a0b0e0c5e0654fe4c8654f977ce0f5960fad2fda42398abd213b06b6e6e0b6e7730aa69f5b9964a1a2b4b0b4c
DIST calculate-install-3.2.2_beta4.tar.bz2 78266 SHA256 83eba712222ff88019176d32f0c4f67ab0baa0fbac48403c559bce3ab5f3d5df SHA512 676401d0589a542ed5a702aad8956a864f4be02adce440be93b90fe876c3a9add71834be312938ebf86735061073e166a5e7da6583c55021dfa07fb7407691ae WHIRLPOOL 102944ab68e74691442bee63785dd4f9df757d56e55e8e730b60a0e8c9c85a71b2e48306af68c2b70f4e36c68022192024fb3ce053e014cfdda9db4f9429a059
DIST calculate-install-3.2.2.tar.bz2 78308 SHA256 86f3d2bcd9abf221fb118372a9b925ee239498c3b73caaa7b6a55f5b5a389896 SHA512 57ca018af5d642f298c349671fce434881492e8549cc180495fb3075ecb5e1fddfd74290e1f22762d4c346aa5eee9f8d5131dba850e4d321a2ac907380059bcb WHIRLPOOL bcb8a2786c5bbe667b928519f971d7349e2a84055509f86e06213ef9751406f73b6f2e83e175ea4e17dc386040253b5dc3f58d0b7984ce1297cebfe1a0c65c75

4
sys-apps/calculate-install/calculate-install-3.2.2_beta1.ebuild → sys-apps/calculate-install/calculate-install-3.2.2.ebuild
Unescape View File

@ -14,10 +14,10 @@ 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"
KEYWORDS="amd64 x86"
IUSE="pxe minimal"
DEPEND="~sys-apps/calculate-core-3.2.2_beta1
DEPEND="~sys-apps/calculate-core-3.2.2
!<sys-apps/calculate-install-2.2.29
app-portage/layman
>=virtual/udev-197

43
sys-apps/calculate-install/calculate-install-3.2.2_beta2-r1.ebuild
Unescape View File

@ -1,43 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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 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.2.2_beta2
!<sys-apps/calculate-install-2.2.29
app-portage/layman
>=virtual/udev-197
!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 )"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-install-3.2.2_beta2-r1.patch"
}

35
sys-apps/calculate-install/calculate-install-3.2.2_beta2.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="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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 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.2.2_beta2
!<sys-apps/calculate-install-2.2.29
app-portage/layman
>=virtual/udev-197
!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 )"

43
sys-apps/calculate-install/calculate-install-3.2.2_beta3-r1.ebuild
Unescape View File

@ -1,43 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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 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.2.2_beta3
!<sys-apps/calculate-install-2.2.29
app-portage/layman
>=virtual/udev-197
!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 )"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-install-3.2.2_beta3-r1.patch"
}

35
sys-apps/calculate-install/calculate-install-3.2.2_beta3.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="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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 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.2.2_beta3
!<sys-apps/calculate-install-2.2.29
app-portage/layman
>=virtual/udev-197
!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 )"

43
sys-apps/calculate-install/calculate-install-3.2.2_beta4-r1.ebuild
Unescape View File

@ -1,43 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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 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.2.2_beta4
!<sys-apps/calculate-install-2.2.29
app-portage/layman
>=virtual/udev-197
!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 )"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-install-3.2.2_beta4-r1.patch"
}

35
sys-apps/calculate-install/calculate-install-3.2.2_beta4.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="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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 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.2.2_beta4
!<sys-apps/calculate-install-2.2.29
app-portage/layman
>=virtual/udev-197
!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 )"

26
sys-apps/calculate-install/files/calculate-install-3.2.2_beta2-r1.patch
Unescape View File

@ -1,26 +0,0 @@
diff --git pym/install/fs_manager.py pym/install/fs_manager.py
index 402f72a..b2c2fa2 100644
--- pym/install/fs_manager.py
+++ pym/install/fs_manager.py
@@ -27,7 +27,7 @@ setLocalTranslate('cl_install3',sys.modules[__name__])
class FileSystemManager:
"""Convert dict install option"""
- defaultOpt = ['noatime','nodiratime']
+ defaultOpt = ['noatime']
defaultBindOpts = ['bind']
supportFS = {
'ext2': {'defaultopt': defaultOpt,
diff --git pym/install/variables/disk.py pym/install/variables/disk.py
index b0f99c1..17b0e2c 100644
--- pym/install/variables/disk.py
+++ pym/install/variables/disk.py
@@ -1423,8 +1423,6 @@ class VariableOsInstallDiskOptions(ReadonlyVariable):
"""TODO: get real options"""
def postProcess(opt):
l_opt = filter(None,opt.split(','))
- if "noatime" in l_opt and not "nodiratime" in l_opt:
- l_opt.append("nodiratime")
return ",".join(l_opt)
diskOpts = dict(filter(lambda x:x[1],

43
sys-apps/calculate-install/files/calculate-install-3.2.2_beta3-r1.patch
Unescape View File

@ -1,43 +0,0 @@
diff --git pym/install/variables/X11.py pym/install/variables/X11.py
index 836803b..58dba88 100644
--- pym/install/variables/X11.py
+++ pym/install/variables/X11.py
@@ -27,6 +27,8 @@ from calculate.lib.utils.common import (getVideoFromXorgLog,
getCompositeFromXorgconf, getVideoFromModules,
getVideoFromVendor, getInstalledVideo)
from calculate.install.distr import DistributiveError
+import fcntl
+import struct
from calculate.lib.cl_lang import setLocalTranslate
setLocalTranslate('cl_install3',sys.modules[__name__])
@@ -283,19 +285,15 @@ class VariableOsInstallFbResolution(ResolutionVariable):
self.help = _("set the framebuffer resolution")
self.label = _("Framebuffer resolution")
+ FBIOGET_VSCREENINFO = 0x4600
+
def get(self):
"""Get current framebuffer resolution"""
- resolution = ""
- fbres = getProgPath('/sbin/fbres')
- if fbres:
- processFbres = process(fbres,stderr=STDOUT)
- textLines = processFbres.readlines()
- if textLines:
- cxx11,cyx11 = \
- self.Get('os_install_x11_resolution').partition('x')[0::2]
- cxfb, cyfb = textLines[0].partition('x')[0::2]
- if not filter(lambda x:not x.isdigit(),
- [cxfb,cyfb,cxx11,cyx11])and \
- int(cxx11) >= int(cxfb) and int(cyx11) >= int(cyfb):
- resolution = "%s-32"%textLines[0]
- return resolution or "1024x768-32"
+ try:
+ fbdev = os.open('/dev/fb0',os.O_RDONLY)
+ data = fcntl.ioctl(fbdev, self.FBIOGET_VSCREENINFO, " "*8)
+ res = struct.unpack("II",data)
+ return "%sx%s"%(res[0],res[1])
+ except (IOError,OSError):
+ pass
+ return "1024x768"

34
sys-apps/calculate-install/files/calculate-install-3.2.2_beta4-r1.patch
Unescape View File

@ -1,34 +0,0 @@
diff --git pym/install/variables/system.py pym/install/variables/system.py
index 297960e..60e868e 100644
--- pym/install/variables/system.py
+++ pym/install/variables/system.py
@@ -26,6 +26,7 @@ from calculate.lib.utils.files import (readFile,getProgPath,process,
readLinesFile)
from calculate.lib.utils.common import getPasswdUsers,getUserGroups,getGroups
from calculate.lib.utils.common import getValueFromConfig,getValueFromCmdLine
+from calculate.lib.utils.common import getUserPrimaryGroup
from calculate.lib.utils.portage import isPkgInstalled
from calculate.lib.utils.device import getUdevDeviceInfo
from crypt import crypt
@@ -217,13 +218,19 @@ class VariableClMigrateUserGroups(UserHelper,Variable):
value)
return value
+ def getPrimaryGroup(self, username):
+ pg = getUserPrimaryGroup(username)
+ if pg:
+ return [pg]
+ return []
+
def get(self):
"""
User groups
"""
passwdList = getPasswdUsers()
- return map(lambda x:getUserGroups(x) \
- if x in passwdList else self.getDefaultGroups(),
+ return map(lambda x:(self.getPrimaryGroup(x) + (getUserGroups(x)
+ if x in passwdList else self.getDefaultGroups())),
self.Get('cl_migrate_user'))
def choice(self):

5
sys-apps/calculate-lib/Manifest
Unescape View File

@ -2,7 +2,4 @@ DIST calculate-lib-2.1.11.tar.bz2 61687 SHA256 62976c08d4fb4810389ace6f5a99abb5a
DIST calculate-lib-2.2.32.tar.bz2 121878 SHA256 fe85e033eb16703e9fc6dcdc06fe12dd215c56315ceed7a6eee8c732229b1cd6 SHA512 933619746b5dd2a30cc4e98080ba3f40c8131c86852f55ecfefd8a239a6625985abb7fcc5e71d3b346d811e30ab997ad1d3c2142d1b1f46a3e6387c009b3eb6a WHIRLPOOL 5f678cee97dacd18e9ba4b10534808b8def8d9b3f476b6a397b8e8da4c7eb844722da62af2c53c4aa00d41c606a2b9f474a780ad257aec5ad8175002bfe97589
DIST calculate-lib-3.2.0.tar.bz2 133810 SHA256 4e1418b37559467e6fe210a107c5e3209499acf8655b2543fbcf98ff30417121 SHA512 3205100d5c1457d29669f46c735a4df59690cac0868fe6410dcf5b9009daac530cf0946a596486a56ad469b9185d9d8409990067b1a1e22ce0cf4c090dea5e06 WHIRLPOOL ee4dbd379d51cb15d15297977b7198fc70fcca5c07779a518f8c5129b0777e49a6894962a1a6464c30b0224a20c260bf258727b075ccdc59249ea978bfffe0eb
DIST calculate-lib-3.2.1.tar.bz2 134267 SHA256 b2303a93e56ee229d83f58765b8c0284d96834684497a034d4f0ac2e9ec8fea7 SHA512 9a9878579a13bb256afa9ef8ffdc0d21b8dea153e185a0ed0cff241ada53e9cfe76abbded770f1b95653989d7f0ba22ac7ba80d921a86792145882a52d3436ce WHIRLPOOL 7e79150a881a2e8b850b7aa98834266624da360df44aebe9385310dc0e6b9555cc36dbd099e0ce81da04d5b6e7430af7d6761af0f0b13eb2bf669c80d1a46a97
DIST calculate-lib-3.2.2_beta1.tar.bz2 133976 SHA256 e3fdfe81d3253352309c07346289679eeb2f9a4fc56ce4ad560e78fa8ede14fb SHA512 501099c3dd835a3792c07619f7b446c89b9d3e947eb52bd2ca19d998b6de01e290eaae4e31d6a67a2a3f20b61758b995b163b2b74b28e9dfa2b6a134916e3ad8 WHIRLPOOL f2c2322940999529d4d2a9eb8fb4e5044a869337d1cb3d182163e7a53b3ac846e33387ad86867c75fbb82ecc71a46bd0aeab3912a5324e0196823c27d0f0fb65
DIST calculate-lib-3.2.2_beta2.tar.bz2 134455 SHA256 1d5427c3d963f376480a6a0f5b891b452f1f3fbd8556b81e99b35da711cdbca5 SHA512 7a7910126ac18b670e7b300469744c3b1e2bdfa2d938e5bf9dbc902569fb200be9a246383880b2f706c57c4fd1ebfa9eb914ecd88689a28353e076b80547bd10 WHIRLPOOL fcd76e47fe9a49cc48d87d6e6aa8af98dd15a8adac2ec940a6ea791c611bd3c40ab1e24788769d2e3e1369b2339384fded84d3d6d3b057654873167ef5281481
DIST calculate-lib-3.2.2_beta3.tar.bz2 140839 SHA256 7c8c543740da5ba4973738cefd0b90d1c129a312f53ee6ff00bc5b053104e39b SHA512 bc09123b1e8801c2e27da411c8a359aa1cfa0951284004eaee60015ae80fb4c76afd12ae7a89e41bd9045d0921c86c5fc5c8e4d41d17bf275882aa74a217344e WHIRLPOOL 10de1d2803dfc2658bfc542e1d8cb2f269aa9a590a91eeb20c95a09970e7f35cd498a15f4a595661f90afe2ab4b3391f25af1a82c0bed5af37bf550e5526c741
DIST calculate-lib-3.2.2_beta4.tar.bz2 141147 SHA256 b7beb4069c2a3be22466071df040dbbedb0292a25a9229e065725ca3904c5b1e SHA512 8b21275e7bd45f5044e08c2c60be6ecf8999227472298fb595c51ff497f57e0fd9e7a42ed77851b2cefba7104a9b2f870db62783a9e74be3c46853b1724401c7 WHIRLPOOL 167df6f68c47c7bfb93272280910c8b0a4c7fb68796865db2f8868de80371ec501bef5742337e10478bf8b77ac713139cb139f1d57947f94bff365d4e81dd377
DIST calculate-lib-3.2.2.tar.bz2 141391 SHA256 51d9e6b6e1d6ca3687dc2d4c797c76d07cd6e048fb7bc08b659c75eccfedcfdf SHA512 667a82eb3ecd0ef5d608e75d6c1581644bb5ea2e544b3dd7c72b7a868a8f7b977c32674e9df4047563d6c46d7ec080fd30bb2f36384e548dcbdb281a9e16d578 WHIRLPOOL 4b3f33ab1df08af4efc9ea8c0205a4e6cbd5b17b8fc13a6f95ce41d5c1b1dcfd9953d100fa891201de87891794dba1425a89497ca1a1c2d83174cbf8cb78a27c

2
sys-apps/calculate-lib/calculate-lib-3.2.2_beta1.ebuild → sys-apps/calculate-lib/calculate-lib-3.2.2.ebuild
Unescape View File

@ -14,7 +14,7 @@ DESCRIPTION="The library for Calculate 3"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="!minimal? ( dev-python/py-smbpasswd )
>=dev-python/pyxml-0.8

36
sys-apps/calculate-lib/calculate-lib-3.2.2_beta2-r1.ebuild
Unescape View File

@ -1,36 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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.2_beta2-r1.patch"
}

28
sys-apps/calculate-lib/calculate-lib-3.2.2_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="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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}"

28
sys-apps/calculate-lib/calculate-lib-3.2.2_beta3.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="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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}"

36
sys-apps/calculate-lib/calculate-lib-3.2.2_beta4-r1.ebuild
Unescape View File

@ -1,36 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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.2_beta4-r1.patch"
}

28
sys-apps/calculate-lib/calculate-lib-3.2.2_beta4.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="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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}"

1044
sys-apps/calculate-lib/files/calculate-lib-3.2.2_beta2-r1.patch
View File

File diff suppressed because it is too large Load Diff

80
sys-apps/calculate-lib/files/calculate-lib-3.2.2_beta4-r1.patch
Unescape View File

@ -1,80 +0,0 @@
diff --git pym/calculate/lib/cl_template.py pym/calculate/lib/cl_template.py
index 0e7fed8..630747d 100644
--- pym/calculate/lib/cl_template.py
+++ pym/calculate/lib/cl_template.py
@@ -5762,7 +5762,8 @@ gettext -d cl_template "$*"
if objTempl.getError():
raise TemplatesError(_("Failed to use patch ") + \
nameFileTemplate)
- elif formatTemplate == 'diff':
+ elif (formatTemplate == 'diff' and
+ self.objVar.Get('cl_verbose_set') == "on"):
self.printSUCCESS(_("Appling patch")+ " " + \
os.path.basename(nameFileTemplate))
if execStr:
diff --git pym/calculate/lib/utils/common.py pym/calculate/lib/utils/common.py
index 75dcdce..1604cce 100644
--- pym/calculate/lib/utils/common.py
+++ pym/calculate/lib/utils/common.py
@@ -397,6 +397,17 @@ def getKernelUid(device):
else:
return device.replace("/","")
+def dict_by_columns(i, sep, key, value):
+ """
+ Получить словарь из файла, где каждая строка разделена sep символом
+ на колонки, key - номер колонки ключей, value номер колонки значений
+ """
+ max_val = max(key,value)
+ return dict(
+ map(lambda x: (x[key], x[value]),
+ filter(lambda x: len(x) >= max_val,
+ map(lambda x: x.split(sep),i))))
+
from calculate.lib.utils.files import readLinesFile
def getUserGroups(userName,prefix="/"):
"""
@@ -407,6 +418,22 @@ def getUserGroups(userName,prefix="/"):
map(lambda x:x.split(':')[0::3],
readLinesFile(path.join(prefix,'etc/group')))))
+
+def getUserPrimaryGroup(userName, prefix="/"):
+ """
+ Получить основную группу пользователя
+ """
+ passwd = path.join(prefix,'etc/passwd')
+ group = path.join(prefix,'etc/group')
+ sep_symb = ":"
+ userGidMap = dict_by_columns(readLinesFile(passwd),sep_symb,0,3)
+ gidGroupMap = dict_by_columns(readLinesFile(group),sep_symb,2,0)
+ if userName in userGidMap:
+ gid = userGidMap[userName]
+ return gidGroupMap.get(gid,None)
+ return None
+
+
def getGroups(prefix="/"):
"""
Get groups from etc/group
diff --git pym/calculate/lib/utils/files.py pym/calculate/lib/utils/files.py
index 7fe505a..846b0ed 100644
--- pym/calculate/lib/utils/files.py
+++ pym/calculate/lib/utils/files.py
@@ -342,10 +342,12 @@ class typeFile:
def isBinary(self, filename):
"""является ли файл бинарным"""
mime = self.getMType(filename)
- if mime.startswith("text"):
- return False
- else:
- return True
+ if mime:
+ if mime.startswith("text"):
+ return False
+ else:
+ return True
+ return None
class scanDirectory:
"""Класс для cканирования директории"""

5
sys-apps/calculate-update/Manifest
Unescape View File

@ -1,6 +1,3 @@
DIST calculate-update-3.2.0.tar.bz2 32349 SHA256 c4c9cc506c61754a74b7f77e5cee641a7ac8a92109b092abf595ddb77868ed05 SHA512 707cd753ad73e59ac3016177d7f3a52a7614be0b85a7b64d0e47858541ce7d9e75531f55cf3169c3734e4bcb8e2ab145a3acdaad1e8b656ee356cb87f7624767 WHIRLPOOL d2a0bfc8d8f756584fdb8c67a1bd950659210de441f8e2cf77cec6416d90a3aaad95bdd42d901fc2b9ce50ee82b9f3c66c6ff2122c4a0250f04d8bb86abf7c7d
DIST calculate-update-3.2.1.tar.bz2 33037 SHA256 319bf5ceac632e711ac9e0e9a0c5ce3e94b783466069b7ec40c6d82ea6915a1a SHA512 d61fd0e21aa080d22435788ebd05cebb997a63c87d913d4c8d824edd4d7a61a8543731588e8eb8d8f9625cb376251fd844dd2513a831c610cd364edd28df0c84 WHIRLPOOL f1cf8dd1dcae4bd6d137046e1c0ef838feaef134f031ba18184aaef8d445832beb1254e9fca82620b323bf62330094d7dd69c9853424e527b33c0a9081be4362
DIST calculate-update-3.2.2_beta1.tar.bz2 33851 SHA256 772889b13c46ec57ead4e557c15dd76c55cebe0760ff902b3b982756b82fb85d SHA512 949e76b8a57b110b2550facd764f3945b742562a1699d5b9f07dd56c39e0da00e407f50dc6d446c7069f8a3af705d835546312a195050c2a5f88d3c68d44d622 WHIRLPOOL 75fdb942e801262b7d18202c7ed3a7895d7b6a96122c4c39bc8c8bc01b65e6057d2d745eede6a05a31d002a3c4178bd6a884ba76ed9353365a32d0b3824725cb
DIST calculate-update-3.2.2_beta2.tar.bz2 33850 SHA256 90f98dfed0e3cb172836b3c77d8225e89e1d5e035bf479e2580389a07e47e12c SHA512 23869ad00c95dbc88c396736e0d99b42dc0d58e68c4f8bea4a9586af7c65da48834d5beea8e7d9d5d5e46b6c0491525cce99d0a220c412abb72eef7d310a78f0 WHIRLPOOL 5de6e86a8d92e47bf81d8b328686d532f0ba8e5a498a973a9606ebbd81ec7e8123804b7ed3552803b3b651178b21fbda3681c326f54a1793d6ec47c29c59ed1c
DIST calculate-update-3.2.2_beta3.tar.bz2 27586 SHA256 39d7215ab0673272798aa12b02d265648e17fd548a87d8d715683bcfa957b2f1 SHA512 b0fcacc458e2cb24362b9f9a4585545f6455939b747c2baee11b33ee50111d5b56a1e07a05592e78f04f58b1995c0b69caf8bbb796a70442ecae5050571c6402 WHIRLPOOL 81cf6f0ccfb5432d967ba8ecab30d5c8f751664be7297b14a805ff8db006326e2d6e8ed594e6eb7ac6fe5815255c4f9e6409d4b100b9bf3b9d55bc59518fbbfd
DIST calculate-update-3.2.2_beta4.tar.bz2 27705 SHA256 15f309233800fe234a2f79f65acc5904029cbfcff465ad703d090f3b4cbaed85 SHA512 5df3f939ed70e91c8961ffdd83a6bf3a6f6fc174dfe136e000ee20d767fcf149ad52aa4cb68cc958c09bade72a61f655e3797d46424db7e8d77a127a8b99dab8 WHIRLPOOL 37b8dee1d82e5e0e0343177189c56712d226f6ca090c2c595ddbf0c527688f0f37754306ab6c5c684596dd494442e3bc2e0fe6ee473c56425ee0adf0ee74921a
DIST calculate-update-3.2.2.tar.bz2 27765 SHA256 bfd3184d994bbdf536d57128ed13aa8b0c174356504fe5570ba47fc939ed4dd9 SHA512 81cce63ef13cd8b5e818dead32c8b8ca6801fae62163383b813b66121e107697094e1f954b0acb972d749771f9752a482d27b9e8aae8a6c9bea448d24167bda9 WHIRLPOOL d6c74da75a356cd95a0711d536ebdd436d5504a7c975a2e7d2b81ad36e381fd17e3ca96a562967f7a5e1954b2215c008b0472912fcfee85b2358fb536f7102c6

6
sys-apps/calculate-update/calculate-update-3.2.2_beta1.ebuild → sys-apps/calculate-update/calculate-update-3.2.2.ebuild
Unescape View File

@ -14,11 +14,11 @@ 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"
KEYWORDS="amd64 x86"
IUSE=""
DEPEND="~sys-apps/calculate-core-3.2.2_beta1
~sys-apps/calculate-install-3.2.2_beta1
DEPEND="~sys-apps/calculate-core-3.2.2
~sys-apps/calculate-install-3.2.2
dev-python/pexpect"
RDEPEND="${DEPEND}"

38
sys-apps/calculate-update/calculate-update-3.2.2_beta2-r1.ebuild
Unescape View File

@ -1,38 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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.2_beta2
~sys-apps/calculate-install-3.2.2_beta2
dev-python/pexpect"
RDEPEND="${DEPEND}"
pkg_preinst() {
distutils-r1_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.2_beta2-r1.patch"
}

38
sys-apps/calculate-update/calculate-update-3.2.2_beta2-r2.ebuild
Unescape View File

@ -1,38 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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.2_beta2
~sys-apps/calculate-install-3.2.2_beta2
dev-python/pexpect"
RDEPEND="${DEPEND}"
pkg_preinst() {
distutils-r1_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.2_beta2-r2.patch"
}

30
sys-apps/calculate-update/calculate-update-3.2.2_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="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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.2_beta2
~sys-apps/calculate-install-3.2.2_beta2
dev-python/pexpect"
RDEPEND="${DEPEND}"
pkg_preinst() {
distutils-r1_pkg_preinst
dosym /usr/sbin/cl-core /usr/sbin/cl-update
dosym /usr/sbin/cl-core /usr/sbin/cl-update-profile
}

38
sys-apps/calculate-update/calculate-update-3.2.2_beta3-r1.ebuild
Unescape View File

@ -1,38 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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.2_beta3
~sys-apps/calculate-install-3.2.2_beta3
dev-python/pexpect"
RDEPEND="${DEPEND}"
pkg_preinst() {
distutils-r1_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.2_beta3-r1.patch"
}

30
sys-apps/calculate-update/calculate-update-3.2.2_beta3.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="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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.2_beta3
~sys-apps/calculate-install-3.2.2_beta3
dev-python/pexpect"
RDEPEND="${DEPEND}"
pkg_preinst() {
distutils-r1_pkg_preinst
dosym /usr/sbin/cl-core /usr/sbin/cl-update
dosym /usr/sbin/cl-core /usr/sbin/cl-update-profile
}

38
sys-apps/calculate-update/calculate-update-3.2.2_beta4-r1.ebuild
Unescape View File

@ -1,38 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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.2_beta4
~sys-apps/calculate-install-3.2.2_beta4
dev-python/pexpect"
RDEPEND="${DEPEND}"
pkg_preinst() {
distutils-r1_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.2_beta4-r1.patch"
}

38
sys-apps/calculate-update/calculate-update-3.2.2_beta4-r2.ebuild
Unescape View File

@ -1,38 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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.2_beta4
~sys-apps/calculate-install-3.2.2_beta4
dev-python/pexpect"
RDEPEND="${DEPEND}"
pkg_preinst() {
distutils-r1_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.2_beta4-r2.patch"
}

38
sys-apps/calculate-update/calculate-update-3.2.2_beta4-r3.ebuild
Unescape View File

@ -1,38 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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.2_beta4
~sys-apps/calculate-install-3.2.2_beta4
dev-python/pexpect"
RDEPEND="${DEPEND}"
pkg_preinst() {
distutils-r1_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.2_beta4-r3.patch"
}

30
sys-apps/calculate-update/calculate-update-3.2.2_beta4.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="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 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.2_beta4
~sys-apps/calculate-install-3.2.2_beta4
dev-python/pexpect"
RDEPEND="${DEPEND}"
pkg_preinst() {
distutils-r1_pkg_preinst
dosym /usr/sbin/cl-core /usr/sbin/cl-update
dosym /usr/sbin/cl-core /usr/sbin/cl-update-profile
}

13
sys-apps/calculate-update/files/calculate-update-3.2.2_beta2-r1.patch
Unescape View File

@ -1,13 +0,0 @@
diff --git data/cl-git-wrapper data/cl-git-wrapper
index 70039b9..81b88d1 100755
--- data/cl-git-wrapper
+++ data/cl-git-wrapper
@@ -22,7 +22,7 @@ native_reps=,$(/usr/sbin/cl-core --method core_variables_show \
if echo $native_reps | grep -q ,${repo_name},
then
# отбновить репозиторий через утилиты Calculate
- /usr/sbin/cl-core --method update --rep $repo_name --sync-only on --skip-update-metadata --skip-eix-update -T none
+ /usr/sbin/cl-core --method update --rep $repo_name --sync-only on --skip-eix-update -T none
else
# выполнить обновление через git
/usr/bin/git $*

1207
sys-apps/calculate-update/files/calculate-update-3.2.2_beta2-r2.patch
View File

File diff suppressed because it is too large Load Diff

12
sys-apps/calculate-update/files/calculate-update-3.2.2_beta3-r1.patch
Unescape View File

@ -1,12 +0,0 @@
diff --git pym/update/variables/action.py pym/update/variables/action.py
index 8e2de8e..799b1f3 100644
--- pym/update/variables/action.py
+++ pym/update/variables/action.py
@@ -29,6 +29,6 @@ class VariableAcUpdateSync(ReadonlyVariable):
"""
def get(self):
action = self.Get("cl_action")
- if action in ("sync",):
+ if action in ("sync", 'update_profile'):
return "on"
return "off"

17
sys-apps/calculate-update/files/calculate-update-3.2.2_beta4-r1.patch
Unescape View File

@ -1,17 +0,0 @@
diff --git pym/update/update_info.py pym/update/update_info.py
index 8ab9fca..f4cfd32 100644
--- pym/update/update_info.py
+++ pym/update/update_info.py
@@ -46,7 +46,11 @@ class UpdateInfo(object):
"""
return SystemIni().getVar(cls.section, cls.varname) == u'on'
- def set_update_ready(self, value):
+ @classmethod
+ def set_update_ready(cls, value):
+ """
+ Установить статус обновления
+ """
SystemIni().setVar(self.section,
{self.varname:"on" if value else "off"})

21
sys-apps/calculate-update/files/calculate-update-3.2.2_beta4-r2.patch
Unescape View File

@ -1,21 +0,0 @@
diff --git pym/update/update_info.py pym/update/update_info.py
index 8ab9fca..a162631 100644
--- pym/update/update_info.py
+++ pym/update/update_info.py
@@ -46,9 +46,13 @@ class UpdateInfo(object):
"""
return SystemIni().getVar(cls.section, cls.varname) == u'on'
- def set_update_ready(self, value):
- SystemIni().setVar(self.section,
- {self.varname:"on" if value else "off"})
+ @classmethod
+ def set_update_ready(cls, value):
+ """
+ Установить статус обновления
+ """
+ SystemIni().setVar(cls.section,
+ {cls.varname:"on" if value else "off"})
def check_for_dispatch(self):
"""

60
sys-apps/calculate-update/files/calculate-update-3.2.2_beta4-r3.patch
Unescape View File

@ -1,60 +0,0 @@
diff --git pym/update/update_info.py pym/update/update_info.py
index 8ab9fca..a162631 100644
--- pym/update/update_info.py
+++ pym/update/update_info.py
@@ -46,9 +46,13 @@ class UpdateInfo(object):
"""
return SystemIni().getVar(cls.section, cls.varname) == u'on'
- def set_update_ready(self, value):
- SystemIni().setVar(self.section,
- {self.varname:"on" if value else "off"})
+ @classmethod
+ def set_update_ready(cls, value):
+ """
+ Установить статус обновления
+ """
+ SystemIni().setVar(cls.section,
+ {cls.varname:"on" if value else "off"})
def check_for_dispatch(self):
"""
diff --git pym/update/wsdl_update.py pym/update/wsdl_update.py
index b295939..32d92e5 100644
--- pym/update/wsdl_update.py
+++ pym/update/wsdl_update.py
@@ -39,11 +39,11 @@ class Wsdl(WsdlBase):
# идентификатор метода
'method_name': "update",
# категория метода
- 'category': __('Update'),
+ 'category': __('Update '),
# заголовок метода
'title': __("Update the System"),
# иконка для графической консоли
- 'image': 'software-properties,preferences-desktop',
+ 'image': 'calculate-update',
# метод присутствует в графической консоли
'gui': True,
# консольная команда
@@ -86,7 +86,7 @@ class Wsdl(WsdlBase):
# идентификатор метода
'method_name': "update_profile",
# категория метода
- 'category': __('Update'),
+ 'category': __('Update '),
# заголовок метода
'title': __("Change the Profile"),
# иконка для графической консоли
@@ -141,9 +141,9 @@ class Wsdl(WsdlBase):
# категория метода
'category': __('Configuration'),
# заголовок метода
- 'title': __("Updates"),
+ 'title': __("The Update Check"),
# иконка для графической консоли
- 'image': 'calculate-update',
+ 'image': 'software-properties,preferences-desktop',
# метод присутствует в графической консоли
'gui': True,
# консольная команда

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

@ -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.2
=sys-apps/calculate-i18n-3.2.2
=sys-apps/calculate-lib-3.2.2
=sys-apps/calculate-core-3.2.2
=sys-apps/calculate-update-3.2.2
cl_client? ( =sys-apps/calculate-client-3.2.2 )
cl_desktop? ( =sys-apps/calculate-desktop-3.2.2 )
cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.2 )
cl_console? ( =sys-apps/calculate-console-3.2.2 )
"

26
sys-apps/calculate-utilities/calculate-utilities-3.2.2_beta1.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.2.2_beta1
=sys-apps/calculate-i18n-3.2.2_beta1
=sys-apps/calculate-lib-3.2.2_beta1
=sys-apps/calculate-core-3.2.2_beta1
=sys-apps/calculate-update-3.2.2_beta1
cl_client? ( =sys-apps/calculate-client-3.2.2_beta1 )
cl_desktop? ( =sys-apps/calculate-desktop-3.2.2_beta1 )
cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.2_beta1 )
cl_console? ( =sys-apps/calculate-console-3.2.2_beta1 )
"

26
sys-apps/calculate-utilities/calculate-utilities-3.2.2_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.2.2_beta2
=sys-apps/calculate-i18n-3.2.2_beta2
=sys-apps/calculate-lib-3.2.2_beta2
=sys-apps/calculate-core-3.2.2_beta2
=sys-apps/calculate-update-3.2.2_beta2-r1
cl_client? ( =sys-apps/calculate-client-3.2.2_beta2 )
cl_desktop? ( =sys-apps/calculate-desktop-3.2.2_beta2 )
cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.2_beta2 )
cl_console? ( =sys-apps/calculate-console-3.2.2_beta2 )
"

26
sys-apps/calculate-utilities/calculate-utilities-3.2.2_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.2.2_beta2-r1
=sys-apps/calculate-i18n-3.2.2_beta2-r1
=sys-apps/calculate-lib-3.2.2_beta2-r1
=sys-apps/calculate-core-3.2.2_beta2
=sys-apps/calculate-update-3.2.2_beta2-r2
cl_client? ( =sys-apps/calculate-client-3.2.2_beta2 )
cl_desktop? ( =sys-apps/calculate-desktop-3.2.2_beta2 )
cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.2_beta2 )
cl_console? ( =sys-apps/calculate-console-3.2.2_beta2 )
"

26
sys-apps/calculate-utilities/calculate-utilities-3.2.2_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.2.2_beta2
=sys-apps/calculate-i18n-3.2.2_beta2
=sys-apps/calculate-lib-3.2.2_beta2
=sys-apps/calculate-core-3.2.2_beta2
=sys-apps/calculate-update-3.2.2_beta2
cl_client? ( =sys-apps/calculate-client-3.2.2_beta2 )
cl_desktop? ( =sys-apps/calculate-desktop-3.2.2_beta2 )
cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.2_beta2 )
cl_console? ( =sys-apps/calculate-console-3.2.2_beta2 )
"

26
sys-apps/calculate-utilities/calculate-utilities-3.2.2_beta3-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.2.2_beta3
=sys-apps/calculate-i18n-3.2.2_beta3
=sys-apps/calculate-lib-3.2.2_beta3
=sys-apps/calculate-core-3.2.2_beta3
=sys-apps/calculate-update-3.2.2_beta3-r1
cl_client? ( =sys-apps/calculate-client-3.2.2_beta3 )
cl_desktop? ( =sys-apps/calculate-desktop-3.2.2_beta3 )
cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.2_beta3 )
cl_console? ( =sys-apps/calculate-console-3.2.2_beta3 )
"

26
sys-apps/calculate-utilities/calculate-utilities-3.2.2_beta3-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.2.2_beta3-r1
=sys-apps/calculate-i18n-3.2.2_beta3
=sys-apps/calculate-lib-3.2.2_beta3
=sys-apps/calculate-core-3.2.2_beta3
=sys-apps/calculate-update-3.2.2_beta3-r1
cl_client? ( =sys-apps/calculate-client-3.2.2_beta3 )
cl_desktop? ( =sys-apps/calculate-desktop-3.2.2_beta3 )
cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.2_beta3 )
cl_console? ( =sys-apps/calculate-console-3.2.2_beta3 )
"

26
sys-apps/calculate-utilities/calculate-utilities-3.2.2_beta3.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.2.2_beta3
=sys-apps/calculate-i18n-3.2.2_beta3
=sys-apps/calculate-lib-3.2.2_beta3
=sys-apps/calculate-core-3.2.2_beta3
=sys-apps/calculate-update-3.2.2_beta3
cl_client? ( =sys-apps/calculate-client-3.2.2_beta3 )
cl_desktop? ( =sys-apps/calculate-desktop-3.2.2_beta3 )
cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.2_beta3 )
cl_console? ( =sys-apps/calculate-console-3.2.2_beta3 )
"

26
sys-apps/calculate-utilities/calculate-utilities-3.2.2_beta4-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.2.2_beta4
=sys-apps/calculate-i18n-3.2.2_beta4
=sys-apps/calculate-lib-3.2.2_beta4
=sys-apps/calculate-core-3.2.2_beta4
=sys-apps/calculate-update-3.2.2_beta4-r1
cl_client? ( =sys-apps/calculate-client-3.2.2_beta4 )
cl_desktop? ( =sys-apps/calculate-desktop-3.2.2_beta4 )
cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.2_beta4 )
cl_console? ( =sys-apps/calculate-console-3.2.2_beta4 )
"

26
sys-apps/calculate-utilities/calculate-utilities-3.2.2_beta4-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.2.2_beta4
=sys-apps/calculate-i18n-3.2.2_beta4
=sys-apps/calculate-lib-3.2.2_beta4
=sys-apps/calculate-core-3.2.2_beta4
=sys-apps/calculate-update-3.2.2_beta4-r2
cl_client? ( =sys-apps/calculate-client-3.2.2_beta4 )
cl_desktop? ( =sys-apps/calculate-desktop-3.2.2_beta4 )
cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.2_beta4 )
cl_console? ( =sys-apps/calculate-console-3.2.2_beta4 )
"

26
sys-apps/calculate-utilities/calculate-utilities-3.2.2_beta4-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.2.2_beta4-r1
=sys-apps/calculate-i18n-3.2.2_beta4
=sys-apps/calculate-lib-3.2.2_beta4-r1
=sys-apps/calculate-core-3.2.2_beta4-r1
=sys-apps/calculate-update-3.2.2_beta4-r2
cl_client? ( =sys-apps/calculate-client-3.2.2_beta4-r1 )
cl_desktop? ( =sys-apps/calculate-desktop-3.2.2_beta4 )
cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.2_beta4-r1 )
cl_console? ( =sys-apps/calculate-console-3.2.2_beta4 )
"

26
sys-apps/calculate-utilities/calculate-utilities-3.2.2_beta4-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.2.2_beta4-r1
=sys-apps/calculate-i18n-3.2.2_beta4-r1
=sys-apps/calculate-lib-3.2.2_beta4-r1
=sys-apps/calculate-core-3.2.2_beta4-r2
=sys-apps/calculate-update-3.2.2_beta4-r3
cl_client? ( =sys-apps/calculate-client-3.2.2_beta4-r1 )
cl_desktop? ( =sys-apps/calculate-desktop-3.2.2_beta4 )
cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.2_beta4-r2 )
cl_console? ( =sys-apps/calculate-console-3.2.2_beta4 )
"

26
sys-apps/calculate-utilities/calculate-utilities-3.2.2_beta4.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.2.2_beta4
=sys-apps/calculate-i18n-3.2.2_beta4
=sys-apps/calculate-lib-3.2.2_beta4
=sys-apps/calculate-core-3.2.2_beta4
=sys-apps/calculate-update-3.2.2_beta4
cl_client? ( =sys-apps/calculate-client-3.2.2_beta4 )
cl_desktop? ( =sys-apps/calculate-desktop-3.2.2_beta4 )
cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.2_beta4 )
cl_console? ( =sys-apps/calculate-console-3.2.2_beta4 )
"
Write Preview
Loading…
Cancel
Save