parent
f2b2cd1925
commit
aaaa7d1792
@ -1,9 +1,11 @@
|
||||
AUX calculate-client-3.2.0_alpha10-r1.patch 801 SHA256 be4aff6b908fe3e97257e366f0c321251d21a7d9bf6b6dc54dbb9fa3b8973399 SHA512 de3ae862d5e60c99e9246feb3f66417bd8e72f01988c5f8410f8a6f3f0e15bcfe40e04677ec5375446a8be125e684c83d8e09d2972ad5e6634a83659accb5f66 WHIRLPOOL 55b76ca531404f069661aecb9d3213db72a600b278e4c304dc9e61c2c814e0934535d1ea2dd9937674a7e950e21c4aa368da34b0730b35dc668652568d62ae07
|
||||
AUX calculate-client-3.2.0_alpha10-r2.patch 1204 SHA256 9cfdbd304f7ef0aa004894d994219101e817904d45fac29e8678db5c015b4c50 SHA512 fdac89484abfcd4134d2d75265d28b3deb01adefef29f5dbb2b54792da28721d26e38b8c4cfc7fbdfb4678714d8a7b80a33016fa652ec8f7c8f260ab0a9c4142 WHIRLPOOL fe7cc9014eac6e743d6ea35feb813b893968058fb66722776d31841c8d2a318773d07447f0009b677570186266da3108ebd79a49d5e191f3f4fde049dc954d46
|
||||
AUX calculate-client-3.2.0_alpha11-r1.patch 537 SHA256 1ce3c895424edee669640db405ff29cca558e2591d416b078e9d68e8dd43633d SHA512 50b4bf1c77924ce196af458056547b02f114ca1a3ef7e97a2ddd9ca17e1a5b3bd73a227e74def867b2ae3acd09b5e2b99537a98e89b1ebf2940de3931a091bca WHIRLPOOL cb67b4a483fb3c87a72e2aa18658e46057837d0d95d19df53c8c61dcc9fac619762208a81e6c8a4b903bb856efbf1c42b53a5ecc14cc22b243186ec8f10c29d2
|
||||
AUX calculate-client-3.2.0_alpha6-r1.patch 995 SHA256 9dbd39647220dfd93fb759b039b583c724abcfb25910813783635a6707421c31 SHA512 3b2ccd132cf820b016c1d103bbf7e9fc66b2fd82e967da930eb5149f7b0e3e40d752371c077be9fa9e548433716a47ac0791c5eebd4976ab1d926ad9df42a137 WHIRLPOOL 2c24d021aa5fa5c696b65d5c2a747fb564d1697c8343ff8d65328dff64fec6bf176cf9cd32333e7f56a67e68c2bb25349be3f194afc532576857cdd29d1fa77a
|
||||
AUX calculate-client-3.2.0_alpha7-r1.patch 0 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 SHA512 cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e WHIRLPOOL 19fa61d75522a4669b44e39c1d2e1726c530232130d407f89afee0964997f7a73e83be698b288febcf88e3e03c4f0757ea8964e59b63d93708b138cc42a66eb3
|
||||
DIST calculate-client-3.2.0_alpha10.tar.bz2 30792 SHA256 793adbab1300b3a51d7b79c2c7a4d8846932b2f86211e27052a57e7809b63e3a SHA512 ff92fa663e46349618527ac4b841d265d011b67b03417e981f812751285e623ae9741597413b662de0ecfc53db684855b9686d67445936af0b33de9a4cd8feef WHIRLPOOL 8e6fb0fb2b9442dd5beacbe8021887a88b0543cc7932c130c456337e43fc4f4317b28495855d313ed8875ba1aa3f8a3fcc41a4bba86ab44a03b88b33d061eca8
|
||||
DIST calculate-client-3.2.0_alpha11.tar.bz2 30805 SHA256 5b9693efc5bfe97e836d802b352c7a9a10808f18d015e9b2d692636bed734619 SHA512 04ab28230a43837de576aa0334c2361b8c16542399cfbadcba85ee49c0fb958d673b88af49a7500921a9e04c9303fe68d3d62f8a5e8bbdea4a2a431367e1acb6 WHIRLPOOL 229db99d222399d6c6ea10f842792ef1ecdb7b88f350e528b31b0cddda4f4b47c553436ca49a9727cecd617fc4e8cc4cfa9cacbacfb78b85bc7502a975f5df0e
|
||||
EBUILD calculate-client-3.2.0_alpha10-r2.ebuild 933 SHA256 091af124e828725446b14cd3e44da9a07cf5531c9ecf5e4915a5f9f4bec8a0cb SHA512 b4b27802c529ce998451c1256a4cac390458a9d74db6aae18d9c7fa395623dd79901aed01fe17dbbf29f0bbcad387cf419477df618987f857a237e2b267dd85c WHIRLPOOL b0a989c2d2a9748acc7d0d43d78e00cc58edbf0fa1f928ddfba0ade65b40587673f076ca06e8a5238aa9469bfc5c5bfde5da821c2b0e3d5c3f6525ef525a0e9e
|
||||
EBUILD calculate-client-3.2.0_alpha11-r1.ebuild 933 SHA256 a8f902075a5cf14e05bf9c7bb71985b72f8b267b0bbba256cee3efad297f4a58 SHA512 624a4b78b91ebe75d6cc3e6429844142db4ca25fffc45e5b798127956eb6f3768271c3db7c9968c995ff80d2b984644afb28b72fc9ffdacfea9445eaf9f7dec2 WHIRLPOOL 0bf7dbd71dbc520567bdc3c7f2df0da5e5645ae3afeb7e9e035fa19119a517699be09e57bc87358caef969580b07888a2c038a7e481a442ca73c408de884df42
|
||||
EBUILD calculate-client-3.2.0_alpha11.ebuild 788 SHA256 6c3cb6622c8aad34725fb78079f59523f0d2661532a21d7c103d501aab45c062 SHA512 c7b34792b722887d5371d83b264efd36ba976434064b93a3e0f62fb272aeded00ada99c8979fffda85f5c86358c1133387b7b5159f18b6706c057a60ff95a38f WHIRLPOOL 619a30f54f2756c8a5dea555a3b8d944b184382ee66ef57292b8e6545227e5b81af0922bfc94dbeb971910391e2d51c72a8d4da79321bc4b0b714543076f8055
|
||||
EBUILD calculate-client-3.2.9999.ebuild 877 SHA256 6bdcde374c0adafe386d071b8eb2c151745cf8bd5794ff46a4cd1084d6ed9cb4 SHA512 f2b58d69254eff369f56bb1a3875aeda7d7457754ca139eec3221d62c44dc69610ee87240b35f737c83a0e395c967562c8582652cf758ec05ab9d61d48f61ddf WHIRLPOOL 4f9b11e3fbce7b45d22ea4bee647d30ec301eb8ec4d5fb2fe95b38b17e4aacb63390065fa8c7ba055dcc5e4b987ddf7560717bfe044f6bcb219b7089daa8dadf
|
||||
|
||||
@ -0,0 +1,38 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
SUPPORT_PYTHON_ABIS="1"
|
||||
PYTHON_DEPEND="2:2.7"
|
||||
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
|
||||
|
||||
inherit distutils eutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="The 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.0_alpha11
|
||||
!<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}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-client-3.2.0_alpha11-r1.patch"
|
||||
}
|
||||
@ -0,0 +1,13 @@
|
||||
diff --git setup.py setup.py
|
||||
index f873cdf..19b1ba7 100755
|
||||
--- setup.py
|
||||
+++ setup.py
|
||||
@@ -33,7 +33,7 @@ data_files = [('/etc/init.d', [('data/client',0755)]),
|
||||
('/usr/share/calculate/xdm/logout.d',
|
||||
['data/logout.d/10client']),
|
||||
('/usr/share/calculate/xdm/logout.d',
|
||||
- ['data/login.d/15resume_remount']),
|
||||
+ ['data/logout.d/15resume_remount']),
|
||||
('/usr/share/calculate/xdm/',[('data/wait_domain',0755)])]
|
||||
|
||||
setup(
|
||||
@ -1,6 +1,8 @@
|
||||
AUX calculate-console-gui-3.2.0_alpha11-r1.patch 644 SHA256 993a0b0beacbf9cc583737205d911c2f223d0aa596905108f625e57ae3e0ece5 SHA512 232edde533f2a347d7bddabe16631dfa482f2271227c2197a4b72466b36b445dfd878223a96959312bbcc7f2fa2a53ffb2e7e8d27370aa01bee35a5c25e83f57 WHIRLPOOL b39f9db5432288aae5d815e6521eb9eaca3cb2d7efd8925c6d66f5fde4d0ed106ad766cbaacba63197f55ccd26749ef66536bc61645a5371de6e16c231ec7043
|
||||
AUX calculate-console-gui-3.2.0_alpha11-r2.patch 1606 SHA256 3227df334116aef9585d700b9820cd59fca8906d5956b8c9a879539642314e48 SHA512 57794eb289bf38fd9f041c44f3ca4766002dc62ff8f75e8cf20c98c0d4fcab3bc7399837f579515da070a48ff80b9e3667eb3145bc9b60101ffcea57533be1f0 WHIRLPOOL 88a534bae58d03822490c3c48a39b715fcacdf035a9484c69eeeecbbc1c26964244918f3e078027fc873ef88061c7f212009114b816cc6e6a2d7c85b885630dd
|
||||
DIST calculate-console-gui-3.2.0_alpha10.tar.bz2 431987 SHA256 32f8b800e0ac6d373ab34a15379c5eb865967316f0401d735d44605cdec8fec4 SHA512 2e48134a9b0a729dda64c009f42b4ff9d6c13f1f05ef0d350de3f81476cb56cbc4ffa69b816b00a260edc7c6a48353112fdc2faf39d0e5a7c09a3dc658bf287c WHIRLPOOL b57a1e8f43cecc764322aed95ac53bc808005bc59abf4ea44be997d54b7aefebf7c28a6b7f04e9b7a510a4dc43e50b9b418417c97c75c9d794b94dcd0b564357
|
||||
DIST calculate-console-gui-3.2.0_alpha11.tar.bz2 433895 SHA256 9a9eb3293ea6041d176a2f8d83b6d991fe767a6414334c19865a8916e7a97c66 SHA512 3a4380b59fd51183c4b2724a59363735ecad4d589b2566dd29bbca2928ee00ad2476727d0e691cfe64c33325b41ea8c50f0a62f88cf4daf792be41a09b442bd0 WHIRLPOOL c1d70247723e32aeb4694ae58eb0ec9e23709db72f1bac826f51119401af6a57bb60edc45194d89ce0f9831282f959a89972e361d3eb36d81318344a66770a88
|
||||
EBUILD calculate-console-gui-3.2.0_alpha10.ebuild 633 SHA256 a1ebfc2ee88d5fe46bbb094ab475a7df1a1d79c8d14510b0a998844ca2308673 SHA512 eb0744efe80da1bced8bfb21d28e037e20de37acd338a0d0725710864085ab3edd6b8c3b4ef19fc3acabf2ab8bad1c760ea37ebb5deafb7ad3e1055ab431b1f2 WHIRLPOOL 5b048962264d259add31ae76520c5ade73847d79da4ae7a3e09b281025d8d17849d6b9feef88fcc94a07f0b12cb77798849ac73bff7c585711bf23bf64b32faf
|
||||
EBUILD calculate-console-gui-3.2.0_alpha11-r1.ebuild 783 SHA256 45351ca44f169f075a1f5e093f93a02b7eb114c65e68c4df3bcf0f8900f27cf0 SHA512 5e430d2c8567e2856508d60141332af335bf2a22f538ca3eb9a73e71b3547d05a16f33bfad78f1cca1006d816ad3cd0298f93c405de87db82895987dab815a1f WHIRLPOOL 89f4c9026d8b2b2c06676a3169156f4b8a2f9afce1bbcd538e9be1698bac13998eb2406979e03cdda2a55a2601417b057435f326ccbd22a339e6152f77b6d8b4
|
||||
EBUILD calculate-console-gui-3.2.0_alpha11-r2.ebuild 783 SHA256 2c90fee2ce08f34c56d458e564a117309b469ea1a768cdbcebd7bdd4031bc758 SHA512 c5473197a3840550b1b8a0063a73d13ef352f87e06f1ef4995b82162752cf99cf4cfae16c0bcee8825ec9378af7b9b6de99defa633f124350ae9c0d65c9192e2 WHIRLPOOL a36397e33c0949e033f0762acf787b60c0bd14ca78a1c73596ed71304df3044d058e0d3563fecc5f3b637c2c7b0829f947476d20c62ef2957bbbf5179dc5be85
|
||||
EBUILD calculate-console-gui-3.2.9999.ebuild 578 SHA256 2a87e98828f92ae2e971b1f5f2927af077e93ed7d3fadacea7f7e232c7a09348 SHA512 15da60d40befc9bba51232dd388df2397aea92ec2b25d951a34fc1a298049602370ac53a98bef42995e3ba911c76bb3a838cf5bfd5a3c4a6af7fc33e0fab34fa WHIRLPOOL 895ac120cb615db6493156e16f0a634da178a667b5c45e122218ce0cc0d6abd096827c506d7cad94f0f613b324cf5d4848e11671caf9b34bbc352ba91d9aa20c
|
||||
|
||||
@ -0,0 +1,32 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
SUPPORT_PYTHON_ABIS="1"
|
||||
PYTHON_DEPEND="2:2.7"
|
||||
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
|
||||
|
||||
inherit distutils eutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="Qt gui console client for WSDL Calculate 3"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
DEPEND="~sys-apps/calculate-core-3.2.0_alpha11
|
||||
dev-python/dbus-python
|
||||
virtual/python-imaging
|
||||
dev-python/pyside[script]"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-console-gui-3.2.0_alpha11-r2.patch"
|
||||
}
|
||||
@ -0,0 +1,54 @@
|
||||
diff --git scripts/cl-update-checker scripts/cl-update-checker
|
||||
index 67055ed..eefdca0 100644
|
||||
--- scripts/cl-update-checker
|
||||
+++ scripts/cl-update-checker
|
||||
@@ -31,6 +31,7 @@ from calculate.update.update_info import UpdateInfo
|
||||
|
||||
GUI_UPDATE_APP = DBUS_METHOD_APP % "update"
|
||||
|
||||
+MINUTE=60
|
||||
|
||||
class SysTray(QtGui.QSystemTrayIcon):
|
||||
ICON = "/usr/share/pixmaps/calculate-console-update.png"
|
||||
@@ -95,7 +96,7 @@ class DBusChecker(dbus.service.Object):
|
||||
self.parent.step()
|
||||
|
||||
class CheckThread(QtGui.QMainWindow, UpdateInfo):
|
||||
- interval = 10
|
||||
+ interval = MINUTE
|
||||
|
||||
def __init__(self, bus):
|
||||
super(CheckThread, self).__init__()
|
||||
@@ -154,8 +155,11 @@ class CheckThread(QtGui.QMainWindow, UpdateInfo):
|
||||
self.systray.hide()
|
||||
|
||||
if __name__ == '__main__':
|
||||
-
|
||||
import sys
|
||||
+
|
||||
+ if os.fork():
|
||||
+ sys.exit(1)
|
||||
+
|
||||
if not user_can_run_update():
|
||||
sys.stderr.write(_("User can not to perform the system update")+"\n")
|
||||
sys.exit(1)
|
||||
@@ -178,12 +182,17 @@ if __name__ == '__main__':
|
||||
bus = dbus.SessionBus()
|
||||
except dbus.exceptions.DBusException, e:
|
||||
sys.exit(1)
|
||||
-
|
||||
+
|
||||
+ try:
|
||||
+ remote_object = bus.get_object(DBUS_NAME_UPDATER, DBUS_APP_UPDATER)
|
||||
+ g = dbus.Interface(remote_object, DBUS_NAME_UPDATER)
|
||||
+ g.quit()
|
||||
+ except Exception as e:
|
||||
+ pass
|
||||
QtGui.QApplication.setQuitOnLastWindowClosed(False)
|
||||
# Export the service
|
||||
name = dbus.service.BusName(DBUS_NAME_UPDATER, bus)
|
||||
# Export the object
|
||||
ct = CheckThread(bus)
|
||||
DBusChecker(bus, DBUS_APP_UPDATER, ct)
|
||||
-
|
||||
sys.exit(app.exec_())
|
||||
@ -0,0 +1,51 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
SUPPORT_PYTHON_ABIS="1"
|
||||
PYTHON_DEPEND="2:2.7"
|
||||
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
|
||||
|
||||
inherit distutils eutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="The WSDL core for Calculate 3"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="minimal"
|
||||
|
||||
DEPEND="~sys-apps/calculate-lib-3.2.0_alpha11
|
||||
>=dev-python/soaplib-1.0
|
||||
!minimal? ( dev-python/sudsds
|
||||
net-libs/dslib
|
||||
dev-python/pyopenssl
|
||||
dev-libs/openssl
|
||||
dev-python/m2crypto
|
||||
dev-python/cherrypy )"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
pkg_preinst() {
|
||||
dosym /usr/sbin/cl-core /usr/sbin/cl-core-setup
|
||||
dosym /usr/sbin/cl-core /usr/sbin/cl-core-patch
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "For autoconfigure calculate-core for adminuser perform:"
|
||||
einfo " cl-core --bootstrap <username>"
|
||||
einfo "For run calculate-core perform:"
|
||||
einfo " /etc/init.d/calculate-core start"
|
||||
einfo "Add calcualte core to autorun:"
|
||||
einfo " rc-update add calculate-core boot"
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-core-3.2.0_alpha11-r1.patch"
|
||||
}
|
||||
@ -0,0 +1,20 @@
|
||||
diff --git core/server/func.py core/server/func.py
|
||||
index 1e0f968..040b715 100644
|
||||
--- core/server/func.py
|
||||
+++ core/server/func.py
|
||||
@@ -21,6 +21,7 @@ from os import path
|
||||
import traceback
|
||||
from traceback import print_exc
|
||||
from calculate.lib.cl_log import log
|
||||
+from calculate.lib.utils.colortext import convert_console_to_xml
|
||||
from api_types import ReturnProgress,ViewParams,Integer,ViewInfo
|
||||
from loaded_methods import LoadedMethods
|
||||
from calculate.lib.cl_lang import setLocalTranslate,getLazyLocalTranslate
|
||||
@@ -61,6 +62,7 @@ class CommonMethods:
|
||||
data = data[FIRST]
|
||||
for i,s in enumerate(list(process("diff","-Nu",
|
||||
orig,data[CFGFNAME]))):
|
||||
+ s = convert_console_to_xml(s)
|
||||
if s.startswith('+') and i>1:
|
||||
out.append('<font color="green">%s</font>'%s)
|
||||
elif s.startswith('-') and i>1:
|
||||
@ -0,0 +1,31 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
SUPPORT_PYTHON_ABIS="1"
|
||||
PYTHON_DEPEND="2:2.7"
|
||||
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
|
||||
|
||||
inherit distutils eutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="The utilities for assembling tasks of Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
RDEPEND=">=sys-apps/calculate-lib-3.2.0_alpha11"
|
||||
|
||||
DEPEND="sys-devel/gettext
|
||||
${RDEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-i18n-3.2.0_alpha11-r1.patch"
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,10 +1,12 @@
|
||||
AUX calculate-install-3.2.0_alpha10-r1.patch 4264 SHA256 cb09ccf6ab73a25bd82f525dcec20b486aac270670ef43e482d4398f172d11f3 SHA512 55d06233e6fbe4c827ed7b33d05586e85e192731c8d6714a45173de863c47675dc4e8c51c21d7f14e3b5372a88fc5e3d45514622332fe61f1ef93f14480a9bdc WHIRLPOOL e521cd5c579fd27ef5083d1d806c161f1f63677f4320d7cbdb21a448c207a06d91f55ed73141c9bd25931b6622109923d9fad91ff91785c0c3aaaa89f12e42e8
|
||||
AUX calculate-install-3.2.0_alpha10-r2.patch 4704 SHA256 e9a74679bc9349b86f2555a9b8745a8b588c2d4fc6416256f9998bdac953aad8 SHA512 deb53d44244ccb8341f39167aeadd510b6971d22486c7e3e886dfd2b99f22037946a466c34726873e4b4631c4f74cffebfaf6508aa5b3dfe87104113609ec07f WHIRLPOOL 50d27159690163b84488094d9da336791223b5bb3aa0a5d3a3626ffb0b29be6618ae5cce5a70de88fa4d75956329ab5c9edf685ba6a50f5578c82463e3c9ed0f
|
||||
AUX calculate-install-3.2.0_alpha10-r3.patch 5320 SHA256 37920446416c97164de653cfb6b45bde2109c4053f2248c65d4ea41057f92467 SHA512 a5af30bd18626349051de8c9531833e67a71f6d6ac0662198505bea200a1e5868f8e994be6c52412b54f5c0d184614c6f2cdc87a29f8b9ac99c7daa5092ef465 WHIRLPOOL 4623fe22df7f6c2f42900b4b30b36e2d0abc090c46d3ed3bae59e35e26f5af522efcadd389181e991859a4b838d6c1bab03f9fbd1ecd2e95b60c46d8058e8c9b
|
||||
AUX calculate-install-3.2.0_alpha11-r1.patch 1589 SHA256 8847019f843b1c2f9645cafe41b02a38a85ecdc7b58b44e94742d11921a23c55 SHA512 4fc825770ebc3f0a99695a826ff663cec4572fc138d1e2d80c53448e480f4486f7d8161276dd88ab08ef8ba4c1071e7737b94a39eafd0c0650a3cd3966c4c5f0 WHIRLPOOL a574d48820b65ebaa7a5e6fd56fad33b9336ce1dba8d6fc2d45d44332a32ca765c9c394d0b0f45a56ae76af7f6214754f3dcc893fec291f895b709e0f3493ccd
|
||||
AUX calculate-install-3.2.0_alpha7-r1.patch 1582 SHA256 4f8794a4ffe6aeeaf00e9aa8159dc8c6ce62661ca49c3c18829ece214fbb7147 SHA512 a719da9355162cd7cc8691c8eb2af38c9ae7c30825b3cab2da2bc4ddcd56a16cda27d88520ee29eeb8bc4b6cd3414023a8ba6038cd3ecc9beac1e447d0cc2de5 WHIRLPOOL dd4af140298d5c56d0d70fbb22c4594bd351fe70c9b08db002bceef13041deb40f7569dd5f065d205f16dc1ba51e33644e85918d19cda279dd2b5dba2eefd6e3
|
||||
AUX calculate-install-3.2.0_alpha7-r2.patch 2968 SHA256 85982512bece11de4cdcba9649e4e25724366f80d9d40053d69a1e0df6ea7285 SHA512 82a7e87066ce9f8bc571f88d1e5380ddc7881cc07e47b12262fa228b09a9d36b5f4cf0343e0e4aaebc820aa4005fd961ed65f132893580a11c38e9b67535c63c WHIRLPOOL 9a12a7b8d6231d76011ba7164dfa598a6d6a70c4c435ea98c80cc3819d1dacced62d1f5972926f03ab8725f7f5df5c087a9f6cb4aeccd480d78ad365246a7107
|
||||
DIST calculate-install-3.2.0_alpha10.tar.bz2 77660 SHA256 2b68d68569f67ee721d9dd0ecbe6b1bd3e722f19f17a48dc60052a5ca39f3961 SHA512 f453dde8eec45865882b5113265179b6e5af0cac77f923808aa0ca112a6e91e7996cf2d2735c5e525b110cdd88d0604aa10aff30c9ded8d69cd09f6de0da30aa WHIRLPOOL 13c23796db8f0e7c522101e53ceb904397bcc06d36c57376979c6d5fd3722a4341d72ce93726ae48665772861d19857b5e6e1b88619b99b4dbb12d7fb71de973
|
||||
DIST calculate-install-3.2.0_alpha11.tar.bz2 77353 SHA256 f4eaa14184ff38db1e3f85f39fb610b9f7abc3373eff3232f271584e2f314c77 SHA512 0254e181c1da0108208b0b08300d40512fc45e7b75106aa7bd608d529cd2ef5a35e5a01062976688def7d5afb6bb2cacdd64eaf05420780566b22e0ef67d85ab WHIRLPOOL 58e8c38d6cf1d8c8ad6a459c643f9a9350bda07a96bcca2f87d6106c54a4dbac8b183e6889e481966e417423100820b4d6048ab471199a1a3b84758b7a3f28fd
|
||||
EBUILD calculate-install-3.2.0_alpha10-r3.ebuild 1059 SHA256 6ce752dbfdbf28d7d238f4fb2056dfcb3473872374e81eafd548a31a897ee343 SHA512 5b6db91a779ecbc312b593da63b20bcc2b7805a74da15c95b046da051aeefd02bb37eaed2839f53640b6935734246f72664ddd1ebaa9a61254e25fe8c42c2ce6 WHIRLPOOL 0b3349fe66201ec881bbd2588417c48441ae0bebb960ba540e135a8fdc72ddbbb03c6548a52f2496b1145671e86390c2ba41e336710137aaf6aa2f60cbe85d72
|
||||
EBUILD calculate-install-3.2.0_alpha11-r1.ebuild 1059 SHA256 e2c39fc5080a4646f7ac53e2a67805264432592a4f4cc6f2bd8fce7b5d9a408b SHA512 4ba34f2beca948b064bd1e3606424ddb04eff26952a3bd859925f33459be736b4851d26d6bba1b62ce07f75d2e3b5e7feacd8bca0b5de9d4883f8ed4ec971836 WHIRLPOOL ec5de7c128ebe02fa730452dce5e63852c702316a88081af0945eb86a1b66abe8ea3d6f3db7c2ef1d43580c055dca9c026fd746597954401413f5450a7b91f72
|
||||
EBUILD calculate-install-3.2.0_alpha11.ebuild 913 SHA256 8d12eee73e1f248e4e9ce0716b5e23c28dc1ef10dfbb6df831d29d056dfbf9e4 SHA512 f3eb34c40b6040ce58b187f3701875be4032eb34bcba388bd11e8f920824bc8b2915dc79f3735c6b396d57883a55e8f72946e811c818598a1cb624c5074b6ccc WHIRLPOOL 06c29dbd810899a09e547632f264697d3110d39f3e84c82545894b8a7ad32a93069d83bac71601fe4f87190f1d7987aef3d4550f59ac1783fc8b9f1bc0a55aab
|
||||
EBUILD calculate-install-3.2.9999.ebuild 673 SHA256 751ba30bf7ffe805119648e852697a500465e128df24228348a2634eec1cb0ec SHA512 bef467672a2c90595f60da18203b81f87a758ca6b73f69f7ead0d95489960ea83403c1ff98f07050f6d96b23ed68ce45f334e9ed30cdafc526e58f884a236122 WHIRLPOOL 0e6b1f055dd0172ea06df1f0832bb2a75670e2a1bc22ec570c36ef91cb84a74e21891de23d3024a2b2de9074e03de14eb8eb8dfb120c4f8407eda4e7814ba12d
|
||||
|
||||
@ -0,0 +1,44 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
SUPPORT_PYTHON_ABIS="1"
|
||||
PYTHON_DEPEND="2:2.7"
|
||||
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
|
||||
|
||||
inherit distutils eutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="The program of installation Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="pxe minimal"
|
||||
|
||||
DEPEND="~sys-apps/calculate-core-3.2.0_alpha11
|
||||
!<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.0_alpha11-r1.patch"
|
||||
}
|
||||
@ -0,0 +1,40 @@
|
||||
diff --git install/fs_manager.py install/fs_manager.py
|
||||
index b2c2fa2..402f72a 100644
|
||||
--- install/fs_manager.py
|
||||
+++ install/fs_manager.py
|
||||
@@ -27,7 +27,7 @@ setLocalTranslate('cl_install3',sys.modules[__name__])
|
||||
class FileSystemManager:
|
||||
"""Convert dict install option"""
|
||||
|
||||
- defaultOpt = ['noatime']
|
||||
+ defaultOpt = ['noatime','nodiratime']
|
||||
defaultBindOpts = ['bind']
|
||||
supportFS = {
|
||||
'ext2': {'defaultopt': defaultOpt,
|
||||
diff --git install/variables/disk.py install/variables/disk.py
|
||||
index 142c3c5..8ccc646 100644
|
||||
--- install/variables/disk.py
|
||||
+++ install/variables/disk.py
|
||||
@@ -1418,13 +1418,20 @@ class VariableOsInstallDiskOptions(ReadonlyVariable):
|
||||
|
||||
def get(self):
|
||||
"""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],
|
||||
zip(self.Get('os_disk_dev'),
|
||||
self.Get('os_disk_options'))))
|
||||
- return map(lambda x:diskOpts.get(x[0],x[1]),
|
||||
+ return map(postProcess,
|
||||
+ map(lambda x:diskOpts.get(x[0],x[1]),
|
||||
map(lambda x:(x[0],FileSystemManager.getDefaultOpt(x[1])),
|
||||
self.ZipVars('os_install_disk_dev',
|
||||
- 'os_install_disk_format')))
|
||||
+ 'os_install_disk_format'))))
|
||||
|
||||
class VariableOsInstallDiskFormat(ReadonlyVariable):
|
||||
"""
|
||||
@ -0,0 +1,37 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
SUPPORT_PYTHON_ABIS="1"
|
||||
PYTHON_DEPEND="2:2.7"
|
||||
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
|
||||
|
||||
inherit distutils eutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="The library for Calculate 3"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="minimal"
|
||||
DEPEND="!minimal? ( dev-python/py-smbpasswd )
|
||||
>=dev-python/pyxml-0.8
|
||||
sys-apps/iproute2
|
||||
sys-apps/pciutils
|
||||
dev-python/progressbar
|
||||
sys-fs/lvm2
|
||||
sys-fs/mdadm
|
||||
dev-python/pyinotify
|
||||
sys-apps/file[python]"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-lib-3.2.0_alpha11-r1.patch"
|
||||
}
|
||||
@ -0,0 +1,33 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
SUPPORT_PYTHON_ABIS="1"
|
||||
PYTHON_DEPEND="2:2.7"
|
||||
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
|
||||
|
||||
inherit distutils eutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="The program of update Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="~sys-apps/calculate-core-3.2.0_alpha11
|
||||
~sys-apps/calculate-install-3.2.0_alpha11
|
||||
dev-python/pexpect"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-update-3.2.0_alpha11-r1.patch"
|
||||
}
|
||||
@ -0,0 +1,36 @@
|
||||
diff --git update/update.py update/update.py
|
||||
index 19a1fe2..0181cfd 100644
|
||||
--- update/update.py
|
||||
+++ update/update.py
|
||||
@@ -169,10 +169,10 @@ class Update:
|
||||
branch, cb_progress=self.setProgress)
|
||||
removeDir(rpath)
|
||||
os.rename(rpath_new, rpath)
|
||||
- except OSError:
|
||||
- raise UpdateError(_("Permission denied to modify the "
|
||||
+ except OSError as e:
|
||||
+ raise UpdateError(_("Failed to modify the "
|
||||
"{repname} repository").format(
|
||||
- repname=repname))
|
||||
+ repname=repname)+":"+str(e))
|
||||
finally:
|
||||
if path.exists(rpath_new):
|
||||
removeDir(rpath_new)
|
||||
@@ -234,11 +234,15 @@ class Update:
|
||||
if not emerge:
|
||||
raise UpdateError(_("The Emerge tool is not found"))
|
||||
self.addProgress()
|
||||
- p = PercentProgress(emerge, "--metadata", part=1, atty=True)
|
||||
+ p = PercentProgress(emerge, "--ask=n", "--metadata", part=1, atty=True)
|
||||
for perc in p.progress():
|
||||
self.setProgress(perc)
|
||||
if p.failed():
|
||||
- raise UpdateError(_("Failed to update metadata"), addon=p.read())
|
||||
+ data = p.read()
|
||||
+ with open('/var/log/calculate/failed-metadata-%d.log' % time.time(),
|
||||
+ 'w') as f:
|
||||
+ f.write(data+p.alldata)
|
||||
+ raise UpdateError(_("Failed to update metadata"), addon=data)
|
||||
return True
|
||||
|
||||
def eixUpdate(self):
|
||||
@ -1,3 +1,4 @@
|
||||
EBUILD calculate-utilities-3.2.0_alpha10-r21.ebuild 844 SHA256 465f0b760a5a683a959037bf724bf238fb4472c9fd17c90857f9f46c29071f2d SHA512 95f4e3311b2c761230cf9291e63e4edebd091b30c6fd300e66bbf2fb135dc4bf4fbd5a17ff1733692a152eb1959b32122af8ce4b5987ac02eed3cac8cc62292f WHIRLPOOL 6c2d3a1920091646f2651b1cca8312d1026d6d7406f980cd3278cb8c3974057940c6ead7e2481a4940d813559c5a2d14fecc4b6d6666f971d8a674c69dc2c7d9
|
||||
EBUILD calculate-utilities-3.2.0_alpha11-r1.ebuild 824 SHA256 4f63d2f1d254bc1c63e04a245cdb49c8ffb3ca684e39ff9d387509a8c70d5656 SHA512 4f443ff9920a54837a9c765538f398b0edc10300c3f3f7d7a4ccf945943f873a5c0a3b80a10c019776bda1153e5d639f67a8dd042cdebc2fc8c43f93f89ebbda WHIRLPOOL 218ac121ce5b37eca5955afdfb15f3491f00d8c338bef0bf26f6103b26cb4cb004b5bcdd0f0789f484f12ee58d96fc13e873416d645208ab9b36701a83970b79
|
||||
EBUILD calculate-utilities-3.2.0_alpha11-r2.ebuild 842 SHA256 aebe19af280bc6b08452445512a559215104fad40300ffcca55f0db46fe62856 SHA512 3df48e29bace9f9a742172f9f37ba873b9e07f5b6319d60e89024a9e59e026e85f7cdad384757ee0ff536d5f0521ce559da11462f425e2b7e0a7e81c82e835d6 WHIRLPOOL f28c5fd92c9d3edd0c568300768c000d310491cac5c041677b157a73915d032a779f56331fee4144bc0cfe7e76f0b56a023b396ba2c91bcab63b1e15b58d2712
|
||||
EBUILD calculate-utilities-3.2.9999.ebuild 800 SHA256 acbb7a4e34387baa1ade9bf97637972fbfc97afa56367381d622198b5237e983 SHA512 9e0c74eb499157b6d3ace20d7e9da630660e46b74a6d575e222e1638c87f85660635187489b9312a45f193780c301d87c1dbb9a0f60414e178e8f54080c71ffd WHIRLPOOL 9b56f590f36d29d3518c66c453f97b14d083e36b62adb70a8916ae4e30b527431602a9edd40d703e5cb4296a01f8c982157b602651ee57a9c0ddb7a4c6aa2fe1
|
||||
|
||||
@ -0,0 +1,26 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=4
|
||||
|
||||
DESCRIPTION="Calculate Utilities meta package"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
SRC_URI=""
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="cl_consolegui cl_client cl_desktop cl_console"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
=sys-apps/calculate-install-3.2.0_alpha11-r1
|
||||
=sys-apps/calculate-i18n-3.2.0_alpha11-r1
|
||||
=sys-apps/calculate-lib-3.2.0_alpha11-r1
|
||||
=sys-apps/calculate-core-3.2.0_alpha11-r1
|
||||
=sys-apps/calculate-update-3.2.0_alpha11-r1
|
||||
cl_client? ( =sys-apps/calculate-client-3.2.0_alpha11-r1 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-3.2.0_alpha11 )
|
||||
cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.0_alpha11-r2 )
|
||||
cl_console? ( =sys-apps/calculate-console-3.2.0_alpha11 )
|
||||
"
|
||||
Loading…
Reference in new issue