Update utilities

atratsevskiy
parent 0a99fbe26b
commit 3c438f556e

@ -7,6 +7,7 @@ AUX calculate-core-3.0.0_alpha6-r4.patch 90149 RMD160 a171cc34e5b30b4d6326cf1349
AUX calculate-core-3.0.0_beta2-fix_translate.patch 1688 RMD160 38b697fcac0474abe3e0397f8502f307277c547c SHA1 046064b65f472ea465b5332e8c3d79e2c68d26a0 SHA256 55f348ed1d32775ecedd3e14ccaebfd281701f27984afc06adf0367775e91486
AUX calculate-core-3.0.0_beta3-r1.patch 10914 RMD160 3cf93bc56214c7f9c251d66fb814b582d57b6153 SHA1 27475db9613b0301c53f4ba36cfb36f147ced615 SHA256 d1a2dcdeb69a295b8a16d8e0bf973edebd3e006e0b2d85ed9df69c36c3e17751
AUX calculate-core-3.0.0_beta3-r2.patch 15034 RMD160 2fceabc3e4a598a78b3d04474de1ffda64922304 SHA1 ba260530761f473db448eb56782fe8672112573e SHA256 9461d3f7643ea9546bb48554a36464201b4594cc32b6b8fba03fc0f620255a93
AUX calculate-core-3.0.0_beta3-setup_pkg.patch 812 RMD160 a758a414d869fcb7ffa66528c434087909a474f4 SHA1 cd7fcbe430cba4eded8cfc539269dec521aace7d SHA256 0cf31c4bd707b50688bbf40870a30021c113f8e1af646fca5d9a91686e5a69c5
DIST calculate-core-3.0.0_alpha5.tar.bz2 73303 RMD160 829ac5e43cef750a1ee1d9a264c265c18ac1bfe1 SHA1 f9f859cf376289264a8fd145ced37ae0073d3254 SHA256 11c5089cec30de3d0edbcf5c42eecae7b15e66299c445c003ab6eb791763083c
DIST calculate-core-3.0.0_alpha6.tar.bz2 73081 RMD160 38b34fdff965f94e96fd031a7cb07f9139cf1823 SHA1 a63e4c092df70c6016acc74daa3dc71ee53ed6a8 SHA256 ce6d2ef0f946c945f1eee574283c8eb70abe6d474858c197979943d86be1044a
DIST calculate-core-3.0.0_beta1.tar.bz2 79293 RMD160 b2231a7da9b1a1785d4e71433b070c09f0799cb6 SHA1 5c74aea5ed04bb2acd66f5f9c8d5a44263d7c2b7 SHA256 1c803a201a7581182839245adc75922650d7c73e632f9e33e9585e2394907dba
@ -24,6 +25,7 @@ EBUILD calculate-core-3.0.0_beta2-r1.ebuild 1127 RMD160 bba2259a2b056e56c358774d
EBUILD calculate-core-3.0.0_beta2.ebuild 996 RMD160 b117f19a5278179ca45219ea60d8c7d87fd90390 SHA1 836566da1e6c543b41fd7857ca83f97db933cd66 SHA256 ebeadfdd2567c49f7bcf3022960585fc21911a07a68a9f51fc4e403a8ea0e32c
EBUILD calculate-core-3.0.0_beta3-r1.ebuild 1123 RMD160 ef610f61ee401c323aa8157186bed6b088f5b112 SHA1 9c9be80413b70ce352fd4f9458121b5294c571bc SHA256 d3de9178477590e44e3728c7b8d9585f475a511ffc4e569ca5c6a27e5fa4ee16
EBUILD calculate-core-3.0.0_beta3-r2.ebuild 1142 RMD160 a66ee1f5aac3dc11aaa93378eca5fa686622c9d2 SHA1 c822fa6caf129336579745a2096c8b41a43ea204 SHA256 1c546de76135ce56ffe31045d9400bf4dddee5c2679df0f31c33482443217811
EBUILD calculate-core-3.0.0_beta3-r3.ebuild 1238 RMD160 f3436dfe299c7b0b5ce820d68429af8030d829af SHA1 55a3246a8c90d3cd1d9f43668cc49a96a3c25fe1 SHA256 edc980e433058d64f75536814233a9727da4ab1e27ce17d6e7807d1381721b0c
EBUILD calculate-core-3.0.0_beta3.ebuild 996 RMD160 adbcd22de2cf7c5a779fc6fe07a5c726a3135d4b SHA1 043996b37dbb5e6fdfe819ffd3135377ac8f824c SHA256 55a290b8fd6cb0c98e019917ca964754041b744b3790c53eef4bd39a52ed7c53
EBUILD calculate-core-3.0.9999.ebuild 580 RMD160 e83a97ea90ff241c21111577d19b2f9d3969c17e SHA1 b431af0a8c098981cab841316e3f6d20595813b1 SHA256 e6f999684875c1d3a4eaaf75daba19d033c8fb32f36a4dd6b8e9682c3b757faa
MISC ChangeLog 236 RMD160 edd02c5e4f0dac5e1383d48ba8142028b51bf534 SHA1 d22f18b34bdae22559bff15a113059d37820dfc7 SHA256 bbb9db87f501c1aa363583f5ae01e095020c3f600af2eb6388dbb547f6ce67b5

@ -0,0 +1,50 @@
# Copyright 1999-2012 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/calculate3/${PN}/${P}.tar.bz2"
DESCRIPTION="The WSDL core for Calculate 3"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="~amd64 ~x86"
IUSE="minimal"
DEPEND="~sys-apps/calculate-lib-3.0.0_beta3
>=dev-python/soaplib-1.0
!minimal? ( dev-python/sudsds
net-libs/dslib
dev-python/pyopenssl
dev-libs/openssl
dev-python/m2crypto
dev-python/cherrypy )"
RDEPEND="${DEPEND}"
pkg_preinst() {
dosym /usr/sbin/cl-core /usr/sbin/cl-core-setup
}
pkg_postinst() {
einfo "For autoconfigure calculate-core for adminuser perform:"
einfo " cl-core --bootstrap <username>"
einfo "For run calculate-core perform:"
einfo " /etc/init.d/calculate-core start"
einfo "Add calcualte core to autorun:"
einfo " rc-update add calculate-core boot"
}
src_unpack() {
unpack "${A}"
cd "${S}"
#many fixes, fix collect table
epatch "${FILESDIR}/calculate-core-3.0.0_beta3-r2.patch"
# empty default value for package name
epatch "${FILESDIR}calculate-core-3.0.0_beta3-setup_pkg.patch"
}

@ -0,0 +1,20 @@
commit 9cf10b97f27b6c26943d606895008870ce935d76
Author: Хирецкий Михаил <mh@calculate.ru>
Date: Fri Jun 29 17:52:10 2012 +0400
Add empty value for setup_pkg
diff --git a/core/variables/setup_package.py b/core/variables/setup_package.py
index aaab9dc..77f3cd8 100644
--- a/core/variables/setup_package.py
+++ b/core/variables/setup_package.py
@@ -45,7 +45,8 @@ class VariableClCorePkgName(Variable):
raise VariableError("Please, choose package")
def choice(self):
- return sorted(chain(*map(lambda x:map(lambda y:reVerSplitToPV(y)['PN'],
+ return [""]+\
+ sorted(chain(*map(lambda x:map(lambda y:reVerSplitToPV(y)['PN'],
listDirectory(x)),
listDirectory('/var/db/pkg',onlyDir=True,fullPath=True))))

@ -1,3 +1,4 @@
AUX calculate-i18n-3.0.0_beta3-r1.patch 747 RMD160 87ca12827537c66614613ff358066fa9eb2e6ebe SHA1 c7ef9698facb89fd4505d9ac939f161f244b8c82 SHA256 590b02b72d63dbd3c2d78afce857aeb1b9563734fab6252389943591f1e7e126
DIST calculate-i18n-2.2.28.tar.bz2 32694 RMD160 5009c0d07fe7b91fdf11fd17fa805bebfdf6ba1d SHA1 8891f1ccc6368099c70b7569e9309dbd86d7b6ee SHA256 899cef9485c48747f5810394728d1abe8473312faba1a6a9d1fb1fe8f4989fb8
DIST calculate-i18n-2.2.29.tar.bz2 33457 RMD160 b38ca13abc28a17e3a8e7e4cbeb41d06053cbb80 SHA1 cc393dea098617cb5d9b7544cec34175f7c5a394 SHA256 200b362bff00f90fae91fa86393e461a73ae607ef427a5990c85b54d842a65c9
DIST calculate-i18n-3.0.0_alpha5.tar.bz2 36270 RMD160 fab1f37da37288b47d465e3e99811ebd7d37947f SHA1 9e440905bb44c10d29eeb3ce6110d5073d499b0c SHA256 c130c4948f5b7b7e9352de0cbcc72d63ce548ff5f450ac238245d87e904604d5
@ -12,6 +13,7 @@ EBUILD calculate-i18n-3.0.0_alpha5.ebuild 505 RMD160 5b7fa629656e70b2bd0eedfe81c
EBUILD calculate-i18n-3.0.0_alpha6.ebuild 505 RMD160 5b7fa629656e70b2bd0eedfe81c606717c3a58ae SHA1 d667bbfcf73a9760ec836e56fdc8d3194fb65ac9 SHA256 3832a3b2bde6e1aa4897d1a1c66116fa9d0be8f6336c3afbe7d08ae6855b820e
EBUILD calculate-i18n-3.0.0_beta1-r1.ebuild 504 RMD160 279d8e6e04ec7030ab7b78b3386199b1a95a51cd SHA1 15b8dc809c7a0b2bbe9a89826c0f59a20082c88a SHA256 f51b590f22e5e1ff0403cc8b1dc6c7f1dd18c0ca5497d4983222273465da0754
EBUILD calculate-i18n-3.0.0_beta2.ebuild 504 RMD160 18d9c647ff50c3b5f7cb08ad2503c31befae9c4e SHA1 6c9a96bbc0840a401649769ac11a8d95656937bc SHA256 5cee7ade2861ff5eb5cfffefe8429ccf84b3a854daede5bf4bcdd3d0dea3a0f8
EBUILD calculate-i18n-3.0.0_beta3-r1.ebuild 624 RMD160 1a16a5c56e04d4452e3e78f86882a17d1aafeea1 SHA1 c2d79ac3470a5c3c3237c18b7892ac018246f74d SHA256 4d2c4e94300416807e11bb6370775358fd4e0db880b8f39a33ca8b92f71d61e2
EBUILD calculate-i18n-3.0.0_beta3.ebuild 504 RMD160 5d7625706b8d2d342396c28f658fdba86300d5df SHA1 e6df2c4256f26e7b6f63532346311c0876da85a5 SHA256 75856220162150d442a10b2961c23036636a0f09abb134b71bf7e0410bc72afe
EBUILD calculate-i18n-3.0.9999.ebuild 509 RMD160 6adb40d19ca007ea86d34ca187c1a696cb1970ee SHA1 05f86e6b1b6cf33701ca0bdc0ec390ad9af44951 SHA256 55fd4fde87b256127c8b6c59723883c4f86b36a747349fddb9253899b00e8b5e
MISC ChangeLog 6171 RMD160 9803abc35a815c6bbf6ef23a3f9125f490dbc388 SHA1 c5e32c1c0f53761fbbf7d0e234fe5adcdb079eeb SHA256 250f8a9836f5a3bd98b6ed83196df7b7e2c1159f3079e628017c14bc44ef5963

@ -0,0 +1,28 @@
# Copyright 1999-2012 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/calculate3/${PN}/${P}.tar.bz2"
DESCRIPTION="The utilities for assembling tasks of Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="~amd64 ~x86"
RDEPEND=">=sys-apps/calculate-lib-3.0.0_beta3"
DEPEND="sys-devel/gettext
${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# fix translate
epatch "${FILESDIR}/calculate-i18n-3.0.0_beta3-r1.patch"
}

@ -0,0 +1,19 @@
commit 2af87d567fd1ad4af90b5597531e02099a0f6446
Author: Хирецкий Михаил <mh@calculate.ru>
Date: Fri Jun 29 17:41:23 2012 +0400
Fix translate
diff --git a/ru/cl_install3.po b/ru/cl_install3.po
index 57201f6..4f9debf 100644
--- a/ru/cl_install3.po
+++ b/ru/cl_install3.po
@@ -735,7 +735,7 @@ msgid "user settings"
msgstr "настройки пользователей"
msgid "Boot configuration is not available on LiveCD"
-msgstr "Разметка не доступна при авторазметке"
+msgstr "Настройка загрузки не доступна на LiveCD"
msgid "Configure only mutable parameters"
msgstr "Конфигурировать только изменяемые параметры"

@ -6,6 +6,7 @@ AUX calculate-install-3.0.0_beta2-r5.patch 2119 RMD160 d2dc9184a33b3ed2245eb8d0b
AUX calculate-install-3.0.0_beta2_fix_detect_mbr.patch 835 RMD160 fa508dc1557b7eef14bdc9c7eaa779a6e0edbcef SHA1 98f9c8615c988d0cd594d90a08e6b88d85102506 SHA256 8004ff9619b59d2d2ee14653c8caf7d4b7c6db504d3a382d460f0a4bc978e3d5
AUX calculate-install-3.0.0_beta2_fix_printerror.patch 1332 RMD160 492e80f1df6b304f2e7d2f550abb14c27e975af6 SHA1 00b9951e62d44c88716da9de96164e1c57db48da SHA256 434e3a411b07e1502c85282899351c32a298811ddb29ce93be48112be74e3ce2
AUX calculate-install-3.0.0_beta3-fix_flash.patch 1614 RMD160 429050e4b2f42dbe94657b139cb654b24f58a55a SHA1 55925f70c062adb10fcc72d5081763c35c58b11c SHA256 5662345a1d41d06bbdb7cb446910e7de4d15c10b7df945c5fa5690c1ace5502c
AUX calculate-install-3.0.0_beta3-fix_icon.patch 779 RMD160 405b17549a7ceba6249f5bb061a58fbfde1c1d45 SHA1 ab90c8b3eda68088fa8b318a1fed191a3fa28016 SHA256 5807a778cbbaa73c7fc31ecd0b7ddf34fadead9031c437098e7441991b38fbe2
AUX calculate-install-3.0.0_beta3-fix_names.patch 763 RMD160 9b4c044b7ea67ffc73676d378c0f93f5b530f8ce SHA1 ba84e484f0b8647609b17351ff59518ae1e32e4e SHA256 d6f4bea659d80a8638bd72bc450fa4025fa9a4a25666021af87db8fc3637b538
AUX calculate-install-3.0.0_beta3-fix_pxe.patch 1045 RMD160 a5e5155a73c07a72de8707b867afff94edb251ba SHA1 5c3629465fec1c841dfac14b007f2e1faec9f8f5 SHA256 a782f429b7f518d05f526f4c64693591e22b63b54a41a08d2630c5bdc42ec426
DIST calculate-install-2.2.28.tar.bz2 82743 RMD160 2cea1e7ad861522bd4036d09767b24d7135e1c9f SHA1 f897ab83dd567f6b4b6317791d615d02adb52c70 SHA256 19f858d831c069e820463543d6f89a17ee4c1c185079ecff4c301594ee41107f
@ -31,6 +32,7 @@ EBUILD calculate-install-3.0.0_beta2-r5.ebuild 1186 RMD160 41a98cedb0fc252ea638a
EBUILD calculate-install-3.0.0_beta3-r1.ebuild 1167 RMD160 22c593aad654447a3d591643ee6129c0d33d766f SHA1 d1789da2fe16505fda66d24a400ab31e9c71e91e SHA256 2a21024a3c215c712310ba0bc449fbe5708e2e8427dc104cff49ed88b58cd664
EBUILD calculate-install-3.0.0_beta3-r2.ebuild 1256 RMD160 0c4e8531e408e3f37abf444b0177692afeb93718 SHA1 6e05b0d4286867ebd4d113ed151e24cfb8f3e1f1 SHA256 93dc4f4863bd00d7df6b1d864371a586dc236bdbd743dfe0a1026910ba893ba6
EBUILD calculate-install-3.0.0_beta3-r3.ebuild 1333 RMD160 4bf358c03baa0b08d108025f2bad80eef3b157e9 SHA1 7d916e08e95f8f13d8e3e0a0f8071288344eb6d9 SHA256 752b4dddfd99a3358fa796ac03f57898d3fd261b4c441f5048a000d756c484d4
EBUILD calculate-install-3.0.0_beta3-r4.ebuild 1412 RMD160 a2096973e848806097492a96348744b272875742 SHA1 3e5fd2d488826c8bc6639aa1a8cfcfa0cbfc3f83 SHA256 08d9622fd1e38f56e09cdd80d1ec2e5f866172537fc9bbbfa646c53c2fcc480c
EBUILD calculate-install-3.0.0_beta3.ebuild 1033 RMD160 e282f795db7496ccfbc194e68240391f09d704d7 SHA1 4c905b8cef066842bba6e0028af6de4342870111 SHA256 f72ca6be4821bd38279295345d1253b494dc17ac2176b2f83026f4645b29dd05
EBUILD calculate-install-3.0.9999.ebuild 609 RMD160 b1a02262dbab9319b6b916460646b526aa43a9a3 SHA1 0c64a92b658890fe5b4a5ee22f35eb143da377dc SHA256 d4cead60af00c67ddcb1aa01e2095437fb1bfe2ca7f717456048ad3e8f039a23
MISC ChangeLog 33827 RMD160 6a48dba3484eeb1bf153dc1724e3ba441b51f89f SHA1 c42362523ac8b49b8ceb521110ba6b4d4ff01c74 SHA256 f31d9cca1055a4fbf38352f01ba9f72bf82597ff1a6436d211ac26d1acddb082

@ -0,0 +1,54 @@
# Copyright 1999-2012 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/calculate3/${PN}/${P}.tar.bz2"
DESCRIPTION="The program of installation Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="~amd64 ~x86"
IUSE="pxe minimal"
DEPEND="~sys-apps/calculate-lib-3.0.0_beta3
!<sys-apps/calculate-install-2.2.29
app-portage/layman
!app-misc/livecd-tools
sys-apps/iproute2[-minimal]
!minimal? ( sys-boot/grub
sys-apps/gptfdisk
>=sys-apps/util-linux-2.19.1
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )
pxe? ( sys-apps/calculate-server
net-ftp/tftp-hpa
net-misc/dhcp
net-fs/nfs-utils )"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# fix scripts names
epatch "${FILESDIR}/calculate-install-3.0.0_beta3-fix_names.patch"
# fix flash install
epatch "${FILESDIR}/calculate-install-3.0.0_beta3-fix_flash.patch"
# fix pxe
epatch "${FILESDIR}/calculate-install-3.0.0_beta3-fix_pxe.patch"
# fix icon
epatch "${FILESDIR}/calculate-install-3.0.0_beta3-fix_icon.patch"
}
pkg_postinst() {
einfo "For install wsdl for calculate-install perform:"
einfo " cl-core --append-variable cl_wsdl=calculate-install"
einfo " cl-core --append-variable cl_merges=calculate-install"
}

@ -0,0 +1,20 @@
commit 6efa34d75b9d6e43d1788e446a6e1cc16aaba9e7
Author: Mike Hiretsky <mh@calculate.ru>
Date: Fri Jun 29 17:55:02 2012 +0400
Change default value
diff --git a/install/cl_wsdl_install.py b/install/cl_wsdl_install.py
index 3cb6710..177890c 100644
--- a/install/cl_wsdl_install.py
+++ b/install/cl_wsdl_install.py
@@ -154,7 +154,8 @@ class Wsdl:
@rpc(Integer, InstallInfo, _returns = Array(ReturnedMessage))
@core_method(category=__('Installation'),title=__('System installation'),
- image='system-installer,applications-other,drive-harddisk',
+ image='calculate-install,system-installer,applications-other,'
+ 'drive-harddisk',
gui=True,command='cl-install',
rights=['install'])
def install ( self, sid, info):

@ -42,7 +42,7 @@ EBUILD calculate-utilities-3.0.0_beta3-r2.ebuild 639 RMD160 5e61c132391e0a811539
EBUILD calculate-utilities-3.0.0_beta3-r3.ebuild 639 RMD160 70e9337e2ad7b08a93ab17e8e654a45edba584a2 SHA1 9df65265dcc3bbf2b6feb3c11ebe45ef126838f9 SHA256 c33febf18bd72c1a06e46d6f5bc43789484f0ac07fa1445b0576f01bbaea7f0a
EBUILD calculate-utilities-3.0.0_beta3-r4.ebuild 642 RMD160 a147f96cc176a66e6402c2ff4eedeee52e62a8b8 SHA1 932562d1dcbca5102441c97f83f9ab69ed8aa6a2 SHA256 d45b696822e7f218e26e489cb47bedaaafdd3b77fcff62c4625135620183ca30
EBUILD calculate-utilities-3.0.0_beta3-r5.ebuild 642 RMD160 ec1c633ffb046ec3467a9f120e70b40ad67b32a6 SHA1 b2a6a52cae4042a7c619c5447b30065a85af362c SHA256 24ff6b585d3a66e7449804b411dadffb07292b648083296c4021b28ab8237bf8
EBUILD calculate-utilities-3.0.0_beta3-r6.ebuild 642 RMD160 8c3fa0007ad383b365bdef3891ec1df15fd71bc2 SHA1 867e7e457989584a32248e05eadf82f5370e9976 SHA256 865114f9ac8cfffebdd770bfc413e40731301877fa53b1b9f7335c08fae0866d
EBUILD calculate-utilities-3.0.0_beta3-r6.ebuild 645 RMD160 f2bc884a2116ed2be26c56b745f2b76d43426f95 SHA1 71945d918679f98b295f99b185572a82deeeb696 SHA256 f65f0ebe8eb2df8e27060e16e8865b8929361ac8d1ac01dff509388bf6621cb1
EBUILD calculate-utilities-3.0.0_beta3.ebuild 633 RMD160 f3f22d135c2bd185fd2fd3f5746099516f33e22f SHA1 319e45cfd0acaaa06d273b293a2f07d0b21362d5 SHA256 c93e9f8b6c6fad4b5e085106e27f9217b4062f4d9b9538cd6f2b6af412bac2eb
EBUILD calculate-utilities-3.0.9999.ebuild 552 RMD160 8883a32b9bde58b14ccc054802fe8997e49bb537 SHA1 829fea2f453d2c54a9bb24e892abe26c9f48880a SHA256 d6519794625722093224801b703a0363929a034a1189b46a2c01cc2327138e59
MISC ChangeLog 38731 RMD160 92b8fb3bfc525c90e82302095cf8ecd4fad03563 SHA1 a8e9f6b4012f5f09b8c37e6a90506df8e405d0db SHA256 7e70a0bc1f3b34c0011f3874773a698a4bb96eb6d3dad10903575156bb8578bc

@ -15,9 +15,9 @@ IUSE="cl_consolegui cl_console"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-3.0.0_beta3-r3
=sys-apps/calculate-i18n-3.0.0_beta3
=sys-apps/calculate-i18n-3.0.0_beta3-r1
=sys-apps/calculate-lib-3.0.0_beta3-r1
=sys-apps/calculate-core-3.0.0_beta3-r2
=sys-apps/calculate-core-3.0.0_beta3-r3
cl_consolegui? ( =sys-apps/calculate-console-gui-3.0.0_beta3 )
cl_console? ( =sys-apps/calculate-console-3.0.0_beta3 )
"

Loading…
Cancel
Save