Fix compile fuse. Add calculate-utils

atratsevskiy
parent e867c7c4ed
commit 6d5c7aeb10

@ -0,0 +1,2 @@
# fix SANDBOX_WRITE for emerge
SANDBOX_WRITE="${SANDBOX_WRITE}:/etc/mtab:/run/mount/utab"

@ -1,11 +1,9 @@
AUX calculate-assemble-2.2.30-fix_install_nvidia.patch 605 SHA256 577678031c6ade23663e5eb7829db5cda954fc06c910543928479c78b9fd2f09 SHA512 b71ce1f2eb505415798002244eb1319abc57e0b3086d4f0a2bf5b6f5e51a8bd9d9568d79f5830d1b4670bba7cc6c45f86532372421d9926be35216aa3563f136 WHIRLPOOL 39048cf908d27835377fa8ac4f89df6249599a8362a0b08b21fefa863c5a39723a5f98ff40d131fd782a75f10a4e3de13fcde0fcd44a66df8bc54fd2878a1997
AUX calculate-assemble-2.2.30-r1.patch 4285 SHA256 8dae56b2a7cef808fef12942c250b8ed46ec0e98272a868103c74b2b2d742821 SHA512 2c816cb5081f5ea23a4dfed087d43eeb5abb4a3e3d62681165336c062ff9b5786b3491b5cd38c66fa89ab791d5ee1b6b5707f008f1e30eb0b3c6f2b999cf07f5 WHIRLPOOL b3325b0ce5c0f32c375e013f1e5e47a8c1d037886215ef9d56ca4241c924834c5a7b6236283f609f8e3b6a00cda1e2ee98598291d1aa6a2ee23fc81095137362
AUX calculate-assemble-2.2.30-r2.patch 10635 SHA256 5cd7850456431824c5eb8bb345e8c547cee097de937e5ed0bcf32a3b1e8ea336 SHA512 446960e252c824a4733e8dd3df9e47c1110f466b7dcb30fced0907a55dfd21ef2a3158a78e438038e071fa85bbf6a2d20474e4d4c3c30f0d5b7d340a522456d8 WHIRLPOOL 44bf54694a28a0c0104193eaedf7a47f5d00f5dcfd1a57a6b9e7179b393c0e0563e89371439d0011f5e9883a3e4e28b664c834ce50fd2649bbbbdd5100a1a397
DIST calculate-assemble-2.2.30.tar.bz2 28740 SHA256 3958e8fc0aac7a704e3d3cba4fffde6a77e9925cbc621d375dbae39518110ad4 SHA512 75dbb69352e9762f4e26729a4cd9ad6e3cf6301dc3e259573e6b3fe3f6d1b5c1c61ba4b36b8783c938fd4f526db259bdeb472db09cd0626a29ae159138a0da69 WHIRLPOOL 027ccd5cee6e53f1c30e212b937129111e1af80f066248ec8a94a7f5a7fcd722fed1f765a7537bb4f206c201e83e5c10818c67a2aa091d071b99ef1e880a400f
EBUILD calculate-assemble-2.2.30-r1.ebuild 688 SHA256 002d98e482a6ff70ec006980f5a5dfa2f2063233c967dd1313ea771347a392d4 SHA512 d2c54d0d9a4abb8fb0acef4f258215fde8e0e9ff087bcb5f62bed997831f0bf42006a34c28275f6c8598777196c98b89b01c66abfc694799e3662b07fc4679c3 WHIRLPOOL 4158b57dcdd591ac05aeeb69d75db9372f1c1a3a05463713dad7013a0966643d34189e54c2858a182fd069c506463c67df5fe45064bc55b6448285f122ee947d
EBUILD calculate-assemble-2.2.30-r2.ebuild 688 SHA256 4ef562445c634f9c791019d7d4580dbf8e3e2f6db8a8948b14de02d885db5cd2 SHA512 4b512e110cbae3827717a027b74139cf9d729f867ae5a2235983512c22c855ebb9866a88ddde675ad32126d235ea9404e2189f17c3d041c128345f53413105b3 WHIRLPOOL dc356c00eeafabd871fbbdc334d9d55672f71f0433ff6de7238ba290a2cb4b744b552b1d7e7ee1d7024e6cfdc9b2df193c14baa48fb299b7a5a572716a6e7e92
DIST calculate-assemble-2.2.31.tar.bz2 28977 SHA256 8488de0b12ee9a9c30d0dd8d5f16f8da11b8b135147ffa29856c91a757afaad8 SHA512 50f9c0cd8442630c882a23a41e73b29355758cd91d4f9911f01c27d2dd7bf0c4b5bc90226075d4cb01ee05829652ed134ae80f89e1795beef5089989e142c223 WHIRLPOOL c3317c2843dc82b77abcecdc3120bbc1df7a31b4cb3dd33de623b2cb30ac9ec40e4cf2662f898eccb41d5a3cc2e75a9e3cbe34f4d989cb6463c3f5524aa43df7
EBUILD calculate-assemble-2.2.30-r3.ebuild 761 SHA256 cbbb0e9dbcd2a83d2d8a23198be1937b568688dec984b074f98bea372baa91e3 SHA512 02ad6d2d39e95ebd143c29a5a9ece23a205174de1e2c6de6e4cb4393a0d3d995144f3648ee83709395f10c6c72ea39b7bd0ccf896734fbf90155423833d55a18 WHIRLPOOL 42b92ec7797c0d641b1a2786f100d8be9e45a1f1e34b162e826a12152f03871de1dcbf064ba051cb0d2871a2cfe09152e51a3c8b8fb4726ecdb28a2b5da3f3ce
EBUILD calculate-assemble-2.2.30.ebuild 566 SHA256 32a365ce380ff51d3064443252bc85455da52a55f6255816cfc511d526f8e83c SHA512 a9c8fcc6a3833255a7bcf6446d450602085cda1d3770a4a5bfcfa8a83092075e4d66a79837b3817d5d1f03492f63f917d9490a45f88119ac8fc29aae39a22db8 WHIRLPOOL 72f890ea8527d636f6f74b15155fd7cd31bca9410bcf16a7a4d960588b087ec50f9b94f5b2560fc21d5611cddb226d06da1fa4cbde6ce27a45d38a3490e0184b
EBUILD calculate-assemble-2.2.31.ebuild 566 SHA256 0c3ffcd83a102ad72eaebe12760fe37324b1941a10228dcd79352cda19f96366 SHA512 2a02faa9d204c2fc3ea578e32191fb445949d8d2a220c74f103956c6a233ab431aa744b9903141370532b717d3ed0a8a11cc2bc0650b45e84b5addef9d6bec94 WHIRLPOOL 3f4605efbda6df5bab0419bc517ca4859732769ad48ce57bdcdc57f4b4e6902cd1dddeca5a8a4006db3ea465369a5c32b7664c56fff34e63898936494074c360
EBUILD calculate-assemble-2.2.9999.ebuild 572 SHA256 5bc8194c32bc4677cf79eaf6ae5f2112cafa51ae900dc3ebb6e879d9414858ea SHA512 62a111e959134709ef7529bfe87ccdfb20b103efc5305bf497ee9f427b3f956f180cd5c612641e557607606de9dbae3326c7881cc16afd9372b752ef65d63c93 WHIRLPOOL 8340a2b45b9941a61473ec4d66d944524dcf6f973ad9a03b9b92471cf5c92199949b2d707e7f738d86bbc9774eebac561df52891385e57d75aa811f47b4c5821
MISC ChangeLog 16686 SHA256 759d02ea5f6029eab950ac93cf54a1c43dcc007a82be8e42cb82eac38369e979 SHA512 d4927fc6204a0a496248edbf3daf5b9259f0fc519a759c1dc8a6d6c2abab33074e75cd29e1696af3debaaac23548d0dc021e8d28c21d5c38cb8b2f06a973be0d WHIRLPOOL 7bd8bf84215ef77ec4035419f79d3226f3db13d6fb417e2b882bd4899bc240764ccc5a32154d8469153dc1c052936aad886a69916148bbf2bffa8d782b343401
MISC metadata.xml 273 SHA256 4e25d45ba43b2ab7f7ae8ab4cfc05c406566cfb143a87166de77fbd8d9f8a943 SHA512 98b0d7d37e851ea86b498b2c0675bf505c75cb00d13932720475cda8a485db2325e2551954af3c534b2f9ef213f372c563d739d25d04a3da681a661c9ade6e91 WHIRLPOOL 44babe185c821b525b0dc317acb29e01223eacd5862804a64e0884502c25a541f53d322f1e63649c90285e93834b802beb21e4b34bd27be4b8d66ae6ac882c96

@ -1,30 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
PYTHON_DEPEND="2:2.7"
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${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="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-builder-2.2.30"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# up to r2 version
epatch "${FILESDIR}/calculate-assemble-2.2.30-r2.patch"
}

@ -17,6 +17,6 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-builder-2.2.30"
DEPEND="~sys-apps/calculate-builder-2.2.31"
RDEPEND="${DEPEND}"

@ -1,91 +0,0 @@
diff --git pym/cl_assemble.py pym/cl_assemble.py
index 3c5158f..285177d 100644
--- pym/cl_assemble.py
+++ pym/cl_assemble.py
@@ -100,8 +100,7 @@ class cl_assemble(color_print):
# foraction - perform only for cl_action == value
DEFAULT_FORACTION = ('make','syncupdate','update')
ACTION_LIST = \
- [
- # emerge -e system first
+ [# emerge -e system first
{'command':'emerge -e system',
'message':_("First execute '%s'")%'emerge -e system',
'step':'firstsystem',
@@ -621,9 +620,9 @@ class cl_assemble(color_print):
self.printMessageForTest(_("Installing %s")%'dev-vcs/git')
self.runChroot("USE='-perl -curl -webdav' emerge -1 git")
- emergeSync = "emerge --sync"
+ emergeSync = "eix-sync"
self.printMessageForTest(_("Updating portages"))
- self.runChroot(emergeSync)
+ self.runChroot(emergeSync,showProcess=True)
emergeLayman = "USE='git' emerge layman"
self.printMessageForTest(_("Installing %s")%"layman")
@@ -761,8 +760,11 @@ class cl_assemble(color_print):
'sys-apps/calculate-core')
if path.exists(path.join(self.clVars.Get('cl_assemble_path'),
"usr/sbin/cl-core")):
- self.runChroot("/usr/sbin/cl-core --append-variable "
- "cl_merges=calculate-install")
+ try:
+ self.runChroot("/usr/sbin/cl-core --append-variable "
+ "cl_merges=calculate-install")
+ except:
+ pass
else:
self.runChroot("cl-install --install")
else:
@@ -774,7 +776,7 @@ class cl_assemble(color_print):
if not isinstance(self.sourceDistr,IsoDistributive):
self.printMessageForTest(_("Receiving kernel sources"))
- self.runChroot('USE="-vmlinuz" emerge '
+ self.runChroot('USE="-minimal -vmlinuz" emerge '
"sys-kernel/calculate-sources")
if not isinstance(self.sourceDistr,IsoDistributive):
@@ -917,7 +919,7 @@ class cl_assemble(color_print):
chrootCommand = process(*commandLine,stderr=ERRval,
stdout=IOval,envdict=envdict)
DEBUG(self._getCommand(chrootCommand.command))
- if raiseError and chrootCommand.failed():
+ if chrootCommand.failed() and raiseError:
raise AssembleError(
_("An error occurred when executing the command")+
":\n %s"%self._getCommand(chrootCommand.command))
@@ -1450,7 +1452,7 @@ class cl_assemble(color_print):
def checkDowngrades(self):
"""Run check downgrades"""
- cmd = self.runChroot("FORMAT='{downgrade}%{FORMAT_ALL}{}' eix -I",
+ cmd = self.runChroot("/usr/bin/eix -T",
raiseError=False,
showProcess=True)
return True
@@ -1662,7 +1664,7 @@ class cl_assemble(color_print):
while drivers:
repeatDrivers = []
for verName,maskName,drvVer in drivers:
- rePackage = re.compile("^\[ebuild[^\]]+]\s+(\S+)")
+ rePackage = re.compile("^\[ebuild[^\]]+]\s+([^\s:]+)")
checkprocess = self.runChroot(
"emerge -pv %s"%
drvVer, raiseError=False,joinErr=True)
diff --git pym/cl_assemble_cmd.py pym/cl_assemble_cmd.py
index 64ea758..942c2c1 100644
--- pym/cl_assemble_cmd.py
+++ pym/cl_assemble_cmd.py
@@ -141,8 +141,9 @@ class assemble_cmd(share_cmd):
self.logicObj.getValidSource())+["stage"]
self.checkChoice("--source",values.source, validSources)
if values.name:
+ print values.name.__repr__()
if not self.logicObj.setName(values.name):
- self.error(_("option %s")%"--name"+
+ self.optobj.error(_("option %s")%"--name"+
": "+ _("invalid value '%s'"%values.name))
return (values, args)

@ -1,10 +1,9 @@
AUX calculate-builder-2.2.30-fix_builder.patch 1216 SHA256 6d40f758e3fef56568026debf7c8092dc2e210dde60474d6abb4b1f0e775944f SHA512 5c07f1257acbf54d4be4c901ab06943bc80b382ab73b47310fb42553f588012b3f199e3a3691d419ef60c7f356892ca7e8475ea7cd45d8e1dc9ded82e80f793f WHIRLPOOL f6e69afa09794949cfd2bef9c2762bc8695f7fcd0310f14261a8e145d24ec3157e96b918ba00379972b0e74652a9d0a9a956f054bf3f1ab7e43cb81e94122711
AUX calculate-builder-2.2.30-r5.patch 7644 SHA256 0a8bb50208f4abf91417b04eef79884b651257c09ce0eb03a5f059b008e388cf SHA512 868f767071781ac115dab3c00609efc8ca54d67062a1030637982d6dd4ec7b60e012205290822f67077abe835b08d7e42134e0c594f22d4653da0fa204e4a7c9 WHIRLPOOL 59048aa571d9cd2c6ccdf97d90f7349d6c8308ac8db996f79a41f7281a6c07a14e6a6b960461793aa15983770b460edf777438b974cc6ffb30a1a13cc8b56b29
AUX calculate-builder-2.2.30-r6.patch 9261 SHA256 ba5d8eae88c268536b0886f0018a3ed0c1f0faba2631325924d3780ee014301e SHA512 530c4f65af5da106e20e12d6deb81b344224870e098c871738a4a24c729c64023774445ae1aa4505b343c33805c03e9b873e903b64d3a872225ecaeb1a9025da WHIRLPOOL 72863773345b07f23d5d5c367e0f7e3e03941c498c872d8fc9b2cd119de859b45850bdd92731f014c783f63376a18dccb1d7ecf9b0f88278772e68efcb4c3e87
DIST calculate-builder-2.2.30.tar.bz2 31257 SHA256 d227f1de5bfa9ef1a78890518693c0e5b812c27c1531fb284825b240acd158ff SHA512 c0ae9a29e13e97e0e53e5643849279dc64945982b8f014a8d12509fedb0d10bbc38ac454361789d58ad2ef6d7e2cd2d27b23fd548f43b798a335f6316eca08d7 WHIRLPOOL 6f8dfb02737bde154b489234bde287904fe37c81b72d4d6fad1351eade21a4458a9d1878338ed6c811d49bea4a22fdecc1631e7fe3aaf74052397c6fd697a3f7
EBUILD calculate-builder-2.2.30-r5.ebuild 844 SHA256 6ca4d09ece5d365f2d3ddffffdba651a320eb083aaf435020412d8dd9f272aaf SHA512 a17af9f46762d8555f2fa39c3f3b7e4c4da278113b47217e1acabc10e97a9f1fb23bb0ad721cfe388cc48e5dc368bac0499b39ccb4603203a7fd212d7a25ba4a WHIRLPOOL b9310f3eade3191cd099f88ea2fb58082bd81bfeef0244ea4bf57d40cf8cc8c4812b123e16afb10b0d5e261ae692c78370a2b1be0a5a6b8eee49f87e6b1e77d8
EBUILD calculate-builder-2.2.30-r6.ebuild 844 SHA256 80ad04d4d0efe0995a7da5947202ecfde52be335a0dbd2cdcbeef7d658a5552c SHA512 131e9385fc812fa8c2765d4910bb8ba36fe905ff86fe1bb257aa51c5301c32805ce2c2a60fa5b107822211179226201d43335f59e0b3176191d6d4ce2ceed3ba WHIRLPOOL 66f49072ced534e508bbd4a5d4d0824fd9b5e04e4a8bc604b5dc400466d35eba6740e80ea7b952389e2c686c6cbd565dab6b7be4b88d30381d16c40f2eb5331d
DIST calculate-builder-2.2.31.tar.bz2 31745 SHA256 42bdbc62319205a1ac68c8e80c822bd6679cd43e98caa9b1140d499872887e60 SHA512 5b3832b9fe910502a953a90e4af289691dde095b17c6a8cd4d059eb8f9fd90880963afec758dea97d0e15eabeebed4ec3325ef91f83ed71b3a08c382b30e220c WHIRLPOOL 399d4f9f308fbe1f0e57a45ba0e0e92a1f5aefcbdec5ffaa664fd955f0f8383f4542f5f229c9ab96127cecc95a1de8e31abb390ed32d306c7ecf970f6cb16fca
EBUILD calculate-builder-2.2.30-r7.ebuild 948 SHA256 d7218587956d9bb0a4ca5dacd97b645bffbe2ae9600454e669e4e9ca4ac417ba SHA512 6003ff9a46c87e7ebd5bb379d4af8c09583af57409dcc7a24f34d1c7cdae057ad35cf55e1d7e7345d6c1f2dc375fdc043daaf4e34b4c3cc76496e4a15ff3c4e9 WHIRLPOOL d399e8688266b32d7bcd024b633fbfc5327cbc089f64389e0cdce9000dec21e2d4a6690b85b8f631c66f13082d979f5272ab875cf502eb398284f5c0f0512cd2
EBUILD calculate-builder-2.2.31.ebuild 668 SHA256 d5d3e22b4c1ff9b201f3da282a590e8a61691ddb35db87d5796ccfbd3e543a8a SHA512 19100ac3601e502e5efdeed7304829d04b110918ccb103bc00c594a8991c9df51f718ef9a9ec61ab8f41449a430b814679a658805058281b91b1776f6b07eb3e WHIRLPOOL e1cc47f8e841b34f54962826c544cdec3bed00b3d6b9c8227a3168e2842f8100870c025410d753ce343d8253da2b75b2ead98598b09d15d4eef6c2403de81895
EBUILD calculate-builder-2.2.9999.ebuild 645 SHA256 12bd65856844de72d88588937b6a65b39b7dec7eaba06d028e8c5a78ef6b28a5 SHA512 fc6396dad3a92a5a746f4ed32caf092ede65898e4822e52ad541faaa44467a4f81daf6f261af8eb20017c6155923e2011433e4b15071d7098392c901ae3a5078 WHIRLPOOL fd0151c3ce9fa98c5ca63470e561487c063293727006da10446c0a2ac2c65305042a5359bc0163840c1dd4502d67641453dddaf5cded552dacf6c5c97ccc7402
MISC ChangeLog 20663 SHA256 f05f75b85860fc850514bd6bcaa1671c6de2ead417071f28ccbec647528f58a2 SHA512 2bcbfd0212333bbf8bfd1fc4de894ee50b71b0671e4769fd40a1aee4fbab0260919b447f109e3b02047835c6e0eb93c04ea6ce135836144d078c09f0c5615d95 WHIRLPOOL dbf2791d84acf8567520bfd90462650ca9c9c0da7a3515e9e5695c3a419cfd043e235d8d681704f33a0c99272e93563de0fc6426f9476f894a48d52a21409462
MISC metadata.xml 270 SHA256 b65e150429ecbf36cf03d094f4e3e7518f536c61289cecff6b817326703d58a0 SHA512 dbfa2e214285bbe643553158f8ce084d93b34cdc10201917e001d26ca96fb76c9aaafdd7573f1827348d831dd7ddcc238fec560544b6efaca08c6eb9aa053cf3 WHIRLPOOL 42d8cc3e4ac41511cb0468bd1622001addef5263562a31c07a040cbe6f412278ee9d2124e864d987793629df5f3dd1c8b145a93715785d290ab917ccd14de9ea

@ -1,34 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
PYTHON_DEPEND="2:2.7"
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The utilities for builder tasks of Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND=">=sys-kernel/calckernel-3.4.18
~sys-apps/calculate-lib-2.2.30
!<sys-apps/calculate-1.4.0_p20100921
app-cdr/cdrkit
sys-fs/squashfs-tools"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# add check on fully kernel sources, fix initrd run, fix using new themes
epatch "${FILESDIR}/calculate-builder-2.2.30-r5.patch"
}

@ -18,17 +18,9 @@ SLOT="0"
KEYWORDS="amd64 x86"
DEPEND=">=sys-kernel/calckernel-3.4.18
~sys-apps/calculate-lib-2.2.30
~sys-apps/calculate-lib-2.2.31
!<sys-apps/calculate-1.4.0_p20100921
app-cdr/cdrkit
sys-fs/squashfs-tools"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# add check on fully kernel sources, fix initrd run, fix using new themes
epatch "${FILESDIR}/calculate-builder-2.2.30-r6.patch"
}

@ -1,170 +0,0 @@
diff --git pym/cl_builder.py pym/cl_builder.py
index 2cc5334..180a0b3 100644
--- pym/cl_builder.py
+++ pym/cl_builder.py
@@ -328,7 +328,7 @@ class cl_builder(color_print):
createdDev = self.createUrandom(mp)
self.dispatchConf(mp)
self.updatePortage(mp)
- self.clearPortage(mp)
+ #self.clearPortage(mp)
self.updateMan(mp)
self.removeUrandom(mp,createdDev)
@@ -578,8 +578,12 @@ class cl_builder(color_print):
"""Get list for portage exclude by 'cl_builder_tree'"""
if self.clVars.Get('cl_builder_tree') == 'off':
portagePath = pathJoin(sourceDirectory,"usr/portage")
- return map(lambda x: path.join("usr/portage",x),
- filter(lambda x: not x in ( "eclass", "licenses", "profiles"),
+ overlayPath = pathJoin(sourceDirectory,"var/lib/layman/calculate")
+ return map(lambda x: path.join("var/lib/layman/calculate",x),
+ filter(lambda x: not x in ("distfiles", "eclass", ".git","profiles"),
+ listDirectory(overlayPath))) + \
+ map(lambda x: path.join("usr/portage",x),
+ filter(lambda x: not x in ("distfiles", "eclass", ".git","profiles"),
listDirectory(portagePath)))
else:
return []
diff --git pym/cl_image_cmd.py pym/cl_image_cmd.py
index f05ac27..9564bec 100644
--- pym/cl_image_cmd.py
+++ pym/cl_image_cmd.py
@@ -70,6 +70,9 @@ CMD_OPTIONS = [{'shortOption':"p",
'optVal':"TIMEZONE",
'help':_("timezone by default")
},
+ {'longOption':'keep-tree',
+ 'help':_("keep portage tree in image")
+ },
{'longOption':"set"},
{'shortOption':"f",
'longOption':"force",
@@ -170,6 +173,9 @@ class image_cmd(share_cmd):
if values.noisohybrid:
self.logicObj.clVars.Set('cl_builder_isohybrid_set','off',True)
+ if values.keep_tree:
+ self.logicObj.clVars.Set('cl_builder_tree','on',True)
+
if args and args[0] == "squash":
self.logicObj.clVars.Set('cl_builder_iso_path','/mnt/flash',True)
if values.timezone and not self.logicObj.setTimezone(values.timezone):
diff --git pym/cl_kernel.py pym/cl_kernel.py
index b6e3c35..456efad 100644
--- pym/cl_kernel.py
+++ pym/cl_kernel.py
@@ -74,12 +74,23 @@ class cl_kernel(color_print):
"""Test directory for kernel sources"""
makefilepath = path.join(dirpath,'Makefile')
kbuildpath = path.join(dirpath,'Kbuild')
- if not path.exists(makefilepath) \
- or not path.exists(kbuildpath) \
- or not "Kbuild for top-level directory of the kernel" in \
+ if path.exists(makefilepath) \
+ and path.exists(kbuildpath) \
+ and "Kbuild for top-level directory of the kernel" in \
open(kbuildpath,'r').read():
- return False
- return True
+ return True
+ return False
+
+ def _testFullKernelDirectory(self,dirpath):
+ """To check the directory for full kernel sources
+
+ Kernel may be installed with minimal (later vmlinuz) flag"""
+ documentationPath = path.join(dirpath,'Documentation')
+ driversPath = path.join(dirpath,'drivers')
+ if path.exists(documentationPath) \
+ and path.exists(driversPath):
+ return True
+ return False
def setNoColor(self):
self.color = False
@@ -95,19 +106,7 @@ class cl_kernel(color_print):
mrproper=False,target="all"):
"""Run kernel compilation"""
clVars = self.clVars
- for themePkg in ['media-gfx/cldx-themes',
- 'media-gfx/cld-themes',
- 'media-gfx/cldg-themes',
- 'media-gfx/cls-themes',
- 'media-gfx/cds-themes',
- 'media-gfx/cmc-themes']:
- installed = getPkgInstalled(themePkg,
- prefix=self.clVars.Get('cl_chroot_path'))
- if installed and installed[0]['PV'].startswith('12'):
- themeName = "calculate"
- break
- else:
- themeName = "tty1"
+ themeName = "calculate"
standardParams = ["--splash=%s"%themeName, "--unionfs",
"--all-ramdisk-modules","--disklabel",
"--no-save-config", "--firmware","--udev",
diff --git pym/cl_kernel_cmd.py pym/cl_kernel_cmd.py
index 3a85ada..54edbc0 100644
--- pym/cl_kernel_cmd.py
+++ pym/cl_kernel_cmd.py
@@ -121,12 +121,30 @@ class kernel_cmd(share_cmd):
self.checkIncompatibleParam("initrd")
if values.symlink:
self.checkIncompatibleParam("symlink")
- if values.k:
- if not self.logicObj._testKernelDirectory(values.k):
- self.optobj.error("%s:'%s'"%
- (_("wrong kernel source directory"),values.k))
- else:
- self.logicObj.clVars.Set('cl_kernel_src_path',values.k,True)
+ if not values.v:
+ if values.k:
+ if not self.logicObj._testKernelDirectory(values.k):
+ self.optobj.error("%s:'%s'"%
+ (_("wrong kernel source directory"),values.k))
+ elif not values.initrd and \
+ not self.logicObj._testFullKernelDirectory(values.k) \
+ and self.checkNotEbuildParam(values,"postinst"):
+ self.optobj.error(("%s:'%s'"%
+ (_("in directory of kernel source not "
+ "enough needed files"),
+ values.k))+"\n"+
+ _("Probably calculate-sources was "
+ "compiled with USE 'minimal'"))
+ else:
+ self.logicObj.clVars.Set('cl_kernel_src_path',values.k,True)
+ elif self.checkNotEbuildParam(values,"postinst"):
+ if not values.initrd and \
+ not self.logicObj._testFullKernelDirectory(
+ self.logicObj.clVars.Get('cl_kernel_src_path')):
+ self.optobj.error((_("in default directory of kernel "
+ "source not enough needed files")+"\n"+
+ _("Probably calculate-sources was "
+ "compiled with USE 'minimal'")))
if values.c and values.o:
self.optobj.error("%s: %s"%(_("incompatible options"),
self.getStringIncompatibleOptions(["c","o"])))
@@ -161,6 +179,9 @@ class kernel_cmd(share_cmd):
def checkEbuildParam(self,options,phase):
return not options.ebuild or os.environ["EBUILD_PHASE"] == phase
+ def checkNotEbuildParam(self,options,phase):
+ return not options.ebuild or os.environ["EBUILD_PHASE"] != phase
+
def makeKernel(self,options):
"""Run kernel compilation, installation, optimization"""
# if set ebuild param check cur EBUILD_PHASE, run kernel compilation
diff --git pym/cl_vars_builder.py pym/cl_vars_builder.py
index 44e4965..c1fd439 100644
--- pym/cl_vars_builder.py
+++ pym/cl_vars_builder.py
@@ -98,7 +98,7 @@ class Data:
cl_builder_kernel_suffix = {}
# include portage directory from image
- cl_builder_tree = {'value':'on'}
+ cl_builder_tree = {'value':'off'}
cl_builder_isohybrid_set = {'value':'on'}

@ -1,12 +1,8 @@
AUX calculate-client-3.1.1-r1.patch 14317 SHA256 16e2df039eedf0a03135975bf53f6faf315670f14f9ab1f90b5dc737be9883c2 SHA512 5c3e867c8987497b749c92f44c0b9d3326e68fa409a84e595a8302dfce1e7a071b5628209c476a087e54d189874938652be97d54a4e15a73cdba02e49c2e7574 WHIRLPOOL 8769f674221208ba8f6c51f85a6db992efccfbfba5063c502babd5f632e476ff9f2da7a2f7d9803614dea986f7d948ed43413dfe5bc00ad373a20ebcee583a48
DIST calculate-client-2.2.30.tar.bz2 32544 SHA256 7ead15dd4c3aa896970b798249f5245f1f94924dbc26d832ee194a87a4a5be5f SHA512 025ace9781e22a997d371deba5045585410fc275e1f2499656eee5ecc5cd174c4cd5defa73a15243db7e5d99c2c72cdf57f037baa06df1a7a2b5629e32d08671 WHIRLPOOL 3e9ca950f6c60362a26537b9ae7f52f42c3fb04b73a7bed26b7befc6c072deb622838e6362eba59153ec39c76b78070863f6e99158d639cabdc1ca3e5cd31f0e
DIST calculate-client-3.1.1.tar.bz2 31247 SHA256 7b5a5f14d2f624443744944681d3467a51cb515418849a45f19647956441f62e SHA512 999cbb693a4af964bcf72f831dba72d273b87c48e73036d94a70db5ef98d886472fcbdfbeb891c198b61986096be9f140017ff3085216342f350af4c7be8dec2 WHIRLPOOL 9f38abe4e9e4443474a0f31e4b18ef9893f1bf15aba78b1e9d3f072385d40b04ed3d0821de9c28eabee0a3d774c15979dc7c32d116d6e223477a7c4c0034afbe
DIST calculate-client-3.1.1_beta3.tar.bz2 31281 SHA256 75b677f31441241ec91bc5bdd9967f004720535944a07c8d446b1487473f4136 SHA512 e0df8b627f672e720c5136020cbb32b0c4ca84e26d36d532d813f2034a5f31220e26ae8b732c6efd233f2eca13c13bce3ef705cdd63062df213bb6f13209226f WHIRLPOOL 64043447b7988f08b981be0b5d0f8e8d3c28eda18969d3d9acd254b729c5ad732a8cf3452c89510d8fd33cfbdb459c998371e347990de374ab658cf8aad79dbc
EBUILD calculate-client-2.2.30.ebuild 957 SHA256 bad66dbd85cb57dc9a4e9e3fb79cb3f4255db01b392fe154fb5c9b644a0735aa SHA512 6a85e6bf9c7725e33e4eb5b7964ea853bd3d14576dc750075c9517791b6bd9735771803e00ce9648174ec8a2eda72cac7f79a3b877ada099d245137699bb2442 WHIRLPOOL 10780dadc928d122d3816a1f07fdcb73dcc3df0956b7fc25d497cdb3b3d71b4fb38aab7c0c9ab32ab1834ee51e8374cf98f3f009be94b42fed42df5ab5799f9d
EBUILD calculate-client-2.2.9999.ebuild 881 SHA256 153806b9d7ff06534049553f4bb0e6d956f26083b949bb3080579c98e41ee9e0 SHA512 02a5a346b1f240f7ee80249504d3b216df529c035cc95ab514d6701a9f542a4ac3b5a66b4dfd27c087261f2904756062fe80f72ce84a41165e2b604526480e4a WHIRLPOOL 7c0f21cf953a73ac1b9c369860b4a898ca762f8a6ce9314160cf301cd133695de215ea15099483c84c3f83125fb6df9a646c633140bba6f98228365eaebc1abe
DIST calculate-client-3.1.2.tar.bz2 31269 SHA256 74fff4b21cf895a214b887b4680c1779d28bd8787fcea95455f4551fb1826f56 SHA512 14e745b1f5425219e0428c698a863ebe558d9d324ce5472950e9ec8bba5c81c55b10b10edd035fae523ac7f660ff98f8b53c7f8518c0a7e13ae24815b455b680 WHIRLPOOL 9b68bdababd5c9aae9c929dfaec709af35c4f7b74eedaeb76a4fb501f6ce88ef3a92c77ad0798947b653073e3d67d312eb94fb9a172559140a6d87672272c71b
EBUILD calculate-client-3.1.1-r1.ebuild 928 SHA256 eb416de44293c5cd9c5533f5f5a56c24e89543f102074e529a4d2fc06568550e SHA512 ddcdc4ec17a90edab0a622582499a5ecc466fa417fe53f886a0718230e665c584e0dc060167d40f00cd02944e355cad5b04931d7ea7955489c38020201558541 WHIRLPOOL 053bce4f78df988d8884c4ce687ef2b8573fb9896c0813aa971b7c3ded9bed472599aa710b02eecc48eb2d4c643018a4746003b761a65f425ac2aba2f89a8c73
EBUILD calculate-client-3.1.1.ebuild 792 SHA256 2ac3ef2561873d746d6d2a4e6fffed95d855df2660b1984dbd4c9d6412336d25 SHA512 95c1d10343a3a2f77586ffcbca756790f1a2b12e68be0b51e9f041245b731b0addc7bc77f9d955d9d91ddb55ac4bbaa4eb943f21af286e53afc2f245c6bd1af7 WHIRLPOOL 048d4c40e1623b64352a06623dbe17221231ecacda27eb99df333e3f149734c4147992817b0bce5b802ad4b3dec773c99d363c12554580f449d5030d33310f83
EBUILD calculate-client-3.1.1_beta3.ebuild 798 SHA256 0ea779212de69b6e3960a5b60c89682167e906b2b5d196001bb3cb10a0f2114a SHA512 62f389571f5a519f91bb5037723618752cf1878e54cf214efebd4e6a6791c89f4f1ab21bebfb45d17e5a410eebf13cea2a750eb167d33e9162f7c5876fc5aeeb WHIRLPOOL 4eff24cb313e12c4b68bab9f5bd67f4e841a0e6a002e737d93cdcf3d7d808decae415495d1f40a1703475330d7a17c1e21e6881f4882fd678b5f5ceef907fbb3
EBUILD calculate-client-3.1.2.ebuild 792 SHA256 38924de03a115b26299ab96da1b8a3081487e53c6bf996408a406752ed98b8ad SHA512 04822571063c1c6fcdf2fdd1969b0f4035b58a1740f8f4ed2a11d3c8a94f9aa7c01df40e5e3b899829e44a1d0030291c8723e82c323f9218f9651b2efb03cb91 WHIRLPOOL f6545a2fe24b0fd6ec331573e12ef90ce86ab57fa5d9620025691bc101a925c8e7e970a5d3ab7b72d4ff480ce6b5f09d69926a06ebc15a340c95015eacc1046b
EBUILD calculate-client-3.1.9999.ebuild 879 SHA256 37385187f78bb708669b5cd2742173b117bb482c784f8f481ab7388554476d65 SHA512 87ebc2dfa965a9bb9d24af13a611e83e412cbabb12957bb14e2a1cd8b9f1951efbf690dcfa8f73711a02cfd0afbc9e9f37209ba9a3884b018c41b3a46e2e847b WHIRLPOOL 349da1bcb076af176079473ccb2fd1a4e3d8eb3ec2a7a6102272d1dd1073a8c181c49e02c89ede4b5cd829856f0c0f5db877b89eb0c6335ad678e58902db293b
MISC ChangeLog 21989 SHA256 065aa2c75428e965caef0348105d8e5464d4103f5f2eb16bb626c7a9278208df SHA512 76ad69386d986e2e65448394d738b4d6abbeffb4af38f13dcfbfe8af64796c9b97eda68eb8cbf749fe7ef2711067da430af1cc1a764712e8df853451f903ab57 WHIRLPOOL 58b0a2837255a2eb67606072ac1a6a06e0db7079b563d3b4c9df45b5dbe0fad31c409800da635a337ad976b31bb08549e89063796e8217d46c83ba8b5e22e1b8
MISC metadata.xml 310 SHA256 5023605d36dcbb5d5fe1b1ac54f7125a4087479b5168601075a8050ed51c38c2 SHA512 67a32e55e64108218d991282f1c1c9b1bad07c12a0d192db9e81df28557baeab75b8c9f5b134568c85f090470c15c727df18dff3c4deef05cc64f8f1be7d3943 WHIRLPOOL a9d79c91db4946f3abee5c6acc52d9eab183e49682a492fe7c7617a15eebee122f8c2f5a6b0834bed76c4f8bbd8bec8e58c726a93c2f4d04a00d92987d9c7227

@ -1,38 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
PYTHON_DEPEND="2:2.7"
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${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="0"
KEYWORDS="amd64 x86"
IUSE="kde xfce gnome"
DEPEND="~sys-apps/calculate-desktop-2.2.30
>=dev-python/python-ldap-2.0[ssl]
>=sys-auth/pam_ldap-180[ssl]
>=sys-auth/nss_ldap-239
>=sys-apps/keyexec-0.1.2
sys-apps/keyutils
sys-auth/pam_keystore
dev-lang/swig
xfce? ( x11-misc/xdialog )
gnome? ( x11-misc/xdialog )
kde? ( kde-base/kdialog )"
RDEPEND="${DEPEND}"
pkg_postinst() {
einfo "For configure calculate-client perform:"
einfo " cl-client --install"
}

@ -1,35 +0,0 @@
# Copyright 1999-2011 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 git-2
EGIT_REPO_URI="git://git.calculate.ru/calculate-2.2/calculate-client.git"
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="0"
KEYWORDS=""
IUSE="kde xfce gnome"
DEPEND="~sys-apps/calculate-desktop-2.2.9999
~sys-apps/calculate-lib-2.2.9999
>=dev-python/python-ldap-2.0[ssl]
>=sys-auth/pam_ldap-180[ssl]
>=sys-auth/nss_ldap-239
>=sys-apps/keyexec-0.1.2
sys-apps/keyutils
dev-lang/swig
sys-auth/pam_keystore
xfce? ( x11-misc/xdialog )
gnome? ( x11-misc/xdialog )
kde? ( kde-base/kdialog )"
RDEPEND="${DEPEND}"

@ -1,30 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
PYTHON_DEPEND="2:2.7"
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
DESCRIPTION="The program of setting and storing the user account in the domain"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-desktop-3.1.1_beta3
!<sys-apps/calculate-client-3.1.0_alpha2
>=dev-python/python-ldap-2.0[ssl]
>=sys-auth/pam_ldap-180[ssl]
>=sys-auth/nss_ldap-239
>=sys-apps/keyexec-0.1.2
sys-apps/keyutils
sys-auth/pam_keystore
dev-lang/swig"
RDEPEND="${DEPEND}"

@ -17,7 +17,7 @@ LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-desktop-3.1.1
DEPEND="~sys-apps/calculate-desktop-3.1.2
!<sys-apps/calculate-client-3.1.0_alpha2
>=dev-python/python-ldap-2.0[ssl]
>=sys-auth/pam_ldap-180[ssl]

@ -1,7 +1,7 @@
DIST calculate-console-gui-3.1.1.tar.bz2 319090 SHA256 b53f9299bb61f7d8ba43c4b2d332be0bc2bbab8d1d4f57540ab97b446815ee9c SHA512 77595bc6008a8f90e29b008a2248af4775e08054c1b30c675a29bed77e8b09b6656f00a2d95b083e2bca21a6faab1ba69d3825b7377c267df615f9b6e7927fd4 WHIRLPOOL 2a3302d82897c73babdb035ee9a60f1578861ac3680981bd164956cd8bbee20370806bfd03a31b2cd8ca946d02396b05fdc332a582e96dc07c7625fa62e4df86
DIST calculate-console-gui-3.1.1_beta3.tar.bz2 319106 SHA256 51850596aeba5d40f5ce4b7a06e6928c654493e51f8617144a854d66498424a1 SHA512 69fca18f637cfd8cbc52ae6110cf19486837637c4a0541ef1a2fe93dd9292dc95fe15e21ec33556edf0cf712e890d0bcf5ab16ec126601352963722d1f0aa1aa WHIRLPOOL d6399218832559ca404aacd603f2046697a68eecd8d1c64c00af3aad17d7155e918e424954eb9334df34413945cdcdb0a47649c7eb9036cc8bb8bed873d310e2
DIST calculate-console-gui-3.1.2.tar.bz2 319138 SHA256 27a760a034c9496eb8ce009ab5c5a5ef84065e0c4b94cbe9641b97e42ef40ac7 SHA512 7fe15012d9d8f1d3e198b0b72c9abac06d966d06589ae3492339f5bd4ba9731c85e7ba0dbd719817dd7342ccf2d3bf202a307d2822397caa248eb3bc59450f7b WHIRLPOOL 1c326eb6050a6de740c424b069a4e574d6b0c41894e799fc33539492328035fb0f7f48e1698a87d368afee22a17235f48751b349727956b544710a3eb3fb908d
EBUILD calculate-console-gui-3.1.1.ebuild 621 SHA256 b54e2eb46fe64749a00c593be5658bcb13256feb098e55ee4a2ab3f7e8c8e940 SHA512 f81e50dafffe6161cd22c384921258a7bdea0c343ce9a543c24a4d524bd07f75c90f33e86e4d769cbe179defc4166468e9a342bf15a1e7cdea945853fdfedf6e WHIRLPOOL e8d84d04865d1511fef1245f139140e83a3a0c54b284d986fe555184b2759320102b0294799049a52298f10164b19ae070125310d8d2e9f17066d5d72aadce62
EBUILD calculate-console-gui-3.1.1_beta3.ebuild 627 SHA256 f105da70663aa5622ae152e8cd5052d897381799bccf4d9f33d052604936a9ab SHA512 f757375f8092a2f5dfc3b19eee3d05717e325f7e1d2105a4b67f110f2159b19388b77cd5c4568daaf0aeca307206d16653af84c2fbcdf721418ced9a7fd9e252 WHIRLPOOL 601ce4c204a1e98885a1821c770f40101a5605ac2de9a07d4de867169d37b411a89f8605f420c2b66799e3275c82c141243e6ee47464386acbd30ce52a3e73e2
EBUILD calculate-console-gui-3.1.2.ebuild 621 SHA256 e9408ea7b51551f980d54a80f11c27910c33c6e2246673f33e4a31e782471d47 SHA512 933ff42b33847f2a015771420a783cd4e6a58137bc01640edb4a13d1666292f9b734a747dff729e9ee1c72a9d8c29299d59bd93d9f7363b68f6d4334b54eae2e WHIRLPOOL 9074397af56c7c4026e036e7a80e6d1eea32b48dc1ee204928fecef5e4b48366b3bd4eb094926cfc03d6db955695ed610d53eb4b8521c34f170baa62dbd49097
EBUILD calculate-console-gui-3.1.9999.ebuild 578 SHA256 25c597010320e393ada128672ffc1a2c2bfbf83a4293a929861f3d58902ffa7f SHA512 cfb7305902629820bf669b238090062c1dff92fe0f6d9c82f7192776961d2f937e7c042d66273ba2711a74d7e14006462d6585f65848838fb0d8d9f2be217cc3 WHIRLPOOL d42e0f6736a830bf53aafa3635192a05b3edbb4ac335bce223ecdd0f7bf75456aaade5a0f0625d247b836485418f5a9d3cfaea4c944cdcfd81645c1d4f4d4201
MISC ChangeLog 470 SHA256 8b235f6e17c0ba8554fefe4d9272cbf6973041881d57255e1ed038190d7bc149 SHA512 6d8b7448216042425d3090693c4ed652394d9fb4b162bc2fbb6a42d29b726c683db806346018ab99c182600618c8cd5101e62d752b97664d916ceae6087ad3e9 WHIRLPOOL db05dc3ad2a014178759c8480aa2ccac0c1adeb31b54a25d3b7a09dce9a58c4a8ae59311488e50b973314b44049c8732989bb7899ce7d4f199ed22f310924b34
MISC metadata.xml 267 SHA256 1e7bf8508278ccc123ad22917ec9d37323e7e89ac15c52a56aeb6a144070a66f SHA512 e7e050662c8fcd87684083e74d1c3d643f747fb2ce1b7dd4e0c3563c44cdcc1651cb83689b820431c95711e2ba75b6ca1832166ba43d3c0cf0fba86a23d54b55 WHIRLPOOL 9bc620181bc5e8dfdf2715e123576cf026a842620c20860d1978bcd768b946a4131f4c3f0910167cbdec7eeb375d24f6c11748e68ceb81a9798ade75f25fedf5

@ -17,7 +17,7 @@ LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-core-3.1.1_beta3
DEPEND="~sys-apps/calculate-core-3.1.2
dev-python/dbus-python
dev-python/imaging
dev-python/pyside[script]"

@ -1,7 +1,7 @@
DIST calculate-console-3.1.1.tar.bz2 26125 SHA256 e5835d029c516d0dc0d84c10960dace64809086421655cdcae7f7c0410845d40 SHA512 ca38e435915f5614e14c20044dd83499487d623658432fe25b80bde654ac1f5e8307ffe2dcbae02c076485cf3cf5a6973b908286030a37ee4c2e1c2803f407df WHIRLPOOL cf6af5987ff3b93bfbd27a8fe5488150b0bde35d5577cd76b4bb2d4c70291834eaf9701684b19686a512091ea5aad65432fad950109cdefba1a6fdc030683713
DIST calculate-console-3.1.1_beta3.tar.bz2 26246 SHA256 b0ea446d787e8f854daa6d60f75cf79ba663d95145337fe49ec5a8c4a4446963 SHA512 8a05bcd610603751d651e97da987e5724e0b8be03a66380190df5bb02ddd0367c325119da3709c4d1a7d0ca475925527f39dbf5ac3582168537b2e6b0c5aa941 WHIRLPOOL 37dcb5d301335d717124040c8e7eb1aeb9d3a334afb37f58dc4a12212f3177827cfab91402c058a3a5e6195d3abbca381222951c7d0739bc80e39de739f24c22
DIST calculate-console-3.1.2.tar.bz2 26141 SHA256 be11ed9e33d349f8f47be3fab2638a7ab18aaad80b674f7ea6850b3203253bf2 SHA512 3ceb42c9c94de4f94362452229d9362d0b996ea745e1f501fbb9135c8b18a265885c83f9dbb747bfcde87165812611c98cea6824ed0181b2af17b232810e0457 WHIRLPOOL 1c2774b926409b7f0491311d6966c6fb467c2ab4c6dad006069ba03c3bc5611c47df1be343d5f616371f74ec2fb3b2f603e4002faf30f741d61687b2b6fd1b16
EBUILD calculate-console-3.1.1.ebuild 543 SHA256 c71eac79e075c7437b94048b33d210f0427144ae663db2c399db540c48556f8e SHA512 f081df75362b123a8df5dd23fd9dcd0cab4e7b67864adfec30498473c4ded03a4a5f4b6ef1db567f5ba70e7ea1377986eb94b7c098d95354a953c780478ec7d4 WHIRLPOOL 1e688516bbcc616d5f122ff2ccdc3081f6dbc68aaadecbead63b13545113fe1f85ef721e21c1aedc868ddd89d965d46bcd306d514371e0e3d4c44e18865582f6
EBUILD calculate-console-3.1.1_beta3.ebuild 549 SHA256 5e7a0b322a4d2c9e29b1511bcba4f7fb9b5d2951527a2c745f42530b0e02f0c6 SHA512 8482763ffaa32f95fbfc8905e25e8043211fc0c2c3223669ce47934e08348ee37b3e989afb0617e75e6f63bf430950cd19e271487f9c2781201a46ba7a677d55 WHIRLPOOL ddac4ac33e9591d8cb27c3bee8c624ca4ebcaf5e2a914b4afe3c6945fdf88834279ebc680da5177d701194df00dc1bc4e58fa617769589d3e5d405031f137084
EBUILD calculate-console-3.1.2.ebuild 543 SHA256 b2ab020334187a8d1d8916cff321831754733553cb6d975c06d279207bb0bb29 SHA512 47093dfe831857602f3852d759c7ee7e677c03ba40af068d903b8601700c9c8cc62ae7c14fe1ef6d2f6fef423b66a2e2a9cfca02303522ae478de50b1fd669b5 WHIRLPOOL 4123474358b93a5eff3db02d09a0b4d23935eee1c29490cb0b9bbdb61561db152ccd2e3a21d0f6c878ec8a0158e3cddcf62a6718f999a89d5a175e5fd079eb03
EBUILD calculate-console-3.1.9999.ebuild 574 SHA256 923cb57128c1c71981b53ff16ccfb63327d5b77c644241411a1eeb16e0ad1e06 SHA512 78abff95b05a359b36eaca9ce4c5990816909dcec58f2ae0beafcde55b2adfcced210ac5fdce47ee1b82ba3fd085640d80f42c18d2c9bbe73ad14f2e9251c0f9 WHIRLPOOL 495e1ad59d6cd502af03c3c2ccd25a319562532ee5263707f30bb0941d9b7d0bb85f6b1c2579e0fba56819de48f2fd159f8c857cfe539da823a16b1ab79f57ae
MISC ChangeLog 458 SHA256 044e2dbed6a26e83fe125911bae84c4fd81059582accdef3cff36787aba6a680 SHA512 3e9992df75ccebd70880679e8d836efdf93b8a9566772f0dd245d41b42ea25a22d707d07c1bc48f610b185705123cf5cf4091744b0c1c8d0c98138a7973d7038 WHIRLPOOL 8ce5e05ff566734ca93bfea52c22843f589e69e6e9ac82dd17dc9d570d384a3d38beb09f15edc96ebbdd8fef1aa8f26ffe62604ca6038786d1139b2b24bd1642
MISC metadata.xml 267 SHA256 1e7bf8508278ccc123ad22917ec9d37323e7e89ac15c52a56aeb6a144070a66f SHA512 e7e050662c8fcd87684083e74d1c3d643f747fb2ce1b7dd4e0c3563c44cdcc1651cb83689b820431c95711e2ba75b6ca1832166ba43d3c0cf0fba86a23d54b55 WHIRLPOOL 9bc620181bc5e8dfdf2715e123576cf026a842620c20860d1978bcd768b946a4131f4c3f0910167cbdec7eeb375d24f6c11748e68ceb81a9798ade75f25fedf5

@ -17,5 +17,5 @@ LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-core-3.1.1_beta3"
DEPEND="~sys-apps/calculate-core-3.1.2"
RDEPEND="${DEPEND}"

@ -1,10 +1,8 @@
AUX calculate-core-3.1.1-r1.patch 6519 SHA256 d258a9bd7cb0e894058e59e7a8f2cbcf29e49152c32777f1fd8ee23a1edfb343 SHA512 7558d31f7997684895d22091832e04379db554a62f2866362b1bf6019b0272289438bc84bf5b0b33d77577003c913c0bd49a8f1ba4f02340f7f3fb69438b3c55 WHIRLPOOL 1436a5f1408cfb8d978163b3e70de417400f3d2596d9061576d42418508de91ae22ec79ce2e8d3cc16818753f816427db201408f204a67f81cb34b2445589a31
AUX calculate-core-3.1.1_beta3-r1.patch 1289 SHA256 e2ea222c9bfcffdbfb30bf447514570d0fa3cf76f4dc2614e119aa3f10ff6fb4 SHA512 f9b618b6e941dfa6240f9346234f3810af0044c32666e0e107f29dfffd87ce4f2b1c3ee65c74ef961d4f4fe50528b0e1b432933a7c97afcfbb998fdf56882a5b WHIRLPOOL 1735cc1b11f1cfccc7c250d02621aa12e192fa906e53f15629acaed54e89cb50887ff1367fbb35e0bfb06fd73d82614f696b68e8904bcfbdb053524eca15ef40
DIST calculate-core-3.1.1.tar.bz2 83374 SHA256 ec2520dcef3f88b70cb8d7b1abbff76178451ede925b4030caf9f74b0d4e43c6 SHA512 aed6300ff2efdaf0f2f7f8e5bbc712a12d2f769abaf9814ab8d958e241e06402c75ed9deafa3d84a704c667cfd5d8a6ab3a0af1cc5a69119ac49a7408b2f4fcc WHIRLPOOL ad84c4e4c81239a1a7f2ba9bb259f9f5362923ff42bf992231a5f2efa937d3b1ba060102aa2ee77b2148ebce3b5638c78cc70b87f698701f2cf97b9ff080f9c8
DIST calculate-core-3.1.1_beta3.tar.bz2 83360 SHA256 ee27bf80f5d89556c122e2718c3f707a06fc49e138d5aa17df24339e2634fa76 SHA512 8707e3220c4b5362944207d44feb7d0b007c19481a4e9522bf7b7f4284d1d63571fbc7578a8fe45f54ccb0202effac5455a7c5b58d33622836afa8d7cfe36ca7 WHIRLPOOL 3046d336fa708b00a2912565d9a41e117e5bd87921e13b10d666af0f542b74189559325cdbbbdff4b58c8894bfc717729af9384c11fd2722a051ca348fb09648
DIST calculate-core-3.1.2.tar.bz2 83552 SHA256 a01e201079fcd86b9fd18cf6a28172117e3a582fa3a6c85d03ba5b7f3f2ef504 SHA512 9f00e07d0da00a06ac9ad2c0fe326a55a9de316d8f92522bb72b77e41a7cb6dace5042ac19ded7a698b4020043c9973144744ef4f0e6345097af81c2c9c3bbf0 WHIRLPOOL d53497401f7643411238617bf3e48c3e40299dfe4594f677cafc091e6304e5da24217c6bd5accbb5e4af8aff574e57b0c709e65e01e21610fbb38c9cc42dbc89
EBUILD calculate-core-3.1.1-r1.ebuild 1207 SHA256 7c3d976590c3fe770e179b97e520f40e540602f9322c8adb940519d775bc7ba4 SHA512 8c684512b3cfcb8b2a4959b30d48588eb85b07ce9641d0f058be457ebad0a26f7eecf298519c957eccdff5039485b529019c48160dfd04aae78452e99ee362a5 WHIRLPOOL cd5eb577361fb701b2fb696e0633401a01a2bdfa9b4c9991c780d24188390c556299d10ba131848c9af48d7f2a490936d910ee1a2d13526191dd4212bc02d7f4
EBUILD calculate-core-3.1.1.ebuild 1073 SHA256 f8908a2004fcd23b99f20777ed8ab13f42a73979e472449f4617b358bdcdb9e9 SHA512 8c91ce1b67eb6fd90683d710dc185efe96d1ede10c8fecbddd9d520a4bcc4039e7c7296bd07bbb560a9837a78175dafc1e80fc7dd2fa108d26057580a9b52237 WHIRLPOOL 0f9b8518a5c379eb89d23867e68cb1a50f8f2e28ae567ce4b1b9decb3a5f5d3c9e1f3bf6e5923351575253b95556c61680f5e1c1704bce11552ac8a6c8acdc63
EBUILD calculate-core-3.1.1_beta3-r1.ebuild 1219 SHA256 50ab94aba191fba70c7c0bcff81d683c98c2e61a34f4ff17736a2025a1f1ddd0 SHA512 d67776973bc63b7328acda77a2f3da4927b88742ea032131676d730e93c5ea6a55bf2c2e9f3e9cd55b30f36cb847c85dc0b870540851b4c523a203da4593c67d WHIRLPOOL 6de35fd21ddf8bb31cfdc226da97273369a1336d66fab2f9596c87adc25f441d4c232cd031e1c88142551f325a5b77f8cbb4db02f60de1fc0823f6d797be5cfd
EBUILD calculate-core-3.1.2.ebuild 1073 SHA256 077e62000c689341b55ab879f9ca0c4f52543ef0e6d99d491de38d2a0a171b33 SHA512 bfc7958b1ee6a9921b891be64a34f430913ab238121ed052daabcf06b36ac861cd63cd7701f04dd74fba39d4a2f1f4911c555bad8e393221325c73198f93129b WHIRLPOOL 8138b1d725f5ea2dad9666f24ede070488ca58b557f0d6bfac64303b4b07bdd96c49eb44156a2bdad735fdb7be670c505453dec5198e80d0700757c72652e760
EBUILD calculate-core-3.1.9999.ebuild 656 SHA256 475e34d10141354a4c60e029fc1cb74b080c3a1371d9e1e44a5e2936b7130ed4 SHA512 9ba865c5effa56079a3841a96d1a4a89d4bbc27e092042aa4a87d1b4ecde9d3a690c92c73e10b330724258aaf3138d2a58d50d18d2fbea9e657c3c5d2f8395ee WHIRLPOOL 89d3bcc657324d1ffb4265eab3e28e94e3d00fb7530c6654e75b52fe002d70f72998930729cfe3320a3ff571277e6e59c649b0df2fe071bcd9b050f9d42608eb
MISC ChangeLog 382 SHA256 ce74a6d08ec1ea80ee021f5378f705102435abfcd5304d851c3f7932a967065e SHA512 f5531edead30072e8fb8f278cad1d265762b8ecdf146b86cf514704f373f2bd8068b3ed35e68186687f83129814b73c6269024d442fb592515c72a9d0e6d3ca1 WHIRLPOOL 48571b2986c2f8797109a3a3440a43f4f87b601e8e52bd41a470bd077b37eb2b6118e6baf86179df065aa2e4a840d9501b2b2455b990a19dfaa2d4ee7784c922
MISC metadata.xml 285 SHA256 821f48d3fa5fac7f73ca371b49cfc11485a7ef44cc856817e41cb1665d89b0c5 SHA512 337b11b6e13958ce6550ab955e1fbc0061b919db3c9cac6964d323c4ab1ce3782e9dd473a1924bcf03b5058452aae212feeeb01e5e6c7844bb88675380c87162 WHIRLPOOL b117f08043f61eb0e88d3881d54ce29e4dd565129442554ee7a30f498b7140d6008abf57be22342a6df8eaefbdc351356dd813788ae25b6274ce6f6fdef30d0f

@ -1,49 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
PYTHON_DEPEND="2:2.7"
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
DESCRIPTION="The WSDL core for Calculate 3"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="~sys-apps/calculate-lib-3.1.1_beta3
>=dev-python/soaplib-1.0
!minimal? ( dev-python/sudsds
net-libs/dslib
dev-python/pyopenssl
dev-libs/openssl
dev-python/m2crypto
dev-python/cherrypy )"
RDEPEND="${DEPEND}"
pkg_preinst() {
dosym /usr/sbin/cl-core /usr/sbin/cl-core-setup
}
pkg_postinst() {
einfo "For autoconfigure calculate-core for adminuser perform:"
einfo " cl-core --bootstrap <username>"
einfo "For run calculate-core perform:"
einfo " /etc/init.d/calculate-core start"
einfo "Add calcualte core to autorun:"
einfo " rc-update add calculate-core boot"
}
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-core-3.1.1_beta3-r1.patch"
}

@ -18,7 +18,7 @@ SLOT="3"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="~sys-apps/calculate-lib-3.1.1
DEPEND="~sys-apps/calculate-lib-3.1.2
>=dev-python/soaplib-1.0
!minimal? ( dev-python/sudsds
net-libs/dslib

@ -1,26 +0,0 @@
diff --git core/server/methods_func.py core/server/methods_func.py
index 8957157..5ba0bfd 100644
--- core/server/methods_func.py
+++ core/server/methods_func.py
@@ -169,7 +169,7 @@ def get_method_argparser(view, args, cl_core = False):
opt = field.opt
data = {'dest':field.name,'help' : opt.help}
if "choice" in field.type and hasattr(field.opt,"syntax") and \
- "{" in field.opt.syntax:
+ field.opt.syntax and "{" in field.opt.syntax:
lgroup = group.add_mutually_exclusive_group()
help = dict(map(lambda x:(x[0].strip("'"),x[2]),
map(lambda x:x.partition(' - '),
diff --git core/server/replace_class.py core/server/replace_class.py
index 238669d..784abc4 100644
--- core/server/replace_class.py
+++ core/server/replace_class.py
@@ -637,7 +637,7 @@ def print_brief_group(Fields, group_name):
body = [['']*len(head)]
res = printTable(body, head)
sys.stdout.flush()
- sys.stdout.write(res)
+ sys.stdout.write(res+"\n")
continue
ChoiceValue = field.tablevalue.values
for row in xrange(len(ChoiceValue)):

@ -1,8 +1,7 @@
DIST calculate-desktop-3.1.1.tar.bz2 12774 SHA256 10ca61723f21036b24bb6d0fa751ee3685030136a922e2dd6ba76363bbff9e87 SHA512 eda46f5f8ba7ebc9109a5cee306b260ed145d46dc2973e13b0063e76dff00136e9d2e0475ff83b969a7e22576fa52584f5fd61bcafd79c96c7acc6c12d616ef7 WHIRLPOOL 359f9dc51987f1f4f432339ee14eb974b3407d4c973fb8077596a0cf3d422894e0f7a532697b50d07cef3f3a6e448decdf395cd7b39718df360c3437a8716059
DIST calculate-desktop-3.1.1_beta3.tar.bz2 12763 SHA256 6a202396fc5ecc162724d2e6751c25331e873d85064f03561cb1ed6400ce020f SHA512 c741f865af78b06b4dc0a334308723afa6f0a5352ba39d25b940f858f7bd522e6ce15d904a67d8afe052202fd7ff0963f84d0dbf231b99541bb1a823889753a7 WHIRLPOOL 123d8cb0f0f4903be528ee336d188537bd660d500e584413e771d65fd927c428f6b5bdaafdcfbdd8c13426f47685ee87fac7f947acc0c4b918d6c0344cdf9049
EBUILD calculate-desktop-2.2.9999.ebuild 978 SHA256 e928c5b54cb7088f6aaac617b640f649607b9e586f795aba743a68b593db84ba SHA512 ccb83768438c663c10f25a921c307306abfd00a0b10965b403f19a88e1cd7dcb0952bd4f716614a794df2d452034e716407d9f26bd23b4d0d2bf89b2422d8bf7 WHIRLPOOL 82b075b6c946418b5b4bb23090eb91580c5d79912c12e3d65da879e693d26ce2ce2d95d39ba7541f39a144aa266e1c5ff4532ad41e2edc5a6262500375818ff9
DIST calculate-desktop-3.1.2.tar.bz2 12765 SHA256 29c29e313018ed4f14d99a97ad623c910836ac742ce4ab2fbfa32d4d5189f90a SHA512 6580c530f34aa146f60763a9a981cd2b3838c00e71171835d999aa8630bfc33eaf5539027705dd0139581d06450877318b2ced7792c8b9dd090f9d53f1d44a2b WHIRLPOOL 3c89caa857d5b6db4a95127f8f280b473dd02a33c23bca7ba3edc35b27f57cc9814f5a96401a92251f934d41768532ab6e25cb89fb480f561eb2ee7853bc98db
EBUILD calculate-desktop-3.1.1.ebuild 686 SHA256 ae839029d031f9a97e43c4e4e9bc1be08a45967bbc7e59ed30555c17d004b73c SHA512 bafa5c898c703c9db0adc47f79a0aa5dd8e22a1138cd08ae4ec9d1582a4588960a9e82a465a5e3ce0d1dab61da5a2be8069c90e298544c21ad2e211d15858927 WHIRLPOOL 06271651f2064aa5799f7bbaca96fde015f383d7b6c3f371ba01fe90e1246d973ad82e29782176a821e16ad15ef03d0d9bb7c0a582a7fccc3d769ec51d93dd79
EBUILD calculate-desktop-3.1.1_beta3.ebuild 692 SHA256 117e8d7c3d8ef3c4bb058a8fd1106d3708ce610a0629b56f1957c3e3445b6250 SHA512 1dac9d8d2a854abc898f3a14305dca17fefcf7fdd1467bcb55ddd06558b65c104d4f512f4846b15359b9ca279e2965cc77ddcabb6397b17658cc6440466db1a7 WHIRLPOOL 28b1577d4c0e36008216fd9998b671dbbc146ddd2eb958e0f025ab9a6c6579df074d3192749b1e62804dbc490444f1a1a6f9cccff03a9766ff0972d266326b11
EBUILD calculate-desktop-3.1.2.ebuild 686 SHA256 04e17a925bce6a088ffd8d6962f2a76f10f20aae1130ed4d3a01b5b8ada389ef SHA512 d9479b231dea1851f08a4a82deba50ba8c9fdac33ad90fc451a17c008de8e5858811a0897cb8cdb6c1204bc03d9cbef58929387d2dcd8105ded9884e0aee7c9b WHIRLPOOL 8329d2d68f91c07287e239cf829f3e3b1601ed1e928ec0b8bcc85e4e5e48696d9fb4e711b205b8eba07a165e658003b0e8d43449a68eca3bb5d45dfbbe17018b
EBUILD calculate-desktop-3.1.9999.ebuild 976 SHA256 405de66b0f54804d4bc025fe786c21ca1a040d6a25928a535efbf84cacd7f505 SHA512 69ebfdc4c04f7c236f728c9938a5538b3822369cc1e1de2593a6e83178b5441ea2e37068ffcd9cf17aa92bcf00ee133ee98da0be5a5f591d69755e1159eeadac WHIRLPOOL c61f805379983ca23af188ff60a99511251a8afb27b75d0c1f08595012a579c42c2ef36603d837865a155706780ba413f0cac74457425eea0e0a59488e3dfda2
MISC ChangeLog 16440 SHA256 2a1c3211586d5dd10a249b61e4a8abf96a27a0c4d1706715b8a563bfa8aabf07 SHA512 962d9b69daeef659f2e1d6f2a5c974d6ed152d22fa9f0ed8c35d4c27e901f976167a2fc260a71c798be29d0161c7e90fa030957b2f74e25dcf35ecdb8fdc69e4 WHIRLPOOL df646b1f4c914fcb7142365b2110eb5112f7653cfddaf1b8a79f4a8f4ac99d50b6be59d3d593a8fb9e754ed92ebbe9a2cdebe320b0941d2ddd1bb9fba85c20b0
MISC metadata.xml 315 SHA256 67fea0b1af7d10c0f86e72ab40f527e99c6f81f7aace4716344bdfb97c769a18 SHA512 5157eefeeaf0675ad9da609efe5a2e11b7afbc02beb1ca1eab77f6ffa76756456ea28f7467bcc01553cb629284c3c9f43ffd30427de9a0f91435a568889ea1ee WHIRLPOOL 5ca9f1c15ab70dfe224cc9ea343dfef3a1a18d7d1004d0bda340245ff7d71c71fa2ed1616e45609140d89c9cd017fef6c68c291490b39199550bc5b5b34ef6a2

@ -1,41 +0,0 @@
# Copyright 1999-2011 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 git-2
EGIT_REPO_URI="git://git.calculate.ru/calculate-2.2/calculate-desktop.git"
DESCRIPTION="The program of the desktop configuration Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS=""
IUSE="kde xfce gnome"
DEPEND="~sys-apps/calculate-lib-2.2.9999
>=dev-python/python-ldap-2.0[ssl]
xfce? ( x11-misc/xdialog )
gnome? ( x11-misc/xdialog )
kde? ( kde-base/kdialog )"
RDEPEND="${DEPEND}"
pkg_postinst() {
#${EROOT}/usr/lib/calculate-2.2/calculate-desktop/bin/install
if use kde || use xfce || use gnome;
then
ewarn "Please restart xdm for refreshing configuration files."
fi
}
pkg_prerm() {
:
#${EROOT}/usr/lib/calculate-2.2/calculate-desktop/bin/uninstall
}

@ -19,7 +19,7 @@ SLOT="3"
KEYWORDS="amd64 x86"
IUSE=""
DEPEND="~sys-apps/calculate-core-3.1.1_beta3
DEPEND="~sys-apps/calculate-core-3.1.2
>=dev-python/python-ldap-2.0[ssl]
media-gfx/feh
x11-apps/xmessage

@ -1,16 +1,14 @@
AUX calculate-i18n-2.2.30-update_translate.patch 1097 SHA256 4076a005481d5cb7ee24af859189a66fe3b2e91c62956903274bcc02d96a6bb3 SHA512 6d91e1c230d2dd8cd5db6672e927134184991c9921cba1ac9bb2f7786de17f6604d0dd26780d1c35adce0fcec91851938f00a130d0939ae79770fa5ee2ebffd6 WHIRLPOOL 0da24810041fb8f0c0652b642b13ef94b47f668fc68a243732b7cf5c7871aaaf5d572fde9f418944a7c7fdc19fc40e044edbc12f205ae039ec485d94c7cf883a
AUX calculate-i18n-3.1.1-r1.patch 23952 SHA256 802f573f61f118260aecf02536738ef6c356a40683064c8274410fae8c2d1e31 SHA512 dcd010894667abbd93517176e44142b113a87135b48a052df5e19179f8eb4c093e96fef3160f838e18703558ed3bdf4805dff55be69e9ba45639864b89d13ece WHIRLPOOL 0f1033929958eac0cad46e352beb0c42b29f5f08c773e3a7af1f37f382466201c835d23280fb00365950b6d6ca6c2245b28382f26788e99d80e831b42dabb2a3
AUX calculate-i18n-3.1.1-r2.patch 72042 SHA256 0b2383d9e0d60d71c4707901510fedfd8521b12ae47241379e961811b59b686e SHA512 689c362567e2c7e896e01d0a5ab8d18755623a18fc8364f4b97d0407957f22cca6ad998d0c4ce6c01bdb19a8729d614ca42aedcec8730ee056d68739adfa5ec2 WHIRLPOOL a7a6803dfd7e83c10a2181cbcdebbf440a20685860a06062381320a7c8516a3305febce2f58448ec7a0b4ddef04fa72d622fe48fab28791c557b1946eb68f0f7
AUX calculate-i18n-3.1.1_beta3-r1.patch 148171 SHA256 a463baac8853fb4214b87744e5baa7aeacd937349c0517f37b2665ebe189f903 SHA512 6c8ab0d63c788b5f348ca83ffbb7216c6666871cd046426b306e5eadd9c3a570f41a90aa58c7448335f0e8e0980876a8cafe2254e3bb3637f34bc1e9f4b68b04 WHIRLPOOL 3e2e900df76ee7c01d0d38416b3451e0897084bec909ae05efc3524559e42d5f9b1c983c21c5978dc2f821e51284e6799605564bd47f43782ca9ec1e578749be
DIST calculate-i18n-2.2.30.tar.bz2 33561 SHA256 ea35b10456abc7aee36295092aeb4bfb0f5d252cca282eca8b84fab8517e79f9 SHA512 39eb7424c1563014829d1f9d0be1bede4ad009189d410fdada18ae2a6675cc7a1e3cdd039cfad3feda6821dea0f567aba73abf24d80f1dd0b32939ec46049f7f WHIRLPOOL 55829c689dd7e2ae2d0f73fd585cbcc465b585e4923a387c03da4640f9f56b0681a46ffb1dc433abbb51c029e59e0b2a66c82ce8be3b24c0119987da2a9d9420
DIST calculate-i18n-2.2.31.tar.bz2 33616 SHA256 0c0a8588b5e7d7dffd06e5d763108fc069cb65ef48965ca7c762ccdde213476b SHA512 6d9cc4c8d7696d77017db7119e53ed766b759f063d1d68804e7f816e238d83c4e69df80db739144811813a6adde0bc15253fbaf0ce257e9162fefc6043b2fed4 WHIRLPOOL ffd0185124ef89323c3fc527df2e3068aff77b5981ffaf93e3e6c54aead2913b0b60abdb939290e0689c5191902acbdefdac75effd6047cbd39db95496300f1b
DIST calculate-i18n-3.1.1.tar.bz2 55461 SHA256 a458d5e909acfd6dc2ac77187e9dd0a467f4cdcc510e454cd0540e27e0174144 SHA512 b396e825b5fdaf49393636922d321a8b7a42c4e136781943a64d4df517fc04f4efbdb6259755bc213474881df63a683d54a58d00f3a838d5c049c0d19adc5fda WHIRLPOOL 1a1138c9ce2b68416aeb00b216ff0935d7a29f2a356932ac326f8b5e9708b61dac0ec93a364de68df17443b9a78aaa9327ccfd4dad59b572f8e73fa54c3f7012
DIST calculate-i18n-3.1.1_beta3.tar.bz2 47633 SHA256 e771960f4f6f40fd391ae2c3df8be0511a08cf9f6542ef5ede49c7e1dc24f8b3 SHA512 cab181f3a6e0843c0048fc35a9e48535a0559d9b1409132138a8351afa6939d2143b0d6133d66c28d34eed9745406c2ca966c956bdfc776c33d26bf3dd363916 WHIRLPOOL 9f8296691683740923d454eef5b16e46c4ab9434a1df4d66ae645b12ef4deb19d737bedf6bad1e8878238f71e75911ca52ee31134b5ba1fffd9ee852b0c30a48
DIST calculate-i18n-3.1.2.tar.bz2 58413 SHA256 8d14096f78e8eb648bd0ebd6e80135a2f90109b07480cdd031d4fa0bb13e55c5 SHA512 1be8418161dc880b9db438441dc784c71abae689cc91f21941b7c1fa11aa5fcc460e5600245482511665409e07ffdb4426f3a4b546f7e403297d894f17493562 WHIRLPOOL 9c667e6c18cfebc1981b9429180230c80bca616c491f8f57c0dd3727f4ca236b130c1392adf940efbbe3ced04ee15af1649b773332047ae56c7a4348f1f08d7b
EBUILD calculate-i18n-2.2.30-r1.ebuild 911 SHA256 e8b93ba79e0b90675b313969903b4ed50f099faa40271dd29a808ea811cf66b9 SHA512 7035d96915cac74838c0955e87fd2bf8eb02e793cf38a543337cb99d72954869d8156b373ead3663a80839f2aa69c76269b9365e63059c8e0b69228d4d996146 WHIRLPOOL 399a8b971be90920bf0747ac1d3907404d0e768be26dd437c4d25a917e31c1e63ab9049dadb05389985ee0d780f4924e33d1dc587c8dc9c8b3c6828405a408b2
EBUILD calculate-i18n-2.2.31.ebuild 767 SHA256 e611ab3d190c836638c6e58005509c0c03464bd387bd4244071ba2931ff732f5 SHA512 6777dd2819905885949c20c58b2aa5bbc0432d2f680a793f0821cc0152eab3dde85a054869d7506b994b1776b6677a6a9e1ccb910d55a8fe619623361f395c14 WHIRLPOOL 436869eca19aaa79160296d5e5a10a539d1e3e7198fd0cda2f31870f45c1f29ca7cb8502badec58e37d1ccc8be0b7ce19c32e57240c18e375cbec1b5968c182d
EBUILD calculate-i18n-2.2.9999.ebuild 770 SHA256 2c38668205a788dd9d1ed413eba96a4f628a14e6f6c7a1ba8718bbcb0842a1ca SHA512 4ddb81ebd5b5c488d7eaad86172394d502e965f5348594054ba104bf706b830987e8f57b60893898e5167184eba1b0b108a683c954c8f80498665fe069504810 WHIRLPOOL 8c0063a90e103e6bf34d4be221aeb086703688830fe3179dbd177750cb179432ec2055886330f99ba8eada65abe97fc805da90ed9f257f8c87d7384611fa677d
EBUILD calculate-i18n-3.1.1-r1.ebuild 715 SHA256 800f97347eb320baefb8e2de59f91d0c28bd0d1b9d096a490dfc8e7e702bf8e4 SHA512 7222eccf61f35d341319db736149fb6d4910116e59c355f5eaef1baad895c0dc3b3bc6a9ba7024b998bb9cb499e215f27e66f40f1213fc69f21b3c0814859de2 WHIRLPOOL 0c672732188bf6b60de1d296fc73e8bb1d7ced9a2fcb0555492b1c7c16d5085628829e2bd187cea29b14840ec57b309740cbe85dc96ec2de9e3cd8a13721fce1
EBUILD calculate-i18n-3.1.1-r2.ebuild 715 SHA256 7159277f1048ca97e40b178221c87e6a279c75f8a8461c55d09e12fdedc62f52 SHA512 52d5290f6d899a65ce5c9f84dce9aced625cf4d3a7a072b1dd7affaf5cb99e44c8c045c6a05e3b66fd4a8e752163a7791744abf0a57c41383c26aa47b40f2cd1 WHIRLPOOL 208fd41f89efcc8f7f01bdb55600ca0a76f2f4f7f4b7360ba4a15caecb11ab09fa3be18eed48c85badecbc6a188f20fcd31a36036ba9dfa057bc23d75be672ca
EBUILD calculate-i18n-3.1.1.ebuild 581 SHA256 588ef5ca33e7498fc0be57350bb2af43c8b38d7f8198e6987618baf4bd3c75bb SHA512 c0fdea5822dbfa3ee68cdf3f21a564723160745a359965ec7084af32d088debafbc5bc1d249e3059b4d31c0c334dc4fed144cc6671cc0972ae8cb0a32bf37794 WHIRLPOOL c7cebc89c43dffff6cb00689dc59b4f8405f39e827c7d390c527abf4b789ca709755015ef6b7627fa8bc52b753edd72b5f9a752e3921563d21b64bd7f71135b3
EBUILD calculate-i18n-3.1.1_beta3-r1.ebuild 727 SHA256 c609180e3b3bc2cd3499e14950696f6d8b80483282e58b1424fd3caed06b9185 SHA512 0ef9c6567add3c4c33ef97eeb6ba1968340a9c57cc749ec81f2e312775975dca32bf07bdd17aecde4bb9e75d11dd6037516826042f51d742da794ddfab9027ac WHIRLPOOL 0a50bf5e04026a51466db1336ecb9bfd5e14dc9cdc2871d81c3c042b062d1709fe33335f36a8b79a58ac21e0e6b225377950fa732b7b5d5e1952e2dcae4abd87
EBUILD calculate-i18n-3.1.2.ebuild 581 SHA256 aff52730d882f431dddca049ff9b1858d62cf6c997d982c1a362ed81bf51ebb1 SHA512 281a908a3ed0d170be475ff9ed909345489474056158559e3169adc535675b4a61cc5910104adfc822d627c0f733d61db207649b19b2d88c1318b5192b8ae14f WHIRLPOOL 765506e887d228da36a5fb8d96889766cea0e741f28b4b6d4a9f2d741638cbfef071f84553566c7d1938506655a48aa3f5e9ae8b18e3e1d7d00f19f0b97e1a69
EBUILD calculate-i18n-3.1.9999.ebuild 583 SHA256 aa60c513b0f672aa9618bfd8099fefaf49fa5ef9b24ee2645356da69563032fa SHA512 14b87ddb0f910e1b983ef465efdc56347abe01d4cdc11d6d81d593a2e65dcba1b79357d37952d7aa7f800fad8d30592db2e337d0fc6ca9807bdba618aff48528 WHIRLPOOL 14a1c4f1ef646aee28934e820763bd149e37860cce1ee34ac2229742980ec178fc43ba284b59a2f71a740cfa8e48ff7658a613b03eb0f84d4a10cefdd65450da
MISC ChangeLog 6384 SHA256 effc6918170f5331b649c7c25ccbbc971a71320be1be056da843adff998c5054 SHA512 5cca782e736ad7b526e434e7f4e1a3ed32bebf98704fda17751f3a8aa8b94896a2864f12edd4aa3fafdbc567db8282efa6355b2313cc119b275b87a756991d31 WHIRLPOOL e24811fac9e15f95144c27b27ae2509effcb3359aa24a9338ec88faffbe0588049367ac3fb8e2c9d823a1e259b1cac3c8503124aa161a9be598a209adffab56e
MISC metadata.xml 276 SHA256 a2312171d1cbfac41a263c0be692d3d12cfa3aab51979af64487824ae674bc2c SHA512 245463edebeceaa340b3e908e9d9a867be6468f00a1f1371b0c81c34e8f0adab2fa0985a2d47bcea7ae222bc481a4da934b8c1386ea664caed110058fb5cbf03 WHIRLPOOL 6b92e6af676bdd0f173df32a5751a16b88c39e8d10f16b7c8867d18a3c4cb4a44938231c315d9e76c8995cb68a8680e858bd984e6649a4470e03d594a0e23ba2

@ -17,14 +17,12 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-builder-2.2.30"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# up to r1 version
epatch "${FILESDIR}/calculate-assemble-2.2.30-r1.patch"
}
RDEPEND=">=sys-apps/calculate-lib-2.2.19
!<sys-apps/calculate-install-2.2.19
!<sys-apps/calculate-client-2.2.19
!<sys-apps/calculate-desktop-2.2.19
!<sys-apps/calculate-builder-2.2.19
!<sys-apps/calculate-assemble-2.2.19"
DEPEND="sys-devel/gettext
${DEPEND}"

@ -1,30 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
PYTHON_DEPEND="2:2.7"
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
DESCRIPTION="The utilities for assembling tasks of Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
RDEPEND=">=sys-apps/calculate-lib-3.1.1"
DEPEND="sys-devel/gettext
${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-i18n-3.1.1-r1.patch"
}

@ -1,30 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
PYTHON_DEPEND="2:2.7"
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
DESCRIPTION="The utilities for assembling tasks of Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
RDEPEND=">=sys-apps/calculate-lib-3.1.1_beta3"
DEPEND="sys-devel/gettext
${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-i18n-3.1.1_beta3-r1.patch"
}

@ -17,7 +17,7 @@ LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
RDEPEND=">=sys-apps/calculate-lib-3.1.1"
RDEPEND=">=sys-apps/calculate-lib-3.1.2"
DEPEND="sys-devel/gettext
${DEPEND}"

@ -1,691 +0,0 @@
diff --git fr/cl_client3.po fr/cl_client3.po
index 5206377..d8c5509 100644
--- fr/cl_client3.po
+++ fr/cl_client3.po
@@ -1,6 +1,6 @@
msgid ""
msgstr ""
-"Project-Id-Version: calculate-client 2.2.20\n"
+"Project-Id-Version: calculate-client 3.1.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-12-25 14:58+0300\n"
"PO-Revision-Date: 2012-12-25 14:58+0300\n"
@@ -12,328 +12,328 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
msgid "Client"
-msgstr ""
+msgstr "Client"
msgid "Domain"
msgstr "domaine"
msgid "Configure"
-msgstr ""
+msgstr "Configurer"
msgid "Domain user login"
-msgstr ""
+msgstr "Identification de l'utilisateur domaine"
msgid "Domain user logout"
-msgstr ""
+msgstr "Sortie de l'utilisateur domaine"
msgid "Change password"
-msgstr "Mot de passe du domaine"
+msgstr "Modifier le mot de passe"
msgid "RsyncProgressBar: Wrong pipe"
-msgstr ""
+msgstr "RsyncProgressBar: Tube incorrect"
msgid "Failed to write variables in file %s"
-msgstr "Création du fichier %s échouée"
+msgstr "Impossible d'écrire les variables dans le fichier %s"
msgid "Wrong password"
-msgstr "Mot de passe du domaine"
+msgstr "Mot de passe incorrect"
msgid "New password"
-msgstr "nouveau mot de passe de l'utilisateur"
+msgstr "Nouveau mot de passe"
msgid "Retype the new password"
-msgstr "indiquer le mot de passe du domaine"
+msgstr "Veuillez ressaisir le nouveau mot de passe"
msgid "ERROR"
-msgstr ""
+msgstr "ERREUR"
msgid "passwords do not match"
-msgstr ""
+msgstr "les mots de passe ne correspondent pas"
-msgid "Appling domain templates"
-msgstr ""
+msgid "Applying domain templates"
+msgstr "On applique les gabarits domaine"
-msgid "Appling undomain templates"
-msgstr ""
+msgid "Applying non-domain templates"
+msgstr "On applique les gabarits hors domaine"
msgid "Second X session for user %s cannot be opened."
-msgstr ""
+msgstr "Il est impossible d'ouvrir une deuxième session X pour l'utilisateur %s"
msgid "Failed to move %s"
-msgstr "Création du fichier %s échouée"
+msgstr "Transfer de %s échoué"
msgid "to %s"
-msgstr ""
+msgstr "à %s"
-msgid "The variable 'cl_sync_skip_path' is empty"
-msgstr ""
+msgid "Variable 'cl_sync_skip_path' empty"
+msgstr "Variable 'cl_sync_skip_path' vide"
-msgid "Method syncUser: option sync=%s incorrect"
-msgstr ""
+msgid "Method syncUser: option sync=%s is incorrect"
+msgstr "Méthode syncUser : l'option sync=%s est incorrecte"
msgid "Receiving the file list from %s"
-msgstr ""
+msgstr "On récupère la liste de fichiers de %s"
-msgid "Downloading the user profile from %s"
-msgstr "Synchroniser le profil d'utilisateur"
+msgid "Fetching the user profile from %s"
+msgstr "On récupère le profil d'utilisateur depuis %s"
msgid "Sending the file list to %s"
-msgstr ""
+msgstr "On envoie la liste de fichiers à %s"
msgid "Uploading the user profile to %s"
-msgstr "Synchroniser le profil d'utilisateur"
+msgstr "On charge le profil utilisateur à %s"
msgid "Failed to execute rsync"
-msgstr "Création du fichier %s échouée"
+msgstr "Impossible d'exécuter rsync"
msgid "Packing the archive on the server"
-msgstr ""
+msgstr "On crée l'archive sur le serveur"
msgid "Failed to create file '%s'"
msgstr "Création du fichier %s échouée"
msgid "Failed to copy '%(from)s' -> '%(to)s'"
-msgstr ""
+msgstr "Impossible de copier '%(from)s' -> '%(to)s'"
msgid "Failed to execute %s"
-msgstr "Création du fichier %s échouée"
+msgstr "Impossible d'exécuter %s"
msgid "Failed to unpack %s"
-msgstr "Création du fichier %s échouée"
+msgstr "Impossible de désarchiver %s"
msgid "Error creating the directory"
-msgstr ""
+msgstr "Impossible de créer le répertoire"
msgid "Permission denied: '%s'"
-msgstr ""
+msgstr "Accès refusé : '%s'"
-msgid "Failed to mount user profile"
-msgstr "Création du fichier %s échouée"
+msgid "Failed to mount the user profile"
+msgstr "Impossible de monter le profil utilisateur"
msgid "Failed to mount Samba resource [%s]"
-msgstr ""
+msgstr "Impossible de monter les ressources Samba [%s]"
-msgid "Local user profile does not need to update with local domain"
-msgstr ""
+msgid "The local user profile does not need to be synchronized with local domain"
+msgstr "Le profil d'utilisateur local n'a pas besoin d'être synchronisé avec le domaine local"
-msgid "Local user profile will be used"
-msgstr ""
+msgid "The local user profile will be used"
+msgstr "Le profil d'utilisateur local sera utilisé"
-msgid "Failed to find profile archive from %s"
-msgstr "Création du fichier %s échouée"
+msgid "Failed to find the profile archive from %s"
+msgstr "Archive du profil introuvable dans %s"
msgid "Copying archive from the server"
-msgstr ""
+msgstr "On copie l'archive depuis le serveur"
-msgid "Unpack profile archive"
-msgstr ""
+msgid "Unpacking the profile"
+msgstr "On désarchive le profil"
-msgid "Failed to unpack archive"
-msgstr ""
+msgid "Failed to unpack"
+msgstr "Impossible de désarchiver"
-msgid "Unable to remove needless files"
-msgstr ""
+msgid "Unable to remove useless files"
+msgstr "Impossibles du supprimer les fichiers inutiles"
msgid "Remote profile already mounted"
-msgstr ""
+msgstr "Le profil distant est déjà monté"
-msgid "Difference time between server and client more 10 minute"
-msgstr ""
+msgid "Time differs between server and client for more than 10 minutes"
+msgstr "Le décalage temporel entre le serveur et le client dépasse 10 minutes"
-msgid "Profile synchronization will be used without archiving"
-msgstr ""
+msgid "Profile synchronization will be applied without archiving"
+msgstr "Le profil sera synchronisé sans archiver"
-msgid "Failed to unmount remote profile"
-msgstr "Création du fichier %s échouée"
+msgid "Failed to unmount the remote profile"
+msgstr "Impossible de démonter le profil distant"
-msgid "Failed to get user profile from domain"
-msgstr "Création du fichier %s échouée"
+msgid "Failed to get the user profile from the domain"
+msgstr "Impossible de récupérer le profil d'utilisateur du domaine"
-msgid "Failed to determinate UID and GID"
-msgstr ""
+msgid "Failed to resolve UID and GID"
+msgstr "Impossible de détecter UID et GID"
msgid "Manually interrupted"
-msgstr ""
+msgstr "Interrompu par l'utilisateur"
msgid "The local profile will be used"
-msgstr ""
+msgstr "Le profil local sera utilisé"
msgid "Failed to open /etc/passwd"
-msgstr ""
+msgstr "Impossible d'ouvrir /etc/passwd"
-msgid "Failed to found user %s"
-msgstr "Création du fichier %s échouée"
+msgid "User %s not found"
+msgstr "Utilisateur %s introuvable"
msgid "User information from /etc/passwd is used"
-msgstr ""
+msgstr "Les données utilisateur stockées à /etc/passwd seront utilisées"
msgid "The computer is not in the domain"
msgstr "Le poste n'est pas dans le domaine"
msgid "User password not found"
-msgstr "Utilisateur %s introuvable dans LDAP"
+msgstr "Mot de passe utilisateur non trouvé"
-msgid "Unable cache user info"
-msgstr ""
+msgid "Unable to cache user info"
+msgstr "Impossible de mettre en cache les informations utilisateur"
msgid "Error synchronizing with the remote server %s"
-msgstr ""
+msgstr "Erreur de synchronisation avec le serveur distant %s"
msgid "Mounted user resource of the domain"
-msgstr "monter les ressources utilisateur et synchroniser le profil utilisateur"
+msgstr "Les ressources utilisateur du domaine sont montées"
msgid "Get a user fallback profile from the %s domain"
-msgstr ""
+msgstr "Récupérer le profil utilisateur du domaine %s"
msgid "Changings in the user profile will not be saved to the domain"
-msgstr "Les changements du profil utilisateur ne seront pas sauvegardés dans le domaine"
+msgstr "Les modifications du profil utilisateur ne seront pas sauvegardées dans le domaine"
-msgid "Get a user profile from the %s domain"
-msgstr ""
+msgid "Get the user profile from domain %s"
+msgstr "Récupérer le profil d'utilisateur du domaine %s"
msgid "Failed to remove %s"
-msgstr "Création du fichier %s échouée"
+msgstr "Impossible de supprimer %s"
-msgid "Failed to make links archive"
-msgstr ""
+msgid "Failed to make a links archive"
+msgstr "Impossible d'archiver les liens"
-msgid "Failed to unpack links archive"
-msgstr ""
+msgid "Failed to unpack the links archive"
+msgstr "Impossible de désarchiver les liens"
msgid "Failed to execute"
-msgstr "Création du fichier %s échouée"
+msgstr "Exécution échouée"
-msgid "Mounting point for server resources not found"
-msgstr ""
+msgid "Mounting point for server resource not found"
+msgstr "Point de montage pour les ressources serveur non trouvé"
msgid "Failed to clear the kernel key for user %s"
-msgstr "Création du fichier %s échouée"
+msgstr "Impossible d'effacer l'option kernel pour l'utilisateur %s"
msgid "User home directory %s not found"
-msgstr ""
+msgstr "Répertoire home de l'utilisateur %s introuvable"
msgid "User %s is already in X session"
-msgstr ""
+msgstr "L'utilisateur %s est déjà dans la session X"
msgid "Failed to unmount user %s resource"
-msgstr "synchroniser le profil utilisateur et démonter les ressources utilisateur"
+msgstr "Impossible de démonter les ressources utilisateur %s"
msgid "Directory %s not found"
-msgstr "Utilisateur %s introuvable dans LDAP"
+msgstr "Répertoire %s non trouvé"
msgid "Mounted remote resources for user %s not found"
-msgstr ""
+msgstr "Ressources distantes montées pour l'utilisateur %s non trouvée"
msgid "Failed to remove dir %s"
-msgstr "Création du fichier %s échouée"
+msgstr "Impossible de supprimer le répertoire %s"
-msgid "User profile saved in the domain"
-msgstr "Les changements du profil utilisateur ne seront pas sauvegardés dans le domaine"
+msgid "Modified user profile saved in the domain"
+msgstr "Les changements du profil utilisateur sont sauvegardés dans le domaine"
msgid "Domain user resource unmounted"
-msgstr ""
+msgstr "Ressources d'utilisateur domaine démontées"
-msgid "Failed to unmount path %s"
-msgstr "Création du fichier %s échouée"
+msgid "Failed to unmount directory %s"
+msgstr "Impossible de démonter le répertoire %s "
msgid "Failed to delete from the default runlevel"
-msgstr ""
+msgstr "Impossible de supprimer du niveau de fonctionnement runlevel"
-msgid "Failed to apply undomain templates"
-msgstr ""
+msgid "Failed to apply non-domain templates"
+msgstr "Impossible de valider les gabarits hors domaine"
-msgid "Failed to clear user cache"
-msgstr "Création du fichier %s échouée"
+msgid "Failed to clear the user cache"
+msgstr "Impossible d'effacer le cache utilisateur"
-msgid "Failed to remove client service from autostart"
-msgstr ""
+msgid "Failed to remove the client service from autostart"
+msgstr "Impossible de supprimer le service client de l'autodémarrage"
msgid "Computer removed from domain %s"
-msgstr ""
+msgstr "Le poste a été supprimé du domaine %s"
msgid "Password"
-msgstr "Mot de passe vide"
+msgstr "Mot de passe"
msgid "Failed to add to the default runlevel"
msgstr "Connexion au serveur LDAP échouée"
msgid "Error restarting"
-msgstr ""
+msgstr "Erreur au redémarrage"
msgid "Server %s does not respond"
-msgstr ""
+msgstr "Le serveur %s ne répond pas"
msgid "Samba server not found in %s"
-msgstr "Utilisateur %s introuvable dans LDAP"
+msgstr "Serveur Samba introuvable dans %s"
msgid "The computer is already in the domain %s"
-msgstr "Le poste n'est pas dans le domaine"
+msgstr "Le poste est déjà dans le domaine %s"
msgid "Before joining the domain, you need to remove it from the previous domain"
-msgstr ""
+msgstr "Avant d'ajouter au domaine, vous devez sortir le poste du domaine précédent"
msgid "Run 'cl-client -r'"
-msgstr ""
+msgstr "Veuillez exécuter 'cl-client -r'"
msgid "Samba resource [%s] mounted"
-msgstr ""
+msgstr "Ressources Samba [%s] monté"
msgid "Domain password for the desktop"
-msgstr "Mot de passe du domaine"
+msgstr "Mot de passe domaine pour le poste"
msgid "Info not found on the server"
-msgstr ""
+msgstr "Informations introuvables sur le serveur"
msgid "services DN or unix DN or bind DN or bind password"
-msgstr ""
+msgstr "services DN ou unix DN ou bind DN ou mot de passe bind"
msgid "Failed to apply install templates or domain templates"
-msgstr ""
+msgstr "Impossible de valider les gabarits d'installation ou les gabarits de domaine"
msgid "Computer added to domain %s"
-msgstr ""
+msgstr "Le poste a été ajouté au domaine %s"
msgid "Failed to apply domain templates"
-msgstr ""
+msgstr "Impossible de valider les gabarits de domaine"
msgid "Templates set for network mode"
-msgstr ""
+msgstr "Les gabarits sont fixés pour le mode réseau"
msgid "Templates set for local mode"
-msgstr ""
+msgstr "Les gabarits sont fixés pour le mode local"
msgid "Moved %(src)s to %(dest)s"
-msgstr ""
+msgstr "%(src)s transféré dans %(dest)s"
msgid "This computer is not in the domain"
-msgstr "Le poste n'est pas dans le domaine"
+msgstr "Ce poste n'est pas dans le domaine"
msgid "Variable not found"
-msgstr ""
+msgstr "Variable non trouvée"
msgid "The user is root"
-msgstr ""
+msgstr "L'utilisateur est root"
-msgid "The program can be executed for a non-root user only"
-msgstr ""
+msgid "The program can be executed by a non-root user only"
+msgstr "Ce programme ne peut être exécuté que par un utilisateur qui n'est pas root"
msgid "Failed to change password"
-msgstr "Création du fichier %s échouée"
+msgstr "Impossible de valider un nouveau mot de passe"
msgid "%s's password changed"
-msgstr ""
+msgstr "Le mot de passe de %s a été modifié"
msgid "The password will be changed when you log out from the X session"
-msgstr ""
+msgstr "Le mot de passe sera modifié une fois vous êtes sorti de la session X"
msgid "Failed to read the file"
msgstr "Création du fichier %s échouée"
msgid "Failed to write to file"
-msgstr "Création du fichier %s échouée"
+msgstr "Impossible d'écrire dans le fichier"
msgid "Failed to create directory %s"
-msgstr "Création du fichier %s échouée"
+msgstr "Création du répertoire %s échouée"
msgid "Failed to create file %s"
msgstr "Création du fichier %s échouée"
@@ -353,9 +353,6 @@ msgstr "Monter les ressources et synchroniser le profil utilisateur"
msgid "%prog user_name"
msgstr "%prog user_name"
-msgid "Mounting resources and synchronizes the user profile"
-msgstr "Monter les ressources et synchroniser le profil utilisateur"
-
msgid "mount all user resources and synchronize the user profile"
msgstr "monter les ressources utilisateur et synchroniser le profil utilisateur"
diff --git ru/cl_client3.po ru/cl_client3.po
index 4eb3b3f..6516f59 100644
--- ru/cl_client3.po
+++ ru/cl_client3.po
@@ -4,7 +4,7 @@ msgstr ""
"Report-Msgid-Bugs-To: support@calculate.ru\n"
"POT-Creation-Date: 2010-10-18 13:00+0400\n"
"PO-Revision-Date: 2011-07-18 16:43+0400\n"
-"Last-Translator: Calculate Ltd. <support@calculate.ru>\n"
+"Last-Translator: Calculate Ltd <support@calculate.ru>, Elena Gavrilova <e.vl."
"Language-Team: Russian <support@calculate.ru>\n"
"Language: ru\n"
"MIME-Version: 1.0\n"
@@ -50,10 +50,10 @@ msgstr "ОШИБКА"
msgid "passwords do not match"
msgstr "пароли не совпадают"
-msgid "Appling domain templates"
+msgid "Applying domain templates"
msgstr "Применены шаблоны ввода в домен"
-msgid "Appling undomain templates"
+msgid "Applying non-domain templates"
msgstr "Применены шаблоны вывода из домена"
msgid "Second X session for user %s cannot be opened."
@@ -65,16 +65,16 @@ msgstr "Не удалось перенести %s"
msgid "to %s"
msgstr "в %s"
-msgid "The variable 'cl_sync_skip_path' is empty"
+msgid "Variable 'cl_sync_skip_path' empty"
msgstr "Переменная 'cl_sync_skip_path' пуста"
-msgid "Method syncUser: option sync=%s incorrect"
+msgid "Method syncUser: option sync=%s is incorrect"
msgstr "Метод syncUser: параметр sync=%s неправильный"
msgid "Receiving the file list from %s"
msgstr "Получение списка файлов из %s"
-msgid "Downloading the user profile from %s"
+msgid "Fetching the user profile from %s"
msgstr "Получение пользовательского профиля из %s"
msgid "Sending the file list to %s"
@@ -107,49 +107,49 @@ msgstr "Ошибка создания директории"
msgid "Permission denied: '%s'"
msgstr "Нет доступа: '%s'"
-msgid "Failed to mount user profile"
+msgid "Failed to mount the user profile"
msgstr "Не удалось подключить пользовательский профиль"
msgid "Failed to mount Samba resource [%s]"
msgstr "Не удалось подключить Samba ресурс [%s]"
-msgid "Local user profile does not need to update with local domain"
+msgid "The local user profile does not need to be synchronized with local domain"
msgstr "Локальный профиль пользователя не нуждается в обновлении с локального домена"
-msgid "Local user profile will be used"
+msgid "The local user profile will be used"
msgstr "Будет использован локальный профиль"
-msgid "Failed to find profile archive from %s"
+msgid "Failed to find the profile archive from %s"
msgstr "Не удалось найти архив с профилем от %s"
msgid "Copying archive from the server"
msgstr "Копирование архива с сервера"
-msgid "Unpack profile archive"
+msgid "Unpacking the profile"
msgstr "Распаковка архива с профилем"
-msgid "Failed to unpack archive"
+msgid "Failed to unpack"
msgstr "Не удалось распаковать архив"
-msgid "Unable to remove needless files"
+msgid "Unable to remove useless files"
msgstr "Не удалось удалить ненужные файлы"
msgid "Remote profile already mounted"
msgstr "Удаленный профиль уже подключен"
-msgid "Difference time between server and client more 10 minute"
+msgid "Time differs between server and client for more than 10 minutes"
msgstr "Разница во времени между сервером и клиентом более 10 минут"
-msgid "Profile synchronization will be used without archiving"
+msgid "Profile synchronization will be applied without archiving"
msgstr "Синхронизация профиля будет использована без архивирования"
-msgid "Failed to unmount remote profile"
+msgid "Failed to unmount the remote profile"
msgstr "Не удалось отмонтировать удаленный профиль"
-msgid "Failed to get user profile from domain"
+msgid "Failed to get the user profile from the domain"
msgstr "Не удалось получить профиль пользователя из домена"
-msgid "Failed to determinate UID and GID"
+msgid "Failed to resolve UID and GID"
msgstr "Не удалось определить UID и GID"
msgid "Manually interrupted"
@@ -161,7 +161,7 @@ msgstr "Будет использован локальный профиль"
msgid "Failed to open /etc/passwd"
msgstr "Не удалось открыть /etc/passwd"
-msgid "Failed to found user %s"
+msgid "User %s not found"
msgstr "Не удалось найти пользователя %s"
msgid "User information from /etc/passwd is used"
@@ -173,7 +173,7 @@ msgstr "Компьютер не в домене"
msgid "User password not found"
msgstr "Не найден пароль пользователя"
-msgid "Unable cache user info"
+msgid "Unable to cache user info"
msgstr "Не удалось закэшировать информацию о пользователе"
msgid "Error synchronizing with the remote server %s"
@@ -188,22 +188,22 @@ msgstr "Получен запасной профиль пользователя
msgid "Changings in the user profile will not be saved to the domain"
msgstr "Изменения в пользовательском профиле не будет сохранено в домене"
-msgid "Get a user profile from the %s domain"
+msgid "Get the user profile from domain %s"
msgstr "Получен профиль пользователя из %s"
msgid "Failed to remove %s"
msgstr "Не удалось удалить %s"
-msgid "Failed to make links archive"
+msgid "Failed to make a links archive"
msgstr "Не удалось создать архив символических ссылок"
-msgid "Failed to unpack links archive"
+msgid "Failed to unpack the links archive"
msgstr "Не удалось распаковать архив символических ссылок"
msgid "Failed to execute"
msgstr "Не удалось выполнить"
-msgid "Mounting point for server resources not found"
+msgid "Mounting point for server resource not found"
msgstr "Не найдена точка монтирования серверных ресурсов"
msgid "Failed to clear the kernel key for user %s"
@@ -227,25 +227,25 @@ msgstr "Не найдны подключенные удаленные ресур
msgid "Failed to remove dir %s"
msgstr "Не удалось удалить директорию %s"
-msgid "User profile saved in the domain"
+msgid "Modified user profile saved in the domain"
msgstr "Профиль пользователя сохранен в домене"
msgid "Domain user resource unmounted"
msgstr "Доменные ресурсы пользователя отключены"
-msgid "Failed to unmount path %s"
+msgid "Failed to unmount directory %s"
msgstr "Не удалось отмонтировать путь %s"
msgid "Failed to delete from the default runlevel"
msgstr "Не удалось удалить из уровня запуска по умолчанию"
-msgid "Failed to apply undomain templates"
+msgid "Failed to apply non-domain templates"
msgstr "Не удалось применить шаблоны вывода из домена"
-msgid "Failed to clear user cache"
+msgid "Failed to clear the user cache"
msgstr "Не удалось очистить кэш пользователей"
-msgid "Failed to remove client service from autostart"
+msgid "Failed to remove the client service from autostart"
msgstr "Не удалось удалить сервис client из автозапуска"
msgid "Computer removed from domain %s"
@@ -314,7 +314,7 @@ msgstr "Не найдена переменная"
msgid "The user is root"
msgstr "Пользователь - root"
-msgid "The program can be executed for a non-root user only"
+msgid "The program can be executed by a non-root user only"
msgstr "Программа не может быть выполнена root пользователем"
msgid "Failed to change password"
@@ -353,9 +353,6 @@ msgstr "Подключить ресурсы и синхронизировать
msgid "%prog user_name"
msgstr "%prog user_name"
-msgid "Mounting resources and synchronizes the user profile"
-msgstr "Подключает ресурсы и синхронизирует пользовательский профиль"
-
msgid "mount all user resources and synchronize the user profile"
msgstr "подключить пользовательские ресурсы и синхронизировать пользовательский профиль"
@@ -439,4 +436,3 @@ msgstr "Пустой пароль"
msgid "new user password"
msgstr "новый пароль пользователя"
-

@ -1,12 +1,7 @@
AUX calculate-install-3.1.0_rootsize.patch 706 SHA256 ca1e8220dafcc5942406644a6bd99a08f54fb94c19b13feeb73c85d2991ea787 SHA512 de2fc9472d4677de1beb903ed70030b1f625842dc6c5b214977b30f2e98e06983f0972634ea57268a1f070f0fe1bde10b661ec7a7750d2c1a31e4a883894ed67 WHIRLPOOL 97e4a373ac13e73bcba520182f1a4fd959cea2757ce1bf0fce1809bd487c03adb67ac288c4f0dd159fa375ca4156fe7ac17e1326cecfcc54c50d789bc881da2e
AUX calculate-install-3.1.1_beta3-r2.patch 2978 SHA256 011577ee13f4144f60c75591958f4aa85e67e75fde425dcaa98f191bee7ed654 SHA512 e3ab2e6a09d2bef6dd07f39a63cf4cb2b7c8197a585591e5de638bfe3140d44f13e6526f1ec7090b5bcaeadad9eeacf0d2637d3bee0e5486ae13d1db7a9cff9b WHIRLPOOL 41cb390786281b17fdba5afcb04f3ce450d11b8c913a5698077422fc7fe55565b31e2950107a3770c55fbb8722396e1d2cfae74b06c958d044c8b5f97804693f
AUX calculate-install-3.1.1_beta3-r3.patch 500 SHA256 6554a78cfc39b13cb6446bb672ffdb27e688f4bdd20c8659012edef4be1a2b4e SHA512 0c43d157e91a31c9043f27b92371acbf514f4d4a8251996b47edadc246adcf46da155e0c9de8b055f312670d342a3d54a59169a904ec50e2845d262a7093bab1 WHIRLPOOL 4d125139685433dabed9b0ded00c766b9bc1ebd17574f2b2a6f56205a2ee35f5f5ca9268dd47aed60dbd3ba62f2df571fde26709f4d1e1895b09f75b78da79a9
DIST calculate-install-3.1.1.tar.bz2 74372 SHA256 d1d18e85c686b66bf3e4a2f66a43fa59ecaa53518110dafb3ee51de161032137 SHA512 dfb315511f9f358a6ae39f0fd211faa7a862787c347b758f48f6dd6b7f373e93bc8b9b1abfc7e84c170d35b4bb4d22053149cd9ef2875a6f89b7115e678b110e WHIRLPOOL dbe98f30ad64739c54e4735344f2e5842f383556d78dd47c682a20938263eaaa305708e3a5c37983df874731329e4d5dfa29f5130552478dfd91078524d8a33d
DIST calculate-install-3.1.1_beta3.tar.bz2 74351 SHA256 17fddc728727d1324fe1ece634d6987f55f54df7c520dded6ee20a631a9860c3 SHA512 524c25aec9e8b330e0fd9e4e0e3ce8a97994795dae336b391bc325a9ebd82c436886015d049ce515b7b2adb0c3dcded1370c45150e3c7d2d2acbb077b2ba4838 WHIRLPOOL 2b5633e4997625b31a3907dfca0caf5ba47e5f0522cb1a9fe4f22412b6abda7f6160d19ee290a277d494f0c60d36222fa792514cf4b27b72a9b4d914122f081c
EBUILD calculate-install-2.2.9999.ebuild 685 SHA256 5b6fe8d4f7c8109f9adcdfa6546bb253c9f04e1d10dc6b1aa6b1087c2486d096 SHA512 0b74f8bb94ba419869cc209963bc8f79cd98e4ffdd95b400f3e6c80d32da23ed314c3ec6bca6163f32e64c6dbdb1503a23e68d49c8f011c762a77b03bc94a326 WHIRLPOOL 5c9e1acddd461064c67e152429e98651298c54c8e4a7f5c9c419cda4045b6a1b5221a5bbfc3c95dd03b48f157d40e1a37e8f7e42e9aacff4575851150cbdb9a4
DIST calculate-install-3.1.2.tar.bz2 74810 SHA256 04198079715e86aeb505c33583c4556eff2981f36cc85b6d09260f4e6b49ea72 SHA512 49611ae979ba894ccbf1306a185c0d9b7221389793d8fe4ce87d6da3d29e3a98f0be79440660970496f77f9cba5c6dc90832d5abc60c630d269fc9c66083709d WHIRLPOOL 7bcaffb6cdb38d734a03616e8107cc0e087ffad1de0de0ddb4783d239b08438bb56e2e043971c4ebde6c734770f552056ad343589c1acccf7bb38b396f162608
EBUILD calculate-install-3.1.1.ebuild 906 SHA256 aaaafe01b587aafacb6f495b6adf596a8be9e4c9c03b54f4142237810113cb1a SHA512 23499fb16a46927045c2b9647efe927ee3941c691825be4f1855d024c43e8039353a84dd6187e75d7e3e1b7433a31ef4408a9d148bab92fd80a28ee28e3af50a WHIRLPOOL c35e222f37e2b50e67f7e3c0fc6e1552a582afe188737f042900a5edd35ab528a4e45314a96292fbbfc7b93f87a78b45ed22a45d9d571846fd3e0e71345c9a38
EBUILD calculate-install-3.1.1_beta3-r2.ebuild 1055 SHA256 a9c434ddd6da2e452e5e3d728d4b2e4d7511862a6f15d2dd2d8cd94c21c15dcd SHA512 f8ba42b6cbaf863ffd7eb55610447693108f45fe7a6bcb7ed98b205b86d8fdc724ddb5c410d37475432fe1c0d17183f71764b3bf224ac38d12141a535b02754d WHIRLPOOL 58169f6227ae3423e62328b9b90054f8a5ff26fff1c788719168dfebd640336cbb344abfc730c8a73580507141d88b116c713ef76ca08253bf9e6314761a5f6b
EBUILD calculate-install-3.1.1_beta3-r3.ebuild 1119 SHA256 91973d20d044bb3c86130bbf34146fc7811ad0e3d47fa6ec73c2e89f1b556b59 SHA512 1e23a9a7944244819dedcf5fea19cbc4bb9191ba99ff3701f9d3e7d22db2b7157c9b6d7089f7dce6813d2c83bec4accaf7039f7ecdad590cbd2028bf025465e2 WHIRLPOOL 156ec963f18d51aa3e7c19697a3db0d525ba48557e76e35662bcd91579c92173cb998c16468c06e29e64c1e694595853cfa59a656a24838790875c02191efe1f
EBUILD calculate-install-3.1.2.ebuild 906 SHA256 ea08e9f4d8c27ef8cda30320ad3c3d7ea99d63fb3aaf3dd762d24449a1bab269 SHA512 25f4302cff9f848e945ae51eca6a396fe448bfbb298e31ba285fa3c0a1d99735aab81f5f08fde0d84a2c76b582b85e0e261561f216375c17cbc1aee6a124e97c WHIRLPOOL d31d28271d1faf838519bc380d0b5d2fbb5d241491fd20f4eac52557f40849aa1463e074d70e7de5101266936f200db0bfaeb481180b6f86303824f0b2725250
EBUILD calculate-install-3.1.9999.ebuild 683 SHA256 e97dd6f046d54a16eee281fa35790c92507b150bc940f3c2b36117e6f44f0a8d SHA512 c1179c500dcaa48506f6334e9e2ccc3cc70d712b2899d7e1d9265bc202f088ab71baa1aaea462deee56fdd5244bee4ab9b9a9da72f25ec511d4f2fa0c3c35f43 WHIRLPOOL 010d35b929fce496b5f16228688e23a95c9c87ebed0d290eeb454e5c1432b55b3b276dfb5786a27222543446a1090ce2f133d80373649fe72341b508d1e16a78
MISC ChangeLog 33978 SHA256 a1cc544f9763b08b3647d90fac1ec53748016bb23260181315896c8c02431443 SHA512 11a09ba60fbc727bd47b57653b4bb0937d98774eb9ca95680a5b55997c7e22db3976cbd0878d908fa0200e04b6cc9eb0ae9ac6f1623235490e2e46e54cc1f7f4 WHIRLPOOL 50352c2950f301cbb5116b8c9972e592767dcb03bd71d081c75de5e69b2a920331abec4756658faf64e291bf6f4f41df67b8d62946683629a2c99b48274eb2f3
MISC metadata.xml 464 SHA256 0e3ea52c58e77580b778f7efb9f476811c168febe02e656961c71a455e4f4d7d SHA512 dd79935fabf9b629ee0913eae0cec88b0d6e46fc58e9b430e07e2a60f2e0ce66e8c257a3da33e17663a778d2a18b3a12f96f18cbc6e009f071788ed9353e4a29 WHIRLPOOL 8f72663b95c36637d15d40e0c56e5fd9e7e06e073993d202d788df1704bb979e794cde966428675f158786e273ba5677151d15d8e40a4715f769172a8ebf3e1e

@ -1,29 +0,0 @@
# Copyright 1999-2011 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 git-2
EGIT_REPO_URI="git://git.calculate.ru/calculate-2.2/calculate-install.git"
DESCRIPTION="The program of installation Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS=""
IUSE="minimal"
DEPEND="~sys-apps/calculate-lib-2.2.9999
app-portage/layman
!minimal? ( sys-boot/grub
sys-apps/gptfdisk
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )"
RDEPEND="${DEPEND}"

@ -1,45 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
PYTHON_DEPEND="2:2.7"
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
DESCRIPTION="The program of installation Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
IUSE="pxe minimal"
DEPEND="~sys-apps/calculate-core-3.1.1_beta3
!<sys-apps/calculate-install-2.2.29
app-portage/layman
!app-misc/livecd-tools
sys-apps/iproute2[-minimal]
!minimal? ( sys-boot/grub
sys-apps/gptfdisk
>=sys-apps/util-linux-2.19.1
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )
pxe? ( sys-apps/calculate-server
net-ftp/tftp-hpa
net-misc/dhcp
net-fs/nfs-utils )"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-install-3.1.1_beta3-r2.patch"
epatch "${FILESDIR}/calculate-install-3.1.1_beta3-r3.patch"
}

@ -18,7 +18,7 @@ SLOT="3"
KEYWORDS="amd64 x86"
IUSE="pxe minimal"
DEPEND="~sys-apps/calculate-core-3.1.1_beta3
DEPEND="~sys-apps/calculate-core-3.1.2
!<sys-apps/calculate-install-2.2.29
app-portage/layman
!app-misc/livecd-tools
@ -35,10 +35,3 @@ DEPEND="~sys-apps/calculate-core-3.1.1_beta3
net-fs/nfs-utils )"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-install-3.1.1_beta3-r2.patch"
}

@ -1,14 +0,0 @@
diff --git a/install/variables/disk.py b/install/variables/disk.py
index 6aa1b02..9856204 100644
--- a/install/variables/disk.py
+++ b/install/variables/disk.py
@@ -782,7 +782,8 @@ class VariableOsLocationDest(LocationHelper,Variable):
################################
# check size for root device
################################
- if self.Get('os_install_root_type') != "flash":
+ if self.Get('os_install_root_type') != "flash" and \
+ not "/usr" in value:
for mp,size in filter(lambda x:x[0]=='/' and x[1].isdigit() and \
int(x[1])<7*1024*1024*1024,
izip(value,

@ -1,70 +0,0 @@
diff --git install/cl_install.py install/cl_install.py
index 65d4972..6cd63c5 100644
--- install/cl_install.py
+++ install/cl_install.py
@@ -809,13 +809,13 @@ class Install(color_print):
"""
for disk in self.clVars.Select('os_disk_dev',
where='os_disk_format',like='ntfs'):
- mountDir = self._getFreeDirectory('/var/lib/calculate/mount.test')
+ mountDir = self._getFreeDirectory('/var/lib/calculate/mount.ntfs')
try:
os.mkdir(mountDir)
except:
continue
if process('/bin/mount',disk,mountDir).success():
- for i in (0.2,0.5,1,2):
+ for i in (0.2,0.5,1,2,4,5):
if process('/bin/umount',mountDir).success():
break
else:
diff --git install/fs_manager.py install/fs_manager.py
index f3f7a62..884d8b7 100644
--- install/fs_manager.py
+++ install/fs_manager.py
@@ -59,7 +59,7 @@ class FileSystemManager:
'msdos': '83',
'type':['hdd','usb-hdd']},
'btrfs': {'defaultopt': defaultOpt,
- 'format': '/sbin/mkfs.btrfs',
+ 'format':'/sbin/mkfs.btrfs',
'formatparam': '{labelparam} {device}',
'gpt': '0700',
'label': '-L {labelname}',
diff --git install/variables/disk.py install/variables/disk.py
index 43cba4d..1682186 100644
--- install/variables/disk.py
+++ install/variables/disk.py
@@ -1016,7 +1016,7 @@ class VariableOsLocationPerformFormat(LocationHelper,Variable):
(self.Get('os_disk_mount'))))
unavailFS = set(self.Select('os_format_type',
where='os_format_use',
- eq="off"))
+ eq="no"))
fixNtfs = self.fixNtfs
for dev,mp,fs,isformat in info:
# should format if change fs or partition is root, but non flash
diff --git install/variables/system.py install/variables/system.py
index 6a70936..04d6455 100644
--- install/variables/system.py
+++ install/variables/system.py
@@ -106,10 +106,16 @@ class VariableOsFormatUse(ReadonlyVariable):
'type': "bool",
'value': "off"}
+ def checkFunc(self,fs):
+ if fs == "btrfs" and self.Get('os_root_type') == 'livecd':
+ return "no"
+ if "format" in FileSystemManager.supportFS[fs] and \
+ path.exists(FileSystemManager.supportFS[fs]["format"]):
+ return "yes"
+ return "no"
+
def get(self):
- return map(lambda x:"yes"
- if path.exists(FileSystemManager.supportFS[x]["format"])
- else "no", self.Get('os_format_type'))
+ return map(self.checkFunc, self.Get('os_format_type'))
class VariableClMigrateRootPwd(UserHelper,Variable):
"""

@ -1,12 +0,0 @@
diff --git a/install/cl_install.py b/install/cl_install.py
index 6cd63c5..d7f7d4c 100644
--- a/install/cl_install.py
+++ b/install/cl_install.py
@@ -557,7 +557,6 @@ class Install(color_print):
maskNvidia = self.clVars.Get('os_nvidia_mask')
if maskNvidia == curNvidiaMask:
return True
- self.printByResult(True)
self.startTask(_("Driver installation for %s")%
self.clVars.Get('hr_video'))
open(nvidiaMaskFile,'w').write(maskNvidia)

@ -5,16 +5,16 @@ AUX calculate-lib-2.2.30-fix_squash.patch 740 SHA256 227414840d4f94dc48879071264
AUX calculate-lib-3.1.1-r1.patch 768 SHA256 9f3310af82834e7ab13c5f2490eabf4831e301d492529572648fc3b0ad7d4848 SHA512 b2c7b58c4a7d14e2eeae4f5447f533c1d4952a942cc9e08ab8d3eeac116066e8c0f933a4a38371411f564ca6cfba540b864e7c1b1db0a8060a9535165b1e79f3 WHIRLPOOL 4ac7a91d978fb52316993d3b59e244591bc93b55b1af014966ee5692af7f2e982a700dcfc127353b87f0984a2fbeac3cef3d0ffdcdf24b3f53e5001218c7d627
DIST calculate-lib-2.1.11.tar.bz2 61687 SHA256 62976c08d4fb4810389ace6f5a99abb5a962f6c8d9053ff943d0669480fb5599 SHA512 e3bc2168a55367cf19ad3a27921b53e5e845643238bf171209ab29752c91b5d4d338a2120774764ac1c79abd93f2deff8680f8faa1407940984ea9fd6a199e67 WHIRLPOOL 0ced92ea493dd8db02b0ae1514ebbb51ee76dc6f441b4a38c984c39da2121fb81dd1f2e840c4c5b71a117a12817a2a269d85676288202aa9801f69727e3338dc
DIST calculate-lib-2.2.30.tar.bz2 120055 SHA256 a5aa07e5c5e02d27a8b9fad8c0e4bd0562d40d7a2753c2b57a18d99bd0dd6cb2 SHA512 7e8920f5fd855f05aba6576d5e4751ecf71a3e4107b46671d9a4be8557e1dd616adefad728b6a9ca87656dca6fd17d52bce41462b7fc906d20118e97607f1b1b WHIRLPOOL 0e8441484ee7d91c9926ab2deed8357272fecb2156e5dad45f865f6b13aff6c43868323dececc859ce7824bedd8794cec25b857be30afa83c44a81bcbcf510d2
DIST calculate-lib-2.2.31.tar.bz2 120044 SHA256 ba38052d8b2349a1c60adc589a74eb8a3ffcbf6f3c1124e4c1fb0da3aa777f12 SHA512 902871b9159f2bcf7a0cc767fb6df5b19902fce6cf9468d96f902c383a422738b65debe3094c92d1f82de2124936496f89631c6eb9670da00807b63156b101b7 WHIRLPOOL 5179ee691519f3a7faa3135d040ad64bd6d67c026ebf39bb17f7d641130a2b58641d1fe5da4f6cfbd45d4442d93508f0a5f641ef2cd8c43e1a322aab3d11f4b9
DIST calculate-lib-3.1.1.tar.bz2 117150 SHA256 649fae3448e0b84300a95e8cdf5dcd5c78aed37c5bcffa65bc763effeb1ced35 SHA512 6f905658d48f3a57716d0814459ce96b7e039be0df8e01bca44c007923984c29ecf3edc5517f2e99d20a9ea462c1d1638b378217919be2fdfd4f9daaebb15e14 WHIRLPOOL 89d2e90b438a1f4f8b0efee41729172e53f39b7b6cbabb4eff4eab89dad23b9188aa7d9fea1392eedf76b4c9ccf4796219ea48d7556b788aecd70091fb84a592
DIST calculate-lib-3.1.1_beta3.tar.bz2 117188 SHA256 3b24971d0b5a24a15d3bfb26b44bf8588c11a11406bbbb2b19ce1c42ea6b89cb SHA512 e3c6e57a042324f53bb3e15eeae515ce091339474bd6769346f1bfd8f900641d8c157d252f422626bb26ea41acec36bff05096d4e302fbd2e9f641ae87cfae2b WHIRLPOOL 7796761ff03fa43561237b5105be6df50daefe7d237379c099bd2cab42e7f950df5184d9191c88cf554997fb22bb00f7a55bc9c68963135015ed709f2b4cff12
DIST calculate-lib-3.1.2.tar.bz2 116970 SHA256 23a3e7b270dc6e215d37c402981e0519d3ac556bd2b7082a5b0a01ea954319c4 SHA512 e00a150b7b512f37c19822580c2630156301e543e7c7429438ef1c5db52c2b63a7ca5f984d2c19cd55028d3f4297e84a71b83c7c04f7fe0cc5b1feda0e5d3412 WHIRLPOOL 57a79453c057a40a539a4c5ee2c6275297af8fcab608f95782c6a9013550dc907937081b45598b19f4797944230dba41e78f81ab28d54066190e51670186e4fe
EBUILD calculate-lib-2.1.11-r3.ebuild 974 SHA256 b96b3e05a647ca20f6e4dd87113ac707d2e6f742d793c4e19c918b898a7512b6 SHA512 ddb92230120073546680b221c0a80fed3fb8519972fd9a05685e0114d8d8e07d248a29f6e9fbe7e4b6b21c406769f6bf3cd038ea6b667533854a720f6a3b4988 WHIRLPOOL 0a56018fca3deeda6fa741015db9155465a7cd06517ffb089a0016e818e708242e136a55c9c1a9bbfcfa3dd1d2b112ad71a8571ddc2033e1e960c6e5402d4238
EBUILD calculate-lib-2.1.9999.ebuild 555 SHA256 99ff8819b9aa2b46bab952f03b7c5bd8a9b8cb42453747cab6df775c004cd787 SHA512 c6f2c7b60c48e87d7e9f71945f0ed748805828988648fbe72b470e118fa652ad18e1d4798e3b749136f07b30f3c0951be4da191b7aab7ad6e2e2d074799c5f46 WHIRLPOOL 57ff64beb5eff94fab2cd3fd28f1ec84c72fb4aaea9077dce38819ec320d68b3e4c820c05705bdea7afaf751511fbaa03c4fa56f54654d687cd029883054148f
EBUILD calculate-lib-2.2.30-r1.ebuild 899 SHA256 17f6439183b849497a3034c719b97a25a4bdd557d34f2053db3b0a2c2b0d8119 SHA512 245c5372f9e266364ce838ec12373faef6903e351a65e5b787de3a264ae1d35fa8a36a8c63c94ccb9dcefd1902051f54159aa5920666048e06a59015aea744f8 WHIRLPOOL a368b1cdcadfeaec1f87c5423627dd2e7933ea3904d3f3133310207ce49867276a034b8991ac9484bc716a8aec9c8cd7b4901b2b033a60128f7b21e60765f5ba
EBUILD calculate-lib-2.2.30.ebuild 770 SHA256 889273e755e58ef53871f85e3bcc7df2ef472953db98d757e5d92534273bf11a SHA512 9cd46d5c8a784304c8297460eb48406ee5712e2d11118e9d283895ed0996d897f1b5b32eb7907eba3347a43c6eaf5fae1c50cd98c146f6c6edec06cd31b7861d WHIRLPOOL ee1c5e7d3e8546599f08cd834a316a62e3d9e5eef2209da24dd44676fdcaac9eb02d83be37db5d8275f5dbd7f464f40ba91790b2d6c85ae34a659369eb7162ff
EBUILD calculate-lib-2.2.31.ebuild 770 SHA256 889273e755e58ef53871f85e3bcc7df2ef472953db98d757e5d92534273bf11a SHA512 9cd46d5c8a784304c8297460eb48406ee5712e2d11118e9d283895ed0996d897f1b5b32eb7907eba3347a43c6eaf5fae1c50cd98c146f6c6edec06cd31b7861d WHIRLPOOL ee1c5e7d3e8546599f08cd834a316a62e3d9e5eef2209da24dd44676fdcaac9eb02d83be37db5d8275f5dbd7f464f40ba91790b2d6c85ae34a659369eb7162ff
EBUILD calculate-lib-2.2.9999.ebuild 730 SHA256 ce7f2300859687d4f6c50948438bee8a8cb407fd7de56c5c48e0aba846ee6774 SHA512 789179018d82ef7c9a5428de20f529e6071380174d1e417c3a4463859d4b9ceca2a2d4ae078dbe309b976541cfba81a30348a77b6b37089b9597b862d4a45fd8 WHIRLPOOL 380084a24bf396c79fd198e1ad51d2457dcbcc5d3b59420f3794d067949cf7951766a880639bd54399f371ed0961163a03f8ea8a5e2483e512243d57408251be
EBUILD calculate-lib-3.1.1-r1.ebuild 823 SHA256 bf68f0425e9bdc49cde3ab9aa2b5c00519204167e7527dc596e1beb6a941c986 SHA512 a457cf63f361f3f8fb0362264f6f5517ae90857b3f93fd475b3ac5404170cf9c02f09bda56c2f38ae5975154f8b278f9ed161c2b0a2aecdd846f1a061ff3c4db WHIRLPOOL 8987f93cac00184dd028600d27a9698fbcf75c67ec3085f281e3dbe7030d7fbd42a17d8245f55873b023eca1b3aba25921ec1b3b40bfd8e792da2d54363f33db
EBUILD calculate-lib-3.1.1.ebuild 690 SHA256 3bd21cbec14f6815642f44234e640f488155f8ad59dbbb22b55a3537dcc1d7ec SHA512 f27f79c7410dd0295bda295080d511b299dd6fd4ebe2058b26e6d6f0dcd029e118dd79849bd3da0260a56cd4b91d4ef649027c158d85d976fc440a9cae0dc12e WHIRLPOOL db749b32ef5a72ed4c9d3476d494f28d3ceb10a215567cf46e23e49063bee9b8e1a2512a25d5006198f8e88fb106ce7da421565dfe6f5f4320f34db033c78513
EBUILD calculate-lib-3.1.1_beta3.ebuild 690 SHA256 3bd21cbec14f6815642f44234e640f488155f8ad59dbbb22b55a3537dcc1d7ec SHA512 f27f79c7410dd0295bda295080d511b299dd6fd4ebe2058b26e6d6f0dcd029e118dd79849bd3da0260a56cd4b91d4ef649027c158d85d976fc440a9cae0dc12e WHIRLPOOL db749b32ef5a72ed4c9d3476d494f28d3ceb10a215567cf46e23e49063bee9b8e1a2512a25d5006198f8e88fb106ce7da421565dfe6f5f4320f34db033c78513
EBUILD calculate-lib-3.1.2.ebuild 690 SHA256 3bd21cbec14f6815642f44234e640f488155f8ad59dbbb22b55a3537dcc1d7ec SHA512 f27f79c7410dd0295bda295080d511b299dd6fd4ebe2058b26e6d6f0dcd029e118dd79849bd3da0260a56cd4b91d4ef649027c158d85d976fc440a9cae0dc12e WHIRLPOOL db749b32ef5a72ed4c9d3476d494f28d3ceb10a215567cf46e23e49063bee9b8e1a2512a25d5006198f8e88fb106ce7da421565dfe6f5f4320f34db033c78513
EBUILD calculate-lib-3.1.9999.ebuild 708 SHA256 a1d64b7f014831bf6b0a38928d53cb55758b7a12e5f3e98fffd28025ffacbce1 SHA512 3873859a791941d421e2338b437521955da383ce986408f1a951305e2dd75a1a4f771c9ec2caa096c5c8ea6a1776d6d0ed99e025ffa786ba029cafdbadfa439b WHIRLPOOL 5ac1a10b53f810ab527a0ebe52bc87e8397e61375cf6e0acbed89d8f6b8385e72bf234e0fdce479c3a3f1652bb6e520710ce9356750a97d644c0db0a33f6facb
MISC ChangeLog 29851 SHA256 16ca15c794bce78eefc487ed372c3d4960078fbd4c5fe4524211688d0146ef97 SHA512 be6bdf290f391529dce0deb67bf9d367e42e407601dd581f7c08d082399b5860cff2a76d4d64dd876154d51e84f34499db06c715145ac64f78d168aae7e78dbf WHIRLPOOL 2561ccd1eefe3423d97c67aff5c0fe6c8ca624e527fb885b042c8e812194bb1635d7e7d7d86c534562eb780c6b9144d92e24893f2d0696cf8a34a6a912a45788
MISC metadata.xml 303 SHA256 181519d9679fd9aee9a7a9806733a50728d3da0b1e0ad54f31499200f7f5c6ec SHA512 41ee4564dbc1cc726a3aa9e49c403f639ed5a9317ee3e5e6bc1ef20bea2dfb7468b3fec57b14c377309f0a0784c552819b615e9bd75a0a23274e493d192e6f8b WHIRLPOOL 4dc60b993c26cc33eebb8b316d8943db7339a66cbcb4e21e0badd3cf22295d458d2c5ac6ace923e0721820536d5ec425f9bf7dd51e722be3f495e021b2dc3fd4

@ -1,28 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
PYTHON_DEPEND="2:2.7"
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
DESCRIPTION="The library for Calculate 3"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="x86 amd64"
IUSE="minimal"
DEPEND="!minimal? ( dev-python/py-smbpasswd )
>=dev-python/pyxml-0.8
sys-apps/iproute2
sys-apps/pciutils
sys-fs/lvm2
sys-fs/mdadm
dev-python/pyinotify
sys-apps/file[python]"
RDEPEND="${DEPEND}"

@ -1,6 +1,6 @@
DIST calculate-update-3.1.1.tar.bz2 6950 SHA256 eba0351191b915d0af0d78066f3426bda06ae8f3a1a3fa4c40f10167c6ed4fda SHA512 9b67eeeabbc13b4331d3b8b97a72ba62516510ca73950e0f3ab6f91600833265028c85c213878aabe736b45f3f8849dba662678fa6c6deffc12094fb3e962814 WHIRLPOOL 59ef81d8f4af30cf4a7c010104ccb89802442b04344f47602222bc2858ef426b0b318e081ecb026921b4e8ccd740d02cec6544cf239e28954d8d61129ea0fe6b
DIST calculate-update-3.1.1_beta3.tar.bz2 6957 SHA256 877b14678860b15d3c9fdb14718f5b865376f4ca335cf7dc085face8d77b32d4 SHA512 2c91d51c65acfd6a0489b85cadfdf629eaf804bbd504ad5f43c836ba22b5d36ec4a147145e2b92ec86259481fb51e9407f03a935bd2fd7584313c68e6d10890e WHIRLPOOL 9ea8a53d9812271829990f3d111ef5720ccfbf44ca91f5c838f56ee1353b49f5aca02e9883253836471ca3395fed17b74cf89bed166d03c4ec4a74abe9aef9d7
DIST calculate-update-3.1.2.tar.bz2 6958 SHA256 d4bffb7e716c0095402ab6401926d1fdfcc9156b39989749511f9229f1130c56 SHA512 3e03be8a206bbae357f42886966c80c7ce877b1264838152c4aa511e05d19473c48be8bf63d7a9f9a7530e11485e5fc51c3317164229883ff5f307467f1de281 WHIRLPOOL 5186d86ee6a2f9677913a27a79c2074c70e147fe3a92c5ab6919ee5c709f8929aad53c34559c6ad1b3649e98ac70e70ec22c57f3a4f3a9f661038daccba9658d
EBUILD calculate-update-3.1.1.ebuild 589 SHA256 ccbdee663aa4ea454c8f4d955881a068516452c20b832c1be57605184431fd77 SHA512 07e2cd20862c1f5f3c0c2cf53e04f8307f3bab3d6ef72a33531a410d33470c9f38961ec2d900beee75bf5d6d1bf89d43d88945792259818c5a90b4b3db952100 WHIRLPOOL 7e1f01703bf854cafe171e9d6203760c7617cad8d0983a78aed36ff58ba20f41f0a44f27eb8293b9aed70fe6e38c4f66647210fb7e8243f7eb7acc94278cd03c
EBUILD calculate-update-3.1.1_beta3.ebuild 601 SHA256 81a5f36a5425b8773ff99f6d6f18b83425d4d704a442c00519dd933f52870397 SHA512 a0b17aa4daafe8606c5cf590a2422dd7257c23e085a3ebc2b345ca21b09b9a27ea77c46a08f5226d52a0f62ccae05fb81a98eb27791dc2cd978a351b4ed35f60 WHIRLPOOL 435108a7118f862d0a08e942250fa5a55a4c2be811010c0a07d9220cf0155dd097a0546ea2186806757c05823ef8efef44b1c5f909511549bfa9bd1998cb8c50
EBUILD calculate-update-3.1.2.ebuild 589 SHA256 9e9bc2a97b640272b5b9a5e75a05b6e988083c022455b8150421f51edd820239 SHA512 33235545f259238a20431e1c5ea86fc0aa3c0d0c26d49ff2a2a20798b13f92f21be800126f963aba755280c8a2e5e62d601fb986e4fdc25d789b01b6e74c3e63 WHIRLPOOL de0babb4ca23225b941a449ba2080cc53bd66de957eacee1e4422f419395f0369a7f466150318d3c9420500d76c57eaefaebbad595bb663d0a21729d0b575223
EBUILD calculate-update-3.1.9999.ebuild 530 SHA256 f014911ae52c1eadd9615ab1a2c930eb79aab49f509260bd6573eb3985ce2ec8 SHA512 3523efdb19b9646a0d1dba6d6a4664393d07f9aa666392d355b4596cb1bca8cd80a62bbd7f6db7029c1173ebb2a16e9cf168cea1d7f2c051ba8838c86c234454 WHIRLPOOL a394a23a0277b40cc2e7242b08750638434c3b6bf0f340fec923f90e738618b1cc0e223e327484f95d24f7637e8bebec6dff4b6385b731376f6f8cc8897caf79
MISC metadata.xml 288 SHA256 9ea2bfebe4ac64765041ad92dda5b8f22f5597a4e560458f98996b00b0393b8a SHA512 88886b3e137bcf7038cc4985b786523dfac1c127aff84ad682b919d92b2c51b0b8d8f97ff60e7239a2ef49ec40fb5dcc41a59cb428ed346f1e44044ecd75b698 WHIRLPOOL d4eb5ba4901e10fe9cf440c63a8a9a59b5e6620004306eec3cd162cf902a89510460774a8c407816bf15033062dc8f96a334e7f873801bc6bcd73edeb833f36b

@ -18,7 +18,7 @@ SLOT="3"
KEYWORDS="amd64 x86"
IUSE=""
DEPEND="~sys-apps/calculate-core-3.1.1_beta3
~sys-apps/calculate-install-3.1.1_beta3"
DEPEND="~sys-apps/calculate-core-3.1.2
~sys-apps/calculate-install-3.1.2"
RDEPEND="${DEPEND}"

@ -1,16 +1,7 @@
EBUILD calculate-utilities-2.2.30-r12.ebuild 674 SHA256 1863e7384380c8c20f4fe5f9aa756b2754526a6c98222a63f08cb7090ccced13 SHA512 dfacb9111a27a70f0062cd76bce0d3113488a91cf0a7d929160ef1b18b840dfeb4862bed4112a0dd03d9bda859501f44d09b32f845f35f96078d93d835e51ad0 WHIRLPOOL dc075cc1b6d28c24b8e0cf308390b055f5850896194cca00962e3d09ea379e085dbc8c8e170e307335e8af8753dc8e216699d73dbf5fc741ba14ae00d18a8975
EBUILD calculate-utilities-2.2.30-r13.ebuild 674 SHA256 f31edde6caf44a80d96b0c8c7ee8d40e6ce0ef252f3b2fc26422dfe1fe3a725b SHA512 6985b65c4ccc36ef71d24b7b5ad383fd0fd989e09d0020a3395d63835725fcd7ab558a8ef704d714631fa63386246631816956ec150e54e77096d1bf297e21ae WHIRLPOOL 770919950b82c10fc2c7953a36106d61a85f2073351265d185b4fd3e170d5bd7d42c832f60f2e8f06fdd5c291bf1fba83c81169953538a7132bc614f89a8d0cc
EBUILD calculate-utilities-2.2.30-r14.ebuild 677 SHA256 577c89bd6d653a96729dbb25f160a1976788ea004f15064f763bb34b31b31c13 SHA512 332a90527d39ae87a0787502e3df4c4cce39d02736c909306afbff941ef425183d0d58dbf00611c8363c2147e786b50ed99a7f5004e2506af774cd0443eba8b2 WHIRLPOOL 5180c2f120968c82e8b7e981f26641607e1e18a63f679bf5c033393012555f57343382ade9464d2057386fd3ff98a0423e9c85877915a20014312bd3e1250d8e
EBUILD calculate-utilities-2.2.30-r15.ebuild 677 SHA256 988a3d27ba687db64de039d6ef30014cd78491b34e8220c51bfd8da9977b8321 SHA512 7e521dc9bab2f42714e1dcc36b03f038625daa2249f0845f2777b3adeb839f5deaee8d426ebe67250e45661b2817ce166d28de9290de646a129ee3cca1f78ff6 WHIRLPOOL 2ef9c4f20a98a0acc71a3cf5580338303b52e45604bef32a604b02a2b7eb2c69fc1708ccbdfd0df032cd7cb44db0192ad23b0354ea8d373a63af7a22403f63d3
EBUILD calculate-utilities-2.2.30-r16.ebuild 677 SHA256 28b711cb7cf18c350bf7f27bf914af47be58b551df41927e300c9110d6ac4930 SHA512 5f86bd6393be8dfca353f2c26b0f658d422f39b1848d7521b8800325d528281da16a3af675ef78e9c697bcc0041b193232693c079c3f3e5494a3ce82a26d7995 WHIRLPOOL 57713cccf37261558df5227a04225127ebab504eb9ab59770f4d76df368e003362c6ed79062b2a170816b9ffc7fc67c627a257611bbc422aaffc760e2e58d7b1
EBUILD calculate-utilities-2.2.30-r17.ebuild 677 SHA256 11fbf5611fd3ffc04775b8f78ef994cc4036b3428d806e6a1155c914b89f7e67 SHA512 e5d26237cdc2ef1af1d2ef6fe680cfa644fb29ed53bdd484e0604819d032fcc8a7e69755ae609b671f526cd9b7b00cd1cee57c8196daca50892bf39b9b1eec0d WHIRLPOOL 824afc9043930e9b897805b8d90a17aca2e3bcf347057e74db3b08bf2855729767501fd793e14a37023de27028ed56a629154e85b0696d699ccd9bb61a667178
EBUILD calculate-utilities-2.2.30-r18.ebuild 677 SHA256 73902c8c8b214450bc5d78dd210c54dde11dc929ea8575d6bcf377f109c05130 SHA512 8c078bba7095405a00c44296318d9e78da6d0e1fc861f04d8209c2055311726ca198de9b447255781fa18d870cd0e299b83cbcee883eff8ce3e573ffbf9b74ec WHIRLPOOL f2811e6d6a7d214803b9843a849aab43eb0d117ba9993b64965a94694091ae057520b5a7ebea007eaaccbd352348a4feec0dec248b9a2dc498157737e244c6bd
EBUILD calculate-utilities-2.2.31.ebuild 665 SHA256 ae87f3614957179ca66f4e1f322dcb280ec89d408bf43a1528c5387b928deed9 SHA512 864f85ae7b8d3a5b648e00f8fdd2b31ce553b7be097cac09d8f11d8d9ca59e091501b90a163e25f2bd123f0585bf1158b1ec99447d03e2b433a6d72369bcc1b3 WHIRLPOOL c4bb4621eea6a14778066ff39e53c4a7e2fc576d29a1291a716edb2a1ae50358b9510d9ad2785bbd2d83e82a10dfe1ff1d567fdfa448c8a416dd1fbbe7a2f4dd
EBUILD calculate-utilities-2.2.9999.ebuild 842 SHA256 56d97b7d2ce11d23b25d9036b4e2ee196b547ce1d11b0cc349a8205515b66bf1 SHA512 fc7802b92ade52210fa7381b55c48638da6d9adee6d2f03f18d6bdd0050756089b3ca8de944f4e865517554523b40737abe9f22587ecae74079eec563f80868b WHIRLPOOL f1382f0629a8dae37aaecf40cb8cbc3682bde3b43e92c9c6a84cda75897dc5d5de043233fb7a3f929749520b05fe3af94187c7a3ccdae4e252e83699d871f225
EBUILD calculate-utilities-3.1.1-r1.ebuild 755 SHA256 f58d2202899da058cbf4c30575237855164c66727f08c974c30e1f8ee3ff13d9 SHA512 4dd1636f144f5f2a7e16ad263c5476fc20ceba4153d6acfb34172a0193892191b2a6f4a878ca6b2a4f04862e47899298927efe05f03f4317676cee4fdd7290ea WHIRLPOOL d4e9578d370f482d632732384e8acb24f3970b61bb1584600d90541f970786e930464d64c8fec33c38c2d09e5a68f35aa8e576ea7b36fe4df78ad963de7fefb2
EBUILD calculate-utilities-3.1.1-r2.ebuild 758 SHA256 1f8ad1e134ac71948505ad81a54e8d746761a97f280093c0b1d60880385296f4 SHA512 a3a25cd549d2a37c5c6b7766b19ee540c1f330789a44014979492789d7ee2586aa7374b16bef7239702c6b4a61bd7377832c9e4c02fa2f467c318df3806b399f WHIRLPOOL e8214f526c4b91ddd3e0550344dec802ac1917bf1aa68717d08e5506a51d5d6abbb08ca59a68eca145e9119e72deb263099ed8480f81490029acabcaa764797c
EBUILD calculate-utilities-3.1.1-r3.ebuild 761 SHA256 70e0fb66ae382253295eeb211bd9ead7cd0e9cb0308362f6d2eacf6e2d382c0f SHA512 2ac5b5accbd60460defc2d51c035834842c9088829e1876fa60c854f718406f41f20cd6351990d396328e7d56caa66b0751c597b357948a4db4ab6bc56f0ffec WHIRLPOOL ac28164c7b3811c9dc03418d11cb0f79c6fa71bf969f93d06f7dbf2435cf898f3f16da80032bc112785e0e7e71fa6ac8f8a1bb7e6731f4561603d7b5590b619d
EBUILD calculate-utilities-3.1.1.ebuild 749 SHA256 df6b6d875b18d091ddce2afcd0af74efc1a5c05ea0b80e3f312329cbe1656de4 SHA512 d57113ea24cbf233b7aeeb543103003c83573f4412fe35a19a9f2fdca4a244b0ce180c3f0c7bc6f17aef04239dee71222250f27ea8ef2810ace18ea7099ef590 WHIRLPOOL ec34fa0a52cdfd9eedf0c10bd8932f85328aa7000b1f78d185b81825e248f5affcac5e45886ef218565dff4c16a71b3b802d83ffa675039b96173cf24e1a9510
EBUILD calculate-utilities-3.1.1_beta3-r2.ebuild 812 SHA256 be02d0600b91b4cf83e4f4c2807197c51cd3829b4aeebdc1972aed946cc7063d SHA512 8e09bad010ec1e9a327b2100c925214038dd58287efd859562a29ed6a9d7a71c70a585acb9796f0b663e972dfdfc49c66d6198959d9170477f99f8fc99901231 WHIRLPOOL cea0d6e1415e36d8a4f8793700e22da96bb4465d7e7e15cee40bf3941368c034e8b0ef7f7f90967807059a256100eb681ce87c4b25d1e796fab53bbc3592f2e3
EBUILD calculate-utilities-3.1.1_beta3-r3.ebuild 812 SHA256 80766e058811a96e2398e79d7324798b75ab044033ac540b6e8881f37b480fa5 SHA512 645ca1ab5bc4a89e5f50927aabbf9bd398c5c7fe5e317dd149e9928c982208c4a9c9c6753f61bf2d1baa6c867420f6d2f40628dec9a1085acdd0d7504cc87704 WHIRLPOOL c384ce9c23ec9b47b6f1787e70e3011a9b8ab0a1c5c547a18c9d0ce890c453c83901223cb4e409f858c504a18bee075dcc797b1db2b299ef74a71c57d70c8648
EBUILD calculate-utilities-3.1.2.ebuild 749 SHA256 23558c58cc6efdda2a0b7321557d0ca2d8afbe6415b466c83c601a860b003ff6 SHA512 9d21e5bccb2a61da8f737657333c47453efe2b253eada64447f1081a043b07883bac2889391b2247f72de171c0dc0cafaffa9e75cd134612707d6a9e45503cc5 WHIRLPOOL e3d63c00b7c1a69cd2919760ff467cea67296fd84af99f470a876f7d98144c10c09ccea29b920684f9eb7adf14e1f67091e0c367aea082375fcf206ebae81634
EBUILD calculate-utilities-3.1.9999.ebuild 800 SHA256 9de4807341cb552ef8d4f702e9c4a0ca10c52c9d532cc2eb741cea29b92f09b5 SHA512 b35ed4d49c4943a5ad375e646bece419271900c50301153408b30dede0fe834e098baaa42a21c130730c0bc32ba09decc588277da6782d2010c18c9d8df679ae WHIRLPOOL 78e2c5ee8ef8356c4fc0275f920177778925278cad78585ed37c08048241f775030e59a0ced0696fba6379741fe865dc339d190c46b5f2173097328a73c64a24
MISC ChangeLog 38731 SHA256 7e70a0bc1f3b34c0011f3874773a698a4bb96eb6d3dad10903575156bb8578bc SHA512 2de466ea990b9eac702b81fd097c3f5d06d1f4db1a4bd1d1b7380b45e551f6fd62c16564ecfc810246157d3ef1113ae373041580e70981d44752e50ed6134bc0 WHIRLPOOL 5ca0cee1ad0e9419f91ec11a9629b9a29db9fcbed4f5ae0aef1f8a2170ff58112c8580d61884c56ee410a0abc201fa8f4419cea35077fc8bb84e733f6fa6f4db

@ -1,30 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=3
DESCRIPTION="Calculate Utilities meta package"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
SRC_URI=""
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="
cl_assemble
cl_builder
cl_server
"
RDEPEND="${RDEPEND}
!sys-apps/calculate-templates
!<sys-apps/calculate-install-3.0.0_alpha1
=sys-apps/calculate-lib-2.2.30
=sys-apps/calculate-i18n-2.2.30-r1
cl_assemble? ( =sys-apps/calculate-assemble-2.2.30-r1 )
cl_builder? ( =sys-apps/calculate-builder-2.2.30-r5 )
cl_server? ( =sys-apps/calculate-server-2.1.16-r5 )
"

@ -1,30 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=3
DESCRIPTION="Calculate Utilities meta package"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
SRC_URI=""
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="
cl_assemble
cl_builder
cl_server
"
RDEPEND="${RDEPEND}
!sys-apps/calculate-templates
!<sys-apps/calculate-install-3.0.0_alpha1
=sys-apps/calculate-lib-2.2.30
=sys-apps/calculate-i18n-2.2.30-r1
cl_assemble? ( =sys-apps/calculate-assemble-2.2.30-r2 )
cl_builder? ( =sys-apps/calculate-builder-2.2.30-r6 )
cl_server? ( =sys-apps/calculate-server-2.1.16-r5 )
"

@ -1,30 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=3
DESCRIPTION="Calculate Utilities meta package"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
SRC_URI=""
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="
cl_assemble
cl_builder
cl_server
"
RDEPEND="${RDEPEND}
!sys-apps/calculate-templates
!<sys-apps/calculate-install-3.0.0_alpha1
=sys-apps/calculate-lib-2.2.30-r1
=sys-apps/calculate-i18n-2.2.30-r1
cl_assemble? ( =sys-apps/calculate-assemble-2.2.30-r2 )
cl_builder? ( =sys-apps/calculate-builder-2.2.30-r6 )
cl_server? ( =sys-apps/calculate-server-2.1.16-r5 )
"

@ -1,30 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=3
DESCRIPTION="Calculate Utilities meta package"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
SRC_URI=""
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="
cl_assemble
cl_builder
cl_server
"
RDEPEND="${RDEPEND}
!sys-apps/calculate-templates
!<sys-apps/calculate-install-3.0.0_alpha1
=sys-apps/calculate-lib-2.2.30-r1
=sys-apps/calculate-i18n-2.2.30-r1
cl_assemble? ( =sys-apps/calculate-assemble-2.2.30-r2 )
cl_builder? ( =sys-apps/calculate-builder-2.2.30-r6 )
cl_server? ( =sys-apps/calculate-server-2.1.16-r6 )
"

@ -1,30 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=3
DESCRIPTION="Calculate Utilities meta package"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
SRC_URI=""
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="
cl_assemble
cl_builder
cl_server
"
RDEPEND="${RDEPEND}
!sys-apps/calculate-templates
!<sys-apps/calculate-install-3.0.0_alpha1
=sys-apps/calculate-lib-2.2.30-r1
=sys-apps/calculate-i18n-2.2.30-r1
cl_assemble? ( =sys-apps/calculate-assemble-2.2.30-r2 )
cl_builder? ( =sys-apps/calculate-builder-2.2.30-r7 )
cl_server? ( =sys-apps/calculate-server-2.1.16-r6 )
"

@ -20,11 +20,11 @@ cl_server
RDEPEND="${RDEPEND}
!sys-apps/calculate-templates
!<sys-apps/calculate-install-3.0.0_alpha1
=sys-apps/calculate-lib-2.2.30-r1
=sys-apps/calculate-i18n-2.2.30-r1
=sys-apps/calculate-lib-2.2.31
=sys-apps/calculate-i18n-2.2.31
cl_assemble? ( =sys-apps/calculate-assemble-2.2.30-r2 )
cl_builder? ( =sys-apps/calculate-builder-2.2.30-r7 )
cl_assemble? ( =sys-apps/calculate-assemble-2.2.31 )
cl_builder? ( =sys-apps/calculate-builder-2.2.31 )
cl_server? ( =sys-apps/calculate-server-2.1.16-r7 )
"

@ -1,26 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=4
DESCRIPTION="Calculate Utilities meta package"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
SRC_URI=""
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
IUSE="cl_consolegui cl_client cl_desktop cl_console"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-3.1.1
=sys-apps/calculate-i18n-3.1.1-r1
=sys-apps/calculate-lib-3.1.1
=sys-apps/calculate-core-3.1.1
=sys-apps/calculate-update-3.1.1
cl_client? ( =sys-apps/calculate-client-3.1.1-r1 )
cl_desktop? ( =sys-apps/calculate-desktop-3.1.1 )
cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.1 )
cl_console? ( =sys-apps/calculate-console-3.1.1 )
"

@ -1,26 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=4
DESCRIPTION="Calculate Utilities meta package"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
SRC_URI=""
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
IUSE="cl_consolegui cl_client cl_desktop cl_console"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-3.1.1
=sys-apps/calculate-i18n-3.1.1-r2
=sys-apps/calculate-lib-3.1.1
=sys-apps/calculate-core-3.1.1-r1
=sys-apps/calculate-update-3.1.1
cl_client? ( =sys-apps/calculate-client-3.1.1-r1 )
cl_desktop? ( =sys-apps/calculate-desktop-3.1.1 )
cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.1 )
cl_console? ( =sys-apps/calculate-console-3.1.1 )
"

@ -1,26 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=4
DESCRIPTION="Calculate Utilities meta package"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
SRC_URI=""
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
IUSE="cl_consolegui cl_client cl_desktop cl_console"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-3.1.1_beta3-r2
=sys-apps/calculate-i18n-3.1.1_beta3-r1
=sys-apps/calculate-lib-3.1.1_beta3
=sys-apps/calculate-core-3.1.1_beta3-r1
=sys-apps/calculate-update-3.1.1_beta3
cl_client? ( =sys-apps/calculate-client-3.1.1_beta3 )
cl_desktop? ( =sys-apps/calculate-desktop-3.1.1_beta3 )
cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.1_beta3 )
cl_console? ( =sys-apps/calculate-console-3.1.1_beta3 )
"

@ -1,26 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=4
DESCRIPTION="Calculate Utilities meta package"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
SRC_URI=""
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
IUSE="cl_consolegui cl_client cl_desktop cl_console"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-3.1.1_beta3-r3
=sys-apps/calculate-i18n-3.1.1_beta3-r1
=sys-apps/calculate-lib-3.1.1_beta3
=sys-apps/calculate-core-3.1.1_beta3-r1
=sys-apps/calculate-update-3.1.1_beta3
cl_client? ( =sys-apps/calculate-client-3.1.1_beta3 )
cl_desktop? ( =sys-apps/calculate-desktop-3.1.1_beta3 )
cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.1_beta3 )
cl_console? ( =sys-apps/calculate-console-3.1.1_beta3 )
"

@ -14,13 +14,13 @@ KEYWORDS="amd64 x86"
IUSE="cl_consolegui cl_client cl_desktop cl_console"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-3.1.1
=sys-apps/calculate-i18n-3.1.1
=sys-apps/calculate-lib-3.1.1
=sys-apps/calculate-core-3.1.1
=sys-apps/calculate-update-3.1.1
cl_client? ( =sys-apps/calculate-client-3.1.1 )
cl_desktop? ( =sys-apps/calculate-desktop-3.1.1 )
cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.1 )
cl_console? ( =sys-apps/calculate-console-3.1.1 )
=sys-apps/calculate-install-3.1.2
=sys-apps/calculate-i18n-3.1.2
=sys-apps/calculate-lib-3.1.2
=sys-apps/calculate-core-3.1.2
=sys-apps/calculate-update-3.1.2
cl_client? ( =sys-apps/calculate-client-3.1.2 )
cl_desktop? ( =sys-apps/calculate-desktop-3.1.2 )
cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.2 )
cl_console? ( =sys-apps/calculate-console-3.1.2 )
"
Loading…
Cancel
Save