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

Update calculate-utilities

Browse Source
atratsevskiy
Mike Hiretsky 13 years ago
parent 145ef34914
commit 4def4225b3
15 changed files with 406 additions and 4 deletions
Show Stats Download Patch File Download Diff File

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

@ -2,6 +2,12 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-client-2.2.24-r1 (21 Sep 2011)
21 Sep 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+calculate-client-2.2.24-r1.ebuild, +files/calculate-client-2.2.24-r1.patch:
Update for bugfix
21 Sep 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
-calculate-client-2.2.18.ebuild, -calculate-client-2.2.19.ebuild,
-calculate-client-2.2.20.ebuild, -calculate-client-2.2.21.ebuild,

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

@ -1,5 +1,7 @@
AUX calculate-client-2.2.24-r1.patch 1511 RMD160 2e67f23a965e33c790fc3085b948dea054b9cc45 SHA1 cb0a528b30b9adcb5bc3859fc21cbf24f1785e39 SHA256 2133f8b483900972f0bb5a759407a980982a1d202f8cda0f16a46bfa58e25de4
DIST calculate-client-2.2.24.tar.bz2 31457 RMD160 c946e6a1fb27b420149ba3aa0e31ee28b2a02014 SHA1 de98f67bc3d10ad8c9b870961458cbd24e510ee1 SHA256 19a1eb817782d52a168d93a47bba86d03fbc1d3a9bea16e3ea6e8e18f765e056
EBUILD calculate-client-2.2.24-r1.ebuild 985 RMD160 cf52e58cc2540c7492936811ae3787cd39812b9b SHA1 204cc72c589768f5607bb8232f257fff9b9e5a05 SHA256 42965241ee3fccd34c51d732410286d8d1de024bf965e1580ddded5a94eb76b0
EBUILD calculate-client-2.2.24.ebuild 857 RMD160 20cd53346f0db753b78d72f4fbf28b7a44b1fad6 SHA1 32f9a70ea31fa00dc476944fe159bf841278025c SHA256 18ca2f2c38cea3499b69c06810fc0b9d9e616e5dbbcc6f05aeb30e1712b25156
EBUILD calculate-client-2.2.9999.ebuild 1623 RMD160 1b81a8a2088dba8bcb439a8c3ecdf1ebfe5656e6 SHA1 bfe1bc648163eab9a638d0be4974157a72ff237c SHA256 7680e14e7e79844248bbf9c45701543b219cd0c71d72cf4d7dcd6f3e571d8402
MISC ChangeLog 20270 RMD160 4a3c4f4b8c465fee745858cb1f7680184a0cdf1c SHA1 178ddda040b8c33bafdc64b202ddb94d042574de SHA256 e685b4b22d97ea04e77461cae54084f36a119b3321494bee17f0c5500a2a06b4
MISC ChangeLog 20473 RMD160 3678486ced4cb385150c3959e50433a62bfb5ea7 SHA1 b6a0d01b2f30081cacc372cd0eef3e8eb1240409 SHA256 6dad2bb3762194530dd207853088c246e59e4b7ae4510e21ced2b9d460f6718d
MISC metadata.xml 310 RMD160 ed986dbc43c958bd57e0fb73749ee09167ee0221 SHA1 4007f716df1aa85ec65d926f246663effc382384 SHA256 5023605d36dcbb5d5fe1b1ac54f7125a4087479b5168601075a8050ed51c38c2

42
sys-apps/calculate-client/calculate-client-2.2.24-r1.ebuild
Unescape View File

@ -0,0 +1,42 @@
# 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.24
>=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}"
src_unpack() {
unpack "${A}"
cd "${S}"
# Fix resolve domain names
epatch "${FILESDIR}/calculate-client-2.2.24-r1.patch"
}
pkg_postinst() {
einfo "For configure calculate-client perform:"
einfo " cl-client --install"
}

40
sys-apps/calculate-client/files/calculate-client-2.2.24-r1.patch
Unescape View File

@ -0,0 +1,40 @@
diff --git pym/cl_client.py pym/cl_client.py
index f3499c3..9d14a4e 100644
--- pym/cl_client.py
+++ pym/cl_client.py
@@ -43,6 +43,7 @@ from convertenv import convertEnv
from encrypt import encrypt
from cl_client_cache import userCache
from shutil import copy2
+from socket import gethostbyname
lang().setLanguage(sys.modules[__name__])
@@ -218,6 +219,13 @@ class ldapData(ldapUser):
return resSearch
return False
+ def _gethostbyname(self,hostname):
+ try:
+ return gethostbyname(hostname)
+ except:
+ pass
+ return None
+
def getNameRemoteServer(self,userName, osLinuxShort, curHost):
"""Если профиль на удаленном сервере, то выдать DNS имя этого сервера
"""
@@ -226,9 +234,12 @@ class ldapData(ldapUser):
prevHost = searchPrevHost[0][0][1]['host'][0]
else:
prevHost = None
+ # get ip address of previous server and current server
+ prevIp = self._gethostbyname(prevHost)
+ curIp = self._gethostbyname(curHost)
# если местоположение актуального профиля найти не удалось
# или его местоположение не на локальном сервере
- if not prevHost or prevHost == curHost:
+ if not prevHost or curIp and prevIp == curIp:
return False
else:
return prevHost

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

@ -2,6 +2,13 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-install-2.2.24-r2 (21 Sep 2011)
21 Sep 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+calculate-install-2.2.24-r2.ebuild,
+files/calculate-install-2.2.24-r2.patch:
Update for feature
21 Sep 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
-calculate-install-2.2.18.ebuild, -calculate-install-2.2.18-r1.ebuild,
-calculate-install-2.2.18-r2.ebuild, -calculate-install-2.2.18-r3.ebuild,

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

@ -1,7 +1,9 @@
AUX calculate-install-2.2.24-r1.patch 2887 RMD160 081aaf2ac8d65f300e503c8b543f46d1e122dbc8 SHA1 a32ced7cfa312e82c8d64f786985beff0ace8f9c SHA256 ad961a894ddd39231084cbabb40e864063b8d8e6f242a7c92204d797e04aef11
AUX calculate-install-2.2.24-r2.patch 6792 RMD160 33e7dd43fbf2078ad3310ee1e4734f4f58689c77 SHA1 a3655b5e3a1547877870cee81e4ec055f72777c8 SHA256 d08237249388a9e909be51035aa73f819fbd5d8eeb24f21f00f2a57fbd359c72
DIST calculate-install-2.2.24.tar.bz2 74207 RMD160 0e76e106863c8f7ae8f715ff600cbf34af53d44f SHA1 156b8438d4be79f897dcb83218152b4efcb3bfe1 SHA256 3fd7a542d484e2bd2da7b7f03685a90e5711a14190e5e53818001c54356c61b5
EBUILD calculate-install-2.2.24-r1.ebuild 932 RMD160 3816f9b8ccac79597a2ad67ac08f323aed855af0 SHA1 5119b9b5e09704e3f20ec8e465e3d2bb6cd426af SHA256 8a07bbb2443b7e22f1a67a4b37baaff69803b02422cd047639a4fc8afa2c733d
EBUILD calculate-install-2.2.24-r2.ebuild 955 RMD160 3efe77eec499e2bacc9aab2dd99719d2f119daee SHA1 0ee20eeb4143d1c1ec4eb5a3b5f11aea18821204 SHA256 8c80c00c0daa52cafdd176bbea51a87d7b01c9d23c9b85c750674a8ff916a1fa
EBUILD calculate-install-2.2.24.ebuild 805 RMD160 03a686ea79b138f2c91e9b7e0ec2282ad28f5f78 SHA1 7cb0dc07aa7eaec1ba6d8d722c08b0936a4b12a9 SHA256 f425da4dbc0ccac4b126517d4770a273add08f26f147d599b6261662561eb2ab
EBUILD calculate-install-2.2.9999.ebuild 595 RMD160 8f9b9a14fed39ded9c2a9d9343aa4e892d620172 SHA1 09aff28bdaa486868e2caddc7911732a905336ee SHA256 534e6c6e465177e269ce7beed96dab08a124878591088c1bf38095e855ca1180
MISC ChangeLog 30902 RMD160 cc395edf774aefd90884cf5a8e1cfc1fbce05b7e SHA1 49df50e8a38e4b78d958ede76fb34ae7039eb657 SHA256 10cbd8710a7c25faca82a6b634965e193fc4f00f803c9a486b95f227e284f9dc
MISC ChangeLog 31111 RMD160 8bcbffa6c9a13259246921a391c2a0d71fda54ec SHA1 cc7e1fc53290de1a85b6a9dc256864ba2576179f SHA256 bba8d3015a3711d68afec080baf0b8498b4e1fbbb8805e3da427f84587ce9737
MISC metadata.xml 310 RMD160 769e4f17a9354da6b168b72a5d65d978f65bf6dd SHA1 83aaae376052d69c7327e880cf028ebc0dea608b SHA256 c29d3efc676d8308872920db5223c78469db86ac236b5d45c3ee98ceb8fca846

42
sys-apps/calculate-install/calculate-install-2.2.24-r2.ebuild
Unescape View File

@ -0,0 +1,42 @@
# 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.24
~sys-apps/calculate-lib-2.2.24
app-portage/layman
!app-misc/livecd-tools
!minimal? ( sys-boot/grub
sys-apps/gptfdisk
>=sys-apps/util-linux-2.19.1
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# support auto march, fix detect current version
epatch "${FILESDIR}/calculate-install-2.2.24-r2.patch"
}
pkg_postinst() {
einfo "For configure calculate-install perform:"
einfo " cl-install --install"
}

156
sys-apps/calculate-install/files/calculate-install-2.2.24-r2.patch
Unescape View File

@ -0,0 +1,156 @@
diff --git data/bashlogin data/bashlogin
index ea9493a..4152a1c 100644
--- data/bashlogin
+++ data/bashlogin
@@ -1,7 +1,26 @@
#!/bin/bash
+# Copyright 2011 Calculate Ltd. http://www.calculate-linux.org
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
export HOME=/root
cat /etc/motd 2>/dev/null
-cd /root
-[[ -e .bash_profile ]] && source .bash_profile
-exec -l /bin/bash -i
+cd $HOME
+if [[ -f .bashrc ]]
+then
+ source .bashrc
+elif [[ -f .bash_profile ]]
+then
+ source .bash_profile
+fi
+exec -l -a bash /bin/bash
diff --git data/calculate data/calculate
index f213a07..b320228 100644
--- data/calculate
+++ data/calculate
@@ -1,4 +1,17 @@
#!/sbin/runscript
+# Copyright 2011 Calculate Ltd. http://www.calculate-linux.org
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
depend() {
need localmount root fsck modules
diff --git data/xautologin data/xautologin
index c33a1bf..8604572 100644
--- data/xautologin
+++ data/xautologin
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2010 Calculate Ltd. http://www.calculate-linux.org
+# Copyright 2011 Calculate Ltd. http://www.calculate-linux.org
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git man/cl-install.1 man/cl-install.1
index 8e64242..f2ddcee 100644
--- man/cl-install.1
+++ man/cl-install.1
@@ -52,7 +52,7 @@ Lets you choose your distribution. Valid values are "CDS", "CLD", "CLDG", "CLD
.PP
\fB\-\-march\fR \fIarchitecture\fR
.RS 4
-Lets you choose your CPU's architecture. Valid values are "i686" and "x86_64". If specified, the required distro will be searched for in '/var/calculate/linux' and '/var/calculate/remote/linux'.
+Lets you choose your CPU's architecture. Valid values are "i686", "x86_64" and "auto". If specified, the required distro will be searched for in '/var/calculate/linux' and '/var/calculate/remote/linux'.
.RE
.PP
\fB\-\-build\fR
diff --git man/ru/cl-install.1 man/ru/cl-install.1
index 94c5cdd..6aeb790 100644
--- man/ru/cl-install.1
+++ man/ru/cl-install.1
@@ -52,7 +52,7 @@ DISK - раздел для установки или директория, в с
.PP
\fB\-\-march\fR \fIархитектура\fR
.RS 4
-Выбор архитектуры процессора, допустимые значения "i686", "x86_64". В случае использования параметра будет выполнен поиск необходимого дистрибутива из исходных директорий.
+Выбор архитектуры процессора, допустимые значения "i686", "x86_64", "auto". В случае использования параметра будет выполнен поиск необходимого дистрибутива из исходных директорий.
.RE
.PP
\fB\-\-build\fR
diff --git pym/cl_fill_install.py pym/cl_fill_install.py
index f7e861c..ed47357 100644
--- pym/cl_fill_install.py
+++ pym/cl_fill_install.py
@@ -845,6 +845,8 @@ class fillVars(object, glob_attr):
self.Get('os_install_linux_shortname'))
if not imagename and self.Get('cl_action') != 'merge':
return ""
+ if self.Get('cl_action') != "system":
+ return self.Get('os_linux_ver')
d = DistributiveRepository()._getfromcontent(imagename)
if "linuxver" in d and d['linuxver'] != "0":
return d['linuxver']
diff --git pym/cl_install.py pym/cl_install.py
index 1d68c9b..a9e0c45 100644
--- pym/cl_install.py
+++ pym/cl_install.py
@@ -27,7 +27,8 @@ from cl_utils import runOsCommand,appendProgramToEnvFile, \
scanDirectory,process,getTupleVersion, \
detectDeviceForPartition,listDirectory, \
cmpVersion,STDOUT,getUdevDeviceInfo, \
- getLvmPartitions,getInstalledVideo
+ getLvmPartitions,getInstalledVideo, \
+ getSupportArch
from cl_vars_share import varsShare
from cl_kernel_utils import KernelConfig,InitRamFs
@@ -2693,3 +2694,9 @@ the system") + " (yes/no)"
else:
self.clVars.Set('os_install_clock_timezone',timezone,force=True)
return True
+
+ def setArchitecture(self,march):
+ """Set architecture by march (support auto keyword)"""
+ if march == "auto":
+ march = getSupportArch()[-1]
+ self.clVars.Set('os_install_arch_machine', march, True)
diff --git pym/cl_install_cmd.py pym/cl_install_cmd.py
index 570ecbe..6f5e7ec 100644
--- pym/cl_install_cmd.py
+++ pym/cl_install_cmd.py
@@ -70,8 +70,9 @@ CMD_OPTIONS = [{'shortOption':"d",
{'longOption':"march",
'optVal':"ARCH",
'type':'choice',
- 'choices':['i686','x86_64'],
- 'help':_("select processor architecture")
+ 'choices':['i686','x86_64','auto'],
+ 'help':_("select processor architecture")+ \
+ " (i686,x86_64 or auto)"
},
{'longOption':"build",
'help':_("installation for assembling")
@@ -446,8 +447,7 @@ class install_cmd(share_cmd):
if self.optobj.values.s:
self.logicObj.setLinuxName(self.optobj.values.s.upper())
if self.optobj.values.march:
- self.logicObj.clVars.Set('os_install_arch_machine',
- self.optobj.values.march,True)
+ self.logicObj.setArchitecture(self.optobj.values.march)
if self.optobj.values.nouuid:
self.logicObj.clVars.Set('cl_uuid_set','off',True)
if self.optobj.values.build:

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

@ -2,6 +2,12 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-lib-2.2.24-r1 (21 Sep 2011)
21 Sep 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+calculate-lib-2.2.24-r1.ebuild, +files/calculate-lib-2.2.24-r1.patch:
Update for feature
21 Sep 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
-calculate-lib-2.2.18.ebuild,
-calculate-lib-2.2.18-r1.ebuild, -calculate-lib-2.2.18-r2.ebuild,

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

@ -1,11 +1,13 @@
AUX calculate-lib-2.2.24-r1.patch 535 RMD160 b54af4930a0b0e0f53ee4a9c546e73035dec200b SHA1 ddd43affd722945698c5823eefdfe3945d7d4fb1 SHA256 b265137d9df4ff2190ddb598de81c21c762d768c3c662ddae3e2789f876ac132
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.24.tar.bz2 109443 RMD160 6e67f4adf69cd611a822cb2ab05084b85d4c32e3 SHA1 db96a8844e5beae0f27e22d646613c79b0682881 SHA256 172fd33fe0d8985d73eacbff882286827f0f15960ef37b641c687bd455ec7857
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.24-r1.ebuild 813 RMD160 c6376d17c33e92ae7d3f8b3036efeceaa266b06f SHA1 c6258579150f11dde4d8b92388ceb1b3dc7892ec SHA256 8bf0d104fc7e9fdb76bd68b2139f3a6c0aed5a77432640a2d52a76424b822c92
EBUILD calculate-lib-2.2.24.ebuild 686 RMD160 8913900f72c73a4aafa50aa19e23e725218319a9 SHA1 2a9a405491df2b0052820708947b1be7b920c23d SHA256 73fa36bc61e08b1070ebb390ad0128e7fe02142abbb9f711e91ff5a2176ee015
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 27780 RMD160 214a34bd4112853d8dc80399b7289b560c98e9af SHA1 a4e05ea808e778eb7e4d939aa639b57108214a99 SHA256 17ed09693f949d788899f5cc12f369e2f63e05498c5c3f5a6b075fa47e4d00e4
MISC ChangeLog 27975 RMD160 000d62bfed56b33935c132cd825fabed4f0aaafa SHA1 64ce6c18715dd1a41b0d3be51aca8dfe48605bb5 SHA256 402586752d0d276954ffe6a7ee697fc7c4fcc0d2c9188b7c629b473ce223d3d1
MISC metadata.xml 303 RMD160 774b65ed76939d6878496ad6ef6451849bdced05 SHA1 7d08569697a290ede98c88ab59db3cdc3037bd15 SHA256 181519d9679fd9aee9a7a9806733a50728d3da0b1e0ad54f31499200f7f5c6ec

35
sys-apps/calculate-lib/calculate-lib-2.2.24-r1.ebuild
Unescape View File

@ -0,0 +1,35 @@
# 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/iproute2
sys-apps/pciutils
sys-fs/lvm2
sys-fs/mdadm
sys-apps/file[python]"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# add detect cpu support arch
epatch "${FILESDIR}/calculate-lib-2.2.24-r1.patch"
}

19
sys-apps/calculate-lib/files/calculate-lib-2.2.24-r1.patch
Unescape View File

@ -0,0 +1,19 @@
diff --git pym/cl_utils.py pym/cl_utils.py
index 6da750d..2450693 100644
--- pym/cl_utils.py
+++ pym/cl_utils.py
@@ -1353,3 +1353,14 @@ def getCmdLineParam(paramName):
return params[-1]
else:
return ""
+
+def getSupportArch():
+ """Get supported architectures by processor.
+
+ Is support processor x86_64 else only i686.
+ """
+ if filter(lambda x:x.startswith('flags') and " lm " in x,
+ readLinesFile('/proc/cpuinfo')):
+ return ['i686','x86_64']
+ else:
+ return ['i686']

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

@ -2,6 +2,12 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-utilities-2.2.24-r3 (21 Sep 2011)
21 Sep 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+calculate-utilities-2.2.24-r3.ebuild:
Update for lib,install and client
21 Sep 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
-calculate-utilities-2.2.18.ebuild, -calculate-utilities-2.2.18-r1.ebuild,
-calculate-utilities-2.2.18-r2.ebuild, -calculate-utilities-2.2.18-r3.ebuild,

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

@ -1,5 +1,6 @@
EBUILD calculate-utilities-2.2.24-r1.ebuild 864 RMD160 a22eb8673a948936e0badbe143b5fedfbfbd8c51 SHA1 0b5d4989ce0937f069e8d99fbb210592f473d8dc SHA256 12b90974f2941a3c49f816bc89075dbb641a16654709baa1ff9ee2fb20815e20
EBUILD calculate-utilities-2.2.24-r2.ebuild 867 RMD160 df598038cc6cc3971cab35ed7984a1dd590bec98 SHA1 a77db53bab42d35ae2677224e3ebc0c26a650a59 SHA256 db8f05e541179081778143f3706c10e42febe96c72fe5a2feceefeff73fd5a50
EBUILD calculate-utilities-2.2.24-r3.ebuild 873 RMD160 8f0b91ade772b6642311b50efd772daa5a4c76cc SHA1 ad4cfb779ce2a85b9dfe6bc040bff73827fce20b SHA256 3d4ea669782aed05bcc33a16117ef01e22c28585e300b751fb5162a13d990901
EBUILD calculate-utilities-2.2.24.ebuild 861 RMD160 71a8eac35eade9be90df9cacbb5b4d9ba07d3664 SHA1 258da46af67a0e0995074a9c7f01b33234711ca9 SHA256 f1a33869f243365632a9af11ab9ed2538a6b2c183dd9ddbf28d48ad564df3d54
EBUILD calculate-utilities-2.2.9999.ebuild 840 RMD160 0c7324a9ed480118ac19f62b162c9ee62c25f964 SHA1 7dadab1430ed147334ed7e9b4fcc86dc99e25d56 SHA256 f3ee28f9f765e7302c83eb4a15a09bdf066f09e6b40e34f6d52157a946df5e66
MISC ChangeLog 26526 RMD160 606e867a4be80edf17f8a6a55a2f9e4116385ef8 SHA1 d86d68c1509243a3c53e9799fe4eae0c55d0326e SHA256 18b8954f105f7cbeb582c383970dd8d37b3bd8e05d9fd5fe180c2786c9add324
MISC ChangeLog 26710 RMD160 05e24cc6b279153fc88817f3f9117c995ca52e4c SHA1 d72141970a509bc4f6855e0ee0b841a4137425d1 SHA256 e134d0d76a3f3d3ae2c16fda556190caba66140fef4fc07589a50008ee2b6f27

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

@ -0,0 +1,36 @@
# 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.24-r2
=sys-apps/calculate-templates-2.2.24-r1
=sys-apps/calculate-lib-2.2.24-r1
=sys-apps/calculate-i18n-2.2.24
cl_assemble? ( =sys-apps/calculate-assemble-2.2.24 )
cl_builder? ( =sys-apps/calculate-builder-2.2.24 )
cl_client? ( =sys-apps/calculate-client-2.2.24-r1 )
cl_desktop? ( =sys-apps/calculate-desktop-2.2.24 )
cl_installgui? ( =app-misc/calculate-install-gui-2.2.24 )
cl_server? ( =sys-apps/calculate-server-2.1.14-r6 )
"
Write Preview
Loading…
Cancel
Save