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

Bump version.

Browse Source
atratsevskiy
Mike Hiretsky 13 years ago
parent 62c8c48780
commit e61739cfdb
127 changed files with 140 additions and 5342 deletions
Show Stats Download Patch File Download Diff File

8
app-misc/calculate-install-gui/Manifest
Unescape View File

@ -1,9 +1,5 @@
DIST calculate-install-gui-2.2.15.tar.bz2 153908 RMD160 6a6abc6b0c40f0731cf1c290d1c617bbb10ab79a SHA1 7adfe12129b600172bd43a62377a9d0015cf2520 SHA256 18e2b7fdc2494b3cbe33e3a47652644cf7339e4696e2ab952201c7b90fa2e422
DIST calculate-install-gui-2.2.16.tar.bz2 153939 RMD160 e6cd346c737468b867ab13f7a25b43fc0307c7b2 SHA1 aed98923a4b1a9670f8020b2f87ebc59c19dbf60 SHA256 43ea773c3b26e3069221d67b7b61badf025f2c148b10dc63853c4a5c15af208b
DIST calculate-install-gui-2.2.17.tar.bz2 153900 RMD160 535fc80e2b07418b98ebe231a6176e5f2bb1e13f SHA1 3753cc71df64adf8e97956c3470a32d550b560ed SHA256 afc0285e966aca5a19829e58a70beadaf002cf401339955aa08ce56c73e2ad70
EBUILD calculate-install-gui-2.2.15.ebuild 711 RMD160 49cfff5e95864f6a24861b589cff1ca7a3cc056c SHA1 d71a43541cd1f481f149debde2e59aa1c7a3720c SHA256 37e2fe7e0da4247c5bdb487e4ee2cb0ce64d864ea30e40bcfdb90ffd41862ea6
EBUILD calculate-install-gui-2.2.16.ebuild 711 RMD160 099a8c83d9b3b720dc2e5923bd53322a1b9ff928 SHA1 7f812483c4dfb825a13abfbe9845332d68d263cb SHA256 8bfc028a78cad12e8a362baf303f66124fb6c6854cb7197d38a1c74a48221db1
EBUILD calculate-install-gui-2.2.17.ebuild 711 RMD160 30a2311b935e014ab5b71a782d4a94579f334af6 SHA1 5640f35a702784806b5c1390e3447b5c6df3ef86 SHA256 f664ac5e426c385996b30341c2aa83dd74dfa4e91085e6d2b5b11727fa393f8c
DIST calculate-install-gui-2.2.18.tar.bz2 153882 RMD160 e29e6824f49a19c9f133f832376499b3470086fc SHA1 b2bea0d0b2879ab4a8f4d85e98b00b6a127d7f7b SHA256 784645eacae84376324d5b4705d47e100870272083e5e8acad5449f4088e11d2
EBUILD calculate-install-gui-2.2.18.ebuild 711 RMD160 7395f07595ce8867cee5e1902fefad0e389040f3 SHA1 dffb55a5bc1a5720cc31ded1bdc7c766e1fcfd66 SHA256 eae2087fe72dc874baa2aebcc22e48d8bc67d89c6c9b074614e6e4a26e55a6be
EBUILD calculate-install-gui-2.2.9999.ebuild 700 RMD160 289147616569eab7f8e75b85db63a87115b96085 SHA1 d885c8cf7bd5290ec2f5bcb0c17baccf596bda35 SHA256 ddc01795d391e954300ac322c1da4ed4c67f13a30739c70437802be8f0a52a81
MISC ChangeLog 13967 RMD160 f1c26adefffa05044f006a414ee3a1bc86d3d083 SHA1 7352feed7b9f99bca30a97f36e2dd3fc71c1d681 SHA256 77e9a6e0857f13728e3065fb9dae29b727aff177f3f359a97a3241f15943ac93
MISC metadata.xml 319 RMD160 c12d856d94a4bbba48275f44c4e9a0eae1ac6f21 SHA1 cddfe781ee5b88c7f5c94d7c5f03a07e61ae3336 SHA256 2a18634b4a257808c269e8c986462b316780c4f8b9a19c7c8b733fa3310a4147

34
app-misc/calculate-install-gui/calculate-install-gui-2.2.16.ebuild
Unescape View File

@ -1,34 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="GUI frontend for the program of installation Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-install-2.2.16
x11-libs/qtermwidget
x11-libs/qt-core"
RDEPEND="${DEPEND}"
src_configure() {
CMAKE_PREFIX_PATH=/usr cmake .
}
src_compile() {
emake || die "make failed"
}
src_install() {
emake DESTDIR="${D}" install || die 'make install failed'
dodoc README
}

34
app-misc/calculate-install-gui/calculate-install-gui-2.2.17.ebuild
Unescape View File

@ -1,34 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="GUI frontend for the program of installation Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-install-2.2.17
x11-libs/qtermwidget
x11-libs/qt-core"
RDEPEND="${DEPEND}"
src_configure() {
CMAKE_PREFIX_PATH=/usr cmake .
}
src_compile() {
emake || die "make failed"
}
src_install() {
emake DESTDIR="${D}" install || die 'make install failed'
dodoc README
}

2
app-misc/calculate-install-gui/calculate-install-gui-2.2.15.ebuild → app-misc/calculate-install-gui/calculate-install-gui-2.2.18.ebuild
Unescape View File

@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-install-2.2.15
DEPEND="~sys-apps/calculate-install-2.2.18
x11-libs/qtermwidget
x11-libs/qt-core"

9
sys-apps/calculate-assemble/ChangeLog
Unescape View File

@ -2,6 +2,15 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-assemble-2.2.18 (29 Jun 2011)
29 Jun 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
-calculate-assemble-2.2.15.ebuild, -calculate-assemble-2.2.16.ebuild,
-calculate-assemble-2.2.17.ebuild, -calculate-assemble-2.2.17-r1.ebuild,
-files/calculate-assemble-2.2.17-x11_rebuild.patch,
+calculate-assemble-2.2.18.ebuild:
Bump version
*calculate-assemble-2.2.17-r1 (24 Jun 2011)
24 Jun 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

12
sys-apps/calculate-assemble/Manifest
Unescape View File

@ -1,11 +1,5 @@
AUX calculate-assemble-2.2.17-x11_rebuild.patch 781 RMD160 d7fa93958e67fdd82bd3716633f4e3e5b7aef3da SHA1 04be48462f61e64829158c1d1acd8b4aae2dacc0 SHA256 34cc81582acf757c27c8147bc070acc78d32ee08e0fc14f07d7dcd0751418e5f
DIST calculate-assemble-2.2.15.tar.bz2 32958 RMD160 8cd8ce7a3b28271ca97a8c31da7b6130f5519765 SHA1 e1208038bc1016ffd73cc04c8afcb0b91af0d822 SHA256 c6c0205025a86bb732ecf3e8d485375e6421121bed39d6ee35746816be107d82
DIST calculate-assemble-2.2.16.tar.bz2 32964 RMD160 3c7b59361e09d6e5c4aed3e727e0d6a4adabec44 SHA1 66bfc29bcf2e0f49e9af92fce10e3aae9b00d9e9 SHA256 423b527ad1c77fe4851e69080f49b0e210fb1c8aeff648069145c754cd4b7a41
DIST calculate-assemble-2.2.17.tar.bz2 32969 RMD160 a645f68e3ed0fee0a4e122620d5dbd629ca7ce69 SHA1 354ca454b7e990bceec92faa296fa8cc995fe3c5 SHA256 1de658e1ea41d60c6ca092816b7f3f555a669516c0ead80e74450e72c00d642f
EBUILD calculate-assemble-2.2.15.ebuild 481 RMD160 079070fb00f88f2320478e6c1b6a131c1a187720 SHA1 2e20fd028a9a0e295048e92f8bfefedde0b91b0a SHA256 5c9de9bebc0029cf4ad109d6c44b352d09efb46852ca421a60cca12ef1e71a67
EBUILD calculate-assemble-2.2.16.ebuild 481 RMD160 69399f236c2ceddd7c240374731d809ea94c2f1c SHA1 913da4fb2fede3bd1aa8d4ff09fdff83a3e45c79 SHA256 1016d77c766f65e2686352a9b322c409fdfacb1a22fd1630dacd08a747277a6b
EBUILD calculate-assemble-2.2.17-r1.ebuild 641 RMD160 856ecf14a1a97bed2b1628078f3de4b180f7b720 SHA1 890414acfdf4c47caf5357b19409437c1baef66b SHA256 0599acac0fb94ef38179887487e0ddd9059c2dd213a95e1088acbad04de1ad57
EBUILD calculate-assemble-2.2.17.ebuild 481 RMD160 4d752771455a136cb104368086689464b1a70d06 SHA1 c99ee0a6c5fb885ca86ebefed809ddb2ca3ac902 SHA256 33ed639b61b5bcfb7342f74292486d54fabdf03e9fd7564a0c10b9dc158c0aa9
DIST calculate-assemble-2.2.18.tar.bz2 33018 RMD160 2c3ae7f1d27c3ad8d5f956d08fa3a676bad8831c SHA1 93737556574d527aae29221a8fe1a0849b962a43 SHA256 25953004f54550c54491498c8bde11fd0761b17bf830d12b0c3a4b6028fd5713
EBUILD calculate-assemble-2.2.18.ebuild 481 RMD160 f347bb36ff1df0ca76adf4a094b77641b4ea33ab SHA1 112d1543752d06d60d6a89e8ef209ffd1b436bf3 SHA256 c3cc49d4b67ee1c26c1e85ef2003372404f54acd50bc73b1a4021f2f612e5013
EBUILD calculate-assemble-2.2.9999.ebuild 482 RMD160 a8dd82b9ec70dd999e13c509f0f11f303bdbf5c7 SHA1 a5218cd678aa8d213ee8455874e7ea0b07246ebc SHA256 2c0fed30ccde6401d214a6de67dc63a0c91fd025508efb3519db9b2cda800ec9
MISC ChangeLog 10611 RMD160 9789060faa18ed5db0556bbaeeea8eda29c8d722 SHA1 d973d19af6a193377c2522fc228c4ddcb5223bab SHA256 4702b73d14c7d30c5881f8db57d907e3d0cc416ac8a9edb8f85490104e3db0cb
MISC ChangeLog 10967 RMD160 5d445418fe0020220f71fd557268cbccd122e549 SHA1 12ebd97a784675027ee748d1ebfa3124c8d314de SHA256 55d341a53b4efcf71813f169e8d33ebcabb314a24d684fb31a19899ba060ca57
MISC metadata.xml 273 RMD160 7d99331acd3ba20fc7ae361cb845f33f73d994ee SHA1 92e19e1e4c24527654168ac0cf9fe58ba78aeb4d SHA256 4e25d45ba43b2ab7f7ae8ab4cfc05c406566cfb143a87166de77fbd8d9f8a943

19
sys-apps/calculate-assemble/calculate-assemble-2.2.15.ebuild
Unescape View File

@ -1,19 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="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.15"
RDEPEND="${DEPEND}"

27
sys-apps/calculate-assemble/calculate-assemble-2.2.17-r1.ebuild
Unescape View File

@ -1,27 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="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.17"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# add x11-module-rebuild if xorg-server rebuild
epatch "${FILESDIR}/calculate-assemble-2.2.17-x11_rebuild.patch"
}

19
sys-apps/calculate-assemble/calculate-assemble-2.2.17.ebuild
Unescape View File

@ -1,19 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="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.17"
RDEPEND="${DEPEND}"

2
sys-apps/calculate-assemble/calculate-assemble-2.2.16.ebuild → sys-apps/calculate-assemble/calculate-assemble-2.2.18.ebuild
Unescape View File

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

21
sys-apps/calculate-assemble/files/calculate-assemble-2.2.17-x11_rebuild.patch
Unescape View File

@ -1,21 +0,0 @@
commit a61c4a0027e6493742e6af341d1b7fa60511cf2c
Author: Mike Hiretsky <mh@calculate.ru>
Date: Fri Jun 24 16:57:53 2011 +0400
Add x11 modules rebuild if emerged xorg-server
diff --git a/pym/cl_assemble.py b/pym/cl_assemble.py
index 6540c51..de13da6 100644
--- a/pym/cl_assemble.py
+++ b/pym/cl_assemble.py
@@ -155,6 +155,10 @@ class cl_assemble(color_print):
'step':'module',
'condition':'sys-kernel/.*source.*',
'progname':'module-rebuild'},
+ # xorg module rebuild
+ {'command':'emerge @x11-module-rebuild',
+ 'step':'x11module',
+ 'condition':'x11-base/xorg-server*'},
# revdep-rebuild
{'command':'revdepRebuild()',
'step':'revdep',

9
sys-apps/calculate-builder/ChangeLog
Unescape View File

@ -2,6 +2,15 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-builder-2.2.18 (29 Jun 2011)
29 Jun 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
-calculate-builder-2.2.15.ebuild, -calculate-builder-2.2.16.ebuild,
-calculate-builder-2.2.16-r4.ebuild,
-files/calculate-builder-2.2.16-fix_dev.patch,
-calculate-builder-2.2.17.ebuild, +calculate-builder-2.2.18.ebuild:
Bump version
*calculate-builder-2.2.17 (22 Jun 2011)
22 Jun 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

12
sys-apps/calculate-builder/Manifest
Unescape View File

@ -1,11 +1,5 @@
AUX calculate-builder-2.2.16-fix_dev.patch 1749 RMD160 c23ac11c05f322afb1c4bf84bc3bafd52765dced SHA1 9330b0fab6d5f03f7a3bc3acb01c7f139b4ca22d SHA256 a5b18e58c199fc092e6358f1a8253c61c149bdb8790d1e0e60598a44d98a9ffa
DIST calculate-builder-2.2.15.tar.bz2 30600 RMD160 1da2f1970fd12aace22f78dff823c4771fb13a69 SHA1 40ce72b6291b1f984e379f23ee295d3f8e18f899 SHA256 205de785e0aea0a934ad6438d99d898f61466bfe2d02a65e835cdca0fbb48017
DIST calculate-builder-2.2.16.tar.bz2 30689 RMD160 f248f584010ff15c025026aa0f6fac901843d74f SHA1 e9253b493966a961352b9d80b109ae58c23bdd6f SHA256 f418a1312ac3f85e0dcf1bf5d545c88e21ce33e301ad7a614fc69fe7037891eb
DIST calculate-builder-2.2.17.tar.bz2 30967 RMD160 4d7718581658563766e26e455f37e89abd14dee9 SHA1 20f8e7d28b93320e98592347673239581dda171f SHA256 8ac0f978dd02f9a35d65b6b0b3008b504b3e58fd0896ecfa7fecdba0a49b1681
EBUILD calculate-builder-2.2.15.ebuild 590 RMD160 b64ca13e863536e1090fc6da28a50d6f84fd2cbd SHA1 56ad8f5017db61fb07eaa7a71ac5808f4011f1de SHA256 76fbb1ec89ed53777a5def347c96ad4c175f5cb54c8f1260bc4f1e11f4356610
EBUILD calculate-builder-2.2.16-r4.ebuild 717 RMD160 90334d713224c41e880eb3c44a6310008bd492aa SHA1 b8ecbad24e35cabee388bfe90f58bdb80ee52e45 SHA256 00986e27ae3e2f539107630ec8e9491046d454dce0bd9066add57299e0071224
EBUILD calculate-builder-2.2.16.ebuild 590 RMD160 357196f9e6ddebe89f15f45e1af9395127bb7855 SHA1 174d2e07112bfa3c19e4cd7d91f1b3ddff89fd81 SHA256 8040fa1928e6c7d4933a6e2f76a171c72e87d10bd4521656f96c19e96984da75
EBUILD calculate-builder-2.2.17.ebuild 590 RMD160 1a51b4a37eb8a4dc340b4a9ca52f7b79857ca074 SHA1 6cb3d1003603acbe3f60b6532bd5107df401048c SHA256 5a61a7ec678c5f2fdeb850641ecb5614fbf8c0fcce14bec565cb908bf50f6e2c
DIST calculate-builder-2.2.18.tar.bz2 30995 RMD160 de051bfc8def67c6adc7c08be6610ed022b0e079 SHA1 5271a56e017acaa0e9fe38fd6717d2ef5ecb4ac8 SHA256 0598342020ebb0008ad7a4ac66c42317663ac153c6f74ed313a7b020b2154c1c
EBUILD calculate-builder-2.2.18.ebuild 590 RMD160 33f7e1c0b350c5c68b30052f174d89e484f0af37 SHA1 86c7e9e00d10190d0db0dee02966d2ff03055d9f SHA256 440610752e8d783cd8ac18a3253456c81e7fb1f5373f1a420f0450f35de43776
EBUILD calculate-builder-2.2.9999.ebuild 555 RMD160 e803b87aed06b8f08e2637e10213a0d81ba3ba0b SHA1 3ed908155f477cfa91155420d4fae903ce8db1da SHA256 fd6326f73e68d91f476498db381f2af62e742e3c461b609a8eb379dc417e1470
MISC ChangeLog 14192 RMD160 e3bfce68d1dab8b9d68b7ed88bbf0f853d45e173 SHA1 3af4feb239091a38c102627918cda46461dc25be SHA256 6e2fe48a5220c0c368573de8243d69b178060055c1ca2c6df8895c1437aa2db2
MISC ChangeLog 14537 RMD160 55a3fabaeab0b7faf921d38f22dd9236102ee7d6 SHA1 e8217ba850a6b2c4611fcaa01874463032c6a2d8 SHA256 b787312534a3e16d80d7172421f9ec833e157cfe952f74ecd2eefed21d63df87
MISC metadata.xml 270 RMD160 b5ff308a82cd6e594c2f04731cdbe9f80a945042 SHA1 58dbf7eb15bb2e6c6c8514f483e51dfacd1c62e9 SHA256 b65e150429ecbf36cf03d094f4e3e7518f536c61289cecff6b817326703d58a0

31
sys-apps/calculate-builder/calculate-builder-2.2.16-r4.ebuild
Unescape View File

@ -1,31 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="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.15-r5
~sys-apps/calculate-install-2.2.16
!<sys-apps/calculate-1.4.0_p20100921
app-cdr/cdrkit
sys-fs/squashfs-tools"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# fix dev directory
epatch "${FILESDIR}/calculate-builder-2.2.16-fix_dev.patch"
}

23
sys-apps/calculate-builder/calculate-builder-2.2.16.ebuild
Unescape View File

@ -1,23 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="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.15-r5
~sys-apps/calculate-install-2.2.16
!<sys-apps/calculate-1.4.0_p20100921
app-cdr/cdrkit
sys-fs/squashfs-tools"
RDEPEND="${DEPEND}"

23
sys-apps/calculate-builder/calculate-builder-2.2.17.ebuild
Unescape View File

@ -1,23 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="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.15-r5
~sys-apps/calculate-install-2.2.17
!<sys-apps/calculate-1.4.0_p20100921
app-cdr/cdrkit
sys-fs/squashfs-tools"
RDEPEND="${DEPEND}"

2
sys-apps/calculate-builder/calculate-builder-2.2.15.ebuild → sys-apps/calculate-builder/calculate-builder-2.2.18.ebuild
Unescape View File

@ -15,7 +15,7 @@ SLOT="0"
KEYWORDS="amd64 x86"
DEPEND=">=sys-kernel/calckernel-3.4.15-r5
~sys-apps/calculate-install-2.2.15
~sys-apps/calculate-install-2.2.18
!<sys-apps/calculate-1.4.0_p20100921
app-cdr/cdrkit
sys-fs/squashfs-tools"

42
sys-apps/calculate-builder/files/calculate-builder-2.2.16-fix_dev.patch
Unescape View File

@ -1,42 +0,0 @@
diff --git a/pym/cl_builder.py b/pym/cl_builder.py
index 6ec85ea..279a906 100644
--- a/pym/cl_builder.py
+++ b/pym/cl_builder.py
@@ -18,6 +18,7 @@ __version__ = "2.2.16"
__app__ = "calculate-builder"
import os
+import stat
import re
import sys
import traceback
@@ -103,6 +104,21 @@ class cl_builder(color_print):
self.clVars.importBuilder()
self.clVars.flIniFile()
+ def createDevNodes(self,directory):
+ """Create nodes for dev http://dev.gentoo.org/~a3li/openrc.txt"""
+ devPath = path.join(directory,"dev")
+ # clean dev
+ for pathname,dirs,files in os.walk(devPath,topdown=False):
+ map(lambda x:os.unlink(path.join(pathname,x)),files)
+ map(lambda x:os.unlink(x) if path.islink(x) else os.rmdir(x),
+ map(lambda x:path.join(pathname,x),dirs))
+ for node,mode,dmode,major,minor in [("console",0600,stat.S_IFCHR,5,1),
+ ("null",0666,stat.S_IFCHR,1,3),
+ ("zero",0666,stat.S_IFCHR,1,5)]:
+ nodePath = path.join(devPath,node)
+ os.mknod(nodePath,mode|dmode,os.makedev(major,minor))
+ os.chmod(nodePath,mode)
+
def applyTemplatesForSquash(self,directory):
"""Apply templates for root of system."""
#self.clVars.Set("cl_root_path","/", True)
@@ -110,6 +126,7 @@ class cl_builder(color_print):
self.clVars.Set("cl_chroot_path",directory, True)
self.clTempl = template(self.clVars)
dirsFiles = self.clTempl.applyTemplates()
+ self.createDevNodes(directory)
self.clTempl.closeFiles()
if self.clTempl.getError():
raise BuilderError(self.clTempl.getError())

7
sys-apps/calculate-client/ChangeLog
Unescape View File

@ -2,6 +2,13 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-client-2.2.18 (29 Jun 2011)
29 Jun 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
-calculate-client-2.2.15.ebuild, -calculate-client-2.2.16.ebuild,
-calculate-client-2.2.17.ebuild, +calculate-client-2.2.18.ebuild:
Bump version
*calculate-client-2.2.17 (22 Jun 2011)
22 Jun 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

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

@ -1,9 +1,5 @@
DIST calculate-client-2.2.15.tar.bz2 37446 RMD160 72fb6f12d591cbac514d781a6e8ff8d05fc2a58b SHA1 92263acc2988bce2201bdabcd7c31b7a60f6d691 SHA256 acf27e11c0169d1cf88c95fcabf7e36523f0d30fb1eed3d967436c6bebad5735
DIST calculate-client-2.2.16.tar.bz2 37445 RMD160 53f68f9d144f6d1c837c913387e267977471d4fc SHA1 8e569aee1352054adc6531812d90058ea9ec9a38 SHA256 59565edea8a1583073fbae412abaec0c94c48d1466b28f605c6178b45be8a7ee
DIST calculate-client-2.2.17.tar.bz2 37440 RMD160 8154631a435c6c0dfef60555667f62b460490afa SHA1 448d7bf765c2d31395bd88d58c60e845e9fe697c SHA256 179f45b382d4b76a8891e3727792b14120507c492067ce3d996b0e21ec4472bd
EBUILD calculate-client-2.2.15.ebuild 1685 RMD160 46473a51349589323d47d2dc8a9263712b479add SHA1 9d04d629fb27f96007427a19f2b7ab70d3bd814e SHA256 1b342f7e8b957a9a4b69148252e246005d8196193317979c65fadea6f2cebed5
EBUILD calculate-client-2.2.16.ebuild 1685 RMD160 08f9b9350dc92446d925991c32353d2ecb2f04e9 SHA1 f7b5ed6fc4be942e76be18f4bd53f6321a292442 SHA256 4a447f7d49d653ec6a3a9c99e5ff12e8436ff3c015bdd220f7ced3b7b39a3076
EBUILD calculate-client-2.2.17.ebuild 1685 RMD160 c042eceba8a58e5f7e7a04a7fd97c84eb9e0495f SHA1 26446980c042a7b7ab5cefa5b7423e6529d0d61b SHA256 d14ade8092c143a231c94948d10ebda52a5e8ca4688f37a73180f131974124d1
DIST calculate-client-2.2.18.tar.bz2 37446 RMD160 adeb047706ac3eb760a1128f6a8a7ae1b845f008 SHA1 d72cbea968bf054aa125e5bf367edf4c9e599178 SHA256 d741541dc3c3e7f7540f08e243dbe8b17369d019bb45dacf93ab3d81aba4b749
EBUILD calculate-client-2.2.18.ebuild 1685 RMD160 0914a029f468329ad9d3599676e8d2358a1812a2 SHA1 a06f36695025ee413fa3781b67ebc951974dd29b SHA256 5e89ef0e05c3c96f39f6f8917a7413226d4967e8d35938cb2d35be1f5bf9fc47
EBUILD calculate-client-2.2.9999.ebuild 1623 RMD160 1b81a8a2088dba8bcb439a8c3ecdf1ebfe5656e6 SHA1 bfe1bc648163eab9a638d0be4974157a72ff237c SHA256 7680e14e7e79844248bbf9c45701543b219cd0c71d72cf4d7dcd6f3e571d8402
MISC ChangeLog 18260 RMD160 f018e14b469043799e2d6689d2f7f4c9040f2557 SHA1 690ab5d109563ca9cd30c87477ffe2241efe8f1f SHA256 e9bdf7a2123e82a2eae551f3e57a05c173f9bd3e0b596e5cd9a333686bcc8224
MISC ChangeLog 18512 RMD160 e4502408dee3775be2006206919df23ae6644ea4 SHA1 b92b82f398a522ca91b5b1cc161e4de49e61f8ec SHA256 744c42f095ecc4a24a486ef42070e80c78d1c83964b67e909195436da6df5041
MISC metadata.xml 310 RMD160 ed986dbc43c958bd57e0fb73749ee09167ee0221 SHA1 4007f716df1aa85ec65d926f246663effc382384 SHA256 5023605d36dcbb5d5fe1b1ac54f7125a4087479b5168601075a8050ed51c38c2

64
sys-apps/calculate-client/calculate-client-2.2.16.ebuild
Unescape View File

@ -1,64 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="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.16
>=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
xfce? ( x11-misc/xdialog )
gnome? ( x11-misc/xdialog )
kde? ( kde-base/kdialog )"
RDEPEND="${DEPEND}"
ISUPDATE=/tmp/${PN}.ebuild.update
# for fixing bug of ebuild calculate-client-2.0.17
OLDISUPDATEPATH="${PORTAGE_TMPDIR}/portage/${CATEGORY}/${PN}-2.0.17/temp/"
OLDISUPDATE="${OLDISUPDATEPATH}/${PN}.update"
pkg_preinst() {
touch ${ISUPDATE}
rm -f /etc/init.d/client
# for fixing bug of ebuild calculate-client-2.0.17
mkdir -p ${OLDISUPDATEPATH}
touch ${OLDISUPDATE}
}
pkg_postinst() {
#/usr/lib/calculate-2.2/calculate-client/bin/install
rm ${ISUPDATE}
# for fixing bug of ebuild calculate-client-2.0.17
rm -rf ${PORTAGE_TMPDIR}/portage/${CATEGORY}/${PN}-2.0.17
rmdir ${PORTAGE_TMPDIR}/portage/${CATEGORY} &>/dev/null
einfo "For configure calculate-client perform:"
einfo " cl-client --install"
}
pkg_prerm() {
# for fixing bug of ebuild calculate-client-2.0.17 (|| -e ${OLDISUPDATE} )
if ! [[ -e ${ISUPDATE} || -e ${OLDISUPDATE} ]];
then
:
#/usr/lib/calculate-2.2/calculate-client/bin/uninstall
fi
}

64
sys-apps/calculate-client/calculate-client-2.2.17.ebuild
Unescape View File

@ -1,64 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="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.17
>=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
xfce? ( x11-misc/xdialog )
gnome? ( x11-misc/xdialog )
kde? ( kde-base/kdialog )"
RDEPEND="${DEPEND}"
ISUPDATE=/tmp/${PN}.ebuild.update
# for fixing bug of ebuild calculate-client-2.0.17
OLDISUPDATEPATH="${PORTAGE_TMPDIR}/portage/${CATEGORY}/${PN}-2.0.17/temp/"
OLDISUPDATE="${OLDISUPDATEPATH}/${PN}.update"
pkg_preinst() {
touch ${ISUPDATE}
rm -f /etc/init.d/client
# for fixing bug of ebuild calculate-client-2.0.17
mkdir -p ${OLDISUPDATEPATH}
touch ${OLDISUPDATE}
}
pkg_postinst() {
#/usr/lib/calculate-2.2/calculate-client/bin/install
rm ${ISUPDATE}
# for fixing bug of ebuild calculate-client-2.0.17
rm -rf ${PORTAGE_TMPDIR}/portage/${CATEGORY}/${PN}-2.0.17
rmdir ${PORTAGE_TMPDIR}/portage/${CATEGORY} &>/dev/null
einfo "For configure calculate-client perform:"
einfo " cl-client --install"
}
pkg_prerm() {
# for fixing bug of ebuild calculate-client-2.0.17 (|| -e ${OLDISUPDATE} )
if ! [[ -e ${ISUPDATE} || -e ${OLDISUPDATE} ]];
then
:
#/usr/lib/calculate-2.2/calculate-client/bin/uninstall
fi
}

2
sys-apps/calculate-client/calculate-client-2.2.15.ebuild → sys-apps/calculate-client/calculate-client-2.2.18.ebuild
Unescape View File

@ -15,7 +15,7 @@ SLOT="0"
KEYWORDS="amd64 x86"
IUSE="kde xfce gnome"
DEPEND="~sys-apps/calculate-desktop-2.2.15
DEPEND="~sys-apps/calculate-desktop-2.2.18
>=dev-python/python-ldap-2.0[ssl]
>=sys-auth/pam_ldap-180[ssl]
>=sys-auth/nss_ldap-239

7
sys-apps/calculate-desktop/ChangeLog
Unescape View File

@ -2,6 +2,13 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-desktop-2.2.18 (29 Jun 2011)
29 Jun 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
-calculate-desktop-2.2.15.ebuild, -calculate-desktop-2.2.16.ebuild,
-calculate-desktop-2.2.17.ebuild, +calculate-desktop-2.2.18.ebuild:
Bump version
*calculate-desktop-2.2.17 (22 Jun 2011)
22 Jun 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

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

@ -1,9 +1,5 @@
DIST calculate-desktop-2.2.15.tar.bz2 16325 RMD160 346405cf222a5571a5cb1acdf2713f4820f1b28b SHA1 a8f3d0c06c19399f79fb41b1c7f74ac53c9ca144 SHA256 0c0e3ff7f5eca3f5219787d3933aca6bdef97fbf00b635d6d3866f30034d56de
DIST calculate-desktop-2.2.16.tar.bz2 16321 RMD160 8185d70173189f923fd37b4d638f8d5d5dfd29c4 SHA1 6cabb20a3c002378e24c8c7f1b71e5c8cdd5b37b SHA256 9fbb287d76570b1454dcd8275f1ee4993967015c041e373b984df04a012d8848
DIST calculate-desktop-2.2.17.tar.bz2 16311 RMD160 2ea309c671b65944f23d1b7c457290ba267fd431 SHA1 dd47146c228cd81eadce42131aeff8c50d55e3a6 SHA256 06a5e5c1d983da0b7ee63e95759f8246daa43041c4a7a316f018877089048fd9
EBUILD calculate-desktop-2.2.15.ebuild 875 RMD160 4644451f6dca378a538b80983e5d673223ac1386 SHA1 cd0aeb7106a9ecfefeec978c6371586d8a70f15f SHA256 bfdaebb424bdb7f8be4cfbd51b617b264b85b72037bd724f79aab511c011f2aa
EBUILD calculate-desktop-2.2.16.ebuild 875 RMD160 f8ca98f74825bf38ac3f7b3beecec6a1f07ae675 SHA1 0f4dc4548215c89ca85d3f80abaa0acfb1052b02 SHA256 8e787e53f1965a4784b8de414cd71ef3b7b0a05e0cb9e05c96a1014c13b889b7
EBUILD calculate-desktop-2.2.17.ebuild 875 RMD160 6402d944dca24913f4f0c240525c1572622b33d7 SHA1 b9d3531e2330473708126f719efb8ffd394710fe SHA256 4f3a22151fb5ac20670a7766185b74a631f021769bff59e594f4f057517f7035
DIST calculate-desktop-2.2.18.tar.bz2 16323 RMD160 b4d1809826406787cbd8d846efec9044795acb0c SHA1 d445f9f7b0f0ef52e5a5d6064fb4841d122640b1 SHA256 1096bf06f5b24d1bdd12cd348b54739c251864803b0688c2d786099c13f45293
EBUILD calculate-desktop-2.2.18.ebuild 875 RMD160 1d4b06da7fc339b6a48413ac086ea6e0ade08984 SHA1 b0714073b31fc408a19c7e4e03389c867592beec SHA256 9fcd74674a9176ed3a96253b21a39849a771d0841c0c03832c97d61c6e4cbadf
EBUILD calculate-desktop-2.2.9999.ebuild 887 RMD160 1dc176568da935318117adcaa7747c2b2924eaab SHA1 c418e1a3b55d04b9f00939259e1231095285eeb1 SHA256 8824762b98472f9b6263c1d85b1f159aea6d7694dee7c93b336eae061afb77d3
MISC ChangeLog 12930 RMD160 1536583c83d63a0f3efa8ada64c28869a14dcbfb SHA1 4e812234745a58780e9c2ad1e95adbc35bed2dd0 SHA256 6a9d9b05ea9f473cd9151ec31baa1db1095e02e2ef810c84065b2353efd0a16b
MISC ChangeLog 13187 RMD160 f7a270da216f918fa4a30d447018705281930264 SHA1 f0afd43622844c6ad204d7a11a1b6b047a54eccb SHA256 7b9d515ce6d2ed296d634d254508c6bd9837062ef6fe58ff270c14ddd8ccba4e
MISC metadata.xml 315 RMD160 36a1a8d03aed0a483def83e076f484a64d452a8b SHA1 f6e70641eab777d2417d8a7600e8d3f09f53f96f SHA256 67fea0b1af7d10c0f86e72ab40f527e99c6f81f7aace4716344bdfb97c769a18

34
sys-apps/calculate-desktop/calculate-desktop-2.2.16.ebuild
Unescape View File

@ -1,34 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The program of the desktop configuration Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="kde xfce gnome"
DEPEND="~sys-apps/calculate-templates-2.2.16
>=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
einfo "For configure calculate-desktop perform:"
einfo " cl-desktop --install"
if use kde || use xfce || use gnome
then
einfo " /etc/init.d/xdm restart"
fi
}

34
sys-apps/calculate-desktop/calculate-desktop-2.2.17.ebuild
Unescape View File

@ -1,34 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The program of the desktop configuration Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="kde xfce gnome"
DEPEND="~sys-apps/calculate-templates-2.2.17
>=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
einfo "For configure calculate-desktop perform:"
einfo " cl-desktop --install"
if use kde || use xfce || use gnome
then
einfo " /etc/init.d/xdm restart"
fi
}

2
sys-apps/calculate-desktop/calculate-desktop-2.2.15.ebuild → sys-apps/calculate-desktop/calculate-desktop-2.2.18.ebuild
Unescape View File

@ -15,7 +15,7 @@ SLOT="0"
KEYWORDS="amd64 x86"
IUSE="kde xfce gnome"
DEPEND="~sys-apps/calculate-templates-2.2.15
DEPEND="~sys-apps/calculate-templates-2.2.18
>=dev-python/python-ldap-2.0[ssl]
xfce? ( x11-misc/xdialog )
gnome? ( x11-misc/xdialog )

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

@ -1,17 +1,5 @@
AUX calculate-install-2.2.15-fix_some_bugs.patch 8909 RMD160 f952fc191970483a7c29bdfe6bd954f11be3e445 SHA1 054b94b52e806299497952642d48dd507f9a92e2 SHA256 6e6e25e06b5f857a51d6d062f1b58d594e970676e903ea51913c0779aa9fb3dd
AUX calculate-install-2.2.17-backport.patch 5142 RMD160 aa3808bd8346199f4a4e9377e23736e552f25483 SHA1 8c0c42c2eeb60fffd6613bb1194d6a7cf0da65bf SHA256 51e929c760101ba94a56bd67592e5d834862c1158769e0f375c3961b9731503d
AUX calculate-install-2.2.17_2.2.18_rc1.patch 6646 RMD160 e1c70ccbba53d3af78f9fef03cb063482a1caf9a SHA1 7ff486bb1c5f67d9a8e37be09e58f8063d497eb7 SHA256 a61186f79da55f2ef15dfb49550def92794a30ae179c5d5e86398b72ffe0d873
AUX calculate-install-2.2.17_2.2.18_rc2.patch 7524 RMD160 700ce4e957209b96362be5cba8f04b79bc8fcf90 SHA1 e2e67469249d604a86bb62b1c733d7c34d169ee6 SHA256 d984e0d6b4dfc11f80ddb3cdec476cecbe3d5da3476507ef2e7e31ccaa5ee781
DIST calculate-install-2.2.15.tar.bz2 69721 RMD160 12b347e84f72e79fcb8d94ad7bd4879593baab0d SHA1 10dc3f5cb0bffebbf902be3cf02fc309ca00b595 SHA256 0e712ba3fb5416863110dd9e363d0a23ef3f0ab3847fc07dfb996bed8d3e9da0
DIST calculate-install-2.2.16.tar.bz2 71560 RMD160 22eec0a3899f1d0b0ec964abe32762b84e96d169 SHA1 098e686d8717564ad4619d63c5a74914d80a4b85 SHA256 34eaf77ee19922e14c74ff2f326535445fd2111eb8f886c9a8923b6955521ba1
DIST calculate-install-2.2.17.tar.bz2 75666 RMD160 e0e5cd4e8b6c275685c937b960c818bf1756e071 SHA1 ca0eb462e7c07588eec58ed7549abc5510c22d79 SHA256 b4567cd83083460417fbe866081d93e29cb63a18d1a0bcfa01bc4be2b9b21a2b
EBUILD calculate-install-2.2.15-r1.ebuild 847 RMD160 2d5152d6026fb0b755c4713b3a65493e9d3e4218 SHA1 6ff5856fdca1ca26976e80aa79d67d33381c11ae SHA256 c81b60b72d76cd153a2440e01ca203276cd0afeafdd1e149450c8790b93f29f8
EBUILD calculate-install-2.2.15.ebuild 718 RMD160 bc3607c77143d1fea398050312fc486ffd0d1b2d SHA1 f914c21f78fd3f2af151530146b0c25135702e1a SHA256 066286e0790f9aa51aa208468e5b4c3a3db082a0230f89c72e59e75c9de5551c
EBUILD calculate-install-2.2.16.ebuild 718 RMD160 ea97d7d5c6062c9815754584861ec4eb33e51860 SHA1 fa11f7f794bc4795bd7bf577119025d4301065fb SHA256 56373b5ea8380fcddc3f2f924935565b50228ad9ce7e3dcfdc644ae48bd19c2c
EBUILD calculate-install-2.2.17-r1.ebuild 853 RMD160 8fa07fe5d9828a36c877eedb2e150225ac065a7e SHA1 a884b554d05809ada39b04cfa8d9c2a8b2e683f8 SHA256 0e58f09fec041e7a47f59326cb72629c8ba10c62a8f3a357d87c0f313d10d194
EBUILD calculate-install-2.2.17-r2.ebuild 851 RMD160 a286cd632225b2d39e0326e37aa820c123020474 SHA1 a0990a4f08265c5b84adc36126c6359213d4d772 SHA256 38d5b7e2225453735680b1120ff9a3099efbe6a1d24bfe0dec3c3157ab80a40a
EBUILD calculate-install-2.2.17-r3.ebuild 851 RMD160 572273a60a8b6e2f7377204138606f7a222f18c4 SHA1 9be4a159249573dacdad0d2562a66937aa2f92d7 SHA256 a4e7546e1d577fa2f5ba6bb70bc6f594bff0d3faa7982196f15114e4c789b652
EBUILD calculate-install-2.2.17.ebuild 718 RMD160 c385f5747fccc79bc01147530a53f91b57d88289 SHA1 dd23fe48aa61f6943a1f997fd09c9f2712910d40 SHA256 f4ed46239c2cdd5f89af93890c805f8942d0d7c16f268325d71e61baddeb20ae
DIST calculate-install-2.2.18.tar.bz2 75850 RMD160 56b1058d1977957cc6ceb8322a049af4dbb8f0cc SHA1 4e990cf5bd6310942b54995293f1f7ea82726aa9 SHA256 2a1b9c3fa93a958f19f05af51f80adf25f5ee0867452fac0304ec721de19cd97
EBUILD calculate-install-2.2.18.ebuild 718 RMD160 6036a151e5e5f44dc88f05943483889aac3db500 SHA1 733eb52ed024192f39a93961b2af8b4f4d8b9ed7 SHA256 a10787adc974dd82ca0272b461ad9b593cd441f821fb1696b57d2b97e3f4297f
EBUILD calculate-install-2.2.9999.ebuild 595 RMD160 8f9b9a14fed39ded9c2a9d9343aa4e892d620172 SHA1 09aff28bdaa486868e2caddc7911732a905336ee SHA256 534e6c6e465177e269ce7beed96dab08a124878591088c1bf38095e855ca1180
MISC ChangeLog 22508 RMD160 87b926511b2704d67d39c61d3046be4e25755025 SHA1 16c8456df0bd76b5820a21044eb0bf561e30c8a0 SHA256 9d1d062a4522008cab9d1912d13688cff47e405455b529fa12a943a83067cd3b
MISC metadata.xml 310 RMD160 769e4f17a9354da6b168b72a5d65d978f65bf6dd SHA1 83aaae376052d69c7327e880cf028ebc0dea608b SHA256 c29d3efc676d8308872920db5223c78469db86ac236b5d45c3ee98ceb8fca846

39
sys-apps/calculate-install/calculate-install-2.2.15-r1.ebuild
Unescape View File

@ -1,39 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${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="0"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="~sys-apps/calculate-templates-2.2.15
app-portage/layman
!minimal? ( sys-boot/grub
sys-apps/gptfdisk
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# fix some bugs
epatch "${FILESDIR}/calculate-install-2.2.15-fix_some_bugs.patch"
}
pkg_postinst() {
einfo "For configure calculate-install perform:"
einfo " cl-install --install"
}

31
sys-apps/calculate-install/calculate-install-2.2.15.ebuild
Unescape View File

@ -1,31 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${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="0"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="~sys-apps/calculate-templates-2.2.15
app-portage/layman
!minimal? ( sys-boot/grub
sys-apps/gptfdisk
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )"
RDEPEND="${DEPEND}"
pkg_postinst() {
einfo "For configure calculate-install perform:"
einfo " cl-install --install"
}

39
sys-apps/calculate-install/calculate-install-2.2.17-r1.ebuild
Unescape View File

@ -1,39 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${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="0"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="~sys-apps/calculate-templates-2.2.17
app-portage/layman
!minimal? ( sys-boot/grub
sys-apps/gptfdisk
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# update for some features
epatch "${FILESDIR}/calculate-install-2.2.17-backport.patch"
}
pkg_postinst() {
einfo "For configure calculate-install perform:"
einfo " cl-install --install"
}

39
sys-apps/calculate-install/calculate-install-2.2.17-r2.ebuild
Unescape View File

@ -1,39 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${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="0"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="~sys-apps/calculate-templates-2.2.17
app-portage/layman
!minimal? ( sys-boot/grub
sys-apps/gptfdisk
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# update to 2.2.18_rc1
epatch "${FILESDIR}/calculate-install-2.2.17_2.2.18_rc1.patch"
}
pkg_postinst() {
einfo "For configure calculate-install perform:"
einfo " cl-install --install"
}

39
sys-apps/calculate-install/calculate-install-2.2.17-r3.ebuild
Unescape View File

@ -1,39 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${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="0"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="~sys-apps/calculate-templates-2.2.17
app-portage/layman
!minimal? ( sys-boot/grub
sys-apps/gptfdisk
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# update to 2.2.18_rc2
epatch "${FILESDIR}/calculate-install-2.2.17_2.2.18_rc2.patch"
}
pkg_postinst() {
einfo "For configure calculate-install perform:"
einfo " cl-install --install"
}

31
sys-apps/calculate-install/calculate-install-2.2.17.ebuild
Unescape View File

@ -1,31 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${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="0"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="~sys-apps/calculate-templates-2.2.17
app-portage/layman
!minimal? ( sys-boot/grub
sys-apps/gptfdisk
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )"
RDEPEND="${DEPEND}"
pkg_postinst() {
einfo "For configure calculate-install perform:"
einfo " cl-install --install"
}

2
sys-apps/calculate-install/calculate-install-2.2.16.ebuild → sys-apps/calculate-install/calculate-install-2.2.18.ebuild
Unescape View File

@ -15,7 +15,7 @@ SLOT="0"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="~sys-apps/calculate-templates-2.2.16
DEPEND="~sys-apps/calculate-templates-2.2.18
app-portage/layman
!minimal? ( sys-boot/grub
sys-apps/gptfdisk

193
sys-apps/calculate-install/files/calculate-install-2.2.15-fix_some_bugs.patch
Unescape View File

@ -1,193 +0,0 @@
diff --git a/pym/cl_distr.py b/pym/cl_distr.py
index 6f8ee5b..dca1b97 100644
--- a/pym/cl_distr.py
+++ b/pym/cl_distr.py
@@ -759,6 +759,11 @@ class PartitionDistributive(Distributive):
def _mountPartition(self,partition,directory,opts=""):
"""Mount partition to directory"""
self._makeDirectory(directory)
+ if "ntfs" in opts:
+ source_dir = isMount(partition)
+ if source_dir:
+ self._mountToDirectory(source_dir,directory,"-o bind")
+ return
self._mountToDirectory(partition,directory,opts)
def _umountPartition(self,directory):
diff --git a/pym/cl_fill_install.py b/pym/cl_fill_install.py
index f602f23..aaaf2a4 100644
--- a/pym/cl_fill_install.py
+++ b/pym/cl_fill_install.py
@@ -864,12 +864,12 @@ class fillVars(object, glob_attr):
def get_os_install_x11_video_drv(self):
"""Video driver used by xorg"""
if self.Get('os_install_root_type') == 'usb-hdd':
- avialable_drivers = getAvailableX11Drivers()
+ available_drivers = getAvailableX11Drivers()
videoVal = self.getValueFromCmdLine("calculate","video")
videoVal = {'i915':'intel'}.get(videoVal,videoVal)
- if videoVal in list_avialable_drivers:
+ if videoVal in available_drivers:
return videoVal
- return self.getVideoByDefault(list_avialable_drivers)
+ return self.getVideoByDefault(available_drivers)
else:
return self.Get('os_x11_video_drv')
diff --git a/pym/cl_install.py b/pym/cl_install.py
index 2593f06..2f72aa7 100644
--- a/pym/cl_install.py
+++ b/pym/cl_install.py
@@ -830,40 +830,22 @@ class cl_install(color_print, SignalInterrupt):
return instnextres
return curnextres
+ def printInstallTables(self):
+ """Print install report"""
+ title, headerList, dataList = self.generateTableData()
+ tableObj = tableReport("", headerList, dataList)
+ tableObj.printReport(False)
+ title, headerList, dataList = self.generateTableBindData()
+ if dataList:
+ tableObj = tableReport(title, headerList, dataList)
+ tableObj.printReport(False)
+
def printInfo(self,update=False):
self.printSUCCESS(_("Installation") + " Calculate Linux")
- self.defaultPrint("%s\n"%_("System information"))
- self.printSUCCESS(_("Computer name")+": %s"%
- self.clVars.Get('os_install_net_hostname'))
- self.printSUCCESS(_("Domain name")+": %s"%
- self.clVars.Get('os_install_net_domain'))
- self.printSUCCESS(_("Network devices")+": %s"%
- self.clVars.Get("os_net_interfaces_info"))
- self.printSUCCESS(_("Installed system")+": %s %s"%
- (self.clVars.Get('os_linux_name'),
- self.clVars.Get('os_linux_ver')))
- self.defaultPrint("%s\n"%_("Hardware"))
- self.printSUCCESS(_("Machine hardware name")+": %s"%
- self.clVars.Get('os_install_arch_machine'))
- self.printSUCCESS(_("Quantity processors")+": %s"%
- self.clVars.Get('hr_cpu_num'))
- self.printSUCCESS(_("Videocard vendor")+": %s"%
- self.clVars.Get('hr_video'))
- self.printSUCCESS(_("{0} video driver").format("Xorg")+": %s"%
- self.clVars.Get('os_install_x11_video_drv'))
- self.printSUCCESS(_("Screen resolution")+": %s"%
- self.clVars.Get('os_install_x11_resolution'))
- self.defaultPrint("%s\n"%_("Localization"))
- self.printSUCCESS(_("Language")+": %s"%
- self.clVars.Get('os_install_locale_lang'))
- self.printSUCCESS(_("Keymap")+": %s"%
- self.clVars.Get('os_install_locale_xkbname'))
- self.printSUCCESS(_("Timezone")+": %s"%
- self.clVars.Get('os_install_clock_timezone'))
-
- self.defaultPrint("%s\n"%_("Location"))
+ clGet = self.clVars.Get
+ installedSystem = "%s %s"%(clGet('os_linux_name'),
+ clGet('os_linux_ver'))
mbrDevice = self.clVars.Get('os_install_mbr')
- addonMbrInfo = ""
if not mbrDevice in ("","off"):
pathVendor = "/sys/block/%s/device/vendor"%mbrDevice
pathModel = "/sys/block/%s/device/model"%mbrDevice
@@ -871,30 +853,67 @@ class cl_install(color_print, SignalInterrupt):
addonMbrInfo = " (%s %s)"% \
(open(pathVendor,'r').read().strip(),
open(pathModel,'r').read().strip())
- self.printSUCCESS(_("Master boot record")+" (MBR): /dev/%s%s"%
- (self.clVars.Get('os_install_mbr'),addonMbrInfo))
+ else:
+ addonMbrInfo = ""
+ mbrdisk = "/dev/%s%s"%(clGet('os_install_mbr'),addonMbrInfo)
else:
- self.printSUCCESS(_("Master boot record")+
- " (MBR): %s"%_("not changed"))
-
- title, headerList, dataList = self.generateTableData()
- tableObj = tableReport("", headerList, dataList)
- tableObj.printReport(False)
- title, headerList, dataList = self.generateTableBindData()
- if dataList:
- tableObj = tableReport(title, headerList, dataList)
- tableObj.printReport(False)
-
- self.defaultPrint("%s\n"%_("Network services"))
- #self.printSUCCESS(_("Authentification")+": %s"%
- # "<needed>")
- self.printSUCCESS(_("PROXY")+": %s"%
- (self.clVars.Get('os_install_proxy') or _("none")))
- self.printSUCCESS(_("NTP")+": %s"%
- (self.clVars.Get('os_install_ntp') or _("none")))
-
- self.defaultPrint("%s\n"%_("Perform pre-install checkups"))
+ mbrdisk = _("not changed")
+
+ flash = clGet('os_install_root_type')=="flash"
+ usbhdd = clGet('os_install_root_type')=="usb-hdd"
+ hdd = clGet('os_install_root_type')=="hdd"
+
+ printData = [
+ [(_("System information"),True),
+ (_("Computer name"),clGet('os_install_net_hostname'),not flash),
+ (_("Domain name"),clGet('os_install_net_domain'),not flash),
+ (_("Network devices"),clGet('os_net_interfaces_info'),hdd),
+ (_("Installed system"),installedSystem,True)
+ ],
+ [(_("Hardware"),hdd),
+ (_("Machine hardware name"),
+ clGet('os_install_arch_machine'),True),
+ (_("Quantity processors"),clGet('hr_cpu_num'),True),
+ (_("Videocard vendor"),clGet('hr_video'),True),
+ (_("{0} video driver").format("Xorg"),
+ clGet('os_install_x11_video_drv'),True),
+ (_("Screen resolution"),clGet('os_install_x11_resolution'),True)
+ ],
+ [(_("Localization"),not flash),
+ (_("Language"),
+ clGet('os_install_locale_lang'),True),
+ (_("Keymap"),clGet('os_install_locale_xkbname'),True),
+ (_("Timezone"),clGet('os_install_clock_timezone'),True),
+ ],
+ [(_("Location"),True),
+ (_("Master boot record")+" (MBR)",mbrdisk,True),
+ (self.printInstallTables,None,True)
+ ],
+ [(_("Network services"),hdd),
+ (_("PROXY"),
+ clGet('os_install_proxy') or _("none"),True),
+ (_("NTP"),clGet('os_install_ntp') or _("none"),True)
+ ],
+ [(_("Perform pre-install checkups"),True)]
+ ]
+
+ for section in printData:
+ sectionname,condition = section[0]
+ # skip section
+ if not (callable(condition) and condition() or \
+ not callable(condition) and condition ):
+ continue
+ self.defaultPrint("%s\n"%sectionname)
+ for label, data, cond in section[1:]:
+ if not (callable(cond) and cond() or \
+ not callable(cond) and cond ):
+ continue
+ if callable(label):
+ label()
+ else:
+ self.printSUCCESS(label+": %s"%data)
+ # preinstall checkups
subname = self.clVars.Get('os_install_linux_subname')
subname = (" %s"%subname) if subname else ""
buildvar = self.clVars.Get('os_install_linux_build')
@@ -1453,6 +1472,8 @@ class cl_install(color_print, SignalInterrupt):
Perform grub installation to disk, which has root partition
"""
+ if not path.exists('/sbin/grub'):
+ raise DistributiveError(_("Cann't install bootloader"))
grubProcess = process("/sbin/grub",
"--device-map=%s/boot/grub/device.map"%target.getDirectory(),
"--batch",stderr=STDOUT)

117
sys-apps/calculate-install/files/calculate-install-2.2.17-backport.patch
Unescape View File

@ -1,117 +0,0 @@
diff --git a/i18n/cl_install_ru.mo b/i18n/cl_install_ru.mo
index f65db0b..777ceca 100644
Binary files a/i18n/cl_install_ru.mo and b/i18n/cl_install_ru.mo differ
diff --git a/pym/cl_fill_install.py b/pym/cl_fill_install.py
index 80ca597..fb9434e 100644
--- a/pym/cl_fill_install.py
+++ b/pym/cl_fill_install.py
@@ -1104,13 +1104,21 @@ class fillVars(object, glob_attr):
else:
return ""
+ def isDNSByDHCP(self):
+ """If first interface get ip by DHCP dns must be DHCP"""
+ dhcps = self.Get('os_install_net_dhcp_set')
+ if dhcps:
+ if dhcps[0] == "on":
+ return True
+ return False
+
def get_os_install_net_dns(self):
"""Get current name servers"""
dnsIps = filter(ip.checkIp,
map(lambda x:x.strip().partition("nameserver")[2].strip(),
filter(lambda x:x.lstrip().startswith("nameserver"),
readLinesFile('/etc/resolv.conf'))))
- return " ".join(dnsIps)
+ return "" if self.isDNSByDHCP() else " ".join(dnsIps)
def get_os_install_net_dns_search(self):
"""Get current name servers"""
@@ -1118,7 +1126,7 @@ class fillVars(object, glob_attr):
map(lambda x:x.strip().partition("search")[2].strip(),
filter(lambda x:x.lstrip().startswith("search"),
readLinesFile('/etc/resolv.conf'))))
- return dnsSearch
+ return "" if self.isDNSByDHCP() else dnsSearch
def get_os_install_net_conf(self):
"""Net setup (networkmanager or openrc)"""
diff --git a/pym/cl_install.py b/pym/cl_install.py
index 966b881..e9fffcd 100644
--- a/pym/cl_install.py
+++ b/pym/cl_install.py
@@ -864,6 +864,12 @@ class cl_install(color_print, SignalInterrupt):
else:
musers = _("none")
+ dnsNoValue = _("none")
+ dhcps = self.clVars.Get('os_install_net_dhcp_set')
+ if dhcps:
+ if dhcps[0] == "on":
+ dnsNoValue = _("DHCP")
+
self.printSUCCESS(_("Installation") + " Calculate Linux")
printData = [
[(_("System"),True),
@@ -883,13 +889,13 @@ class cl_install(color_print, SignalInterrupt):
(_("PROXY"),
clGet('os_install_proxy') or _("none"),True),
(_("NTP"),clGet('os_install_ntp') or _("none"),True),
- (_("DNS"),clGet('os_install_net_dns') or _("none"),True)
+ (_("DNS"),clGet('os_install_net_dns') or dnsNoValue,True)
],
[(_("Hardware"),True),
(_("Machine hardware name"),
clGet('os_install_arch_machine'),True),
(_("Quantity processors"),clGet('hr_cpu_num'),hdd),
- (_("Videocard vendor"),clGet('hr_video'),hdd),
+ (_("Videocard"),clGet('hr_video_name'),hdd),
(_("{0} video driver").format("Xorg"),
clGet('os_install_x11_video_drv'),hdd),
(_("Screen resolution"),clGet('os_install_x11_resolution'),hdd)
@@ -1820,7 +1826,7 @@ class cl_install(color_print, SignalInterrupt):
clGet('os_install_net_route_network'),
clGet('os_install_net_route_gw'),
clGet('os_install_net_route_src')) + \
- map(lambda x:(x[0],_("DHCP")),
+ map(lambda x:(x[0],_("DHCP"),_("DHCP"),_("DHCP")),
filter(lambda x:x[1]=='on',zip(clGet('os_install_net_interfaces'),
clGet('os_install_net_dhcp_set'))))
diff --git a/pym/cl_install_cmd.py b/pym/cl_install_cmd.py
index 67a049a..d1424d3 100644
--- a/pym/cl_install_cmd.py
+++ b/pym/cl_install_cmd.py
@@ -228,8 +228,8 @@ class install_cmd(share_cmd):
" " + _("ip specifing error: '{ip}' "
"(example: '{example}')").format(\
ip=ipaddr,example="eth0:192.168.0.21/16"))
- if values.dns:
- if not re.match("^{0}(,{0})*$".format(iputils.IP_ADDR),values.dns):
+ if not values.dns is None:
+ if not re.match("(^{0}(,{0})*|)$".format(iputils.IP_ADDR),values.dns):
self.optobj.error(_("option %s:") %"--dns" +\
" " + _("dns specifing error: '%s'") %\
values.dns)
@@ -319,7 +319,7 @@ class install_cmd(share_cmd):
def setNetworkParams(self,ipaddrs,routes,dns,setup,dhcps):
"""Set nework params"""
- if dns:
+ if not dns is None:
self.logicObj.clVars.Set("os_install_net_dns",dns,True)
ipaddrs = map(lambda x:x.split(":"),ipaddrs or [])
routes = map(lambda x:x+[""]*(4-len(x)),
diff --git a/pym/cl_vars_install.py b/pym/cl_vars_install.py
index 77ae323..6feec2e 100644
--- a/pym/cl_vars_install.py
+++ b/pym/cl_vars_install.py
@@ -376,6 +376,7 @@ class Data:
# lib vars
os_locale_xkb = {}
hr_video = {}
+ hr_video_name = {}
os_linux_name = {}
os_scratch = {}
os_x11_video_drv = {}

152
sys-apps/calculate-install/files/calculate-install-2.2.17_2.2.18_rc1.patch
Unescape View File

@ -1,152 +0,0 @@
diff --git i18n/cl_install_ru.mo i18n/cl_install_ru.mo
index f65db0b..e8ea763 100644
Binary files i18n/cl_install_ru.mo and i18n/cl_install_ru.mo differ
diff --git pym/cl_fill_install.py pym/cl_fill_install.py
index 80ca597..fb9434e 100644
--- pym/cl_fill_install.py
+++ pym/cl_fill_install.py
@@ -1104,13 +1104,21 @@ class fillVars(object, glob_attr):
else:
return ""
+ def isDNSByDHCP(self):
+ """If first interface get ip by DHCP dns must be DHCP"""
+ dhcps = self.Get('os_install_net_dhcp_set')
+ if dhcps:
+ if dhcps[0] == "on":
+ return True
+ return False
+
def get_os_install_net_dns(self):
"""Get current name servers"""
dnsIps = filter(ip.checkIp,
map(lambda x:x.strip().partition("nameserver")[2].strip(),
filter(lambda x:x.lstrip().startswith("nameserver"),
readLinesFile('/etc/resolv.conf'))))
- return " ".join(dnsIps)
+ return "" if self.isDNSByDHCP() else " ".join(dnsIps)
def get_os_install_net_dns_search(self):
"""Get current name servers"""
@@ -1118,7 +1126,7 @@ class fillVars(object, glob_attr):
map(lambda x:x.strip().partition("search")[2].strip(),
filter(lambda x:x.lstrip().startswith("search"),
readLinesFile('/etc/resolv.conf'))))
- return dnsSearch
+ return "" if self.isDNSByDHCP() else dnsSearch
def get_os_install_net_conf(self):
"""Net setup (networkmanager or openrc)"""
diff --git pym/cl_install.py pym/cl_install.py
index 966b881..e1bf83e 100644
--- pym/cl_install.py
+++ pym/cl_install.py
@@ -864,6 +864,12 @@ class cl_install(color_print, SignalInterrupt):
else:
musers = _("none")
+ dnsNoValue = _("none")
+ dhcps = self.clVars.Get('os_install_net_dhcp_set')
+ if dhcps:
+ if dhcps[0] == "on":
+ dnsNoValue = _("DHCP")
+
self.printSUCCESS(_("Installation") + " Calculate Linux")
printData = [
[(_("System"),True),
@@ -883,13 +889,13 @@ class cl_install(color_print, SignalInterrupt):
(_("PROXY"),
clGet('os_install_proxy') or _("none"),True),
(_("NTP"),clGet('os_install_ntp') or _("none"),True),
- (_("DNS"),clGet('os_install_net_dns') or _("none"),True)
+ (_("DNS"),clGet('os_install_net_dns') or dnsNoValue,True)
],
[(_("Hardware"),True),
(_("Machine hardware name"),
clGet('os_install_arch_machine'),True),
(_("Quantity processors"),clGet('hr_cpu_num'),hdd),
- (_("Videocard vendor"),clGet('hr_video'),hdd),
+ (_("Videocard"),clGet('hr_video_name'),hdd),
(_("{0} video driver").format("Xorg"),
clGet('os_install_x11_video_drv'),hdd),
(_("Screen resolution"),clGet('os_install_x11_resolution'),hdd)
@@ -1153,7 +1159,8 @@ class cl_install(color_print, SignalInterrupt):
map(lambda x:x[NET],routes)+map(lambda x:x[NET],routedata))
routes = filter(lambda x:x[GW] or x[SRC],routes)
wrongGws = map(lambda x:x[GW],
- filter(lambda x:not ip.isIpInNet(x[GW],*nets),
+ filter(lambda x:not ip.isIpInNet(x[GW],
+ *(set(nets)-set([x[NET]]))),
filter(lambda x:x[GW],
routes)))
if wrongGws:
@@ -1170,7 +1177,12 @@ class cl_install(color_print, SignalInterrupt):
if not dev:
gwnetwork = ip.isIpInNet(gw,*nets)[0]
dev = filter(lambda x:x[NET]==gwnetwork,
- routedata+newroutes)[0][DEV]
+ routedata+newroutes)
+ if not dev:
+ raise InstallError(
+ _("Can not determine device for network %s")%
+ network)
+ dev = dev[0][DEV]
if not gw and not src:
continue
newroutes.append((network,gw,dev,src))
@@ -1820,7 +1832,7 @@ class cl_install(color_print, SignalInterrupt):
clGet('os_install_net_route_network'),
clGet('os_install_net_route_gw'),
clGet('os_install_net_route_src')) + \
- map(lambda x:(x[0],_("DHCP")),
+ map(lambda x:(x[0],_("DHCP"),_("DHCP"),_("DHCP")),
filter(lambda x:x[1]=='on',zip(clGet('os_install_net_interfaces'),
clGet('os_install_net_dhcp_set'))))
diff --git pym/cl_install_cmd.py pym/cl_install_cmd.py
index 67a049a..d1424d3 100644
--- pym/cl_install_cmd.py
+++ pym/cl_install_cmd.py
@@ -228,8 +228,8 @@ class install_cmd(share_cmd):
" " + _("ip specifing error: '{ip}' "
"(example: '{example}')").format(\
ip=ipaddr,example="eth0:192.168.0.21/16"))
- if values.dns:
- if not re.match("^{0}(,{0})*$".format(iputils.IP_ADDR),values.dns):
+ if not values.dns is None:
+ if not re.match("(^{0}(,{0})*|)$".format(iputils.IP_ADDR),values.dns):
self.optobj.error(_("option %s:") %"--dns" +\
" " + _("dns specifing error: '%s'") %\
values.dns)
@@ -319,7 +319,7 @@ class install_cmd(share_cmd):
def setNetworkParams(self,ipaddrs,routes,dns,setup,dhcps):
"""Set nework params"""
- if dns:
+ if not dns is None:
self.logicObj.clVars.Set("os_install_net_dns",dns,True)
ipaddrs = map(lambda x:x.split(":"),ipaddrs or [])
routes = map(lambda x:x+[""]*(4-len(x)),
diff --git pym/cl_vars_install.py pym/cl_vars_install.py
index 77ae323..5238f7b 100644
--- pym/cl_vars_install.py
+++ pym/cl_vars_install.py
@@ -299,6 +299,10 @@ class Data:
# net setup (networkmanager or openrc)
os_install_net_conf = {}
+ # net service configured
+ os_install_net_settings = {'mode':'w',
+ 'value':''}
+
# dhcp or not
os_install_net_dhcp_set = {}
@@ -376,6 +380,7 @@ class Data:
# lib vars
os_locale_xkb = {}
hr_video = {}
+ hr_video_name = {}
os_linux_name = {}
os_scratch = {}
os_x11_video_drv = {}

183
sys-apps/calculate-install/files/calculate-install-2.2.17_2.2.18_rc2.patch
Unescape View File

@ -1,183 +0,0 @@
diff --git i18n/cl_install_ru.mo i18n/cl_install_ru.mo
index f65db0b..e8ea763 100644
Binary files i18n/cl_install_ru.mo and i18n/cl_install_ru.mo differ
diff --git pym/cl_fill_install.py pym/cl_fill_install.py
index 80ca597..fb9434e 100644
--- pym/cl_fill_install.py
+++ pym/cl_fill_install.py
@@ -1104,13 +1104,21 @@ class fillVars(object, glob_attr):
else:
return ""
+ def isDNSByDHCP(self):
+ """If first interface get ip by DHCP dns must be DHCP"""
+ dhcps = self.Get('os_install_net_dhcp_set')
+ if dhcps:
+ if dhcps[0] == "on":
+ return True
+ return False
+
def get_os_install_net_dns(self):
"""Get current name servers"""
dnsIps = filter(ip.checkIp,
map(lambda x:x.strip().partition("nameserver")[2].strip(),
filter(lambda x:x.lstrip().startswith("nameserver"),
readLinesFile('/etc/resolv.conf'))))
- return " ".join(dnsIps)
+ return "" if self.isDNSByDHCP() else " ".join(dnsIps)
def get_os_install_net_dns_search(self):
"""Get current name servers"""
@@ -1118,7 +1126,7 @@ class fillVars(object, glob_attr):
map(lambda x:x.strip().partition("search")[2].strip(),
filter(lambda x:x.lstrip().startswith("search"),
readLinesFile('/etc/resolv.conf'))))
- return dnsSearch
+ return "" if self.isDNSByDHCP() else dnsSearch
def get_os_install_net_conf(self):
"""Net setup (networkmanager or openrc)"""
diff --git pym/cl_install.py pym/cl_install.py
index 966b881..e1bf83e 100644
--- pym/cl_install.py
+++ pym/cl_install.py
@@ -864,6 +864,12 @@ class cl_install(color_print, SignalInterrupt):
else:
musers = _("none")
+ dnsNoValue = _("none")
+ dhcps = self.clVars.Get('os_install_net_dhcp_set')
+ if dhcps:
+ if dhcps[0] == "on":
+ dnsNoValue = _("DHCP")
+
self.printSUCCESS(_("Installation") + " Calculate Linux")
printData = [
[(_("System"),True),
@@ -883,13 +889,13 @@ class cl_install(color_print, SignalInterrupt):
(_("PROXY"),
clGet('os_install_proxy') or _("none"),True),
(_("NTP"),clGet('os_install_ntp') or _("none"),True),
- (_("DNS"),clGet('os_install_net_dns') or _("none"),True)
+ (_("DNS"),clGet('os_install_net_dns') or dnsNoValue,True)
],
[(_("Hardware"),True),
(_("Machine hardware name"),
clGet('os_install_arch_machine'),True),
(_("Quantity processors"),clGet('hr_cpu_num'),hdd),
- (_("Videocard vendor"),clGet('hr_video'),hdd),
+ (_("Videocard"),clGet('hr_video_name'),hdd),
(_("{0} video driver").format("Xorg"),
clGet('os_install_x11_video_drv'),hdd),
(_("Screen resolution"),clGet('os_install_x11_resolution'),hdd)
@@ -1153,7 +1159,8 @@ class cl_install(color_print, SignalInterrupt):
map(lambda x:x[NET],routes)+map(lambda x:x[NET],routedata))
routes = filter(lambda x:x[GW] or x[SRC],routes)
wrongGws = map(lambda x:x[GW],
- filter(lambda x:not ip.isIpInNet(x[GW],*nets),
+ filter(lambda x:not ip.isIpInNet(x[GW],
+ *(set(nets)-set([x[NET]]))),
filter(lambda x:x[GW],
routes)))
if wrongGws:
@@ -1170,7 +1177,12 @@ class cl_install(color_print, SignalInterrupt):
if not dev:
gwnetwork = ip.isIpInNet(gw,*nets)[0]
dev = filter(lambda x:x[NET]==gwnetwork,
- routedata+newroutes)[0][DEV]
+ routedata+newroutes)
+ if not dev:
+ raise InstallError(
+ _("Can not determine device for network %s")%
+ network)
+ dev = dev[0][DEV]
if not gw and not src:
continue
newroutes.append((network,gw,dev,src))
@@ -1820,7 +1832,7 @@ class cl_install(color_print, SignalInterrupt):
clGet('os_install_net_route_network'),
clGet('os_install_net_route_gw'),
clGet('os_install_net_route_src')) + \
- map(lambda x:(x[0],_("DHCP")),
+ map(lambda x:(x[0],_("DHCP"),_("DHCP"),_("DHCP")),
filter(lambda x:x[1]=='on',zip(clGet('os_install_net_interfaces'),
clGet('os_install_net_dhcp_set'))))
diff --git pym/cl_install_cmd.py pym/cl_install_cmd.py
index 67a049a..d1424d3 100644
--- pym/cl_install_cmd.py
+++ pym/cl_install_cmd.py
@@ -228,8 +228,8 @@ class install_cmd(share_cmd):
" " + _("ip specifing error: '{ip}' "
"(example: '{example}')").format(\
ip=ipaddr,example="eth0:192.168.0.21/16"))
- if values.dns:
- if not re.match("^{0}(,{0})*$".format(iputils.IP_ADDR),values.dns):
+ if not values.dns is None:
+ if not re.match("(^{0}(,{0})*|)$".format(iputils.IP_ADDR),values.dns):
self.optobj.error(_("option %s:") %"--dns" +\
" " + _("dns specifing error: '%s'") %\
values.dns)
@@ -319,7 +319,7 @@ class install_cmd(share_cmd):
def setNetworkParams(self,ipaddrs,routes,dns,setup,dhcps):
"""Set nework params"""
- if dns:
+ if not dns is None:
self.logicObj.clVars.Set("os_install_net_dns",dns,True)
ipaddrs = map(lambda x:x.split(":"),ipaddrs or [])
routes = map(lambda x:x+[""]*(4-len(x)),
diff --git pym/cl_migrate_users.py pym/cl_migrate_users.py
index 877dff0..6a8552a 100644
--- pym/cl_migrate_users.py
+++ pym/cl_migrate_users.py
@@ -38,7 +38,7 @@ class migrateGroups(_shareData):
"""Migrate group to new system"""
maxGid = 65000
- minGid = 500
+ minGid = 1000
fileGroups = "/etc/group"
def __init__(self, prefixNewSystem):
@@ -93,7 +93,7 @@ class migrateUsers(_shareData):
"""Migrate users to new system"""
maxId = 65000
- minId = 500
+ minId = 1000
filePasswd = "/etc/passwd"
def __init__(self, prefixNewSystem):
@@ -249,7 +249,7 @@ class migrate(color_print):
minId = 1000
maxGid = 65000
minGid = 1000
- minSysId = 500
+ minSysId = 1000
newUserGroups = ["audio", "cdrom", "cdrw", "games", "lp", "plugdev",
"scanner" "usb", "users", "video", "wheel"]
diff --git pym/cl_vars_install.py pym/cl_vars_install.py
index 77ae323..5238f7b 100644
--- pym/cl_vars_install.py
+++ pym/cl_vars_install.py
@@ -299,6 +299,10 @@ class Data:
# net setup (networkmanager or openrc)
os_install_net_conf = {}
+ # net service configured
+ os_install_net_settings = {'mode':'w',
+ 'value':''}
+
# dhcp or not
os_install_net_dhcp_set = {}
@@ -376,6 +380,7 @@ class Data:
# lib vars
os_locale_xkb = {}
hr_video = {}
+ hr_video_name = {}
os_linux_name = {}
os_scratch = {}
os_x11_video_drv = {}

17
sys-apps/calculate-lib/ChangeLog
Unescape View File

@ -2,6 +2,23 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-lib-2.2.18 (29 Jun 2011)
29 Jun 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
-files/calculate-lib-2.1.8-fix_fifo.patch,
-files/calculate-lib-2.2.8-file.patch, -calculate-lib-2.2.15.ebuild,
-calculate-lib-2.2.15-r2.ebuild,
-files/calculate-lib-2.2.15-fix_get_from_xorg.patch,
-files/lib_i18n_path.patch, -calculate-lib-2.2.15-r1.ebuild,
-files/calculate-lib-2.2.15-fix_update_config.patch,
-calculate-lib-2.2.16.ebuild, -calculate-lib-2.2.16-r1.ebuild,
-files/calculate-lib-2.2.16-fix_get_uid.patch, -calculate-lib-2.2.17.ebuild,
-calculate-lib-2.2.17-r1.ebuild, -calculate-lib-2.2.17-r2.ebuild,
-calculate-lib-2.2.17-r3.ebuild, -files/calculate-lib-2.2.17-backport.patch,
-files/calculate-lib-2.2.17-fix_videodetect.patch,
-files/calculate-lib-2.2.17_2.2.18_rc1.patch, +calculate-lib-2.2.18.ebuild:
Bump version
*calculate-lib-2.2.17-r3 (27 Jun 2011)
27 Jun 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

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

@ -1,30 +1,11 @@
AUX calculate-lib-2.1.8-fix_fifo.patch 1049 RMD160 efc57f006e2d1c73b645f881a6d0ae631c92bdfd SHA1 24122c47ef1a411d731229535e2fda27b0ec8dd0 SHA256 dd4589a0b7085431ffc9c2972890b11c5d0445db5129b8e4fac17d371057c9e2
AUX calculate-lib-2.2.15-fix_get_from_xorg.patch 1781 RMD160 5ab65ae39abebcb114b3c7870b5a501ad3e24fce SHA1 288c51322988bd3d64ff7a01f7d77bac275cda78 SHA256 b90eb1cc093d4dfef43b38077fbb993b0bb92f75158ceaea1b768427d24915fc
AUX calculate-lib-2.2.15-fix_update_config.patch 1072 RMD160 74541ac312602b2d314da5412524f4191c86e3ad SHA1 3d0c9bbe2d99c9d8783fae628136fbe52217a6ab SHA256 634dc581d1728beb021ee805053625c7908180355b62a5e31f4579cffce2c530
AUX calculate-lib-2.2.16-fix_get_uid.patch 1624 RMD160 4f9bc24d1f2e99ab929399a3fedca273f28f1956 SHA1 d17822f1b29f0e5254c6d9207a919f5ec3695e98 SHA256 833a6e4da7ddd2ad431ebf1cfd4acb6aeae2b6571f1e00b7e74df9310250e286
AUX calculate-lib-2.2.17-backport.patch 2553 RMD160 a59dda5e1566e53a021474a52dfbb4f54516d7a5 SHA1 25fd7e130dc62b29a8125cf7f2c477f68f1b7898 SHA256 7444f2bc297dd12d4b9cadd5281286550cff19adcbc362e66c027c57b5a8202d
AUX calculate-lib-2.2.17-fix_videodetect.patch 1176 RMD160 bb8def2761f2a533f5b49f38b3618a93dcfface2 SHA1 b7b14f4739af07dccc75261b95f83482bbcc4506 SHA256 54adaee609cde4a812761b4641ab3ed10c18d0adb37f3879a7b8515805a1a5e3
AUX calculate-lib-2.2.17_2.2.18_rc1.patch 4096 RMD160 edf28fa477db91da884a9acd537d16b42b167876 SHA1 640f61d5d30f824dd21badcc77366917d298a629 SHA256 768b18cbef4017ee4eb292df8787bb86a76c68f9186c945b9dd7ee71f79eeb9a
AUX calculate-lib-2.2.8-file.patch 747 RMD160 8a1f90c822eaefac69b67aa6999a1dc8c2b51b9f SHA1 aeded1b0587785145f4e62f3e81a2726e7c4312d SHA256 45ce03a248d8bec22bbdf006ce607809761304d255467e687242f9423c8413a4
AUX lib_i18n_path.patch 1114 RMD160 6e561c46e91105f4e7686678771da21e8f3685a2 SHA1 b58e8906104b4b9d1a1bd8ecb6959767cad2d329 SHA256 2913821d3c069612485e6dd7fb0e71bc06e5061054309ad9ed6bac29eee732f2
DIST calculate-lib-2.1.11.tar.bz2 61687 RMD160 93ca4f84ff2cd7018addfd4de162959d78e51f78 SHA1 53149951c346fea7709cb43b4d8ebefe63acb0fd SHA256 62976c08d4fb4810389ace6f5a99abb5a962f6c8d9053ff943d0669480fb5599
DIST calculate-lib-2.1.8.tar.bz2 61178 RMD160 4a4ed063a9b4d3b82723f5f6eb046c97ad9fcda1 SHA1 93eb20057afff6e98c409388e1259a3ad078bb7a SHA256 ef8e315001663da7a45e69b82dc7c158fb0e10bd567efa95bf8a654ed441144a
DIST calculate-lib-2.2.15.tar.bz2 109037 RMD160 643f8a670cdeb9ad8435884bc91052f9240b6c35 SHA1 a1931a6671fc4f8428b61f754ac7e0b965e858cd SHA256 726f4d9aa716d7f46b3a4d0ecdf0aa9ab2ae01e4c9b14dfa2771858afa039c6c
DIST calculate-lib-2.2.16.tar.bz2 109647 RMD160 669732216cea1e7cc0a25c05a553aac0a195f0d6 SHA1 3d4007f6e0079337635263f90b4f416f38b70ac3 SHA256 429c3a5c3cd81307b04cdca40a1c2db1bdf4d4a09b261a2cc1c5ac2773ac3b64
DIST calculate-lib-2.2.17.tar.bz2 111462 RMD160 0acfb8620a6984a9abe44fbc2aa6a42f8aed8825 SHA1 0d2fbe33e891c3c1223f14926364d8839ef97ca8 SHA256 1e628526481bc3888f8cc251609caece96ca1a4e988258e68c20644a9db1c9f7
DIST calculate-lib-2.2.18.tar.bz2 111559 RMD160 294326d180c3de46ef1f5c56d4da10313e123d87 SHA1 e6340c81573421eca1f8b882f4a4929830df8bdd SHA256 8e8c0124ab9e2efa270fba9529c36a4dd12aa6d616d005e35945bbd999b6a3a5
EBUILD calculate-lib-2.1.11.ebuild 585 RMD160 742e544ac2f98074ac2cf29227c931e213cff023 SHA1 64e098b169359f3106c0e360261cb5fbb99602f4 SHA256 501467786f3943c8fcf47b787b9582c8aa4f8dfec9e664d784f098b6a3702ba7
EBUILD calculate-lib-2.1.8-r1.ebuild 730 RMD160 a207fbb024eaedeff679eb052b6ca04f289f914f SHA1 68c72562dc796958dd83dc4c59b2444678180b52 SHA256 b6a343b0f4d9e557ca42f5505c56c2373c04d1fa98191cf03b15cd0cdd0bb603
EBUILD calculate-lib-2.1.8-r2.ebuild 810 RMD160 ff412a1e0f7ea1ec3493738e23e3e7ec9334d49d SHA1 251a1fa961d07ef51c1c29ff930f73839b838bc8 SHA256 9cb04ff79362d497c9ac6a52353933683201337cb50104ab7a0b70ba6fdb04c1
EBUILD calculate-lib-2.2.15-r1.ebuild 746 RMD160 5cb4e3ee379a8be31b3f44ec541964647d901661 SHA1 0b354f080225e876daf8d428c97d6f61eefb273c SHA256 5ec08bd26cb1699f439be732a95b34538ab56f239da045e10a69caf5f3c53369
EBUILD calculate-lib-2.2.15-r2.ebuild 834 RMD160 094c6f06d2c116ba59b8e6c8dae4d549f2d3aca4 SHA1 f8b79d90adeff8e7db4d6eec6545fa50008ac738 SHA256 0d898cf610d1d98d784262c0e72923ddce46e5cf515b0b8609d04f38b4e71962
EBUILD calculate-lib-2.2.15.ebuild 620 RMD160 c6b655288e00b8225c87a7c0aee27df1602978bf SHA1 8effba1ef6dec2caf6c75162ced40d8d9c571702 SHA256 733ddccc79c4df5fac82a50a8c94b1494033ed7fb89f4df6ec95d5e8e10ab1d7
EBUILD calculate-lib-2.2.16-r1.ebuild 768 RMD160 4312332a4e8dcba397e40a469dd6d2f50246c1b6 SHA1 67ca7c5877154f05cd0189d113bded9925dceecf SHA256 c7f1967046c6efd62360be848fe6e88edfb425c1d1ed8057c33f9f7eae83510c
EBUILD calculate-lib-2.2.16.ebuild 620 RMD160 c6b655288e00b8225c87a7c0aee27df1602978bf SHA1 8effba1ef6dec2caf6c75162ced40d8d9c571702 SHA256 733ddccc79c4df5fac82a50a8c94b1494033ed7fb89f4df6ec95d5e8e10ab1d7
EBUILD calculate-lib-2.2.17-r1.ebuild 744 RMD160 86da0ffbf03134fe70ee9d80d9af87156d310bca SHA1 f278e62476d4b3fc1600e8b29916aa755d869a94 SHA256 4c224e947dece22065ed65d8ff7d2fe01a9da6a5e06ddb3cc9f68faa043e33b1
EBUILD calculate-lib-2.2.17-r2.ebuild 840 RMD160 ed12ca418bce8b0237ebe6d3b46709629a22fa7a SHA1 8f063ff4f43548c886ada89d9bbf9d3da92fad48 SHA256 54f4cfd0660e2c528745c9f0bfa1ba566508356c22b3296b6c6ea760ecb3c92a
EBUILD calculate-lib-2.2.17-r3.ebuild 759 RMD160 34b990d3913c6cc57665c766f6222eaab94e1845 SHA1 abc49361d3603a453fe395194e1bc792181c7ed5 SHA256 082c114940e0b6622a936a3d3f2a76850cdebef74d979d27eab530265209c67a
EBUILD calculate-lib-2.2.17.ebuild 620 RMD160 c6b655288e00b8225c87a7c0aee27df1602978bf SHA1 8effba1ef6dec2caf6c75162ced40d8d9c571702 SHA256 733ddccc79c4df5fac82a50a8c94b1494033ed7fb89f4df6ec95d5e8e10ab1d7
EBUILD calculate-lib-2.2.18.ebuild 620 RMD160 c6b655288e00b8225c87a7c0aee27df1602978bf SHA1 8effba1ef6dec2caf6c75162ced40d8d9c571702 SHA256 733ddccc79c4df5fac82a50a8c94b1494033ed7fb89f4df6ec95d5e8e10ab1d7
EBUILD calculate-lib-2.2.9999.ebuild 726 RMD160 6dce718f317825c712f7c9595a3e712ef6222cf9 SHA1 42e1607a36e826310ef5ed317d717c5aa8acc2bf SHA256 dce73aafa346ea1fd88b6e99d8f6184a562de56e3eb871c1b5849890b13c34c2
EBUILD calculate-lib-9999.ebuild 476 RMD160 3df165f011b324fa8dc37d0443e941263943dd61 SHA1 069ab864dc83f32c69c4349d807d25e1196756ee SHA256 07a628ede4f47849908dd543f879ab8b40a5ca887b892fa0f5cf6c1ef2a24cab
MISC ChangeLog 21724 RMD160 78c0c1cc75d1f7e962b7e6d6fe24262f7b0bcf9c SHA1 fa89b959bc54235a44c09375ee60bb6bed8ee3ad SHA256 3852b2f0b45c0186d36b421161c69b0baf676649cadcb9c97df2518f271ac418
MISC ChangeLog 22583 RMD160 078a097e2adbb512502869a62d04a890e18ec413 SHA1 69bbcbc6da9575d65eae58a24c7211759b14d6f4 SHA256 0552a86ea869bf86e80066e6b925c1463f327c850e08f67eadccb01305adc0f5
MISC metadata.xml 303 RMD160 774b65ed76939d6878496ad6ef6451849bdced05 SHA1 7d08569697a290ede98c88ab59db3cdc3037bd15 SHA256 181519d9679fd9aee9a7a9806733a50728d3da0b1e0ad54f31499200f7f5c6ec

32
sys-apps/calculate-lib/calculate-lib-2.2.15-r1.ebuild
Unescape View File

@ -1,32 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The library for Calculate 2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="2.2"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="!<sys-apps/calculate-lib-2.1.8-r1
!=sys-apps/calculate-lib-2.1.9
!=sys-apps/calculate-lib-2.1.10
!minimal? ( dev-python/py-smbpasswd )
>=dev-python/pyxml-0.8
sys-apps/file[python]"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# back port
epatch "${FILESDIR}/calculate-lib-2.2.15-fix_get_from_xorg.patch"
}

34
sys-apps/calculate-lib/calculate-lib-2.2.15-r2.ebuild
Unescape View File

@ -1,34 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The library for Calculate 2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="2.2"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="!<sys-apps/calculate-lib-2.1.8-r1
!=sys-apps/calculate-lib-2.1.9
!=sys-apps/calculate-lib-2.1.10
!minimal? ( dev-python/py-smbpasswd )
>=dev-python/pyxml-0.8
sys-apps/file[python]"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# back port
epatch "${FILESDIR}/calculate-lib-2.2.15-fix_get_from_xorg.patch"
# fix update-config
epatch "${FILESDIR}/calculate-lib-2.2.15-fix_update_config.patch"
}

32
sys-apps/calculate-lib/calculate-lib-2.2.16-r1.ebuild
Unescape View File

@ -1,32 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The library for Calculate 2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="2.2"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="!<sys-apps/calculate-lib-2.1.8-r1
!=sys-apps/calculate-lib-2.1.9
!=sys-apps/calculate-lib-2.1.10
!minimal? ( dev-python/py-smbpasswd )
>=dev-python/pyxml-0.8
sys-apps/file[python]"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# fix get uid and get gid by /etc files
epatch "${FILESDIR}/calculate-lib-2.2.16-fix_get_uid.patch"
}

23
sys-apps/calculate-lib/calculate-lib-2.2.16.ebuild
Unescape View File

@ -1,23 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The library for Calculate 2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="2.2"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="!<sys-apps/calculate-lib-2.1.8-r1
!=sys-apps/calculate-lib-2.1.9
!=sys-apps/calculate-lib-2.1.10
!minimal? ( dev-python/py-smbpasswd )
>=dev-python/pyxml-0.8
sys-apps/file[python]"
RDEPEND="${DEPEND}"

31
sys-apps/calculate-lib/calculate-lib-2.2.17-r1.ebuild
Unescape View File

@ -1,31 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The library for Calculate 2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="2.2"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="!<sys-apps/calculate-lib-2.1.8-r1
!=sys-apps/calculate-lib-2.1.9
!=sys-apps/calculate-lib-2.1.10
!minimal? ( dev-python/py-smbpasswd )
>=dev-python/pyxml-0.8
sys-apps/file[python]"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# add some features
epatch "${FILESDIR}/calculate-lib-2.2.17-backport.patch"
}

33
sys-apps/calculate-lib/calculate-lib-2.2.17-r2.ebuild
Unescape View File

@ -1,33 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The library for Calculate 2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="2.2"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="!<sys-apps/calculate-lib-2.1.8-r1
!=sys-apps/calculate-lib-2.1.9
!=sys-apps/calculate-lib-2.1.10
!minimal? ( dev-python/py-smbpasswd )
>=dev-python/pyxml-0.8
sys-apps/file[python]"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# add some features
epatch "${FILESDIR}/calculate-lib-2.2.17-backport.patch"
# fix x11 video driver detect
epatch "${FILESDIR}/calculate-lib-2.2.17-fix_videodetect.patch"
}

31
sys-apps/calculate-lib/calculate-lib-2.2.17-r3.ebuild
Unescape View File

@ -1,31 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The library for Calculate 2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="2.2"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="!<sys-apps/calculate-lib-2.1.8-r1
!=sys-apps/calculate-lib-2.1.9
!=sys-apps/calculate-lib-2.1.10
!minimal? ( dev-python/py-smbpasswd )
>=dev-python/pyxml-0.8
sys-apps/file[python]"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# patch for update to 2.2.18_rc1
epatch "${FILESDIR}/calculate-lib-2.2.17_2.2.18_rc1.patch"
}

23
sys-apps/calculate-lib/calculate-lib-2.2.17.ebuild
Unescape View File

@ -1,23 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The library for Calculate 2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="2.2"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="!<sys-apps/calculate-lib-2.1.8-r1
!=sys-apps/calculate-lib-2.1.9
!=sys-apps/calculate-lib-2.1.10
!minimal? ( dev-python/py-smbpasswd )
>=dev-python/pyxml-0.8
sys-apps/file[python]"
RDEPEND="${DEPEND}"

0
sys-apps/calculate-lib/calculate-lib-2.2.15.ebuild → sys-apps/calculate-lib/calculate-lib-2.2.18.ebuild
Unescape View File

27
sys-apps/calculate-lib/files/calculate-lib-2.1.8-fix_fifo.patch
Unescape View File

@ -1,27 +0,0 @@
commit 267519aa6b09b24cb45e965bbbdb8448eb8dde6b
Author: Mike Hiretsky <mh@calculate.ru>
Date: Tue May 17 09:57:50 2011 +0400
Add fifo to scan files.
diff --git a/pym/cl_profile.py b/pym/cl_profile.py
index cad373a..618ef27 100644
--- a/pym/cl_profile.py
+++ b/pym/cl_profile.py
@@ -1940,6 +1940,7 @@ class _file(_error):
self.files = []
self.links = []
self.sockets = []
+ self.fifo = []
def getFilesDir(dirP, dirname,names):
for nameFile in names:
absNameFile = dirname + "/" + nameFile
@@ -1953,6 +1954,8 @@ class _file(_error):
dirP.dirs.append(absNameFile)
elif stat.S_ISSOCK(os.stat(absNameFile)[stat.ST_MODE]):
dirP.sockets.append(absNameFile)
+ elif stat.S_ISFIFO(os.stat(absNameFile)[stat.ST_MODE]):
+ dirP.fifo.append(absNameFile)
for profileDir in profilesDirs:
if profileDir:
dirP = dirProf()

39
sys-apps/calculate-lib/files/calculate-lib-2.2.15-fix_get_from_xorg.patch
Unescape View File

@ -1,39 +0,0 @@
diff --git a/pym/cl_fill.py b/pym/cl_fill.py
index 172b861..bf45cb2 100644
--- a/pym/cl_fill.py
+++ b/pym/cl_fill.py
@@ -440,7 +440,7 @@ class fillVars(varsShare):
matchSect = re.search(r'Section "Device".*?EndSection',
open('/etc/X11/xorg.conf').read(),re.S)
if matchSect:
- resDriver = re.search(r'Driver\s*"([^"]+)"',
+ resDriver = re.search(r'^\S*Driver\s*"([^"]+)"',
matchSect.group(0),re.S)
if resDriver and resDriver.group(1) in list_avialable_drivers:
return resDriver.group(1)
diff --git a/pym/cl_vars_share.py b/pym/cl_vars_share.py
index 316193c..961aa01 100644
--- a/pym/cl_vars_share.py
+++ b/pym/cl_vars_share.py
@@ -358,16 +358,17 @@ class varsShare:
lineCompositeTmp = ""
lineComposite = ""
for line in confLines:
+ line = line.strip()
if flagStartExtensions:
- if 'EndSection' in line:
+ if line.startswith('EndSection'):
lineComposite = lineCompositeTmp
break
- elif 'Section' in line:
+ elif line.startswith('Section'):
break
- if 'Option' in line and '"Composite"' in line:
+ if line.startswith('Option') and '"Composite"' in line:
lineCompositeTmp = line
else:
- if '"Extensions"' in line and 'Section' in line:
+ if '"Extensions"' in line and line.startswith('Section'):
flagStartExtensions = True
if lineComposite:
listOpt = filter(lambda x: x.strip(), lineComposite.split('"'))

20
sys-apps/calculate-lib/files/calculate-lib-2.2.15-fix_update_config.patch
Unescape View File

@ -1,20 +0,0 @@
commit 19de404978dcd87f477af6fbbeb7340c2fb2141d
Author: Mike Hiretsky <mh@calculate.ru>
Date: Fri Jun 3 13:52:49 2011 +0400
Add update-config for meta packages.
diff --git a/pym/update_config/cl_update_config.py b/pym/update_config/cl_update_config.py
index 7f9ba9f..1bd10f4 100644
--- a/pym/update_config/cl_update_config.py
+++ b/pym/update_config/cl_update_config.py
@@ -383,7 +383,8 @@ class updateSystemConfigs(shareUpdateConfigs):
# флаг обновления и программы используемые для наложения шаблонов
flagUpdate, mergePrograms = self.getFlagUpdAndInstPrograms()
# Проверка есть ли в пакете защищенные конфигурационные файлы
- if not self.isExistsProtectFiles(configPath):
+ if not self.isExistsProtectFiles(configPath) and \
+ not "-meta" in nameProgram:
self.logger.info(_("Package %s") %nameProgram)
self.logger.warn(_("Not found protected files"))
return True

38
sys-apps/calculate-lib/files/calculate-lib-2.2.16-fix_get_uid.patch
Unescape View File

@ -1,38 +0,0 @@
commit eb2b5489b3f8f72319215b4c2c453bed62f7b9e7
Author: Mike Hiretsky <mh@calculate.ru>
Date: Tue Jun 14 09:41:07 2011 +0400
Fix get Uid and Gid by passwd and group files.
diff --git a/pym/cl_template.py b/pym/cl_template.py
index 753d801..8fe5d74 100644
--- a/pym/cl_template.py
+++ b/pym/cl_template.py
@@ -4329,9 +4329,11 @@ variable 'cl_name'"))
"""Get uid by username from chroot passwd file"""
passwdFile = os.path.join(self._baseDir,'etc/passwd')
if os.path.exists(passwdFile):
- mapUid = dict(map(lambda x:x.split(':')[0:3:2],
+ mapUid = dict(
+ filter(lambda x:x[0] and x[1],
+ map(lambda x:x.split(':')[0:3:2],
filter(lambda x:not x.startswith('#'),
- open(passwdFile,'r'))))
+ open(passwdFile,'r')))))
if strUid in mapUid:
return int(mapUid[strUid])
return None
@@ -4340,9 +4342,11 @@ variable 'cl_name'"))
"""Get gid by groupname from chroot group file"""
groupFile = os.path.join(self._baseDir,'etc/group')
if os.path.exists(groupFile):
- mapGid = dict(map(lambda x:x.split(':')[0:3:2],
+ mapGid = dict(
+ filter(lambda x:x[0] and x[1],
+ map(lambda x:x.split(':')[0:3:2],
filter(lambda x:not x.startswith('#'),
- open(groupFile,'r'))))
+ open(groupFile,'r')))))
if strGid in mapGid:
return int(mapGid[strGid])
return None

75
sys-apps/calculate-lib/files/calculate-lib-2.2.17-backport.patch
Unescape View File

@ -1,75 +0,0 @@
diff --git a/pym/cl_fill.py b/pym/cl_fill.py
index 639e100..a846970 100644
--- a/pym/cl_fill.py
+++ b/pym/cl_fill.py
@@ -24,7 +24,7 @@ from cl_vars_share import varsShare, clLocale
from os.path import exists as pathexists
from os import path
from cl_utils import isMount, genpassword, getAvailableX11Drivers, \
- listDirectory,isPkgInstalled
+ listDirectory,isPkgInstalled,lspci
from utils import ip
from encrypt import getHash
@@ -529,19 +529,21 @@ class fillVars(varsShare):
return valBoardName or "unknown"
return ""
+ def get_hr_video_name(self):
+ """Get video name"""
+ pciVideo = list(sorted(lspci("VGA compatible").items()))
+ if pciVideo:
+ pciVideo = pciVideo[0][1]
+ vendor=pciVideo.get("vendor","").split(" ")[0]
+ name=pciVideo.get("name","")
+ if "[" in name and "]" in name:
+ name = name.partition("[")[2].partition("]")[0]
+ return "{vendor} {name}".format(vendor=vendor,name=name)
+ return ""
+
def get_hr_video(self):
"""Videocard vendor"""
- lines=self._runos("lspci")
- if not lines:
- return ""
- reVGA = re.compile("vga",re.I)
- foundVGA = False
- for line in lines:
- if reVGA.search(line):
- foundVGA = True
- break
- if not foundVGA:
- return "vesa"
+ line = self.Get('hr_video_name')
if "nVidia" in line or "GeForce" in line:
return "nvidia"
elif "ATI" in line:
diff --git a/pym/cl_vars.py b/pym/cl_vars.py
index 3ffa1db..4d7f9f2 100644
--- a/pym/cl_vars.py
+++ b/pym/cl_vars.py
@@ -185,6 +185,9 @@ class Data:
# video verdor name
hr_video = {'hide':True}
+ # videocard name
+ hr_video_name = {'hide':True}
+
# Video driver used by xorg
os_x11_video_drv = {'hide':True}
diff --git a/pym/utils/ip.py b/pym/utils/ip.py
index bec371d..a1ec1be 100644
--- a/pym/utils/ip.py
+++ b/pym/utils/ip.py
@@ -179,6 +179,7 @@ def getRouteTable(onlyIface=[]):
yield (network,dict(zip(routeParams[0::2],routeParams[1::2])))
def getInterfaces():
- """Get available interfaces"""
- return filter(lambda x:x != "lo",
- listDirectory('/sys/class/net'))
+ """Get available interfaces (discard which hasn't device)"""
+ sysNet = "/sys/class/net"
+ return filter(lambda x:path.exists(path.join(sysNet,x,"device")),
+ listDirectory(sysNet))

29
sys-apps/calculate-lib/files/calculate-lib-2.2.17-fix_videodetect.patch
Unescape View File

@ -1,29 +0,0 @@
commit d22ba198c61eccec92c1ec1309380fba19757c23
Author: Mike Hiretsky <mh@calculate.ru>
Date: Fri Jun 24 10:49:36 2011 +0400
Remove from available X11 drivers drivers in /usr/portage/distfiles.
diff --git a/pym/cl_utils.py b/pym/cl_utils.py
index 24760c9..025b051 100644
--- a/pym/cl_utils.py
+++ b/pym/cl_utils.py
@@ -967,16 +967,10 @@ def getSquashList():
def getAvailableX11Drivers(prefix="/"):
"""Get available x11 drivers"""
- distfiles = path.join(prefix,'usr/portage/distfiles')
xorg_modules_dir = path.join(prefix,'usr/lib/xorg/modules/drivers')
- return list(set(
- map(lambda x:'fglrx' if x.startswith('ati-driver') else "nvidia",
- filter(lambda x:x.startswith('ati-driver-installer') or
- x.startswith('NVIDIA-Linux'),
- listDirectory(distfiles))) + \
- map(lambda x: x[:-7],
+ return map(lambda x: x[:-7],
filter(lambda x:x.endswith('_drv.so'),
- listDirectory(xorg_modules_dir)))))
+ listDirectory(xorg_modules_dir)))
def lspci(filtername=None,shortInfo=False):
"""Get hash of lspci, filtred by filtername. If shortInfo, then

118
sys-apps/calculate-lib/files/calculate-lib-2.2.17_2.2.18_rc1.patch
Unescape View File

@ -1,118 +0,0 @@
diff --git pym/cl_fill.py pym/cl_fill.py
index 639e100..a846970 100644
--- pym/cl_fill.py
+++ pym/cl_fill.py
@@ -24,7 +24,7 @@ from cl_vars_share import varsShare, clLocale
from os.path import exists as pathexists
from os import path
from cl_utils import isMount, genpassword, getAvailableX11Drivers, \
- listDirectory,isPkgInstalled
+ listDirectory,isPkgInstalled,lspci
from utils import ip
from encrypt import getHash
@@ -529,19 +529,21 @@ class fillVars(varsShare):
return valBoardName or "unknown"
return ""
+ def get_hr_video_name(self):
+ """Get video name"""
+ pciVideo = list(sorted(lspci("VGA compatible").items()))
+ if pciVideo:
+ pciVideo = pciVideo[0][1]
+ vendor=pciVideo.get("vendor","").split(" ")[0]
+ name=pciVideo.get("name","")
+ if "[" in name and "]" in name:
+ name = name.partition("[")[2].partition("]")[0]
+ return "{vendor} {name}".format(vendor=vendor,name=name)
+ return ""
+
def get_hr_video(self):
"""Videocard vendor"""
- lines=self._runos("lspci")
- if not lines:
- return ""
- reVGA = re.compile("vga",re.I)
- foundVGA = False
- for line in lines:
- if reVGA.search(line):
- foundVGA = True
- break
- if not foundVGA:
- return "vesa"
+ line = self.Get('hr_video_name')
if "nVidia" in line or "GeForce" in line:
return "nvidia"
elif "ATI" in line:
diff --git pym/cl_utils.py pym/cl_utils.py
index 24760c9..025b051 100644
--- pym/cl_utils.py
+++ pym/cl_utils.py
@@ -967,16 +967,10 @@ def getSquashList():
def getAvailableX11Drivers(prefix="/"):
"""Get available x11 drivers"""
- distfiles = path.join(prefix,'usr/portage/distfiles')
xorg_modules_dir = path.join(prefix,'usr/lib/xorg/modules/drivers')
- return list(set(
- map(lambda x:'fglrx' if x.startswith('ati-driver') else "nvidia",
- filter(lambda x:x.startswith('ati-driver-installer') or
- x.startswith('NVIDIA-Linux'),
- listDirectory(distfiles))) + \
- map(lambda x: x[:-7],
+ return map(lambda x: x[:-7],
filter(lambda x:x.endswith('_drv.so'),
- listDirectory(xorg_modules_dir)))))
+ listDirectory(xorg_modules_dir)))
def lspci(filtername=None,shortInfo=False):
"""Get hash of lspci, filtred by filtername. If shortInfo, then
diff --git pym/cl_vars.py pym/cl_vars.py
index 3ffa1db..4d7f9f2 100644
--- pym/cl_vars.py
+++ pym/cl_vars.py
@@ -185,6 +185,9 @@ class Data:
# video verdor name
hr_video = {'hide':True}
+ # videocard name
+ hr_video_name = {'hide':True}
+
# Video driver used by xorg
os_x11_video_drv = {'hide':True}
diff --git pym/cl_vars_share.py pym/cl_vars_share.py
index 66e1567..755ae89 100644
--- pym/cl_vars_share.py
+++ pym/cl_vars_share.py
@@ -144,6 +144,15 @@ class clLocale:
'xkblayout':'pt,us',
'language':'pt',
},
+ #Romanian
+ 'ro_RO' : {
+ 'locale':'ro_RO.UTF-8',
+ 'keymap':'ro_win',
+ 'dumpkeys_charset':'',
+ 'consolefont':'lat2-16',
+ 'xkblayout':'ro,us',
+ 'language':'ro',
+ },
#Russian
'ru_RU' : {
'locale':'ru_RU.UTF-8',
diff --git pym/utils/ip.py pym/utils/ip.py
index bec371d..a1ec1be 100644
--- pym/utils/ip.py
+++ pym/utils/ip.py
@@ -179,6 +179,7 @@ def getRouteTable(onlyIface=[]):
yield (network,dict(zip(routeParams[0::2],routeParams[1::2])))
def getInterfaces():
- """Get available interfaces"""
- return filter(lambda x:x != "lo",
- listDirectory('/sys/class/net'))
+ """Get available interfaces (discard which hasn't device)"""
+ sysNet = "/sys/class/net"
+ return filter(lambda x:path.exists(path.join(sysNet,x,"device")),
+ listDirectory(sysNet))

26
sys-apps/calculate-lib/files/calculate-lib-2.2.8-file.patch
Unescape View File

@ -1,26 +0,0 @@
diff --git a/pym/cl_utils.py b/pym/cl_utils.py
index b84d6e6..d6fa979 100644
--- a/pym/cl_utils.py
+++ b/pym/cl_utils.py
@@ -28,7 +28,11 @@ import re
import sys
import getpass
from types import StringType
-import magic as type_file
+
+try:
+ from magic import open as type_file, MAGIC_NONE as MAGIC_NONE
+except ImportError:
+ from magic import open as type_file, NONE as MAGIC_NONE
import cl_lang
tr = cl_lang.lang()
@@ -73,7 +77,7 @@ class typeFile:
"""Получение типа файла"""
def __init__(self, magic=0x410):
- self.magicObject = type_file.open(type_file.MAGIC_NONE)
+ self.magicObject = type_file(MAGIC_NONE)
self.magicObject.load()
self.magicObject.setflags(magic)

25
sys-apps/calculate-lib/files/lib_i18n_path.patch
Unescape View File

@ -1,25 +0,0 @@
diff --git a/pym/cl_base.py b/pym/cl_base.py
index 4a8626e..15a8d34 100644
--- a/pym/cl_base.py
+++ b/pym/cl_base.py
@@ -126,7 +126,7 @@ class lang:
#self.nameDomain = ''
""" Название файла перевода (Домен) если используется 1 файл перевода
"""
- self.__catalog = os.path.abspath('/usr/share/calculate/i18n')
+ self.__catalog = os.path.abspath('/usr/share/calculate-2.0/i18n')
""" Путь к каталогу переводов (в этом каталоге
ru_RU/LC_MESSAGES в котором файл перевода)
"""
diff --git a/setup.py b/setup.py
index 3e60076..e1df18c 100755
--- a/setup.py
+++ b/setup.py
@@ -31,6 +31,6 @@ setup(
license = "http://www.apache.org/licenses/LICENSE-2.0",
package_dir = {'calculate-lib': "."},
packages = ['calculate-lib.pym'],
- data_files = [("/usr/share/calculate/i18n",['i18n/cl_lib_ru.mo']),
+ data_files = [("/usr/share/calculate-2.0/i18n",['i18n/cl_lib_ru.mo']),
("/var/calculate/remote",[])],
)

30
sys-apps/calculate-templates/ChangeLog
Unescape View File

@ -2,6 +2,36 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-templates-2.2.18 (29 Jun 2011)
29 Jun 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
-calculate-templates-2.2.15.ebuild, -calculate-templates-2.2.15-r1.ebuild,
-files/calculate-templates-2.2.15-ntfs_mount.patch,
-calculate-templates-2.2.16.ebuild, -calculate-templates-2.2.16-r1.ebuild,
-calculate-templates-2.2.16-r2.ebuild, -calculate-templates-2.2.16-r3.ebuild,
-calculate-templates-2.2.16-r4.ebuild, -calculate-templates-2.2.16-r5.ebuild,
-calculate-templates-2.2.16-r6.ebuild,
-files/calculate-templates-2.2.16-clean_dev.patch,
-files/calculate-templates-2.2.16-fix_update_grub2.patch,
-files/calculate-templates-2.2.16-fix_variable_bug.patch,
-files/calculate-templates-2.2.16-many_fix.patch,
-files/calculate-templates-2.2.16-udev_runlevel.patch,
-calculate-templates-2.2.17.ebuild, -calculate-templates-2.2.17-r1.ebuild,
-calculate-templates-2.2.17-r2.ebuild, -calculate-templates-2.2.17-r3.ebuild,
-calculate-templates-2.2.17-r4.ebuild, -calculate-templates-2.2.17-r5.ebuild,
-calculate-templates-2.2.17-r6.ebuild, -calculate-templates-2.2.17-r7.ebuild,
-calculate-templates-2.2.17-r8.ebuild,
-files/calculate-templates-2.2.17-add_ro_locale.patch,
-files/calculate-templates-2.2.17-fix_confdnet.patch,
-files/calculate-templates-2.2.17-fix_default_grub.patch,
-files/calculate-templates-2.2.17-fix_nm_applets.patch,
-files/calculate-templates-2.2.17_2.2.18_rc1.patch,
-files/calculate-templates-2.2.17_2.2.18_rc2.patch,
-files/calculate-templates-2.2.17_2.2.18_rc3.patch,
-files/calculate-templates-2.2.17_2.2.18_rc4.patch,
+calculate-templates-2.2.18.ebuild:
Bump version
*calculate-templates-2.2.17-r8 (28 Jun 2011)
28 Jun 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

39
sys-apps/calculate-templates/Manifest
Unescape View File

@ -1,38 +1,5 @@
AUX calculate-templates-2.2.15-ntfs_mount.patch 485 RMD160 49f1a2bd98da6779ec7746cb4d318d89e627d7b7 SHA1 7b369bfdcc509daa4caaab66a408c0663feab694 SHA256 fb0a29438c6652ac3a1d66cfb4c587bddd2bbc2dd5025a4113cca19b8ac2d79b
AUX calculate-templates-2.2.16-clean_dev.patch 395 RMD160 bed144222a7bc3a6c21628435b1d1b69f8b1bc3e SHA1 773823d4c09e6b28e54c08bc31671c24dba18fe0 SHA256 66de5c10ad83bd5f593d33dba4a8486af048eea5737ca4c1f16cae1b4bd03287
AUX calculate-templates-2.2.16-fix_update_grub2.patch 638 RMD160 54db9d8124f5a8fa21c703e8496d482abf4f986a SHA1 d15551224c57538b79d2c87d89d427ef5467a04d SHA256 b5f46a2bc102f53bb417a5edc7203e95cb000d2f8cef0a36afd614442b1b6b37
AUX calculate-templates-2.2.16-fix_variable_bug.patch 827 RMD160 0352e4877b12e60dc02c5bdf609d0ae4d9c320a5 SHA1 ee38fead790ba2be8c0cd860caecfac01448bda4 SHA256 5ed1e434e7809c3df1a6cc68a8b5f27aaa1d0cc77ca1f7decb2edfe07ee08aee
AUX calculate-templates-2.2.16-many_fix.patch 5685 RMD160 1968f13bd59ff2fec5a5a95a43cf7b679f34067c SHA1 3b5ccf94a26a68c5d510d2fcf3fa6e83fc061278 SHA256 6371f16d085b38bf14a1036bc02ab4eb96e518f8fda02500e410c68a6192db39
AUX calculate-templates-2.2.16-udev_runlevel.patch 664 RMD160 1bbdbcc1b85db4f7aa912f37793b79279db5e34c SHA1 4fbc223b674cae230cb5834adffaa15b09beee67 SHA256 f9f089808ce30e3716ed6836173af73ccee6a871e077721c3e3fea046dccada0
AUX calculate-templates-2.2.17-add_ro_locale.patch 498 RMD160 05eda5818c7be804fd2e4c9e21c45cf368a7c6ad SHA1 1f846441b44a9f2c7126fa3ebbd22e92f0c815dd SHA256 1c10e6c1540ee0ecf5010346ac6a07348d6530d147b26948f80ab9a22ee37c1c
AUX calculate-templates-2.2.17-fix_confdnet.patch 2264 RMD160 0e8d5c0557e14feef9b39cfd4fe28ecfa8f5eb07 SHA1 929c3af4e10c8c043fd5f8fafa7ccd31b5960976 SHA256 64febfd58e6c61c8b5db6e4b30d2618d9bee7972442551b003bfc6600f5f5d6a
AUX calculate-templates-2.2.17-fix_default_grub.patch 1054 RMD160 ee615500496c2079eb9bb619e3e58b864b1358b6 SHA1 eaf9d47d075b9c1a18adf45498090839d980fb22 SHA256 fa91de2e7706625ab15170e1252aba75492dd9fb6b30cca666255e9b838d6f62
AUX calculate-templates-2.2.17-fix_nm_applets.patch 1565 RMD160 a277588b557c779977d82ef76e1d75ecaebc9193 SHA1 3ee95d115cdc9132a3bbe743c0fc644e49c14f29 SHA256 a514b7f6d4e19ec0792b1dbea0c0ba8ac4ef8a2b447285761c03951fb3798b04
AUX calculate-templates-2.2.17_2.2.18_rc1.patch 12917 RMD160 8da94b86383e48c7817d2fc16d5ca7b20e98fffe SHA1 3877ff28c667828465b697866fc17541ad157091 SHA256 fb7283eebb2c15eeac4c13cd61033f96791444c632a1cceadc647cac4c910f74
AUX calculate-templates-2.2.17_2.2.18_rc2.patch 12980 RMD160 3db3ff2189210c57112180f88c14e89170a6c362 SHA1 b6c6f6339b4a738ade6b3de0fb83737080d3846a SHA256 f70ce143c4119d012d4ce99b6892ebc5c6501429bcbad0d074fda42bb7519789
AUX calculate-templates-2.2.17_2.2.18_rc3.patch 12979 RMD160 f8a346a04c5315e6ff07852f55e310b898455e09 SHA1 f51fb41ea9367ed42c5ff9c84a48fe95568ec2f4 SHA256 385b0a8f147daa0b7a346e91630692bf6538acead9490c9217b3d96a387da9b6
AUX calculate-templates-2.2.17_2.2.18_rc4.patch 12980 RMD160 6b5aac8bbf69e0ccb7f9a9beb7ded3956fa11608 SHA1 f4bffd951707f5e9fff853824a6dc408bb28dc69 SHA256 8099b3637a5ef9259add78b2a3ed5bd47726e495f79d6fee472ad9a2b9eaec86
DIST calculate-templates-2.2.15.tar.bz2 231070 RMD160 df93588bb98c449447b276d124ebfc7062fcac7a SHA1 881f004803062de7b0d2704fbb9b81abb40f378f SHA256 6f252027a037111662ae89a9007405f8d474967a79015690fb85cebd749d6858
DIST calculate-templates-2.2.16.tar.bz2 231990 RMD160 ad50cc16875daae294ee2ddd674481a57e4ce874 SHA1 5d90afc0dceca2d80ca5cb20a3d18c04dfb60abd SHA256 bca54589f5fa75054d8d9572650411fa2fe4776869331fe7fe37d75f4b442c16
DIST calculate-templates-2.2.17.tar.bz2 232607 RMD160 07757917dd29340942bd32fc92e72317322c3b5a SHA1 51d261f0dda34ac7a86e67c95563c3f58dbf7eb8 SHA256 fb70270ddac2ed2d4ede8e579d01a2dca5ee58f965edc093f1ed3b475feca228
EBUILD calculate-templates-2.2.15-r1.ebuild 729 RMD160 8b18ba4e019e41c71c35b3e57a932392c6acd96e SHA1 798f98bfafde4d9a54c4dc50fa35215eb0c0abee SHA256 7864707d6fd5755fb8746d7baa38cf7edb6582d82f86ddde8e761b49876b9d35
EBUILD calculate-templates-2.2.15.ebuild 581 RMD160 5da007565b9066ee8d849d05b2bbcb1664d3dcdb SHA1 d7ec78384157280404ed3d355d038dff97b54bfe SHA256 3a2203e9188b248c966402b641bb82ea5fcc4da6949300ace6221ff6f3ede29b
EBUILD calculate-templates-2.2.16-r1.ebuild 718 RMD160 b895824c54c056ad2048c97598beee5ee2725e42 SHA1 bd7f305fc4e53793c324cc79ea8cf97c905d6ca9 SHA256 e5f2df494867c12cbcf40e3a68e2696c0f93a83746a65f7ba0f901b970020226
EBUILD calculate-templates-2.2.16-r2.ebuild 819 RMD160 23fe4054610a206253eede0a808ffaee6ad0e1ae SHA1 8e8b6e7c79d659d27aacf1eb1e41ae1699f6801a SHA256 296f0e4dc85a00952ed0cfff810e4bd8bf9c80ecca4e12b783d08bce21f077c9
EBUILD calculate-templates-2.2.16-r3.ebuild 907 RMD160 88d62fa36ac974ad4bf179c4d68aef3e6ed5a0cb SHA1 5079bf164a1ef44f79203cb0fb4ffb848970141a SHA256 9a4d5472f9c58f00c0b96cd5111aa075d57d44502f9f0587caec0f684dc54f3d
EBUILD calculate-templates-2.2.16-r4.ebuild 819 RMD160 23fe4054610a206253eede0a808ffaee6ad0e1ae SHA1 8e8b6e7c79d659d27aacf1eb1e41ae1699f6801a SHA256 296f0e4dc85a00952ed0cfff810e4bd8bf9c80ecca4e12b783d08bce21f077c9
EBUILD calculate-templates-2.2.16-r5.ebuild 710 RMD160 351de063b806621905ed4cf87c07af1181256a1f SHA1 b74ec6f07f87351bc1e9d3cbcef8bc2de9927186 SHA256 a8e5f7b02820d6e55f68146764424f77f66e60f42d634cdffe321ba6e97b365f
EBUILD calculate-templates-2.2.16-r6.ebuild 809 RMD160 65feb7c914b5db32bc36fa59db0dcd94bcd3437d SHA1 5ccb3bdb5701e26d9bda6c227fd32f04bdcd7a36 SHA256 c5a450b553855cf3f2ac4835dbcbd9520b4699ca8d923269ce7c92229017ff99
EBUILD calculate-templates-2.2.16.ebuild 581 RMD160 e90f17422eed60fe9e68d5854a2f911f3553eb00 SHA1 4a9be464e21b3e31380de5ef94889710ce6fe806 SHA256 a54f409c05a8cbce66600f723bdfb272c696dada737b5507ebce56f970da29dd
EBUILD calculate-templates-2.2.17-r1.ebuild 726 RMD160 dfe0412292b24c413b66fd6122479fd800623b88 SHA1 3d9683f3f718b583dacb6dd8ce079df1d75e3260 SHA256 ace8143d9c329a0c6251ed633f0b70e2a8cea0b0c7507a7c01838d9e6c51205e
EBUILD calculate-templates-2.2.17-r2.ebuild 826 RMD160 1fce0a40d35cc879faadec257bebe03dcf73581d SHA1 84290f6ee4975c453ed1e190962d6a03f6494c81 SHA256 e5371f35725e55eda2ec16993e8662dddcc81c1d96a29e6c5125d53aa144326b
EBUILD calculate-templates-2.2.17-r3.ebuild 912 RMD160 5d6f46b1786bb0eb12b3f0a45fd6e6871ff433fd SHA1 29e049edc78d79756816cd7b5b02d6e8140f7e6a SHA256 36c3582ff8dcf7acb634a518254a2778d6a067e2a838223fc4f4b537cd173862
EBUILD calculate-templates-2.2.17-r4.ebuild 998 RMD160 4cb54e989cd3a0f35cb1a0268103b9a7d469b67d SHA1 c46277219df6f1c455132ccef4fd285743fcce24 SHA256 be196789ddf7b66bdb3a99f4509a32b4c4e9a18a9d08b6825a84ddfff80d462d
EBUILD calculate-templates-2.2.17-r5.ebuild 715 RMD160 fbd1853bbbb04362ba120b10ca4c2c6cda22b0c9 SHA1 080aa41605f17902eeb44ba80f5cc3d7a42dd6e2 SHA256 7d553af9574a5300a8ed303c5437c6aece4e2eaf298bce9ff28fbd7c59411e55
EBUILD calculate-templates-2.2.17-r6.ebuild 715 RMD160 73bc152aa96a0f3cf2241db38f6d12754b5944df SHA1 07a0d1ecbd33d56f4c8f580a420796e37d2922f3 SHA256 1008cc2be182dcb21c3c5e9ca1ac41ec37dedcacdaf58df0bd2cfa984a7f2afb
EBUILD calculate-templates-2.2.17-r7.ebuild 715 RMD160 1ad65784cfd4127849dc1d957312de7ea031c1dd SHA1 d5bfc402c3706d8ea23fe25a3847e2dd12845484 SHA256 635e6838b8630633b8d1d2efea46138255d515c09b449250835fb5da02847b04
EBUILD calculate-templates-2.2.17-r8.ebuild 715 RMD160 0e07ebfd43cc2b7dd3353cfd77d6c1825a7de264 SHA1 76fa04945ece4e47142c9937dff9c8a7531da737 SHA256 aa4f5f8ec62f161a14aabaaa6f6f6e8bcd3576cafe602a12fc3556d251b8aede
EBUILD calculate-templates-2.2.17.ebuild 581 RMD160 991699af00f53a98e27423e7b9a549260682b499 SHA1 769663ae8634d3725c7c6e96a4e830d73e2489e8 SHA256 4483ec21865c2f5b25f7114b08afe89b11d83fcd141484df0372633ba3304537
DIST calculate-templates-2.2.18.tar.bz2 233661 RMD160 c8e42c3ed8860193286ff8eaeddcd1c75bb1ef0b SHA1 f197621e5777c16aca9b892d30ede172eee50522 SHA256 d3d236c7e0760db3ad9ea79f0fed9d9e5f97d69acabbae3bbc9c9d2e62a50984
EBUILD calculate-templates-2.2.18.ebuild 581 RMD160 7069b5e31c10ade1bc04c3e1f4ff769ae0f80712 SHA1 d024d43f3c1496321bab619518c300d69385952c SHA256 c30ceff00fc644d3e968050f1cd7ceeffcf916d8d8fc5db723db13b0666ab500
EBUILD calculate-templates-2.2.9999.ebuild 572 RMD160 14e53f7c05efbb563b793b1025669cbe79d0838c SHA1 226d287ce0a00609ed6c871321abf5000565227e SHA256 5df16332077472571e2d4aae47e958d1e6efe3a8d694b61053778f75a537142f
MISC ChangeLog 24385 RMD160 fbb2bf81d92c1548d824401617610ac00cbcb566 SHA1 997f4a385aa4df65797bdc3e1b1bb0990b274a1e SHA256 f4df51cce80b35960cc6c7d211e6b229ceb539ad13ab30371c17c23105630a0b
MISC ChangeLog 26038 RMD160 81e818cc05f7cc5c9d2b28ab3117612eb445f0db SHA1 1747dafb0cacc13db733af06fda224cc78151b9c SHA256 eca9262c1594e7279a20434305acdb5bf3a848eb6d9a156348ee3342bd7c7488
MISC metadata.xml 338 RMD160 4a1a51881bdf09b961217d2056114ca4ccb8b4d2 SHA1 5fcb2724427f9ac5dda07abb5c829c24e6db9ae6 SHA256 175d9ae86b71b291a519414e816b05290d0e4be74726cc8d5449a500c51a3b2d

37
sys-apps/calculate-templates/calculate-templates-2.2.15-r1.ebuild
Unescape View File

@ -1,37 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-lib-2.2.15"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# add template for udisk mount ntfs
epatch "${FILESDIR}/calculate-templates-2.2.15-ntfs_mount.patch"
}
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

37
sys-apps/calculate-templates/calculate-templates-2.2.16-r1.ebuild
Unescape View File

@ -1,37 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-lib-2.2.16"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# fix variable bug
epatch "${FILESDIR}/calculate-templates-2.2.16-fix_variable_bug.patch"
}
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

39
sys-apps/calculate-templates/calculate-templates-2.2.16-r2.ebuild
Unescape View File

@ -1,39 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-lib-2.2.16"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# fix variable bug
epatch "${FILESDIR}/calculate-templates-2.2.16-fix_variable_bug.patch"
# add udev to sysinit runlevel
epatch "${FILESDIR}/calculate-templates-2.2.16-udev_runlevel.patch"
}
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

41
sys-apps/calculate-templates/calculate-templates-2.2.16-r3.ebuild
Unescape View File

@ -1,41 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-lib-2.2.16"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# fix variable bug
epatch "${FILESDIR}/calculate-templates-2.2.16-fix_variable_bug.patch"
# add udev to sysinit runlevel
epatch "${FILESDIR}/calculate-templates-2.2.16-udev_runlevel.patch"
# clean dev directory
epatch "${FILESDIR}/calculate-templates-2.2.16-clean_dev.patch"
}
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

39
sys-apps/calculate-templates/calculate-templates-2.2.16-r4.ebuild
Unescape View File

@ -1,39 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-lib-2.2.16"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# fix variable bug
epatch "${FILESDIR}/calculate-templates-2.2.16-fix_variable_bug.patch"
# add udev to sysinit runlevel
epatch "${FILESDIR}/calculate-templates-2.2.16-udev_runlevel.patch"
}
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

37
sys-apps/calculate-templates/calculate-templates-2.2.16-r5.ebuild
Unescape View File

@ -1,37 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-lib-2.2.16"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# fix variable bug
epatch "${FILESDIR}/calculate-templates-2.2.16-many_fix.patch"
}
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

39
sys-apps/calculate-templates/calculate-templates-2.2.16-r6.ebuild
Unescape View File

@ -1,39 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-lib-2.2.16"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# fix variable bug
epatch "${FILESDIR}/calculate-templates-2.2.16-many_fix.patch"
# fix grub2 update config
epatch "${FILESDIR}/calculate-templates-2.2.16-fix_update_grub2.patch"
}
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

29
sys-apps/calculate-templates/calculate-templates-2.2.16.ebuild
Unescape View File

@ -1,29 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-lib-2.2.16"
RDEPEND="${DEPEND}"
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

37
sys-apps/calculate-templates/calculate-templates-2.2.17-r1.ebuild
Unescape View File

@ -1,37 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-lib-2.2.17"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# fix grub2 default config
epatch "${FILESDIR}/calculate-templates-2.2.17-fix_default_grub.patch"
}
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

39
sys-apps/calculate-templates/calculate-templates-2.2.17-r2.ebuild
Unescape View File

@ -1,39 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-lib-2.2.17"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# fix grub2 default config
epatch "${FILESDIR}/calculate-templates-2.2.17-fix_default_grub.patch"
# fix nm-applets (kde,gnome)
epatch "${FILESDIR}/calculate-templates-2.2.17-fix_nm_applets.patch"
}
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

41
sys-apps/calculate-templates/calculate-templates-2.2.17-r3.ebuild
Unescape View File

@ -1,41 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-lib-2.2.17"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# fix grub2 default config
epatch "${FILESDIR}/calculate-templates-2.2.17-fix_default_grub.patch"
# fix nm-applets (kde,gnome)
epatch "${FILESDIR}/calculate-templates-2.2.17-fix_nm_applets.patch"
# fix conf.d/net
epatch "${FILESDIR}/calculate-templates-2.2.17-fix_confdnet.patch"
}
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

43
sys-apps/calculate-templates/calculate-templates-2.2.17-r4.ebuild
Unescape View File

@ -1,43 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-lib-2.2.17"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# fix grub2 default config
epatch "${FILESDIR}/calculate-templates-2.2.17-fix_default_grub.patch"
# fix nm-applets (kde,gnome)
epatch "${FILESDIR}/calculate-templates-2.2.17-fix_nm_applets.patch"
# fix conf.d/net
epatch "${FILESDIR}/calculate-templates-2.2.17-fix_confdnet.patch"
# add ro locale
epatch "${FILESDIR}/calculate-templates-2.2.17-add_ro_locale.patch"
}
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

37
sys-apps/calculate-templates/calculate-templates-2.2.17-r5.ebuild
Unescape View File

@ -1,37 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-lib-2.2.17"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# patch to 2.2.18_rc1
epatch "${FILESDIR}/calculate-templates-2.2.17_2.2.18_rc1.patch"
}
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

37
sys-apps/calculate-templates/calculate-templates-2.2.17-r6.ebuild
Unescape View File

@ -1,37 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-lib-2.2.17"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# patch to 2.2.18_rc2
epatch "${FILESDIR}/calculate-templates-2.2.17_2.2.18_rc2.patch"
}
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

37
sys-apps/calculate-templates/calculate-templates-2.2.17-r7.ebuild
Unescape View File

@ -1,37 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-lib-2.2.17"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# patch to 2.2.18_rc3
epatch "${FILESDIR}/calculate-templates-2.2.17_2.2.18_rc3.patch"
}
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

37
sys-apps/calculate-templates/calculate-templates-2.2.17-r8.ebuild
Unescape View File

@ -1,37 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-lib-2.2.17"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# patch to 2.2.18_rc4
epatch "${FILESDIR}/calculate-templates-2.2.17_2.2.18_rc4.patch"
}
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

29
sys-apps/calculate-templates/calculate-templates-2.2.17.ebuild
Unescape View File

@ -1,29 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-lib-2.2.17"
RDEPEND="${DEPEND}"
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

2
sys-apps/calculate-templates/calculate-templates-2.2.15.ebuild → sys-apps/calculate-templates/calculate-templates-2.2.18.ebuild
Unescape View File

@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-lib-2.2.15"
DEPEND="~sys-apps/calculate-lib-2.2.18"
RDEPEND="${DEPEND}"

20
sys-apps/calculate-templates/files/calculate-templates-2.2.15-ntfs_mount.patch
Unescape View File

@ -1,20 +0,0 @@
commit 2374d6b47d30b23bf8aaff38b94a3cf3fe8a0bfa
Author: Mike Hiretsky <mh@calculate.ru>
Date: Thu May 19 12:28:03 2011 +0400
Add support mounting ntfs partition by udisks.
diff --git install/1merge/baselayout/filesystems install/1merge/baselayout/filesystems
new file mode 100644
index 0000000..38516e8
--- /dev/null
+++ install/1merge/baselayout/filesystems
@@ -0,0 +1,8 @@
+# Calculate format=patch
+<reg>(# 'mount -t auto' command.
+#
+)
+</reg>
+<text>\1ntfs-3g
+
+</text>

13
sys-apps/calculate-templates/files/calculate-templates-2.2.16-clean_dev.patch
Unescape View File

@ -1,13 +0,0 @@
commit c937509b08e142d6e682c15ce09865c267ccd18a
Author: Mike Hiretsky <mh@calculate.ru>
Date: Fri Jun 17 12:16:00 2011 +0400
Clean dev path.
diff --git builder/clean/dev/.calculate_directory builder/clean/dev/.calculate_directory
new file mode 100644
index 0000000..f116a07
--- /dev/null
+++ builder/clean/dev/.calculate_directory
@@ -0,0 +1 @@
+# Calculate path=/ name=dev append=clear

15
sys-apps/calculate-templates/files/calculate-templates-2.2.16-fix_update_grub2.patch
Unescape View File

@ -1,15 +0,0 @@
commit 7ff49ef7feef78973a9e0cf48899ada8a4458fc7
Author: Mike Hiretsky <mh@calculate.ru>
Date: Fri Jun 17 15:13:22 2011 +0400
Fix grub2 update config.
diff --git a/install/1merge/grub2/update-grub b/install/1merge/grub2/update-grub
index d574225..561679f 100644
--- a/install/1merge/grub2/update-grub
+++ b/install/1merge/grub2/update-grub
@@ -1,3 +1,3 @@
-# Calculate path=/tmp exec=/bin/bash os_install_root_type!=livecd
+# Calculate path=/tmp exec=/bin/bash os_install_root_type!=livecd&&exists(/sbin/grub-mkconfig,root)!=
CHROOT_PATH=#-cl_chroot_grub-# /sbin/grub-mkconfig >#-cl_chroot_path-#/boot/grub/grub.cfg 2>/dev/null

24
sys-apps/calculate-templates/files/calculate-templates-2.2.16-fix_variable_bug.patch
Unescape View File

@ -1,24 +0,0 @@
commit bc65810e87b9ad982476d4ca05743ba035a39ef5
Author: Mike Hiretsky <mh@calculate.ru>
Date: Fri Jun 10 17:59:53 2011 +0400
Fix variable bug.
diff --git a/desktop/desktop/20-kde-4.6/.kde4/share/config/ksplashrc b/desktop/desktop/20-kde-4.6/.kde4/share/config/ksplashrc
index e323c6c..a69927b 100644
--- a/desktop/desktop/20-kde-4.6/.kde4/share/config/ksplashrc
+++ b/desktop/desktop/20-kde-4.6/.kde4/share/config/ksplashrc
@@ -2,9 +2,9 @@
#тема загрузки рабочего стола
[KSplash]
Engine=KSplashX
-#?os_install_locale_lang!=pt_BR#
+#?os_locale_lang!=pt_BR#
Theme=CalculateSplash#-case(capitalize,os_locale_language)-#
-#os_install_locale_lang#
-#?os_install_locale_lang==pt_BR#
+#os_locale_lang#
+#?os_locale_lang==pt_BR#
Theme=CalculateSplashPt
-#os_install_locale_lang#
+#os_locale_lang#

126
sys-apps/calculate-templates/files/calculate-templates-2.2.16-many_fix.patch
Unescape View File

@ -1,126 +0,0 @@
diff --git desktop/desktop/20-kde-4.6/.kde4/share/config/ksplashrc desktop/desktop/20-kde-4.6/.kde4/share/config/ksplashrc
index e323c6c..a69927b 100644
--- desktop/desktop/20-kde-4.6/.kde4/share/config/ksplashrc
+++ desktop/desktop/20-kde-4.6/.kde4/share/config/ksplashrc
@@ -2,9 +2,9 @@
#тема загрузки рабочего стола
[KSplash]
Engine=KSplashX
-#?os_install_locale_lang!=pt_BR#
+#?os_locale_lang!=pt_BR#
Theme=CalculateSplash#-case(capitalize,os_locale_language)-#
-#os_install_locale_lang#
-#?os_install_locale_lang==pt_BR#
+#os_locale_lang#
+#?os_locale_lang==pt_BR#
Theme=CalculateSplashPt
-#os_install_locale_lang#
+#os_locale_lang#
diff --git install/1merge/glibc/locale.gen install/1merge/glibc/locale.gen
index cf85a94..15cff6b 100644
--- install/1merge/glibc/locale.gen
+++ install/1merge/glibc/locale.gen
@@ -26,7 +26,6 @@ nn_NO.UTF-8 UTF-8
pl_PL.UTF-8 UTF-8
#Portuguese
pt_PT.UTF-8 UTF-8
-pt_PT.UTF-8@euro UTF-8
#Russian
ru_RU.UTF-8 UTF-8
#Spanish
diff --git install/1merge/grub2/default.grub install/1merge/grub2/default.grub
index a3f5f9f..67ddb16 100644
--- install/1merge/grub2/default.grub
+++ install/1merge/grub2/default.grub
@@ -2,17 +2,27 @@
GRUB_DISABLE_RECOVERY=true
GRUB_DEFAULT=saved
GRUB_TIMEOUT=3
-GRUB_CMDLINE_LINUX_DEFAULT="console=tty1 udev quiet doscsi"
-GRUB_CMDLINE_LINUX="video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=silent,theme:tty1 #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-#"
+#?pkg(media-gfx/cld-themes)!=||pkg(media-gfx/cldx-themes)!=||pkg(media-gfx/cldg-themes)!=||pkg(media-gfx/cls-themes)!=||pkg(media-gfx/cds-themes)!=||pkg(media-gfx/cmc-themes)!=#
+GRUB_CMDLINE_LINUX="video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=silent,theme:tty1 #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-# console=tty1 udev quiet"
+#pkg#
+#?pkg(media-gfx/cld-themes)==&&pkg(media-gfx/cldx-themes)==&&pkg(media-gfx/cldg-themes)==&&pkg(media-gfx/cls-themes)==&&pkg(media-gfx/cds-themes)==&&pkg(media-gfx/cmc-themes)==#
+GRUB_CMDLINE_LINUX="video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=off,theme:tty1 #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-# console=tty1 udev quiet"
+#pkg#
GRUB_TERMINAL="gfxterm"
GRUB_GFXMODE="auto"
GRUB_BACKGROUND="/boot/grub/grub-calculate.png"
GRUB_COLOR_NORMAL="white/black"
GRUB_COLOR_HIGHLIGHT="magenta/black"
GRUB_VIDEO_BACKEND="vbe"
-#?os_install_linux_subname==#
+#?os_install_linux_subname==&&os_install_scratch==off#
GRUB_DISTRIBUTOR="#-os_install_linux_name-#"
#os_install_linux_subname#
-#?os_install_linux_subname!=#
+#?os_install_linux_subname!=&&os_install_scratch==off#
GRUB_DISTRIBUTOR="#-os_install_linux_name-# #-os_install_linux_subname-#"
#os_install_linux_subname#
+#?os_install_linux_subname==&&os_install_scratch==on#
+GRUB_DISTRIBUTOR="#-os_install_linux_name-# Builder"
+#os_install_linux_subname#
+#?os_install_linux_subname!=&&os_install_scratch==on#
+GRUB_DISTRIBUTOR="#-os_install_linux_name-# #-os_install_linux_subname-# Builder"
+#os_install_linux_subname#
diff --git install/1merge/openrc/boot.runlevels/.calculate_directory install/1merge/openrc/boot.runlevels/.calculate_directory
new file mode 100644
index 0000000..e5f23f4
--- /dev/null
+++ install/1merge/openrc/boot.runlevels/.calculate_directory
@@ -0,0 +1,2 @@
+# Calculate path=/etc/runlevels name=boot
+
diff --git install/1merge/openrc/boot.runlevels/consolefont install/1merge/openrc/boot.runlevels/consolefont
new file mode 100644
index 0000000..fb62863
--- /dev/null
+++ install/1merge/openrc/boot.runlevels/consolefont
@@ -0,0 +1 @@
+# Calculate link=/etc/init.d/consolefont symbolic
diff --git install/1merge/openrc/default.runlevels/.calculate_directory install/1merge/openrc/default.runlevels/.calculate_directory
new file mode 100644
index 0000000..7e25c99
--- /dev/null
+++ install/1merge/openrc/default.runlevels/.calculate_directory
@@ -0,0 +1,2 @@
+# Calculate path=/etc/runlevels name=default cl_chroot_status==off
+
diff --git install/1merge/openrc/default.runlevels/numlock install/1merge/openrc/default.runlevels/numlock
new file mode 100644
index 0000000..0bc43c1
--- /dev/null
+++ install/1merge/openrc/default.runlevels/numlock
@@ -0,0 +1 @@
+# Calculate link=/etc/init.d/numlock symbolic hr_laptop!=
diff --git install/1merge/openrc/defaultrunlevel/.calculate_directory install/1merge/openrc/defaultrunlevel/.calculate_directory
deleted file mode 100644
index 7e25c99..0000000
--- install/1merge/openrc/defaultrunlevel/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=/etc/runlevels name=default cl_chroot_status==off
-
diff --git install/1merge/openrc/defaultrunlevel/wicd install/1merge/openrc/defaultrunlevel/wicd
deleted file mode 100644
index 0bc43c1..0000000
--- install/1merge/openrc/defaultrunlevel/wicd
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/etc/init.d/numlock symbolic hr_laptop!=
diff --git install/1merge/udev/sysinit/.calculate_directory install/1merge/udev/sysinit/.calculate_directory
new file mode 100644
index 0000000..0f7257b
--- /dev/null
+++ install/1merge/udev/sysinit/.calculate_directory
@@ -0,0 +1,2 @@
+# Calculate path=/etc/runlevels
+
diff --git install/1merge/udev/sysinit/udev install/1merge/udev/sysinit/udev
new file mode 100644
index 0000000..568c5de
--- /dev/null
+++ install/1merge/udev/sysinit/udev
@@ -0,0 +1 @@
+# Calculate link=/etc/init.d/udev symbolic

21
sys-apps/calculate-templates/files/calculate-templates-2.2.16-udev_runlevel.patch
Unescape View File

@ -1,21 +0,0 @@
commit 902b8fdcb3a3918e343189e8eb993ec699196096
Author: Mike Hiretsky <mh@calculate.ru>
Date: Tue Jun 14 09:15:01 2011 +0400
Add udev to sysinit runlevel.
diff --git install/1merge/udev/sysinit/.calculate_directory install/1merge/udev/sysinit/.calculate_directory
new file mode 100644
index 0000000..0f7257b
--- /dev/null
+++ install/1merge/udev/sysinit/.calculate_directory
@@ -0,0 +1,2 @@
+# Calculate path=/etc/runlevels
+
diff --git install/1merge/udev/sysinit/udev install/1merge/udev/sysinit/udev
new file mode 100644
index 0000000..568c5de
--- /dev/null
+++ install/1merge/udev/sysinit/udev
@@ -0,0 +1 @@
+# Calculate link=/etc/init.d/udev symbolic

19
sys-apps/calculate-templates/files/calculate-templates-2.2.17-add_ro_locale.patch
Unescape View File

@ -1,19 +0,0 @@
commit cf463b3383fe2c47ebc21e21ae5214cade177f0e
Author: Alexander Tratsevskiy <at@calculate.ru>
Date: Fri Jun 24 11:46:40 2011 +0400
Add ro_RO.UTF-8
diff --git a/install/1merge/glibc/locale.gen b/install/1merge/glibc/locale.gen
index 15cff6b..c087558 100644
--- a/install/1merge/glibc/locale.gen
+++ b/install/1merge/glibc/locale.gen
@@ -26,6 +26,8 @@ nn_NO.UTF-8 UTF-8
pl_PL.UTF-8 UTF-8
#Portuguese
pt_PT.UTF-8 UTF-8
+#Romanian
+ro_RO.UTF-8 UTF-8
#Russian
ru_RU.UTF-8 UTF-8
#Spanish

37
sys-apps/calculate-templates/files/calculate-templates-2.2.17-fix_confdnet.patch
Unescape View File

@ -1,37 +0,0 @@
commit 65d15784982b020953cc131947893efed6360f26
Author: Mike Hiretsky <mh@calculate.ru>
Date: Fri Jun 24 10:26:29 2011 +0400
Remove empty route from conf.d/net.
diff --git a/install/1merge/openrc/conf.d/net b/install/1merge/openrc/conf.d/net
index a40ea98..ab11f5b 100644
--- a/install/1merge/openrc/conf.d/net
+++ b/install/1merge/openrc/conf.d/net
@@ -5,18 +5,26 @@ modules="!plug"
#os_install_linux_system#
#?list(os_install_net_interfaces,0)!=&&list(os_install_net_dhcp_set,0)!=on&&list(os_install_net_ip,0)!=#
config_#-list(os_install_net_interfaces,0)-#=( "#-list(os_install_net_ip,0)-#/#-list(os_install_net_cidr,0)-#" )
+#list#
+#?list(os_install_net_interfaces,0)!=&&list(os_install_net_dhcp_set,0)!=on&&list(os_install_net_ip,0)!=&&list(os_install_net_route,0)!=#
routes_#-list(os_install_net_interfaces,0)-#="#-list(os_install_net_route,0)-#"
#list#
#?list(os_install_net_interfaces,1)!=&&list(os_install_net_dhcp_set,1)!=on&&list(os_install_net_ip,1)!=#
config_#-list(os_install_net_interfaces,1)-#=( "#-list(os_install_net_ip,1)-#/#-list(os_install_net_cidr,1)-#" )
+#list#
+#?list(os_install_net_interfaces,1)!=&&list(os_install_net_dhcp_set,1)!=on&&list(os_install_net_ip,1)!=&&list(os_install_net_route,1)!=#
routes_#-list(os_install_net_interfaces,1)-#="#-list(os_install_net_route,1)-#"
#list#
#?list(os_install_net_interfaces,2)!=&&list(os_install_net_dhcp_set,2)!=on&&list(os_install_net_ip,2)!=#
config_#-list(os_install_net_interfaces,2)-#=( "#-list(os_install_net_ip,2)-#/#-list(os_install_net_cidr,2)-#" )
+#list#
+#?list(os_install_net_interfaces,2)!=&&list(os_install_net_dhcp_set,2)!=on&&list(os_install_net_ip,2)!=&&list(os_install_net_route,2)!=#
routes_#-list(os_install_net_interfaces,2)-#="#-list(os_install_net_route,2)-#"
#list#
#?list(os_install_net_interfaces,3)!=&&list(os_install_net_dhcp_set,3)!=on&&list(os_install_net_ip,3)!=#
config_#-list(os_install_net_interfaces,3)-#=( "#-list(os_install_net_ip,3)-#/#-list(os_install_net_cidr,3)-#" )
+#list#
+#?list(os_install_net_interfaces,3)!=&&list(os_install_net_dhcp_set,3)!=on&&list(os_install_net_ip,3)!=&&list(os_install_net_route,3)!=#
routes_#-list(os_install_net_interfaces,3)-#="#-list(os_install_net_route,3)-#"
#list#
#?os_install_net_dns!=#

19
sys-apps/calculate-templates/files/calculate-templates-2.2.17-fix_default_grub.patch
Unescape View File

@ -1,19 +0,0 @@
commit ae0eab36bbb05426f00724f8f56db5d0fe28d8f0
Author: Mike Hiretsky <mh@calculate.ru>
Date: Wed Jun 22 18:39:13 2011 +0400
Fix grub error on boot.
diff --git a/install/1merge/grub2/default.grub b/install/1merge/grub2/default.grub
index 67ddb16..b9a91cc 100644
--- a/install/1merge/grub2/default.grub
+++ b/install/1merge/grub2/default.grub
@@ -8,7 +8,7 @@ GRUB_CMDLINE_LINUX="video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,spla
#?pkg(media-gfx/cld-themes)==&&pkg(media-gfx/cldx-themes)==&&pkg(media-gfx/cldg-themes)==&&pkg(media-gfx/cls-themes)==&&pkg(media-gfx/cds-themes)==&&pkg(media-gfx/cmc-themes)==#
GRUB_CMDLINE_LINUX="video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=off,theme:tty1 #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-# console=tty1 udev quiet"
#pkg#
-GRUB_TERMINAL="gfxterm"
+!GRUB_TERMINAL=del
GRUB_GFXMODE="auto"
GRUB_BACKGROUND="/boot/grub/grub-calculate.png"
GRUB_COLOR_NORMAL="white/black"

42
sys-apps/calculate-templates/files/calculate-templates-2.2.17-fix_nm_applets.patch
Unescape View File

@ -1,42 +0,0 @@
commit 03d33a463c49fd4f7431aedf6b3bdce01068aa19
Author: Mike Hiretsky <mh@calculate.ru>
Date: Thu Jun 23 17:15:17 2011 +0400
Remove networkmanager applet from kde,gnome,xfce if use openrc.
diff --git install/1merge/networkmanager/plasma-applet-networkmanagement.desktop install/1merge/networkmanager/plasma-applet-networkmanagement.desktop
new file mode 100644
index 0000000..2b3b677
--- /dev/null
+++ install/1merge/networkmanager/plasma-applet-networkmanagement.desktop
@@ -0,0 +1,8 @@
+# Calculate path=/usr/share/kde4/services pkg(kde-base/kdelibs)!= format=kde
+[Desktop Entry]
+#?os_install_net_conf==networkmanager#
+X-KDE-Library=plasma_applet_networkmanagement
+#os_install_net_conf#
+#?os_install_net_conf!=networkmanager#
+X-KDE-Library=
+#os_install_net_conf#
diff --git install/1merge/nm-applet/.calculate_directory install/1merge/nm-applet/.calculate_directory
new file mode 100644
index 0000000..6f79f0c
--- /dev/null
+++ install/1merge/nm-applet/.calculate_directory
@@ -0,0 +1,2 @@
+# Calculate belong()!=&&cl_chroot_status==off&&pkg(gnome-extra/nm-applet)!= path=/etc/xdg name=autostart
+
diff --git install/1merge/nm-applet/nm-applet.desktop install/1merge/nm-applet/nm-applet.desktop
new file mode 100644
index 0000000..d32af0f
--- /dev/null
+++ install/1merge/nm-applet/nm-applet.desktop
@@ -0,0 +1,8 @@
+# Calculate format=kde
+[Desktop Entry]
+#?os_install_net_conf==networkmanager#
+X-GNOME-Autostart-enabled=true
+#os_install_net_conf#
+#?os_install_net_conf!=networkmanager#
+X-GNOME-Autostart-enabled=false
+#os_install_net_conf#

290
sys-apps/calculate-templates/files/calculate-templates-2.2.17_2.2.18_rc1.patch
Unescape View File

@ -1,290 +0,0 @@
diff --git builder/iso/calcboot/isolinux/keymap.cfg builder/iso/calcboot/isolinux/keymap.cfg
index d4abb5e..9da49d6 100644
--- builder/iso/calcboot/isolinux/keymap.cfg
+++ builder/iso/calcboot/isolinux/keymap.cfg
@@ -80,6 +80,11 @@ LABEL keymap:pt_PT
KERNEL calcmenu.c32
APPEND isolinux.cfg calculate=,keymap:pt_PT
+LABEL keymap:ro_RO
+ MENU LABEL Romanian
+ KERNEL calcmenu.c32
+ APPEND isolinux.cfg calculate=,keymap:ro_RO
+
LABEL keymap:ru_RU
MENU LABEL Russian
KERNEL calcmenu.c32
diff --git builder/iso/calcboot/isolinux/lang.cfg builder/iso/calcboot/isolinux/lang.cfg
index aefb539..180dafb 100644
--- builder/iso/calcboot/isolinux/lang.cfg
+++ builder/iso/calcboot/isolinux/lang.cfg
@@ -50,6 +50,11 @@ LABEL lang:ru_RU
KERNEL calcmenu.c32
APPEND isolinux.cfg calculate=lang:ru_RU,keymap:ru_RU,timezone:Europe/Moscow
+LABEL lang:ro_RO
+ MENU LABEL Romanian
+ KERNEL calcmenu.c32
+ APPEND isolinux.cfg calculate=lang:ro_RO,keymap:ro_RO,timezone:Europe/Bucharest
+
LABEL lang:es_ES
MENU LABEL Espanol
KERNEL calcmenu.c32
diff --git desktop/00-desktop-init/empty_dir/2ini_res.env desktop/00-desktop-init/empty_dir/2ini_res.env
index ba4c0a6..13bac65 100644
--- desktop/00-desktop-init/empty_dir/2ini_res.env
+++ desktop/00-desktop-init/empty_dir/2ini_res.env
@@ -118,6 +118,19 @@ videos = #-ini(resource.path)-#/Видео
desktop = /home/#-ur_login-#/Рабочий стол
#os_locale_lang#
+#?os_locale_lang==ro_RO#
+documents = #-ini(resource.path)-#/Documente
+downloads = #-ini(resource.path)-#/Descărcări
+music = #-ini(resource.path)-#/Muzică
+pictures = #-ini(resource.path)-#/Poze
+public = #-ini(resource.path)-#/Public
+templates = #-ini(resource.path)-#/Templates
+videos = #-ini(resource.path)-#/Video
+#os_locale_lang#
+#?os_locale_lang==ro_RO&&ur_domain_set==off#
+desktop = /home/#-ur_login-#/Desktop
+#os_locale_lang#
+
#?os_locale_lang==uk_UA#
documents = #-ini(resource.path)-#/Документи
downloads = #-ini(resource.path)-#/Завантаження
diff --git desktop/desktop/00-patch-2.2.0.16/2ini_res.env desktop/desktop/00-patch-2.2.0.16/2ini_res.env
index ba4c0a6..ec7ae86 100644
--- desktop/desktop/00-patch-2.2.0.16/2ini_res.env
+++ desktop/desktop/00-patch-2.2.0.16/2ini_res.env
@@ -105,6 +105,19 @@ videos = #-ini(resource.path)-#/Vídeos
desktop = /home/#-ur_login-#/Desktop
#os_locale_lang#
+#?os_locale_lang==ro_RO#
+documents = #-ini(resource.path)-#/Documente
+downloads = #-ini(resource.path)-#/Descărcări
+music = #-ini(resource.path)-#/Muzică
+pictures = #-ini(resource.path)-#/Poze
+public = #-ini(resource.path)-#/Public
+templates = #-ini(resource.path)-#/Templates
+videos = #-ini(resource.path)-#/Video
+#os_locale_lang#
+#?os_locale_lang==ro_RO&&ur_domain_set==off#
+desktop = /home/#-ur_login-#/Desktop
+#os_locale_lang#
+
#?os_locale_lang==ru_RU#
documents = #-ini(resource.path)-#/Документы
downloads = #-ini(resource.path)-#/Загрузки
diff --git desktop/desktop/30-gnome-2.26/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ro desktop/desktop/30-gnome-2.26/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ro
new file mode 100644
index 0000000..a40c1af
--- /dev/null
+++ desktop/desktop/30-gnome-2.26/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ro
@@ -0,0 +1,12 @@
+# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==ro_RO
+<?xml version="1.0"?>
+<gconf>
+ <entry name="layouts" type="list" ltype="string">
+ <li type="string">
+ <stringvalue>ro</stringvalue>
+ </li>
+ <li type="string">
+ <stringvalue>us</stringvalue>
+ </li>
+ </entry>
+</gconf>
diff --git desktop/desktop/30-gnome-2.30/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ro desktop/desktop/30-gnome-2.30/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ro
new file mode 100644
index 0000000..a40c1af
--- /dev/null
+++ desktop/desktop/30-gnome-2.30/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ro
@@ -0,0 +1,12 @@
+# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==ro_RO
+<?xml version="1.0"?>
+<gconf>
+ <entry name="layouts" type="list" ltype="string">
+ <li type="string">
+ <stringvalue>ro</stringvalue>
+ </li>
+ <li type="string">
+ <stringvalue>us</stringvalue>
+ </li>
+ </entry>
+</gconf>
diff --git desktop/desktop/60-firefox-3.5/.mozilla/firefox/calculate.default/prefs.js desktop/desktop/60-firefox-3.5/.mozilla/firefox/calculate.default/prefs.js
index 846e584..3d9432e 100644
--- desktop/desktop/60-firefox-3.5/.mozilla/firefox/calculate.default/prefs.js
+++ desktop/desktop/60-firefox-3.5/.mozilla/firefox/calculate.default/prefs.js
@@ -71,6 +71,9 @@ user_pref("spellchecker.dictionary", "pt");
#?pkg(www-plugins/spell-mozilla-plugin)!=&&os_locale_language==ru#
user_pref("spellchecker.dictionary", "ru");
#pkg#
+#?pkg(www-plugins/spell-mozilla-plugin)!=&&os_locale_language==ro#
+user_pref("spellchecker.dictionary", "ro");
+#pkg#
#?pkg(www-plugins/spell-mozilla-plugin)!=&&os_locale_language==uk#
user_pref("spellchecker.dictionary", "uk-UA");
#pkg#
diff --git install/1merge/00-calculate-install/calculate2.env install/1merge/00-calculate-install/calculate2.env
new file mode 100644
index 0000000..cead32f
--- /dev/null
+++ install/1merge/00-calculate-install/calculate2.env
@@ -0,0 +1,4 @@
+# Calculate format=samba path=/etc/calculate
+
+[install]
+os_install_net_settings = #-os_install_net_conf-#
diff --git install/1merge/glibc/locale.gen install/1merge/glibc/locale.gen
index 15cff6b..c087558 100644
--- install/1merge/glibc/locale.gen
+++ install/1merge/glibc/locale.gen
@@ -26,6 +26,8 @@ nn_NO.UTF-8 UTF-8
pl_PL.UTF-8 UTF-8
#Portuguese
pt_PT.UTF-8 UTF-8
+#Romanian
+ro_RO.UTF-8 UTF-8
#Russian
ru_RU.UTF-8 UTF-8
#Spanish
diff --git install/1merge/grub2/default.grub install/1merge/grub2/default.grub
index 67ddb16..b9a91cc 100644
--- install/1merge/grub2/default.grub
+++ install/1merge/grub2/default.grub
@@ -8,7 +8,7 @@ GRUB_CMDLINE_LINUX="video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,spla
#?pkg(media-gfx/cld-themes)==&&pkg(media-gfx/cldx-themes)==&&pkg(media-gfx/cldg-themes)==&&pkg(media-gfx/cls-themes)==&&pkg(media-gfx/cds-themes)==&&pkg(media-gfx/cmc-themes)==#
GRUB_CMDLINE_LINUX="video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=off,theme:tty1 #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-# console=tty1 udev quiet"
#pkg#
-GRUB_TERMINAL="gfxterm"
+!GRUB_TERMINAL=del
GRUB_GFXMODE="auto"
GRUB_BACKGROUND="/boot/grub/grub-calculate.png"
GRUB_COLOR_NORMAL="white/black"
diff --git install/1merge/networkmanager/plasma-applet-networkmanagement.desktop install/1merge/networkmanager/plasma-applet-networkmanagement.desktop
new file mode 100644
index 0000000..2b3b677
--- /dev/null
+++ install/1merge/networkmanager/plasma-applet-networkmanagement.desktop
@@ -0,0 +1,8 @@
+# Calculate path=/usr/share/kde4/services pkg(kde-base/kdelibs)!= format=kde
+[Desktop Entry]
+#?os_install_net_conf==networkmanager#
+X-KDE-Library=plasma_applet_networkmanagement
+#os_install_net_conf#
+#?os_install_net_conf!=networkmanager#
+X-KDE-Library=
+#os_install_net_conf#
diff --git install/1merge/networkmanager/system-connections/.calculate_directory install/1merge/networkmanager/system-connections/.calculate_directory
index 4401bf6..b3a2ea7 100644
--- install/1merge/networkmanager/system-connections/.calculate_directory
+++ install/1merge/networkmanager/system-connections/.calculate_directory
@@ -1 +1 @@
-# Calculate path=/etc/NetworkManager exists(/etc/NetworkManager/system-connections,root)==&&cl_chroot_status==off&&os_install_root_type!=livecd||ac_install_system==up
+# Calculate path=/etc/NetworkManager os_install_net_settings!=networkmanager&&cl_chroot_status==off&&os_install_root_type!=livecd||ac_install_system==up
diff --git install/1merge/nm-applet/.calculate_directory install/1merge/nm-applet/.calculate_directory
new file mode 100644
index 0000000..6f79f0c
--- /dev/null
+++ install/1merge/nm-applet/.calculate_directory
@@ -0,0 +1,2 @@
+# Calculate belong()!=&&cl_chroot_status==off&&pkg(gnome-extra/nm-applet)!= path=/etc/xdg name=autostart
+
diff --git install/1merge/nm-applet/nm-applet.desktop install/1merge/nm-applet/nm-applet.desktop
new file mode 100644
index 0000000..d32af0f
--- /dev/null
+++ install/1merge/nm-applet/nm-applet.desktop
@@ -0,0 +1,8 @@
+# Calculate format=kde
+[Desktop Entry]
+#?os_install_net_conf==networkmanager#
+X-GNOME-Autostart-enabled=true
+#os_install_net_conf#
+#?os_install_net_conf!=networkmanager#
+X-GNOME-Autostart-enabled=false
+#os_install_net_conf#
diff --git install/1merge/openrc/conf.d/net install/1merge/openrc/conf.d/net
index a40ea98..4d39ad5 100644
--- install/1merge/openrc/conf.d/net
+++ install/1merge/openrc/conf.d/net
@@ -1,22 +1,30 @@
-# Calculate comment=# exists(/etc/conf.d/net,root)==&&cl_chroot_status==off&&os_install_root_type!=livecd&&os_install_net_conf==openrc||ac_install_system==up&&os_install_net_conf==openrc
+# Calculate comment=# os_install_net_settings!=openrc&&cl_chroot_status==off&&os_install_root_type!=livecd&&os_install_net_conf==openrc||ac_install_system==up&&os_install_net_conf==openrc
#?os_install_linux_system==server#
modules="!plug"
#os_install_linux_system#
#?list(os_install_net_interfaces,0)!=&&list(os_install_net_dhcp_set,0)!=on&&list(os_install_net_ip,0)!=#
config_#-list(os_install_net_interfaces,0)-#=( "#-list(os_install_net_ip,0)-#/#-list(os_install_net_cidr,0)-#" )
+#list#
+#?list(os_install_net_interfaces,0)!=&&list(os_install_net_dhcp_set,0)!=on&&list(os_install_net_ip,0)!=&&list(os_install_net_route,0)!=#
routes_#-list(os_install_net_interfaces,0)-#="#-list(os_install_net_route,0)-#"
#list#
#?list(os_install_net_interfaces,1)!=&&list(os_install_net_dhcp_set,1)!=on&&list(os_install_net_ip,1)!=#
config_#-list(os_install_net_interfaces,1)-#=( "#-list(os_install_net_ip,1)-#/#-list(os_install_net_cidr,1)-#" )
+#list#
+#?list(os_install_net_interfaces,1)!=&&list(os_install_net_dhcp_set,1)!=on&&list(os_install_net_ip,1)!=&&list(os_install_net_route,1)!=#
routes_#-list(os_install_net_interfaces,1)-#="#-list(os_install_net_route,1)-#"
#list#
#?list(os_install_net_interfaces,2)!=&&list(os_install_net_dhcp_set,2)!=on&&list(os_install_net_ip,2)!=#
config_#-list(os_install_net_interfaces,2)-#=( "#-list(os_install_net_ip,2)-#/#-list(os_install_net_cidr,2)-#" )
+#list#
+#?list(os_install_net_interfaces,2)!=&&list(os_install_net_dhcp_set,2)!=on&&list(os_install_net_ip,2)!=&&list(os_install_net_route,2)!=#
routes_#-list(os_install_net_interfaces,2)-#="#-list(os_install_net_route,2)-#"
#list#
#?list(os_install_net_interfaces,3)!=&&list(os_install_net_dhcp_set,3)!=on&&list(os_install_net_ip,3)!=#
config_#-list(os_install_net_interfaces,3)-#=( "#-list(os_install_net_ip,3)-#/#-list(os_install_net_cidr,3)-#" )
+#list#
+#?list(os_install_net_interfaces,3)!=&&list(os_install_net_dhcp_set,3)!=on&&list(os_install_net_ip,3)!=&&list(os_install_net_route,3)!=#
routes_#-list(os_install_net_interfaces,3)-#="#-list(os_install_net_route,3)-#"
#list#
#?os_install_net_dns!=#
diff --git install/1merge/sudo/sudoers install/1merge/sudo/sudoers
index 961a5bf..25c4cde 100644
--- install/1merge/sudo/sudoers
+++ install/1merge/sudo/sudoers
@@ -1,4 +1,4 @@
-# Calculate comment=#
+# Calculate comment=# chmod=0400
Defaults env_reset
#?os_install_root_type==livecd#
diff --git install/1system/calculate-install/calculate2.env install/1system/calculate-install/calculate2.env
index d83a0f6..27df9f5 100644
--- install/1system/calculate-install/calculate2.env
+++ install/1system/calculate-install/calculate2.env
@@ -6,6 +6,10 @@ os_install_dev_from = #-os_root_dev-#
# NTP is a protocol designed to synchronize the clocks of computers over a network.
os_install_ntp = #-os_install_ntp-#
#os_root_type#
+#pkg(sys-apps/calculate-install)>2.2.17-r1&&os_root_type=hdd#
+# name of net manager which is used
+os_install_net_settings = #-os_install_net_conf-#
+#pkg#
#?os_install_linux_ver>10.8.81#
[main]
diff --git install/2laptop/lenovo/sudo/sudoers install/2laptop/lenovo/sudo/sudoers
index dc81e5e..f252dae 100644
--- install/2laptop/lenovo/sudo/sudoers
+++ install/2laptop/lenovo/sudo/sudoers
@@ -1,4 +1,4 @@
-# Calculate format=patch path=/etc
+# Calculate format=patch path=/etc chmod=0400
<reg>(# BEGIN laptop configuration)
.*(# END laptop configuration)</reg>
<text>\1
diff --git install/2laptop/samsung/sudo/sudoers install/2laptop/samsung/sudo/sudoers
index ee88674..4b5b0f7 100644
--- install/2laptop/samsung/sudo/sudoers
+++ install/2laptop/samsung/sudo/sudoers
@@ -1,4 +1,4 @@
-# Calculate format=patch path=/etc
+# Calculate format=patch path=/etc chmod=0400
<reg>(# BEGIN laptop configuration)
.*(# END laptop configuration)</reg>
<text>\1

292
sys-apps/calculate-templates/files/calculate-templates-2.2.17_2.2.18_rc2.patch
Unescape View File

@ -1,292 +0,0 @@
diff --git builder/iso/calcboot/isolinux/keymap.cfg builder/iso/calcboot/isolinux/keymap.cfg
index d4abb5e..9da49d6 100644
--- builder/iso/calcboot/isolinux/keymap.cfg
+++ builder/iso/calcboot/isolinux/keymap.cfg
@@ -80,6 +80,11 @@ LABEL keymap:pt_PT
KERNEL calcmenu.c32
APPEND isolinux.cfg calculate=,keymap:pt_PT
+LABEL keymap:ro_RO
+ MENU LABEL Romanian
+ KERNEL calcmenu.c32
+ APPEND isolinux.cfg calculate=,keymap:ro_RO
+
LABEL keymap:ru_RU
MENU LABEL Russian
KERNEL calcmenu.c32
diff --git builder/iso/calcboot/isolinux/lang.cfg builder/iso/calcboot/isolinux/lang.cfg
index aefb539..180dafb 100644
--- builder/iso/calcboot/isolinux/lang.cfg
+++ builder/iso/calcboot/isolinux/lang.cfg
@@ -50,6 +50,11 @@ LABEL lang:ru_RU
KERNEL calcmenu.c32
APPEND isolinux.cfg calculate=lang:ru_RU,keymap:ru_RU,timezone:Europe/Moscow
+LABEL lang:ro_RO
+ MENU LABEL Romanian
+ KERNEL calcmenu.c32
+ APPEND isolinux.cfg calculate=lang:ro_RO,keymap:ro_RO,timezone:Europe/Bucharest
+
LABEL lang:es_ES
MENU LABEL Espanol
KERNEL calcmenu.c32
diff --git desktop/00-desktop-init/empty_dir/2ini_res.env desktop/00-desktop-init/empty_dir/2ini_res.env
index ba4c0a6..13bac65 100644
--- desktop/00-desktop-init/empty_dir/2ini_res.env
+++ desktop/00-desktop-init/empty_dir/2ini_res.env
@@ -118,6 +118,19 @@ videos = #-ini(resource.path)-#/Видео
desktop = /home/#-ur_login-#/Рабочий стол
#os_locale_lang#
+#?os_locale_lang==ro_RO#
+documents = #-ini(resource.path)-#/Documente
+downloads = #-ini(resource.path)-#/Descărcări
+music = #-ini(resource.path)-#/Muzică
+pictures = #-ini(resource.path)-#/Poze
+public = #-ini(resource.path)-#/Public
+templates = #-ini(resource.path)-#/Templates
+videos = #-ini(resource.path)-#/Video
+#os_locale_lang#
+#?os_locale_lang==ro_RO&&ur_domain_set==off#
+desktop = /home/#-ur_login-#/Desktop
+#os_locale_lang#
+
#?os_locale_lang==uk_UA#
documents = #-ini(resource.path)-#/Документи
downloads = #-ini(resource.path)-#/Завантаження
diff --git desktop/desktop/00-patch-2.2.0.16/2ini_res.env desktop/desktop/00-patch-2.2.0.16/2ini_res.env
index ba4c0a6..ec7ae86 100644
--- desktop/desktop/00-patch-2.2.0.16/2ini_res.env
+++ desktop/desktop/00-patch-2.2.0.16/2ini_res.env
@@ -105,6 +105,19 @@ videos = #-ini(resource.path)-#/Vídeos
desktop = /home/#-ur_login-#/Desktop
#os_locale_lang#
+#?os_locale_lang==ro_RO#
+documents = #-ini(resource.path)-#/Documente
+downloads = #-ini(resource.path)-#/Descărcări
+music = #-ini(resource.path)-#/Muzică
+pictures = #-ini(resource.path)-#/Poze
+public = #-ini(resource.path)-#/Public
+templates = #-ini(resource.path)-#/Templates
+videos = #-ini(resource.path)-#/Video
+#os_locale_lang#
+#?os_locale_lang==ro_RO&&ur_domain_set==off#
+desktop = /home/#-ur_login-#/Desktop
+#os_locale_lang#
+
#?os_locale_lang==ru_RU#
documents = #-ini(resource.path)-#/Документы
downloads = #-ini(resource.path)-#/Загрузки
diff --git desktop/desktop/30-gnome-2.26/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ro desktop/desktop/30-gnome-2.26/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ro
new file mode 100644
index 0000000..a40c1af
--- /dev/null
+++ desktop/desktop/30-gnome-2.26/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ro
@@ -0,0 +1,12 @@
+# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==ro_RO
+<?xml version="1.0"?>
+<gconf>
+ <entry name="layouts" type="list" ltype="string">
+ <li type="string">
+ <stringvalue>ro</stringvalue>
+ </li>
+ <li type="string">
+ <stringvalue>us</stringvalue>
+ </li>
+ </entry>
+</gconf>
diff --git desktop/desktop/30-gnome-2.30/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ro desktop/desktop/30-gnome-2.30/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ro
new file mode 100644
index 0000000..a40c1af
--- /dev/null
+++ desktop/desktop/30-gnome-2.30/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ro
@@ -0,0 +1,12 @@
+# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==ro_RO
+<?xml version="1.0"?>
+<gconf>
+ <entry name="layouts" type="list" ltype="string">
+ <li type="string">
+ <stringvalue>ro</stringvalue>
+ </li>
+ <li type="string">
+ <stringvalue>us</stringvalue>
+ </li>
+ </entry>
+</gconf>
diff --git desktop/desktop/60-firefox-3.5/.mozilla/firefox/calculate.default/prefs.js desktop/desktop/60-firefox-3.5/.mozilla/firefox/calculate.default/prefs.js
index 846e584..3d9432e 100644
--- desktop/desktop/60-firefox-3.5/.mozilla/firefox/calculate.default/prefs.js
+++ desktop/desktop/60-firefox-3.5/.mozilla/firefox/calculate.default/prefs.js
@@ -71,6 +71,9 @@ user_pref("spellchecker.dictionary", "pt");
#?pkg(www-plugins/spell-mozilla-plugin)!=&&os_locale_language==ru#
user_pref("spellchecker.dictionary", "ru");
#pkg#
+#?pkg(www-plugins/spell-mozilla-plugin)!=&&os_locale_language==ro#
+user_pref("spellchecker.dictionary", "ro");
+#pkg#
#?pkg(www-plugins/spell-mozilla-plugin)!=&&os_locale_language==uk#
user_pref("spellchecker.dictionary", "uk-UA");
#pkg#
diff --git install/1merge/00-calculate-install/calculate2.env install/1merge/00-calculate-install/calculate2.env
new file mode 100644
index 0000000..cead32f
--- /dev/null
+++ install/1merge/00-calculate-install/calculate2.env
@@ -0,0 +1,4 @@
+# Calculate format=samba path=/etc/calculate
+
+[install]
+os_install_net_settings = #-os_install_net_conf-#
diff --git install/1merge/glibc/locale.gen install/1merge/glibc/locale.gen
index 15cff6b..c087558 100644
--- install/1merge/glibc/locale.gen
+++ install/1merge/glibc/locale.gen
@@ -26,6 +26,8 @@ nn_NO.UTF-8 UTF-8
pl_PL.UTF-8 UTF-8
#Portuguese
pt_PT.UTF-8 UTF-8
+#Romanian
+ro_RO.UTF-8 UTF-8
#Russian
ru_RU.UTF-8 UTF-8
#Spanish
diff --git install/1merge/grub2/default.grub install/1merge/grub2/default.grub
index 67ddb16..f719541 100644
--- install/1merge/grub2/default.grub
+++ install/1merge/grub2/default.grub
@@ -8,8 +8,8 @@ GRUB_CMDLINE_LINUX="video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,spla
#?pkg(media-gfx/cld-themes)==&&pkg(media-gfx/cldx-themes)==&&pkg(media-gfx/cldg-themes)==&&pkg(media-gfx/cls-themes)==&&pkg(media-gfx/cds-themes)==&&pkg(media-gfx/cmc-themes)==#
GRUB_CMDLINE_LINUX="video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=off,theme:tty1 #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-# console=tty1 udev quiet"
#pkg#
-GRUB_TERMINAL="gfxterm"
-GRUB_GFXMODE="auto"
+!GRUB_TERMINAL=del
+GRUB_GFXMODE="1024x768"
GRUB_BACKGROUND="/boot/grub/grub-calculate.png"
GRUB_COLOR_NORMAL="white/black"
GRUB_COLOR_HIGHLIGHT="magenta/black"
diff --git install/1merge/networkmanager/plasma-applet-networkmanagement.desktop install/1merge/networkmanager/plasma-applet-networkmanagement.desktop
new file mode 100644
index 0000000..2b3b677
--- /dev/null
+++ install/1merge/networkmanager/plasma-applet-networkmanagement.desktop
@@ -0,0 +1,8 @@
+# Calculate path=/usr/share/kde4/services pkg(kde-base/kdelibs)!= format=kde
+[Desktop Entry]
+#?os_install_net_conf==networkmanager#
+X-KDE-Library=plasma_applet_networkmanagement
+#os_install_net_conf#
+#?os_install_net_conf!=networkmanager#
+X-KDE-Library=
+#os_install_net_conf#
diff --git install/1merge/networkmanager/system-connections/.calculate_directory install/1merge/networkmanager/system-connections/.calculate_directory
index 4401bf6..b3a2ea7 100644
--- install/1merge/networkmanager/system-connections/.calculate_directory
+++ install/1merge/networkmanager/system-connections/.calculate_directory
@@ -1 +1 @@
-# Calculate path=/etc/NetworkManager exists(/etc/NetworkManager/system-connections,root)==&&cl_chroot_status==off&&os_install_root_type!=livecd||ac_install_system==up
+# Calculate path=/etc/NetworkManager os_install_net_settings!=networkmanager&&cl_chroot_status==off&&os_install_root_type!=livecd||ac_install_system==up
diff --git install/1merge/nm-applet/.calculate_directory install/1merge/nm-applet/.calculate_directory
new file mode 100644
index 0000000..6f79f0c
--- /dev/null
+++ install/1merge/nm-applet/.calculate_directory
@@ -0,0 +1,2 @@
+# Calculate belong()!=&&cl_chroot_status==off&&pkg(gnome-extra/nm-applet)!= path=/etc/xdg name=autostart
+
diff --git install/1merge/nm-applet/nm-applet.desktop install/1merge/nm-applet/nm-applet.desktop
new file mode 100644
index 0000000..d32af0f
--- /dev/null
+++ install/1merge/nm-applet/nm-applet.desktop
@@ -0,0 +1,8 @@
+# Calculate format=kde
+[Desktop Entry]
+#?os_install_net_conf==networkmanager#
+X-GNOME-Autostart-enabled=true
+#os_install_net_conf#
+#?os_install_net_conf!=networkmanager#
+X-GNOME-Autostart-enabled=false
+#os_install_net_conf#
diff --git install/1merge/openrc/conf.d/net install/1merge/openrc/conf.d/net
index a40ea98..4d39ad5 100644
--- install/1merge/openrc/conf.d/net
+++ install/1merge/openrc/conf.d/net
@@ -1,22 +1,30 @@
-# Calculate comment=# exists(/etc/conf.d/net,root)==&&cl_chroot_status==off&&os_install_root_type!=livecd&&os_install_net_conf==openrc||ac_install_system==up&&os_install_net_conf==openrc
+# Calculate comment=# os_install_net_settings!=openrc&&cl_chroot_status==off&&os_install_root_type!=livecd&&os_install_net_conf==openrc||ac_install_system==up&&os_install_net_conf==openrc
#?os_install_linux_system==server#
modules="!plug"
#os_install_linux_system#
#?list(os_install_net_interfaces,0)!=&&list(os_install_net_dhcp_set,0)!=on&&list(os_install_net_ip,0)!=#
config_#-list(os_install_net_interfaces,0)-#=( "#-list(os_install_net_ip,0)-#/#-list(os_install_net_cidr,0)-#" )
+#list#
+#?list(os_install_net_interfaces,0)!=&&list(os_install_net_dhcp_set,0)!=on&&list(os_install_net_ip,0)!=&&list(os_install_net_route,0)!=#
routes_#-list(os_install_net_interfaces,0)-#="#-list(os_install_net_route,0)-#"
#list#
#?list(os_install_net_interfaces,1)!=&&list(os_install_net_dhcp_set,1)!=on&&list(os_install_net_ip,1)!=#
config_#-list(os_install_net_interfaces,1)-#=( "#-list(os_install_net_ip,1)-#/#-list(os_install_net_cidr,1)-#" )
+#list#
+#?list(os_install_net_interfaces,1)!=&&list(os_install_net_dhcp_set,1)!=on&&list(os_install_net_ip,1)!=&&list(os_install_net_route,1)!=#
routes_#-list(os_install_net_interfaces,1)-#="#-list(os_install_net_route,1)-#"
#list#
#?list(os_install_net_interfaces,2)!=&&list(os_install_net_dhcp_set,2)!=on&&list(os_install_net_ip,2)!=#
config_#-list(os_install_net_interfaces,2)-#=( "#-list(os_install_net_ip,2)-#/#-list(os_install_net_cidr,2)-#" )
+#list#
+#?list(os_install_net_interfaces,2)!=&&list(os_install_net_dhcp_set,2)!=on&&list(os_install_net_ip,2)!=&&list(os_install_net_route,2)!=#
routes_#-list(os_install_net_interfaces,2)-#="#-list(os_install_net_route,2)-#"
#list#
#?list(os_install_net_interfaces,3)!=&&list(os_install_net_dhcp_set,3)!=on&&list(os_install_net_ip,3)!=#
config_#-list(os_install_net_interfaces,3)-#=( "#-list(os_install_net_ip,3)-#/#-list(os_install_net_cidr,3)-#" )
+#list#
+#?list(os_install_net_interfaces,3)!=&&list(os_install_net_dhcp_set,3)!=on&&list(os_install_net_ip,3)!=&&list(os_install_net_route,3)!=#
routes_#-list(os_install_net_interfaces,3)-#="#-list(os_install_net_route,3)-#"
#list#
#?os_install_net_dns!=#
diff --git install/1merge/sudo/sudoers install/1merge/sudo/sudoers
index 961a5bf..25c4cde 100644
--- install/1merge/sudo/sudoers
+++ install/1merge/sudo/sudoers
@@ -1,4 +1,4 @@
-# Calculate comment=#
+# Calculate comment=# chmod=0400
Defaults env_reset
#?os_install_root_type==livecd#
diff --git install/1system/calculate-install/calculate2.env install/1system/calculate-install/calculate2.env
index d83a0f6..27df9f5 100644
--- install/1system/calculate-install/calculate2.env
+++ install/1system/calculate-install/calculate2.env
@@ -6,6 +6,10 @@ os_install_dev_from = #-os_root_dev-#
# NTP is a protocol designed to synchronize the clocks of computers over a network.
os_install_ntp = #-os_install_ntp-#
#os_root_type#
+#pkg(sys-apps/calculate-install)>2.2.17-r1&&os_root_type=hdd#
+# name of net manager which is used
+os_install_net_settings = #-os_install_net_conf-#
+#pkg#
#?os_install_linux_ver>10.8.81#
[main]
diff --git install/2laptop/lenovo/sudo/sudoers install/2laptop/lenovo/sudo/sudoers
index dc81e5e..f252dae 100644
--- install/2laptop/lenovo/sudo/sudoers
+++ install/2laptop/lenovo/sudo/sudoers
@@ -1,4 +1,4 @@
-# Calculate format=patch path=/etc
+# Calculate format=patch path=/etc chmod=0400
<reg>(# BEGIN laptop configuration)
.*(# END laptop configuration)</reg>
<text>\1
diff --git install/2laptop/samsung/sudo/sudoers install/2laptop/samsung/sudo/sudoers
index ee88674..4b5b0f7 100644
--- install/2laptop/samsung/sudo/sudoers
+++ install/2laptop/samsung/sudo/sudoers
@@ -1,4 +1,4 @@
-# Calculate format=patch path=/etc
+# Calculate format=patch path=/etc chmod=0400
<reg>(# BEGIN laptop configuration)
.*(# END laptop configuration)</reg>
<text>\1

292
sys-apps/calculate-templates/files/calculate-templates-2.2.17_2.2.18_rc3.patch
Unescape View File

@ -1,292 +0,0 @@
diff --git builder/iso/calcboot/isolinux/keymap.cfg builder/iso/calcboot/isolinux/keymap.cfg
index d4abb5e..9da49d6 100644
--- builder/iso/calcboot/isolinux/keymap.cfg
+++ builder/iso/calcboot/isolinux/keymap.cfg
@@ -80,6 +80,11 @@ LABEL keymap:pt_PT
KERNEL calcmenu.c32
APPEND isolinux.cfg calculate=,keymap:pt_PT
+LABEL keymap:ro_RO
+ MENU LABEL Romanian
+ KERNEL calcmenu.c32
+ APPEND isolinux.cfg calculate=,keymap:ro_RO
+
LABEL keymap:ru_RU
MENU LABEL Russian
KERNEL calcmenu.c32
diff --git builder/iso/calcboot/isolinux/lang.cfg builder/iso/calcboot/isolinux/lang.cfg
index aefb539..c008495 100644
--- builder/iso/calcboot/isolinux/lang.cfg
+++ builder/iso/calcboot/isolinux/lang.cfg
@@ -50,6 +50,11 @@ LABEL lang:ru_RU
KERNEL calcmenu.c32
APPEND isolinux.cfg calculate=lang:ru_RU,keymap:ru_RU,timezone:Europe/Moscow
+LABEL lang:ro_RO
+ MENU LABEL Romanian
+ KERNEL calcmenu.c32
+ APPEND isolinux.cfg calculate=lang:ro_RO,keymap:ro_RO,timezone:Europe/Istanbul
+
LABEL lang:es_ES
MENU LABEL Espanol
KERNEL calcmenu.c32
diff --git desktop/00-desktop-init/empty_dir/2ini_res.env desktop/00-desktop-init/empty_dir/2ini_res.env
index ba4c0a6..13bac65 100644
--- desktop/00-desktop-init/empty_dir/2ini_res.env
+++ desktop/00-desktop-init/empty_dir/2ini_res.env
@@ -118,6 +118,19 @@ videos = #-ini(resource.path)-#/Видео
desktop = /home/#-ur_login-#/Рабочий стол
#os_locale_lang#
+#?os_locale_lang==ro_RO#
+documents = #-ini(resource.path)-#/Documente
+downloads = #-ini(resource.path)-#/Descărcări
+music = #-ini(resource.path)-#/Muzică
+pictures = #-ini(resource.path)-#/Poze
+public = #-ini(resource.path)-#/Public
+templates = #-ini(resource.path)-#/Templates
+videos = #-ini(resource.path)-#/Video
+#os_locale_lang#
+#?os_locale_lang==ro_RO&&ur_domain_set==off#
+desktop = /home/#-ur_login-#/Desktop
+#os_locale_lang#
+
#?os_locale_lang==uk_UA#
documents = #-ini(resource.path)-#/Документи
downloads = #-ini(resource.path)-#/Завантаження
diff --git desktop/desktop/00-patch-2.2.0.16/2ini_res.env desktop/desktop/00-patch-2.2.0.16/2ini_res.env
index ba4c0a6..ec7ae86 100644
--- desktop/desktop/00-patch-2.2.0.16/2ini_res.env
+++ desktop/desktop/00-patch-2.2.0.16/2ini_res.env
@@ -105,6 +105,19 @@ videos = #-ini(resource.path)-#/Vídeos
desktop = /home/#-ur_login-#/Desktop
#os_locale_lang#
+#?os_locale_lang==ro_RO#
+documents = #-ini(resource.path)-#/Documente
+downloads = #-ini(resource.path)-#/Descărcări
+music = #-ini(resource.path)-#/Muzică
+pictures = #-ini(resource.path)-#/Poze
+public = #-ini(resource.path)-#/Public
+templates = #-ini(resource.path)-#/Templates
+videos = #-ini(resource.path)-#/Video
+#os_locale_lang#
+#?os_locale_lang==ro_RO&&ur_domain_set==off#
+desktop = /home/#-ur_login-#/Desktop
+#os_locale_lang#
+
#?os_locale_lang==ru_RU#
documents = #-ini(resource.path)-#/Документы
downloads = #-ini(resource.path)-#/Загрузки
diff --git desktop/desktop/30-gnome-2.26/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ro desktop/desktop/30-gnome-2.26/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ro
new file mode 100644
index 0000000..a40c1af
--- /dev/null
+++ desktop/desktop/30-gnome-2.26/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ro
@@ -0,0 +1,12 @@
+# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==ro_RO
+<?xml version="1.0"?>
+<gconf>
+ <entry name="layouts" type="list" ltype="string">
+ <li type="string">
+ <stringvalue>ro</stringvalue>
+ </li>
+ <li type="string">
+ <stringvalue>us</stringvalue>
+ </li>
+ </entry>
+</gconf>
diff --git desktop/desktop/30-gnome-2.30/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ro desktop/desktop/30-gnome-2.30/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ro
new file mode 100644
index 0000000..a40c1af
--- /dev/null
+++ desktop/desktop/30-gnome-2.30/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ro
@@ -0,0 +1,12 @@
+# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==ro_RO
+<?xml version="1.0"?>
+<gconf>
+ <entry name="layouts" type="list" ltype="string">
+ <li type="string">
+ <stringvalue>ro</stringvalue>
+ </li>
+ <li type="string">
+ <stringvalue>us</stringvalue>
+ </li>
+ </entry>
+</gconf>
diff --git desktop/desktop/60-firefox-3.5/.mozilla/firefox/calculate.default/prefs.js desktop/desktop/60-firefox-3.5/.mozilla/firefox/calculate.default/prefs.js
index 846e584..3d9432e 100644
--- desktop/desktop/60-firefox-3.5/.mozilla/firefox/calculate.default/prefs.js
+++ desktop/desktop/60-firefox-3.5/.mozilla/firefox/calculate.default/prefs.js
@@ -71,6 +71,9 @@ user_pref("spellchecker.dictionary", "pt");
#?pkg(www-plugins/spell-mozilla-plugin)!=&&os_locale_language==ru#
user_pref("spellchecker.dictionary", "ru");
#pkg#
+#?pkg(www-plugins/spell-mozilla-plugin)!=&&os_locale_language==ro#
+user_pref("spellchecker.dictionary", "ro");
+#pkg#
#?pkg(www-plugins/spell-mozilla-plugin)!=&&os_locale_language==uk#
user_pref("spellchecker.dictionary", "uk-UA");
#pkg#
diff --git install/1merge/00-calculate-install/calculate2.env install/1merge/00-calculate-install/calculate2.env
new file mode 100644
index 0000000..cead32f
--- /dev/null
+++ install/1merge/00-calculate-install/calculate2.env
@@ -0,0 +1,4 @@
+# Calculate format=samba path=/etc/calculate
+
+[install]
+os_install_net_settings = #-os_install_net_conf-#
diff --git install/1merge/glibc/locale.gen install/1merge/glibc/locale.gen
index 15cff6b..c087558 100644
--- install/1merge/glibc/locale.gen
+++ install/1merge/glibc/locale.gen
@@ -26,6 +26,8 @@ nn_NO.UTF-8 UTF-8
pl_PL.UTF-8 UTF-8
#Portuguese
pt_PT.UTF-8 UTF-8
+#Romanian
+ro_RO.UTF-8 UTF-8
#Russian
ru_RU.UTF-8 UTF-8
#Spanish
diff --git install/1merge/grub2/default.grub install/1merge/grub2/default.grub
index 67ddb16..f719541 100644
--- install/1merge/grub2/default.grub
+++ install/1merge/grub2/default.grub
@@ -8,8 +8,8 @@ GRUB_CMDLINE_LINUX="video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,spla
#?pkg(media-gfx/cld-themes)==&&pkg(media-gfx/cldx-themes)==&&pkg(media-gfx/cldg-themes)==&&pkg(media-gfx/cls-themes)==&&pkg(media-gfx/cds-themes)==&&pkg(media-gfx/cmc-themes)==#
GRUB_CMDLINE_LINUX="video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=off,theme:tty1 #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-# console=tty1 udev quiet"
#pkg#
-GRUB_TERMINAL="gfxterm"
-GRUB_GFXMODE="auto"
+!GRUB_TERMINAL=del
+GRUB_GFXMODE="1024x768"
GRUB_BACKGROUND="/boot/grub/grub-calculate.png"
GRUB_COLOR_NORMAL="white/black"
GRUB_COLOR_HIGHLIGHT="magenta/black"
diff --git install/1merge/networkmanager/plasma-applet-networkmanagement.desktop install/1merge/networkmanager/plasma-applet-networkmanagement.desktop
new file mode 100644
index 0000000..2b3b677
--- /dev/null
+++ install/1merge/networkmanager/plasma-applet-networkmanagement.desktop
@@ -0,0 +1,8 @@
+# Calculate path=/usr/share/kde4/services pkg(kde-base/kdelibs)!= format=kde
+[Desktop Entry]
+#?os_install_net_conf==networkmanager#
+X-KDE-Library=plasma_applet_networkmanagement
+#os_install_net_conf#
+#?os_install_net_conf!=networkmanager#
+X-KDE-Library=
+#os_install_net_conf#
diff --git install/1merge/networkmanager/system-connections/.calculate_directory install/1merge/networkmanager/system-connections/.calculate_directory
index 4401bf6..b3a2ea7 100644
--- install/1merge/networkmanager/system-connections/.calculate_directory
+++ install/1merge/networkmanager/system-connections/.calculate_directory
@@ -1 +1 @@
-# Calculate path=/etc/NetworkManager exists(/etc/NetworkManager/system-connections,root)==&&cl_chroot_status==off&&os_install_root_type!=livecd||ac_install_system==up
+# Calculate path=/etc/NetworkManager os_install_net_settings!=networkmanager&&cl_chroot_status==off&&os_install_root_type!=livecd||ac_install_system==up
diff --git install/1merge/nm-applet/.calculate_directory install/1merge/nm-applet/.calculate_directory
new file mode 100644
index 0000000..6f79f0c
--- /dev/null
+++ install/1merge/nm-applet/.calculate_directory
@@ -0,0 +1,2 @@
+# Calculate belong()!=&&cl_chroot_status==off&&pkg(gnome-extra/nm-applet)!= path=/etc/xdg name=autostart
+
diff --git install/1merge/nm-applet/nm-applet.desktop install/1merge/nm-applet/nm-applet.desktop
new file mode 100644
index 0000000..d32af0f
--- /dev/null
+++ install/1merge/nm-applet/nm-applet.desktop
@@ -0,0 +1,8 @@
+# Calculate format=kde
+[Desktop Entry]
+#?os_install_net_conf==networkmanager#
+X-GNOME-Autostart-enabled=true
+#os_install_net_conf#
+#?os_install_net_conf!=networkmanager#
+X-GNOME-Autostart-enabled=false
+#os_install_net_conf#
diff --git install/1merge/openrc/conf.d/net install/1merge/openrc/conf.d/net
index a40ea98..4d39ad5 100644
--- install/1merge/openrc/conf.d/net
+++ install/1merge/openrc/conf.d/net
@@ -1,22 +1,30 @@
-# Calculate comment=# exists(/etc/conf.d/net,root)==&&cl_chroot_status==off&&os_install_root_type!=livecd&&os_install_net_conf==openrc||ac_install_system==up&&os_install_net_conf==openrc
+# Calculate comment=# os_install_net_settings!=openrc&&cl_chroot_status==off&&os_install_root_type!=livecd&&os_install_net_conf==openrc||ac_install_system==up&&os_install_net_conf==openrc
#?os_install_linux_system==server#
modules="!plug"
#os_install_linux_system#
#?list(os_install_net_interfaces,0)!=&&list(os_install_net_dhcp_set,0)!=on&&list(os_install_net_ip,0)!=#
config_#-list(os_install_net_interfaces,0)-#=( "#-list(os_install_net_ip,0)-#/#-list(os_install_net_cidr,0)-#" )
+#list#
+#?list(os_install_net_interfaces,0)!=&&list(os_install_net_dhcp_set,0)!=on&&list(os_install_net_ip,0)!=&&list(os_install_net_route,0)!=#
routes_#-list(os_install_net_interfaces,0)-#="#-list(os_install_net_route,0)-#"
#list#
#?list(os_install_net_interfaces,1)!=&&list(os_install_net_dhcp_set,1)!=on&&list(os_install_net_ip,1)!=#
config_#-list(os_install_net_interfaces,1)-#=( "#-list(os_install_net_ip,1)-#/#-list(os_install_net_cidr,1)-#" )
+#list#
+#?list(os_install_net_interfaces,1)!=&&list(os_install_net_dhcp_set,1)!=on&&list(os_install_net_ip,1)!=&&list(os_install_net_route,1)!=#
routes_#-list(os_install_net_interfaces,1)-#="#-list(os_install_net_route,1)-#"
#list#
#?list(os_install_net_interfaces,2)!=&&list(os_install_net_dhcp_set,2)!=on&&list(os_install_net_ip,2)!=#
config_#-list(os_install_net_interfaces,2)-#=( "#-list(os_install_net_ip,2)-#/#-list(os_install_net_cidr,2)-#" )
+#list#
+#?list(os_install_net_interfaces,2)!=&&list(os_install_net_dhcp_set,2)!=on&&list(os_install_net_ip,2)!=&&list(os_install_net_route,2)!=#
routes_#-list(os_install_net_interfaces,2)-#="#-list(os_install_net_route,2)-#"
#list#
#?list(os_install_net_interfaces,3)!=&&list(os_install_net_dhcp_set,3)!=on&&list(os_install_net_ip,3)!=#
config_#-list(os_install_net_interfaces,3)-#=( "#-list(os_install_net_ip,3)-#/#-list(os_install_net_cidr,3)-#" )
+#list#
+#?list(os_install_net_interfaces,3)!=&&list(os_install_net_dhcp_set,3)!=on&&list(os_install_net_ip,3)!=&&list(os_install_net_route,3)!=#
routes_#-list(os_install_net_interfaces,3)-#="#-list(os_install_net_route,3)-#"
#list#
#?os_install_net_dns!=#
diff --git install/1merge/sudo/sudoers install/1merge/sudo/sudoers
index 961a5bf..25c4cde 100644
--- install/1merge/sudo/sudoers
+++ install/1merge/sudo/sudoers
@@ -1,4 +1,4 @@
-# Calculate comment=#
+# Calculate comment=# chmod=0400
Defaults env_reset
#?os_install_root_type==livecd#
diff --git install/1system/calculate-install/calculate2.env install/1system/calculate-install/calculate2.env
index d83a0f6..27df9f5 100644
--- install/1system/calculate-install/calculate2.env
+++ install/1system/calculate-install/calculate2.env
@@ -6,6 +6,10 @@ os_install_dev_from = #-os_root_dev-#
# NTP is a protocol designed to synchronize the clocks of computers over a network.
os_install_ntp = #-os_install_ntp-#
#os_root_type#
+#pkg(sys-apps/calculate-install)>2.2.17-r1&&os_root_type=hdd#
+# name of net manager which is used
+os_install_net_settings = #-os_install_net_conf-#
+#pkg#
#?os_install_linux_ver>10.8.81#
[main]
diff --git install/2laptop/lenovo/sudo/sudoers install/2laptop/lenovo/sudo/sudoers
index dc81e5e..f252dae 100644
--- install/2laptop/lenovo/sudo/sudoers
+++ install/2laptop/lenovo/sudo/sudoers
@@ -1,4 +1,4 @@
-# Calculate format=patch path=/etc
+# Calculate format=patch path=/etc chmod=0400
<reg>(# BEGIN laptop configuration)
.*(# END laptop configuration)</reg>
<text>\1
diff --git install/2laptop/samsung/sudo/sudoers install/2laptop/samsung/sudo/sudoers
index ee88674..4b5b0f7 100644
--- install/2laptop/samsung/sudo/sudoers
+++ install/2laptop/samsung/sudo/sudoers
@@ -1,4 +1,4 @@
-# Calculate format=patch path=/etc
+# Calculate format=patch path=/etc chmod=0400
<reg>(# BEGIN laptop configuration)
.*(# END laptop configuration)</reg>
<text>\1

292
sys-apps/calculate-templates/files/calculate-templates-2.2.17_2.2.18_rc4.patch
Unescape View File

@ -1,292 +0,0 @@
diff --git builder/iso/calcboot/isolinux/keymap.cfg builder/iso/calcboot/isolinux/keymap.cfg
index d4abb5e..9da49d6 100644
--- builder/iso/calcboot/isolinux/keymap.cfg
+++ builder/iso/calcboot/isolinux/keymap.cfg
@@ -80,6 +80,11 @@ LABEL keymap:pt_PT
KERNEL calcmenu.c32
APPEND isolinux.cfg calculate=,keymap:pt_PT
+LABEL keymap:ro_RO
+ MENU LABEL Romanian
+ KERNEL calcmenu.c32
+ APPEND isolinux.cfg calculate=,keymap:ro_RO
+
LABEL keymap:ru_RU
MENU LABEL Russian
KERNEL calcmenu.c32
diff --git builder/iso/calcboot/isolinux/lang.cfg builder/iso/calcboot/isolinux/lang.cfg
index aefb539..c008495 100644
--- builder/iso/calcboot/isolinux/lang.cfg
+++ builder/iso/calcboot/isolinux/lang.cfg
@@ -50,6 +50,11 @@ LABEL lang:ru_RU
KERNEL calcmenu.c32
APPEND isolinux.cfg calculate=lang:ru_RU,keymap:ru_RU,timezone:Europe/Moscow
+LABEL lang:ro_RO
+ MENU LABEL Romanian
+ KERNEL calcmenu.c32
+ APPEND isolinux.cfg calculate=lang:ro_RO,keymap:ro_RO,timezone:Europe/Istanbul
+
LABEL lang:es_ES
MENU LABEL Espanol
KERNEL calcmenu.c32
diff --git desktop/00-desktop-init/empty_dir/2ini_res.env desktop/00-desktop-init/empty_dir/2ini_res.env
index ba4c0a6..13bac65 100644
--- desktop/00-desktop-init/empty_dir/2ini_res.env
+++ desktop/00-desktop-init/empty_dir/2ini_res.env
@@ -118,6 +118,19 @@ videos = #-ini(resource.path)-#/Видео
desktop = /home/#-ur_login-#/Рабочий стол
#os_locale_lang#
+#?os_locale_lang==ro_RO#
+documents = #-ini(resource.path)-#/Documente
+downloads = #-ini(resource.path)-#/Descărcări
+music = #-ini(resource.path)-#/Muzică
+pictures = #-ini(resource.path)-#/Poze
+public = #-ini(resource.path)-#/Public
+templates = #-ini(resource.path)-#/Templates
+videos = #-ini(resource.path)-#/Video
+#os_locale_lang#
+#?os_locale_lang==ro_RO&&ur_domain_set==off#
+desktop = /home/#-ur_login-#/Desktop
+#os_locale_lang#
+
#?os_locale_lang==uk_UA#
documents = #-ini(resource.path)-#/Документи
downloads = #-ini(resource.path)-#/Завантаження
diff --git desktop/desktop/00-patch-2.2.0.16/2ini_res.env desktop/desktop/00-patch-2.2.0.16/2ini_res.env
index ba4c0a6..ec7ae86 100644
--- desktop/desktop/00-patch-2.2.0.16/2ini_res.env
+++ desktop/desktop/00-patch-2.2.0.16/2ini_res.env
@@ -105,6 +105,19 @@ videos = #-ini(resource.path)-#/Vídeos
desktop = /home/#-ur_login-#/Desktop
#os_locale_lang#
+#?os_locale_lang==ro_RO#
+documents = #-ini(resource.path)-#/Documente
+downloads = #-ini(resource.path)-#/Descărcări
+music = #-ini(resource.path)-#/Muzică
+pictures = #-ini(resource.path)-#/Poze
+public = #-ini(resource.path)-#/Public
+templates = #-ini(resource.path)-#/Templates
+videos = #-ini(resource.path)-#/Video
+#os_locale_lang#
+#?os_locale_lang==ro_RO&&ur_domain_set==off#
+desktop = /home/#-ur_login-#/Desktop
+#os_locale_lang#
+
#?os_locale_lang==ru_RU#
documents = #-ini(resource.path)-#/Документы
downloads = #-ini(resource.path)-#/Загрузки
diff --git desktop/desktop/30-gnome-2.26/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ro desktop/desktop/30-gnome-2.26/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ro
new file mode 100644
index 0000000..a40c1af
--- /dev/null
+++ desktop/desktop/30-gnome-2.26/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ro
@@ -0,0 +1,12 @@
+# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==ro_RO
+<?xml version="1.0"?>
+<gconf>
+ <entry name="layouts" type="list" ltype="string">
+ <li type="string">
+ <stringvalue>ro</stringvalue>
+ </li>
+ <li type="string">
+ <stringvalue>us</stringvalue>
+ </li>
+ </entry>
+</gconf>
diff --git desktop/desktop/30-gnome-2.30/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ro desktop/desktop/30-gnome-2.30/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ro
new file mode 100644
index 0000000..a40c1af
--- /dev/null
+++ desktop/desktop/30-gnome-2.30/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ro
@@ -0,0 +1,12 @@
+# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==ro_RO
+<?xml version="1.0"?>
+<gconf>
+ <entry name="layouts" type="list" ltype="string">
+ <li type="string">
+ <stringvalue>ro</stringvalue>
+ </li>
+ <li type="string">
+ <stringvalue>us</stringvalue>
+ </li>
+ </entry>
+</gconf>
diff --git desktop/desktop/60-firefox-3.5/.mozilla/firefox/calculate.default/prefs.js desktop/desktop/60-firefox-3.5/.mozilla/firefox/calculate.default/prefs.js
index 846e584..3d9432e 100644
--- desktop/desktop/60-firefox-3.5/.mozilla/firefox/calculate.default/prefs.js
+++ desktop/desktop/60-firefox-3.5/.mozilla/firefox/calculate.default/prefs.js
@@ -71,6 +71,9 @@ user_pref("spellchecker.dictionary", "pt");
#?pkg(www-plugins/spell-mozilla-plugin)!=&&os_locale_language==ru#
user_pref("spellchecker.dictionary", "ru");
#pkg#
+#?pkg(www-plugins/spell-mozilla-plugin)!=&&os_locale_language==ro#
+user_pref("spellchecker.dictionary", "ro");
+#pkg#
#?pkg(www-plugins/spell-mozilla-plugin)!=&&os_locale_language==uk#
user_pref("spellchecker.dictionary", "uk-UA");
#pkg#
diff --git install/1merge/00-calculate-install/calculate2.env install/1merge/00-calculate-install/calculate2.env
new file mode 100644
index 0000000..cead32f
--- /dev/null
+++ install/1merge/00-calculate-install/calculate2.env
@@ -0,0 +1,4 @@
+# Calculate format=samba path=/etc/calculate
+
+[install]
+os_install_net_settings = #-os_install_net_conf-#
diff --git install/1merge/glibc/locale.gen install/1merge/glibc/locale.gen
index 15cff6b..c087558 100644
--- install/1merge/glibc/locale.gen
+++ install/1merge/glibc/locale.gen
@@ -26,6 +26,8 @@ nn_NO.UTF-8 UTF-8
pl_PL.UTF-8 UTF-8
#Portuguese
pt_PT.UTF-8 UTF-8
+#Romanian
+ro_RO.UTF-8 UTF-8
#Russian
ru_RU.UTF-8 UTF-8
#Spanish
diff --git install/1merge/grub2/default.grub install/1merge/grub2/default.grub
index 67ddb16..f719541 100644
--- install/1merge/grub2/default.grub
+++ install/1merge/grub2/default.grub
@@ -8,8 +8,8 @@ GRUB_CMDLINE_LINUX="video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,spla
#?pkg(media-gfx/cld-themes)==&&pkg(media-gfx/cldx-themes)==&&pkg(media-gfx/cldg-themes)==&&pkg(media-gfx/cls-themes)==&&pkg(media-gfx/cds-themes)==&&pkg(media-gfx/cmc-themes)==#
GRUB_CMDLINE_LINUX="video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=off,theme:tty1 #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-# console=tty1 udev quiet"
#pkg#
-GRUB_TERMINAL="gfxterm"
-GRUB_GFXMODE="auto"
+!GRUB_TERMINAL=del
+GRUB_GFXMODE="1024x768"
GRUB_BACKGROUND="/boot/grub/grub-calculate.png"
GRUB_COLOR_NORMAL="white/black"
GRUB_COLOR_HIGHLIGHT="magenta/black"
diff --git install/1merge/networkmanager/plasma-applet-networkmanagement.desktop install/1merge/networkmanager/plasma-applet-networkmanagement.desktop
new file mode 100644
index 0000000..2b3b677
--- /dev/null
+++ install/1merge/networkmanager/plasma-applet-networkmanagement.desktop
@@ -0,0 +1,8 @@
+# Calculate path=/usr/share/kde4/services pkg(kde-base/kdelibs)!= format=kde
+[Desktop Entry]
+#?os_install_net_conf==networkmanager#
+X-KDE-Library=plasma_applet_networkmanagement
+#os_install_net_conf#
+#?os_install_net_conf!=networkmanager#
+X-KDE-Library=
+#os_install_net_conf#
diff --git install/1merge/networkmanager/system-connections/.calculate_directory install/1merge/networkmanager/system-connections/.calculate_directory
index 4401bf6..b3a2ea7 100644
--- install/1merge/networkmanager/system-connections/.calculate_directory
+++ install/1merge/networkmanager/system-connections/.calculate_directory
@@ -1 +1 @@
-# Calculate path=/etc/NetworkManager exists(/etc/NetworkManager/system-connections,root)==&&cl_chroot_status==off&&os_install_root_type!=livecd||ac_install_system==up
+# Calculate path=/etc/NetworkManager os_install_net_settings!=networkmanager&&cl_chroot_status==off&&os_install_root_type!=livecd||ac_install_system==up
diff --git install/1merge/nm-applet/.calculate_directory install/1merge/nm-applet/.calculate_directory
new file mode 100644
index 0000000..6f79f0c
--- /dev/null
+++ install/1merge/nm-applet/.calculate_directory
@@ -0,0 +1,2 @@
+# Calculate belong()!=&&cl_chroot_status==off&&pkg(gnome-extra/nm-applet)!= path=/etc/xdg name=autostart
+
diff --git install/1merge/nm-applet/nm-applet.desktop install/1merge/nm-applet/nm-applet.desktop
new file mode 100644
index 0000000..d32af0f
--- /dev/null
+++ install/1merge/nm-applet/nm-applet.desktop
@@ -0,0 +1,8 @@
+# Calculate format=kde
+[Desktop Entry]
+#?os_install_net_conf==networkmanager#
+X-GNOME-Autostart-enabled=true
+#os_install_net_conf#
+#?os_install_net_conf!=networkmanager#
+X-GNOME-Autostart-enabled=false
+#os_install_net_conf#
diff --git install/1merge/openrc/conf.d/net install/1merge/openrc/conf.d/net
index a40ea98..4d39ad5 100644
--- install/1merge/openrc/conf.d/net
+++ install/1merge/openrc/conf.d/net
@@ -1,22 +1,30 @@
-# Calculate comment=# exists(/etc/conf.d/net,root)==&&cl_chroot_status==off&&os_install_root_type!=livecd&&os_install_net_conf==openrc||ac_install_system==up&&os_install_net_conf==openrc
+# Calculate comment=# os_install_net_settings!=openrc&&cl_chroot_status==off&&os_install_root_type!=livecd&&os_install_net_conf==openrc||ac_install_system==up&&os_install_net_conf==openrc
#?os_install_linux_system==server#
modules="!plug"
#os_install_linux_system#
#?list(os_install_net_interfaces,0)!=&&list(os_install_net_dhcp_set,0)!=on&&list(os_install_net_ip,0)!=#
config_#-list(os_install_net_interfaces,0)-#=( "#-list(os_install_net_ip,0)-#/#-list(os_install_net_cidr,0)-#" )
+#list#
+#?list(os_install_net_interfaces,0)!=&&list(os_install_net_dhcp_set,0)!=on&&list(os_install_net_ip,0)!=&&list(os_install_net_route,0)!=#
routes_#-list(os_install_net_interfaces,0)-#="#-list(os_install_net_route,0)-#"
#list#
#?list(os_install_net_interfaces,1)!=&&list(os_install_net_dhcp_set,1)!=on&&list(os_install_net_ip,1)!=#
config_#-list(os_install_net_interfaces,1)-#=( "#-list(os_install_net_ip,1)-#/#-list(os_install_net_cidr,1)-#" )
+#list#
+#?list(os_install_net_interfaces,1)!=&&list(os_install_net_dhcp_set,1)!=on&&list(os_install_net_ip,1)!=&&list(os_install_net_route,1)!=#
routes_#-list(os_install_net_interfaces,1)-#="#-list(os_install_net_route,1)-#"
#list#
#?list(os_install_net_interfaces,2)!=&&list(os_install_net_dhcp_set,2)!=on&&list(os_install_net_ip,2)!=#
config_#-list(os_install_net_interfaces,2)-#=( "#-list(os_install_net_ip,2)-#/#-list(os_install_net_cidr,2)-#" )
+#list#
+#?list(os_install_net_interfaces,2)!=&&list(os_install_net_dhcp_set,2)!=on&&list(os_install_net_ip,2)!=&&list(os_install_net_route,2)!=#
routes_#-list(os_install_net_interfaces,2)-#="#-list(os_install_net_route,2)-#"
#list#
#?list(os_install_net_interfaces,3)!=&&list(os_install_net_dhcp_set,3)!=on&&list(os_install_net_ip,3)!=#
config_#-list(os_install_net_interfaces,3)-#=( "#-list(os_install_net_ip,3)-#/#-list(os_install_net_cidr,3)-#" )
+#list#
+#?list(os_install_net_interfaces,3)!=&&list(os_install_net_dhcp_set,3)!=on&&list(os_install_net_ip,3)!=&&list(os_install_net_route,3)!=#
routes_#-list(os_install_net_interfaces,3)-#="#-list(os_install_net_route,3)-#"
#list#
#?os_install_net_dns!=#
diff --git install/1merge/sudo/sudoers install/1merge/sudo/sudoers
index 961a5bf..27f8cea 100644
--- install/1merge/sudo/sudoers
+++ install/1merge/sudo/sudoers
@@ -1,4 +1,4 @@
-# Calculate comment=#
+# Calculate comment=# chmod=0440
Defaults env_reset
#?os_install_root_type==livecd#
diff --git install/1system/calculate-install/calculate2.env install/1system/calculate-install/calculate2.env
index d83a0f6..fb06d8a 100644
--- install/1system/calculate-install/calculate2.env
+++ install/1system/calculate-install/calculate2.env
@@ -6,6 +6,10 @@ os_install_dev_from = #-os_root_dev-#
# NTP is a protocol designed to synchronize the clocks of computers over a network.
os_install_ntp = #-os_install_ntp-#
#os_root_type#
+#?pkg(sys-apps/calculate-install)>2.2.17-r1&&os_root_type=hdd#
+# name of net manager which is used
+os_install_net_settings = #-os_install_net_conf-#
+#pkg#
#?os_install_linux_ver>10.8.81#
[main]
diff --git install/2laptop/lenovo/sudo/sudoers install/2laptop/lenovo/sudo/sudoers
index dc81e5e..c8b2a4c 100644
--- install/2laptop/lenovo/sudo/sudoers
+++ install/2laptop/lenovo/sudo/sudoers
@@ -1,4 +1,4 @@
-# Calculate format=patch path=/etc
+# Calculate format=patch path=/etc chmod=0440
<reg>(# BEGIN laptop configuration)
.*(# END laptop configuration)</reg>
<text>\1
diff --git install/2laptop/samsung/sudo/sudoers install/2laptop/samsung/sudo/sudoers
index ee88674..cbbeb5b 100644
--- install/2laptop/samsung/sudo/sudoers
+++ install/2laptop/samsung/sudo/sudoers
@@ -1,4 +1,4 @@
-# Calculate format=patch path=/etc
+# Calculate format=patch path=/etc chmod=0440
<reg>(# BEGIN laptop configuration)
.*(# END laptop configuration)</reg>
<text>\1

22
sys-apps/calculate-utilities/ChangeLog
Unescape View File

@ -2,6 +2,28 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-utilities-2.2.18 (29 Jun 2011)
29 Jun 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
-calculate-utilities-2.2.15.ebuild, -calculate-utilities-2.2.15-r1.ebuild,
-calculate-utilities-2.2.15-r2.ebuild, -calculate-utilities-2.2.15-r3.ebuild,
-calculate-utilities-2.2.15-r4.ebuild, -calculate-utilities-2.2.15-r5.ebuild,
-calculate-utilities-2.2.15-r6.ebuild, -calculate-utilities-2.2.15-r7.ebuild,
-calculate-utilities-2.2.15-r8.ebuild, -calculate-utilities-2.2.16.ebuild,
-calculate-utilities-2.2.16-r1.ebuild, -calculate-utilities-2.2.16-r2.ebuild,
-calculate-utilities-2.2.16-r3.ebuild, -calculate-utilities-2.2.16-r5.ebuild,
-calculate-utilities-2.2.16-r6.ebuild, -calculate-utilities-2.2.16-r7.ebuild,
-calculate-utilities-2.2.16-r8.ebuild, -calculate-utilities-2.2.16-r9.ebuild,
-calculate-utilities-2.2.17.ebuild, -calculate-utilities-2.2.17-r1.ebuild,
-calculate-utilities-2.2.17-r2.ebuild, -calculate-utilities-2.2.17-r3.ebuild,
-calculate-utilities-2.2.17-r4.ebuild, -calculate-utilities-2.2.17-r5.ebuild,
-calculate-utilities-2.2.17-r6.ebuild, -calculate-utilities-2.2.17-r7.ebuild,
-calculate-utilities-2.2.17-r8.ebuild, -calculate-utilities-2.2.17-r9.ebuild,
-calculate-utilities-2.2.17-r10.ebuild,
-calculate-utilities-2.2.17-r11.ebuild,
-calculate-utilities-2.2.17-r12.ebuild, +calculate-utilities-2.2.18.ebuild:
Bump version
*calculate-utilities-2.2.17-r12 (28 Jun 2011)
28 Jun 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

34
sys-apps/calculate-utilities/Manifest
Unescape View File

@ -1,33 +1,3 @@
EBUILD calculate-utilities-2.2.15-r1.ebuild 832 RMD160 688a5ec9a4cb023e8ece8bf14a8bc7b18beccaaf SHA1 65cdc57f37474b8210b27df6f5d35ac59c24db7d SHA256 e6124e3bce16a5da7fa5ed5abfaa8a30c0eb259b554f645c66efdb19f54a0e7d
EBUILD calculate-utilities-2.2.15-r2.ebuild 832 RMD160 cb65479ab3ab4ffcc582f2a86ceff5efee0e5b30 SHA1 e0ea10eb3d28c8a06937f90b419c975c6d14a463 SHA256 ab7e18c952928326e4bbfdf7998f8546c04f837a2434f672868b716775ac36db
EBUILD calculate-utilities-2.2.15-r3.ebuild 835 RMD160 fdaed0dfa80627e09cd92df7757973e73748ac19 SHA1 861e875d5b3b7a69bc5e743180ece46af0a51a30 SHA256 c4f255a9c0e7b2a3c490f9bac66a89d4215281e79cbb1e38bd0e8e03ce7d88af
EBUILD calculate-utilities-2.2.15-r4.ebuild 838 RMD160 0ac5b0baa9591e32d3bc1fb83259a1af6f145ef3 SHA1 cb20981186bc64ac2164699e4e28cd63c121ff71 SHA256 3b6c1f777bac3ca53fea9a2441873ca79cd6241d135f9f9c5285a5f678ae2161
EBUILD calculate-utilities-2.2.15-r5.ebuild 835 RMD160 42276695e9bf95587ec5eace649fa843e9362328 SHA1 bae5173d4ff7ab20a7f77a559efc9da9b5670b48 SHA256 2ee5b5a91cb90139cef361a3db7cac87c846009bf7db3a6ac0b99fd444c7bc9f
EBUILD calculate-utilities-2.2.15-r6.ebuild 838 RMD160 f0c7a4b6c12275c0449e425b6106321d22e08889 SHA1 5bc93df591f212e427427f59f60ca10afadd1274 SHA256 a9aeb9d16c68b093a14d572173cf0eba4bbf69aac2343bb88fe66ac43a090037
EBUILD calculate-utilities-2.2.15-r7.ebuild 838 RMD160 e7bd561b748a694cdf0eb38ba147275f87d9825e SHA1 f233c7cdc657c94547c1ac49ff183ef6dd318960 SHA256 b7d23b34efc574ea82da2fb0873c7dada7c5b22fff0eac9faf2b6374b10fc1c6
EBUILD calculate-utilities-2.2.15-r8.ebuild 838 RMD160 6cb786cc327fd21574645c741b8d0ff6a8cead0f SHA1 0bf765da8584c388a44f07e05be7944f3b3b4af0 SHA256 afa805257de5139c9222943549e71c6c9d3c98e35e656022300fe6038ca4db4a
EBUILD calculate-utilities-2.2.15.ebuild 829 RMD160 08af4128804390a3611da9de6a0877f86f837c03 SHA1 d4c713a63a074a193a2a8a614ed80c5e343af871 SHA256 5e60616c449b464b7163a25c32f1dd5a565d5c878b823a23b2848fda49d0afca
EBUILD calculate-utilities-2.2.16-r1.ebuild 832 RMD160 9be3baed52d490886fa38f80ec555079df94c53d SHA1 ee2c14277839133bbaed580eea6ef410326fdf1e SHA256 1e5ca44a76ff03db937e09f9d5a8a65f46b120b965994a9eda808a9b2406e7d4
EBUILD calculate-utilities-2.2.16-r2.ebuild 832 RMD160 4826ccde3d7b32d4d2759b97e1458bb06cb18c70 SHA1 518d1dcb131969c105677a7cc466dc9183c6a8e3 SHA256 278a8b98d18a248baba4bafeeab897c3aa8ec8e415338845fa8df1e9d0a044b1
EBUILD calculate-utilities-2.2.16-r3.ebuild 835 RMD160 f84cb05a48401db24066b12fd6072f4be9e10288 SHA1 c5acff3b7797bca438ec15389f5cb4fcaf4544a2 SHA256 23d33632597256283de090fea72a29ff365a438572d28c97238963f43af4f23e
EBUILD calculate-utilities-2.2.16-r5.ebuild 838 RMD160 9845d647992a22ae7f2f2820d02618b899b411ab SHA1 cc474c09d0c063700a6df558d38ca4e1df55db5b SHA256 904dab1a4523ba775678a018801fdfe86239d816b83c680c05d5c280daef886f
EBUILD calculate-utilities-2.2.16-r6.ebuild 838 RMD160 bfb8ec8683ad8b4f6fea90f423ae75a07e3a18ff SHA1 e03bceedf7a857f5b94bd0d73b619d0772334fa7 SHA256 fa0ad9c9b54fd18e71c584d1de688beb42e559d4029de4dff92d600e43022152
EBUILD calculate-utilities-2.2.16-r7.ebuild 838 RMD160 4d48ee6d8663886d511ab9c972d776d5040ab3ed SHA1 225ce03d203607703c025873911779b2a7e17af7 SHA256 f8052f8dabdd324a0a62654e9db7f916384dc644affed7394b57070d513ba50d
EBUILD calculate-utilities-2.2.16-r8.ebuild 838 RMD160 3ece201fcefd6cb4d4813742658991a4d338721e SHA1 1b46fa9829570f6a64e700a3b2056d6fbc583f7b SHA256 74b34c332b2faa2b70eac1aa7f7418ebcc8fa7a1376a4e84d8acc392a009ebde
EBUILD calculate-utilities-2.2.16-r9.ebuild 838 RMD160 860152120f6a6e35ee51258bbef3729c9b53a311 SHA1 8c980cf20a6853c05a2c5bca56a5e3e86865190a SHA256 1f234a0841146b71e3b9683ae5a71ad4896d31c2f3f5a3583a4c52e435cd1ced
EBUILD calculate-utilities-2.2.16.ebuild 829 RMD160 dee34889a7f8ab23011ca57685573d0c3b7ba2ef SHA1 e2dcd703f0045e6d8c5647c131c0a72f7d03a9b0 SHA256 f2666edf4ce390eeea6cfc5f3750742a93b861ad1f431aac9ec2c6eeefbf3af7
EBUILD calculate-utilities-2.2.17-r1.ebuild 838 RMD160 730c47dc92b94fb5d654ea0519619595814eb823 SHA1 e4295b0baf7b7415d98217f41e077ae272904889 SHA256 b011892b1f94debc03abf616965018b56a4ed9adf8b2b3849ce10ea18c412ec9
EBUILD calculate-utilities-2.2.17-r10.ebuild 841 RMD160 0cd4014138a1d4585316e3ac24890314ba6cc069 SHA1 d31db1a7e31b27bc5fb1f051533b2a393a9dba2f SHA256 e26b4522a08e7bc77d1d3b85f5f3db13bca31c74a8a4c73220d1c2c0cc57eaea
EBUILD calculate-utilities-2.2.17-r11.ebuild 841 RMD160 f243bf2d3a25a121a1edcbb2a384ec92dc8d64eb SHA1 cd1f509667dde32d96658263990ccf772c8babfc SHA256 4e3687a8adde6d28f87a49b5b98aa2070dce89be79cf63270a729b9a22d7163d
EBUILD calculate-utilities-2.2.17-r12.ebuild 841 RMD160 717eeb19e1fff279e01f901c3d419d04b4e0d718 SHA1 7b157daacb26fc483cb7f9cc6fa4779816774c31 SHA256 871ee6aac396b4f836a6c08bc20951b3d73d525857b2feba6670a3b2e71fcd02
EBUILD calculate-utilities-2.2.17-r2.ebuild 838 RMD160 77c6a1fe6fe2a5362c5d687d4bf9d6ae4ba55640 SHA1 90dc1b30046b1207424b969140f3d8659f2298c8 SHA256 bfb285120cd0df0cad0283c2fab7d5b26148f207d2a8e4a2a63becc8a4c84b60
EBUILD calculate-utilities-2.2.17-r3.ebuild 838 RMD160 41fda29d1dedca885073afba581ccefd3984f398 SHA1 6985b9720b7957900d7048d67334e9c804d873a8 SHA256 7a27dee7d29e940f8d0c2c87f0c4553771c120afa672ca40fde9b0da38cd1504
EBUILD calculate-utilities-2.2.17-r4.ebuild 838 RMD160 50ebe6b7429697cb961f398ce26b06bd36d76d56 SHA1 f1772a64f1fd35cd7f7d0441eb00e7d5b0b9e8ef SHA256 6eacc7fb52b06b241b5c389eea3f78644bf041f27951d9fa05317873f3745822
EBUILD calculate-utilities-2.2.17-r5.ebuild 838 RMD160 eabbdf6a93661be23c44928d591759bfd78d7a9b SHA1 92925419376aa9389a819984dadc96c7e830340b SHA256 f352440df69e23dcbab1cac1a7ad53e2db8b334f925402d7a4b278ce6cede7cc
EBUILD calculate-utilities-2.2.17-r6.ebuild 838 RMD160 26a95cd01bc633878f7c33de9a6990f07835d252 SHA1 100364fae1828ab27a54351e7cf2dd9badf62e09 SHA256 5ffd4db1ed6e2e1de201137a7d30eed7247543a0c294eda14c961345f7aad9e0
EBUILD calculate-utilities-2.2.17-r7.ebuild 841 RMD160 2df9886a9bdf03f9f64738ae9862df73decf0e74 SHA1 2904857c354c757ea38a6138b4ffc8a45c1f2a05 SHA256 97bc320598288b8204e5300a96e4e653d6de98ebd76a9e1890c7b99beb9116bb
EBUILD calculate-utilities-2.2.17-r8.ebuild 841 RMD160 274fa8d79b0f5dbf687dec6eddc0551ada68000d SHA1 4ec06a7f4a7908bae9167f119c499dc65b97ec4b SHA256 61f0cff5c9448279cd7c67e9a57966b08a439ace1696421d1e9410b562e5e967
EBUILD calculate-utilities-2.2.17-r9.ebuild 841 RMD160 bbbca3c558b7f99cf801bf2ebcff71fdf8c559c0 SHA1 1f215ef2dd184779fd81e8006180cba0fc774ea4 SHA256 520c283973458ca547e62396b80b7531d1641d75de8103a5a86d52e2587d95a1
EBUILD calculate-utilities-2.2.17.ebuild 829 RMD160 29fb0a089833990a144d2f31cad389d4feaad2a6 SHA1 a2a0a45be11ccbb49772f0bc04dc0be2c68ea361 SHA256 0f96a85ef7e239058d62387237df40e3ba19e310e963226398d91413967a60b3
EBUILD calculate-utilities-2.2.18.ebuild 829 RMD160 e73b8763bd13098473327959bc435ff52d470836 SHA1 b394d0126e846d4780a77f2f89429f6bf8734a27 SHA256 550f341dc60ca43b23100152a58c30178cb1c88456d007bb1439fb4cb949fcd1
EBUILD calculate-utilities-2.2.9999.ebuild 840 RMD160 0c7324a9ed480118ac19f62b162c9ee62c25f964 SHA1 7dadab1430ed147334ed7e9b4fcc86dc99e25d56 SHA256 f3ee28f9f765e7302c83eb4a15a09bdf066f09e6b40e34f6d52157a946df5e66
MISC ChangeLog 14128 RMD160 3ca726e97b403f1f3469d89c32befffdf87899fe SHA1 4f4db3f47d3f5380e4a3268e11f5361be70270aa SHA256 fcaafa3f7be0773cc811925e25c180f400455681bfe44de35681659880798797
MISC ChangeLog 15520 RMD160 4fd913a3b0c46a64984403142ad6b6bc52660e73 SHA1 4a31ac486e6b040e62f0ba1a07a059d767b5b7ec SHA256 8a2f7f174ddc71d728fa92d4cb77c5ca3107082a2e419ea62452656d7479aa8e

36
sys-apps/calculate-utilities/calculate-utilities-2.2.15-r1.ebuild
Unescape View File

@ -1,36 +0,0 @@
# Copyright 1999-2011 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_client
cl_desktop
cl_installgui
cl_server
"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-2.2.15
=sys-apps/calculate-templates-2.2.15-r1
=sys-apps/calculate-lib-2.2.15
cl_assemble? ( =sys-apps/calculate-assemble-2.2.15 )
cl_builder? ( =sys-apps/calculate-builder-2.2.15 )
cl_client? ( =sys-apps/calculate-client-2.2.15 )
cl_desktop? ( =sys-apps/calculate-desktop-2.2.15 )
cl_installgui? ( =app-misc/calculate-install-gui-2.2.15 )
cl_server? ( =sys-apps/calculate-server-2.1.13-r2 )
"

36
sys-apps/calculate-utilities/calculate-utilities-2.2.15-r2.ebuild
Unescape View File

@ -1,36 +0,0 @@
# Copyright 1999-2011 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_client
cl_desktop
cl_installgui
cl_server
"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-2.2.15
=sys-apps/calculate-templates-2.2.15-r1
=sys-apps/calculate-lib-2.2.15
cl_assemble? ( =sys-apps/calculate-assemble-2.2.15 )
cl_builder? ( =sys-apps/calculate-builder-2.2.15 )
cl_client? ( =sys-apps/calculate-client-2.2.15 )
cl_desktop? ( =sys-apps/calculate-desktop-2.2.15 )
cl_installgui? ( =app-misc/calculate-install-gui-2.2.15 )
cl_server? ( =sys-apps/calculate-server-2.1.13-r3 )
"

36
sys-apps/calculate-utilities/calculate-utilities-2.2.15-r3.ebuild
Unescape View File

@ -1,36 +0,0 @@
# Copyright 1999-2011 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_client
cl_desktop
cl_installgui
cl_server
"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-2.2.15-r1
=sys-apps/calculate-templates-2.2.15-r1
=sys-apps/calculate-lib-2.2.15
cl_assemble? ( =sys-apps/calculate-assemble-2.2.15 )
cl_builder? ( =sys-apps/calculate-builder-2.2.15 )
cl_client? ( =sys-apps/calculate-client-2.2.15 )
cl_desktop? ( =sys-apps/calculate-desktop-2.2.15 )
cl_installgui? ( =app-misc/calculate-install-gui-2.2.15 )
cl_server? ( =sys-apps/calculate-server-2.1.13-r3 )
"

36
sys-apps/calculate-utilities/calculate-utilities-2.2.15-r4.ebuild
Unescape View File

@ -1,36 +0,0 @@
# Copyright 1999-2011 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_client
cl_desktop
cl_installgui
cl_server
"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-2.2.15-r1
=sys-apps/calculate-templates-2.2.15-r1
=sys-apps/calculate-lib-2.2.15-r1
cl_assemble? ( =sys-apps/calculate-assemble-2.2.15 )
cl_builder? ( =sys-apps/calculate-builder-2.2.15 )
cl_client? ( =sys-apps/calculate-client-2.2.15 )
cl_desktop? ( =sys-apps/calculate-desktop-2.2.15 )
cl_installgui? ( =app-misc/calculate-install-gui-2.2.15 )
cl_server? ( =sys-apps/calculate-server-2.1.13-r3 )
"

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save