From ed9b855443e4c7e8335006360ca2763a1eb93af6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=BF=D0=B8=D1=80=D0=B8=D0=B4=D0=BE=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=20=D0=94=D0=B5=D0=BD=D0=B8=D1=81?= Date: Thu, 5 Jul 2012 11:58:32 +0400 Subject: [PATCH] add select locate templates --- sys-apps/calculate-i18n/Manifest | 2 + .../calculate-i18n-3.0.0_beta3-r2.ebuild | 28 +++ .../files/calculate-i18n-3.0.0_beta3-r2.patch | 41 ++++ sys-apps/calculate-install/Manifest | 2 + .../calculate-install-3.0.0_beta3-r5.ebuild | 48 ++++ ...install-3.0.0_beta3-locate_templates.patch | 218 ++++++++++++++++++ sys-apps/calculate-utilities/Manifest | 1 + .../calculate-utilities-3.0.0_beta3-r9.ebuild | 24 ++ 8 files changed, 364 insertions(+) create mode 100644 sys-apps/calculate-i18n/calculate-i18n-3.0.0_beta3-r2.ebuild create mode 100644 sys-apps/calculate-i18n/files/calculate-i18n-3.0.0_beta3-r2.patch create mode 100644 sys-apps/calculate-install/calculate-install-3.0.0_beta3-r5.ebuild create mode 100644 sys-apps/calculate-install/files/calculate-install-3.0.0_beta3-locate_templates.patch create mode 100644 sys-apps/calculate-utilities/calculate-utilities-3.0.0_beta3-r9.ebuild diff --git a/sys-apps/calculate-i18n/Manifest b/sys-apps/calculate-i18n/Manifest index beddbb29b..3594e2888 100644 --- a/sys-apps/calculate-i18n/Manifest +++ b/sys-apps/calculate-i18n/Manifest @@ -1,4 +1,5 @@ AUX calculate-i18n-3.0.0_beta3-r1.patch 747 RMD160 87ca12827537c66614613ff358066fa9eb2e6ebe SHA1 c7ef9698facb89fd4505d9ac939f161f244b8c82 SHA256 590b02b72d63dbd3c2d78afce857aeb1b9563734fab6252389943591f1e7e126 +AUX calculate-i18n-3.0.0_beta3-r2.patch 1664 RMD160 abc9ee137d7edd09c1197b81825c5e8a60b226c8 SHA1 dbaf389efe5d78f2113db3ff82c714b3826ead1f SHA256 fef2fee015a5882762fc8f0c82c3224567cbd765c48a9a0d66f72f9c48c92384 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 @@ -14,6 +15,7 @@ EBUILD calculate-i18n-3.0.0_alpha6.ebuild 505 RMD160 5b7fa629656e70b2bd0eedfe81c 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-r2.ebuild 624 RMD160 1198c228ecc3ea6811b39ef01c40dc75b2353578 SHA1 3645b3219c19af324020b5ba3c21b533eac51a47 SHA256 c2431f848e5c9cb47806aed016e4b8e5cb8844b9112c7ffd81712f41cd4bfcf8 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 diff --git a/sys-apps/calculate-i18n/calculate-i18n-3.0.0_beta3-r2.ebuild b/sys-apps/calculate-i18n/calculate-i18n-3.0.0_beta3-r2.ebuild new file mode 100644 index 000000000..bbc815413 --- /dev/null +++ b/sys-apps/calculate-i18n/calculate-i18n-3.0.0_beta3-r2.ebuild @@ -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-r2.patch" +} diff --git a/sys-apps/calculate-i18n/files/calculate-i18n-3.0.0_beta3-r2.patch b/sys-apps/calculate-i18n/files/calculate-i18n-3.0.0_beta3-r2.patch new file mode 100644 index 000000000..f349b4c12 --- /dev/null +++ b/sys-apps/calculate-i18n/files/calculate-i18n-3.0.0_beta3-r2.patch @@ -0,0 +1,41 @@ +diff --git ru/cl_install3.po ru/cl_install3.po +index 57201f6..2c91b64 100644 +--- ru/cl_install3.po ++++ 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 "Конфигурировать только изменяемые параметры" +@@ -1084,3 +1084,27 @@ msgstr "Конфигурировать только динамические п + + msgid "configure only dynamic parameters" + msgstr "конфигурировать только динамические параметры" ++ ++msgid "Network interface, DHCP, IP address and network mask (example:%s)" ++msgstr "Сетевой интерфейс, HDCP, IP-адрес и маска сети (пример:%s)" ++ ++msgid "select location templates %s" ++msgstr "выбор местонахождения шаблонов %s" ++ ++msgid "locate must be from list 'overlay','local','remote','clt'" ++msgstr "местонахождение шаблонов должно быть из списка 'overlay','local','remote','clt'" ++ ++msgid "Location templates" ++msgstr "Местонахождение шаблонов" ++ ++msgid "Overlay templates" ++msgstr "Overlay шаблоны" ++ ++msgid "Local templates" ++msgstr "Локальные шаблоны" ++ ++msgid "Remote templates" ++msgstr "Удалённые шаблоны" ++ ++msgid "clt templates" ++msgstr "clt шаблоны" diff --git a/sys-apps/calculate-install/Manifest b/sys-apps/calculate-install/Manifest index 4a70b26b6..9bd615f91 100644 --- a/sys-apps/calculate-install/Manifest +++ b/sys-apps/calculate-install/Manifest @@ -9,6 +9,7 @@ AUX calculate-install-3.0.0_beta3-fix_flash.patch 1614 RMD160 429050e4b2f42dbe94 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 +AUX calculate-install-3.0.0_beta3-locate_templates.patch 9426 RMD160 8fa31b7fb469abe84abf97a8ea924ec9b9a37075 SHA1 1c06d9a36ea5c4d192dcc8d6eedf2ed4008d017a SHA256 f2ddbc3c0b8108914ed00f3bda0e83186469a2d3f9eb2d4c22e9b4b830dd464f DIST calculate-install-2.2.28.tar.bz2 82743 RMD160 2cea1e7ad861522bd4036d09767b24d7135e1c9f SHA1 f897ab83dd567f6b4b6317791d615d02adb52c70 SHA256 19f858d831c069e820463543d6f89a17ee4c1c185079ecff4c301594ee41107f DIST calculate-install-2.2.29.tar.bz2 82398 RMD160 c40620015f4a22bbc4217ec64545238c20d775c2 SHA1 41489657a19f3c60c93fada41c1c0b35d9d2d2cc SHA256 0d1b5fcca2711f31fbd5680dea652fa7765ad781529ba80c5fa92cf736d73d10 DIST calculate-install-3.0.0_alpha5.tar.bz2 74890 RMD160 f39e866350697c52c17d13ed1be7dff10a507aeb SHA1 1d63d4da43b67ddd9e03bc194ea55ece071c3cb8 SHA256 4287277093b66d0d0a6c94f825d067a61cff99bd625dea7acc92110738c2bd08 @@ -33,6 +34,7 @@ EBUILD calculate-install-3.0.0_beta3-r1.ebuild 1167 RMD160 22c593aad654447a3d591 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-r5.ebuild 1176 RMD160 bafa995373ea077070b7b2575c82117c2ff53f6d SHA1 a262874d9b93196d06d404e19e8f4101f0e5e811 SHA256 3621d76b19ae0532fab5292c46a2bbe2a12156615dc57600ff547deca2c1fdde 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 diff --git a/sys-apps/calculate-install/calculate-install-3.0.0_beta3-r5.ebuild b/sys-apps/calculate-install/calculate-install-3.0.0_beta3-r5.ebuild new file mode 100644 index 000000000..d02432783 --- /dev/null +++ b/sys-apps/calculate-install/calculate-install-3.0.0_beta3-r5.ebuild @@ -0,0 +1,48 @@ +# 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/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}" + + # locate tamplates + epatch "${FILESDIR}/calculate-install-3.0.0_beta3-locate_templates.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" +} diff --git a/sys-apps/calculate-install/files/calculate-install-3.0.0_beta3-locate_templates.patch b/sys-apps/calculate-install/files/calculate-install-3.0.0_beta3-locate_templates.patch new file mode 100644 index 000000000..de14c53af --- /dev/null +++ b/sys-apps/calculate-install/files/calculate-install-3.0.0_beta3-locate_templates.patch @@ -0,0 +1,218 @@ +diff --git data/calculate data/calculate +index 23aaee8..70b2ad8 100644 +--- data/calculate ++++ data/calculate +@@ -111,10 +111,10 @@ configure_users() { + + start() { + /usr/sbin/cl-core --append-variable cl_wsdl=calculate-install +- /usr/sbin/cl-core --append-variable cl_merge=calculate-install ++ /usr/sbin/cl-core --append-variable cl_merges=calculate-install + install_video_driver + LANG=C create_nonroot_user +- LANG=C /usr/sbin/cl-core --method configure_system --no-progress --live ++ LANG=C /usr/sbin/cl-core --method setup_system --no-progress --live + LANG=C configure_users + + /usr/sbin/env-update +diff --git install/cl_install.py install/cl_install.py +index a5f53ef..59665ac 100644 +--- install/cl_install.py ++++ install/cl_install.py +@@ -181,14 +181,60 @@ class Install(color_print): + """Apply templates for root of system.""" + #self.clVars.Set("cl_root_path","/", True) + self.clVars.Set("cl_chroot_path","/", True) +- self.clTempl = ProgressTemplate(self.setProgress,self.clVars, +- cltFilter=False) +- dirsFiles = self.clTempl.applyTemplates() +- if self.clTempl.getError(): +- self.printERROR(self.clTempl.getError()) +- return False +- else: +- return dirsFiles ++ templates_locate = self.clVars.Get('cl_templates_locate') ++ ++# cltObj = True if 'clt' in templates_locate else False ++ dirs_list, files_list = ([],[]) ++ listTemplatePaths = self.clVars.Get("cl_template_path") ++ for location in templates_locate: ++ if location in ("overlay", "local", "remote", "clt"): ++ if len(listTemplatePaths) != 3: ++ self.printERROR(\ ++ _("Error in template variable 'cl_template_path=%s'")\ ++ %str(listTemplatePaths)) ++ return False ++ elif location == "local": ++ self.clVars.Set("cl_template_path", ++ [listTemplatePaths[1]], True) ++ elif location == "remote": ++ self.clVars.Set("cl_template_path", ++ [listTemplatePaths[2]], True) ++ elif location == "overlay": ++ self.clVars.Set("cl_template_path", ++ [listTemplatePaths[0]], True) ++ elif location == "clt": ++# list_paths = ['/etc'] + \ ++# os.environ.get('CONFIG_PROTECT').split() ++# for template_path in list_paths: ++# if not os.path.isdir(template_path): ++# continue ++# print template_path ++# self.clVars.Set("cl_template_path", ++# [template_path], True) ++# self.clTempl = ProgressTemplate(self.setProgress, ++# self.clVars,cltObj=True, ++# cltFilter=True) ++# ++# dirsFiles = self.clTempl.applyTemplates() ++# # cltObj = False ++# print dirsFiles ++# dirs_list += (dirsFiles[0]) ++# files_list += (dirsFiles[1]) ++ continue ++ ++ self.clTempl = ProgressTemplate(self.setProgress, self.clVars, ++ cltFilter=False) ++ ++ dirsFiles = self.clTempl.applyTemplates() ++ dirs_list += (dirsFiles[0]) ++ files_list += (dirsFiles[1]) ++ try: ++ if self.clTempl.getError(): ++ self.printERROR(self.clTempl.getError()) ++ return False ++ except AttributeError: ++ pass ++ return (dirs_list, files_list) + + def applyTemplatesFlash(self,directory): + """Apply templates for root of system.""" +@@ -940,9 +986,8 @@ class Install(color_print): + self.applyTemplatesFlash('/') + else: + self.startTask( +- _("Configuring flash installation")) +- self.applyTemplatesFlash(targetDistr.getDirectory(), +- progress=True) ++ _("Configuring flash installation"),progress=True) ++ self.applyTemplatesFlash(targetDistr.getDirectory()) + self.endTask() + self.closeClTemplate() + # change boot config +diff --git install/cl_wsdl_install.py install/cl_wsdl_install.py +index 3cb6710..27bba63 100644 +--- install/cl_wsdl_install.py ++++ install/cl_wsdl_install.py +@@ -76,6 +76,7 @@ class InstallInfo(ClassSerializer): + cl_autopartition_root_size = String + + cl_live = Boolean ++ cl_templates_locate = Array(String) + + os_install_pxe = Boolean + os_install_pxe_path = String +@@ -154,7 +155,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): +@@ -476,6 +478,7 @@ class Wsdl: + dv.Set('cl_action','merge',True) + dv.addGroup(None, + normal=("cl_live",), ++ expert=('cl_templates_locate',), + next_label=_("Reconfigure")) + return dv + +diff --git install/variables/disk.py install/variables/disk.py +index a2e8078..39be7f5 100644 +--- install/variables/disk.py ++++ install/variables/disk.py +@@ -1639,5 +1639,6 @@ class VariableOsInstallDiskSingle(Variable): + self.Get('os_disk_parent'))) + deviceParentMap = dict(self.ZipVars('os_device_dev','os_device_name')) + return map(lambda x:(x,"%s (%s)"%(x, +- deviceParentMap.get(diskParentMap.get(x,x),_("Unknown")))), ++ deviceParentMap.get(diskParentMap.get(x,x), ++ _("Unknown")))), + self.availDevs())+[("","")] +diff --git install/variables/net.py install/variables/net.py +index df2ae35..306a396 100644 +--- install/variables/net.py ++++ install/variables/net.py +@@ -118,7 +118,9 @@ class VariableOsInstallNetData(NetHelper,TableVariable): + + def init(self): + self.label = _("Addresses") +- self.help = _("IP address with network (example:%s)")%"192.168.1.1/24" ++# self.help = _("IP address with network (example:%s)")%"192.168.1.1/24" ++ self.help = _("Network interface, DHCP, IP address and network mask " ++ "(example:%s)")%" --ip eth0:off:192.168.1.1:24" + + class VariableOsInstallNetHostname(NetHelper,Variable): + """ +@@ -585,12 +587,13 @@ class VariableOsInstallNetConf(NetHelper,Variable): + if filter(lambda x:x.lower() == ("networkmanager"), + listDirectory('/etc/runlevels/boot')+ + listDirectory('/etc/runlevels/default')) \ +- or self.Get('os_install_root_type') == "livecd": ++ or self.Get('os_root_type') == "livecd": + nm = "networkmanager" + else: + nm = "" + for val,comment in self.Get('os_install_net_conf_available'): +- if nm == val: ++ if nm == val and not (self.Get('os_root_dev') == '/dev/nfs' and \ ++ self.Get('os_install_root_type') == "livecd"): + return nm + else: + return "openrc" +diff --git install/variables/system.py install/variables/system.py +index 1efd0a8..76c6665 100644 +--- install/variables/system.py ++++ install/variables/system.py +@@ -458,6 +458,29 @@ class VariableClLive(Variable): + self.label = _("Configure only dynamic parameters") + self.help = _("configure only dynamic parameters") + ++class VariableClTemplatesLocate(Variable): ++ """ ++ Location templates ++ """ ++ type = "choice-list" ++ value = ['overlay','local','remote','clt'] ++ element = "selecttable" ++ opt = ["-l","--locate"] ++ metavalue = "TEMPLATES" ++ untrusted = True ++ ++ def init(self): ++ self.label = _("Location templates") ++ self.help = _("select location templates %s") \ ++ %"'overlay','local','remote','clt'" ++ ++ def choice(self): ++ return [ ++ ('overlay',_('Overlay templates')), ++ ('local',_('Local templates')), ++ ('remote',_('Remote templates')), ++ ('clt',_('clt templates'))] ++ + class VariableOsInstallPxe(ReadonlyVariable): + """ + Installation for PXE loading +@@ -473,7 +496,7 @@ class VariableOsInstallPxe(ReadonlyVariable): + for pkg in ['net-misc/dhcp','net-ftp/tftp-hpa','net-fs/nfs-utils']: + if not isPkgInstalled(pkg): + raise VariableError( +- _("You must to install %s package for PXE installation") ++ _("You must to install %s package for PXE installation") + %pkg) + try: + config = cl_template.iniParser('/etc/calculate/calculate.env') diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest index 5d900c78f..caf9f4fec 100644 --- a/sys-apps/calculate-utilities/Manifest +++ b/sys-apps/calculate-utilities/Manifest @@ -45,6 +45,7 @@ EBUILD calculate-utilities-3.0.0_beta3-r5.ebuild 642 RMD160 ec1c633ffb046ec3467a EBUILD calculate-utilities-3.0.0_beta3-r6.ebuild 645 RMD160 f2bc884a2116ed2be26c56b745f2b76d43426f95 SHA1 71945d918679f98b295f99b185572a82deeeb696 SHA256 f65f0ebe8eb2df8e27060e16e8865b8929361ac8d1ac01dff509388bf6621cb1 EBUILD calculate-utilities-3.0.0_beta3-r7.ebuild 648 RMD160 b8011bb135d46f5fc3f46dffbc7403ec7c73c9e0 SHA1 cb77aaef9aaf08d0a361b0d23563a8e57553063d SHA256 753fe5fa9603ee4c411ba5894bf2d5302720430ae797fa64f37303f1df61600f EBUILD calculate-utilities-3.0.0_beta3-r8.ebuild 651 RMD160 35285bdb68d7ce708869be355483ae368efc680d SHA1 28b8b58e48fa651dd6121764014981551c71ee05 SHA256 d12fb74e6e4695e4a17389dce5fa53fe54b7b7abf81c753997a72ff91a88b55f +EBUILD calculate-utilities-3.0.0_beta3-r9.ebuild 651 RMD160 044ee01252f8868dcdf73cf1f70b11353bc5d8c1 SHA1 52dbcd75bd12488076fa8e12cf2313555ec3fc16 SHA256 c8a0ce8d20401defe4bed61b7ccae27715905b3eb6ecaa57ab6d3aafb87aacc6 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 diff --git a/sys-apps/calculate-utilities/calculate-utilities-3.0.0_beta3-r9.ebuild b/sys-apps/calculate-utilities/calculate-utilities-3.0.0_beta3-r9.ebuild new file mode 100644 index 000000000..56e697e9c --- /dev/null +++ b/sys-apps/calculate-utilities/calculate-utilities-3.0.0_beta3-r9.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 + +DESCRIPTION="Calculate Utilities meta package" +HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" +SRC_URI="" + +LICENSE="Apache-2.0" +SLOT="3" +KEYWORDS="~amd64 ~x86" +IUSE="cl_consolegui cl_console" + +RDEPEND="${RDEPEND} + =sys-apps/calculate-install-3.0.0_beta3-r5 + =sys-apps/calculate-i18n-3.0.0_beta3-r2 + =sys-apps/calculate-lib-3.0.0_beta3-r1 + =sys-apps/calculate-core-3.0.0_beta3-r4 + cl_consolegui? ( =sys-apps/calculate-console-gui-3.0.0_beta3-r2 ) + cl_console? ( =sys-apps/calculate-console-3.0.0_beta3-r1 ) +" +