From 2ae28f85018db8a79cb0ab8d9b69959dc67d16cf Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Mon, 4 Apr 2011 11:22:51 +0400 Subject: [PATCH] Update calculate-lib. --- sys-apps/calculate-lib/ChangeLog | 7 + sys-apps/calculate-lib/Manifest | 4 +- .../calculate-lib-2.2.12-r4.ebuild | 36 +++++ .../calculate-lib-2.2.12-exec_option.patch | 153 ++++++++++++++++++ sys-apps/calculate-utilities/ChangeLog | 6 + sys-apps/calculate-utilities/Manifest | 3 +- .../calculate-utilities-2.2.12-r11.ebuild | 36 +++++ 7 files changed, 243 insertions(+), 2 deletions(-) create mode 100644 sys-apps/calculate-lib/calculate-lib-2.2.12-r4.ebuild create mode 100644 sys-apps/calculate-lib/files/calculate-lib-2.2.12-exec_option.patch create mode 100644 sys-apps/calculate-utilities/calculate-utilities-2.2.12-r11.ebuild diff --git a/sys-apps/calculate-lib/ChangeLog b/sys-apps/calculate-lib/ChangeLog index 77bc240cc..a0dd58220 100644 --- a/sys-apps/calculate-lib/ChangeLog +++ b/sys-apps/calculate-lib/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*calculate-lib-2.2.12-r4 (04 Apr 2011) + + 04 Apr 2011; Mike Hiretsky (mhiretskiy) + +calculate-lib-2.2.12-r4.ebuild, + +files/calculate-lib-2.2.12-exec_option.patch: + Update for feature. + 26 Mar 2011; Mike Hiretsky (mhiretskiy) +calculate-lib-2.2.12-r1.ebuild, +files/calculate-lib-2.2.12-fix_traceback_initrd.patch: diff --git a/sys-apps/calculate-lib/Manifest b/sys-apps/calculate-lib/Manifest index 30bfeda8c..e0a20bc95 100644 --- a/sys-apps/calculate-lib/Manifest +++ b/sys-apps/calculate-lib/Manifest @@ -2,6 +2,7 @@ AUX calculate-lib-2.2.11-autoupdate_opt.patch 8280 RMD160 f2c4b2f76ca2710a5021e3 AUX calculate-lib-2.2.11-dialog_fix.patch 849 RMD160 cc13018cafddffc603718e788ea77f50882b75d9 SHA1 249f378b1037865d3f084e0e3be3b0f372a92007 SHA256 381f93dce6dae156d9ff743dce5133cc91d1a70cdd0b1fa488d77d5e43d6287b AUX calculate-lib-2.2.11-feature_for_builder.patch 976 RMD160 e9ef481c18a0296cfe71e2fbf09dca4c46bfec55 SHA1 8ce02b1f12a1c678da206b79a363e7d90e7d7058 SHA256 145430b4c15454de42f0bf75f7904f41ed2a9a2c224553ff93bdc5e31896b699 AUX calculate-lib-2.2.11-fix_C_locale.patch 707 RMD160 a453baa97fb5044a3993c3fb966ae20956086b50 SHA1 6da63f41bead7ab6fe160f124dca32a9f25d2a33 SHA256 2d4fce242b036ccfadd6d6e759e8598c50c48f7875e4b881cbe90e91d3967373 +AUX calculate-lib-2.2.12-exec_option.patch 7256 RMD160 d5651ddc87e6352f66ab774f525e9b17e5b5fc5c SHA1 84c23fe59358b2542c9db3a71e6ebc89a0bb5b00 SHA256 9439e60af8e4c9f02bd0f78c983e28bd36775500687ce2d7bbce6a73de7faf02 AUX calculate-lib-2.2.12-fix_magic_type.patch 1947 RMD160 fe87cba3b39977f48a9ee2641abdd863a7d8e35b SHA1 10bd543ebe244671448eec3b0269f0556f35a1f4 SHA256 d1cdbe00780ae4bb8f9c9d550eb1e27d35f0c4290fbdc76dde3480b7b63de196 AUX calculate-lib-2.2.12-fix_traceback_initrd.patch 697 RMD160 8699f730f34ca416e4fdcccbb3dad7ea703efedb SHA1 2d69e61fbbdf8522cfc11694dc3bd484ca0fc836 SHA256 5f1ad54be610448775d5d9574cc950209106a8cd78a2bb8f44d60134d66bcff3 AUX calculate-lib-2.2.8-file.patch 747 RMD160 8a1f90c822eaefac69b67aa6999a1dc8c2b51b9f SHA1 aeded1b0587785145f4e62f3e81a2726e7c4312d SHA256 45ce03a248d8bec22bbdf006ce607809761304d255467e687242f9423c8413a4 @@ -16,8 +17,9 @@ EBUILD calculate-lib-2.2.11-r4.ebuild 1064 RMD160 30ed0f5167215c68f1817a1438ba77 EBUILD calculate-lib-2.2.12-r1.ebuild 812 RMD160 aafaf2386947f7a48117808bdc0f3c424a818e76 SHA1 e4c3766b9d04cb552299786a43596a4f584fcb38 SHA256 b5d921ac79b0c6790f6b7d3254f3ea449dfbfb8284a1b30031af4972a6779e66 EBUILD calculate-lib-2.2.12-r2.ebuild 908 RMD160 6729ec07bc4f2781b82bb76cc1e8a73153432f6f SHA1 d8b4bcb889307b5f0e6ccc8630c33ed24853bcb0 SHA256 7d0e6c7d46c671a1c114f83c10c86fe3e6e2040cddcad78d8bd7700994c601c2 EBUILD calculate-lib-2.2.12-r3.ebuild 908 RMD160 6729ec07bc4f2781b82bb76cc1e8a73153432f6f SHA1 d8b4bcb889307b5f0e6ccc8630c33ed24853bcb0 SHA256 7d0e6c7d46c671a1c114f83c10c86fe3e6e2040cddcad78d8bd7700994c601c2 +EBUILD calculate-lib-2.2.12-r4.ebuild 1001 RMD160 e0cfe7523e69046aa19ca0772fe04b98d67fa639 SHA1 289255a8a201fefb95cbff02329796daf3f175ba SHA256 e8315dd3c74d85510a28a43ef89a49acacc32e23456c24c437b777493deed968 EBUILD calculate-lib-2.2.12.ebuild 658 RMD160 06fdd308870e61e7863b81d764b2eee0829318dc SHA1 6cb79fbcb690bf8691bb376f7bf41bd5d5a446c7 SHA256 f8ee73c568345855b7e01dfeb3af3de9545e2169d7a82a60afc2bb81f95dbe3b EBUILD calculate-lib-2.2.9999.ebuild 592 RMD160 e559e7ccafdb150093a055b4f90bf33666ab796c SHA1 752fe9e05ce1380af9a44bf5e81a56dc00f36506 SHA256 f4cf5511cca3007b735cf98871ee72442c6bf677be63349058d1bb029a4b1abf EBUILD calculate-lib-9999.ebuild 476 RMD160 e510e0aa98b7f6da9acc37197073cac0d5d6a47f SHA1 393c416fcfd77d6c05aea8932a7a1e3805aa926d SHA256 a9eee592ec352db7852e93ad33249072307051d3bda6cfdcd034ea9b96747578 -MISC ChangeLog 17698 RMD160 b3991df59f3c82206f100d483979831192a795ae SHA1 8f5ec1d87d6366482551721dd9da08ee16ebd885 SHA256 a6fba1e393188bd8ee57846e2c3263ae431d2fcd89e960a7d1f3659ab81e08d1 +MISC ChangeLog 17905 RMD160 ca18db47f3c53f2c57448a03ef811d2c6cd387d4 SHA1 a8b04592f50fced10813ab956e26248121b78fa6 SHA256 ca85d3a8625eebab02ae4842023da341d912c6b170702ba68ea63fab5a5f6a0d MISC metadata.xml 303 RMD160 774b65ed76939d6878496ad6ef6451849bdced05 SHA1 7d08569697a290ede98c88ab59db3cdc3037bd15 SHA256 181519d9679fd9aee9a7a9806733a50728d3da0b1e0ad54f31499200f7f5c6ec diff --git a/sys-apps/calculate-lib/calculate-lib-2.2.12-r4.ebuild b/sys-apps/calculate-lib/calculate-lib-2.2.12-r4.ebuild new file mode 100644 index 000000000..f8aa339a1 --- /dev/null +++ b/sys-apps/calculate-lib/calculate-lib-2.2.12-r4.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +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-templates-2.2.12 + !=dev-python/pyxml-0.8 + sys-apps/file[python]" +RDEPEND="${DEPEND}" + +src_unpack() { + unpack "${A}" + cd "${S}" + + # fix trackback fall in detect initrd + epatch "${FILESDIR}/calculate-lib-2.2.12-fix_traceback_initrd.patch" + # fix get type by magic module + epatch "${FILESDIR}/calculate-lib-2.2.12-fix_magic_type.patch" + # add exec option for template + epatch "${FILESDIR}/calculate-lib-2.2.12-exec_option.patch" +} diff --git a/sys-apps/calculate-lib/files/calculate-lib-2.2.12-exec_option.patch b/sys-apps/calculate-lib/files/calculate-lib-2.2.12-exec_option.patch new file mode 100644 index 000000000..43828ecdc --- /dev/null +++ b/sys-apps/calculate-lib/files/calculate-lib-2.2.12-exec_option.patch @@ -0,0 +1,153 @@ +commit ced929a1261a4087c90338b2d9728a76d361c289 +Author: Самоукин Алексей +Date: Mon Apr 4 11:03:14 2011 +0400 + + Add header parametr exec. + +diff --git a/pym/cl_template.py b/pym/cl_template.py +index a49a4d9..7ccb5f5 100644 +--- a/pym/cl_template.py ++++ b/pym/cl_template.py +@@ -436,7 +436,7 @@ class fileHeader(_terms): + # Допустимые параметры заголовка + allowParam = ["format", "format_conf", "comment", "append", "force", + "link", "mirror", "symbolic", "chmod", "chown", "name", +- "path", "autoupdate"] ++ "path", "autoupdate", "exec"] + + # Тип шаблона + fileType = "" +@@ -562,6 +562,9 @@ class fileHeader(_terms): + self.headerTerm = False + self.setError(_("incorrect header parameters - '%s'")\ + %"append=%s"%self.params["append"]) ++ if 'exec' in self.params: ++ self.execStr = "#!%s"%self.params['exec'] ++ + if not incorrectParams and self.params: + incorrectParams = set(self.params.keys()) - set(self.allowParam) + if incorrectParams: +@@ -3549,9 +3552,16 @@ re.M|re.S) + self.autoUpdateFiles = [] + self.autoUpdateDirs = [] + ++ ++ def executeTemplate(self, path, execPath): ++ """Execute template""" ++ if os.system("""%s %s %s"""%(execPath,path,'>/dev/null 2>&1')) == 0: ++ return True ++ else: ++ return False + +- # Преобразование восьмеричного в целое (ввод строка, вывод число) + def __octToInt(self, strOct): ++ """Преобразование восьмеричного в целое (ввод строка, вывод число)""" + if strOct: + try: + res = string.atoi(strOct, 8) +@@ -4390,7 +4400,6 @@ variable 'cl_name'")) + + # Родительская директория + path = optFile["path"] +- + # Изменяем название родительской директории + if "path" in objHeadNew.params: + path = objHeadNew.params['path'] +@@ -4422,6 +4431,20 @@ variable 'cl_name'")) + if realPath in self.filesFilter: + return ([], False) + typeAppendTemplate = objHeadNew.typeAppend ++ ++ # Параметр exec ++ if "exec" in objHeadNew.params: ++ execPath = objHeadNew.params['exec'] ++ if not os.access(execPath,os.X_OK): ++ self.setError(_("False value 'exec' in template") + ": " +\ ++ nameFileTemplate) ++ self.setError(_("Can not execute %s") %execPath) ++ return ([], False) ++ if typeAppendTemplate == "join": ++ self.setError(_("False value 'append=join' in template") + ": " +\ ++ nameFileTemplate) ++ return ([], False) ++ + # Очищаем оригинальный файл + if typeAppendTemplate == "clear": + try: +@@ -4827,6 +4850,14 @@ variable 'cl_name'")) + else: + self.textConfig = title + self.textTemplate + self.saveConfFile() ++ if 'exec' in objHeadNew.params: ++ if not self.executeTemplate(self.nameFileConfig, ++ objHeadNew.params['exec']): ++ self.setError(_("False template") + ": " +\ ++ nameFileTemplate) ++ self.setError(_("Can not execute") + ": " +\ ++ self.nameFileConfig) ++ return False + return filesApply + # Создаем объект в случае параметра format в заголовке + if (typeAppendTemplate == "replace" or\ +@@ -4888,7 +4919,16 @@ variable 'cl_name'")) + self.textTemplate + else: + self.textConfig = title + self.textTemplate ++ + self.saveConfFile() ++ if 'exec' in objHeadNew.params: ++ if not self.executeTemplate(self.nameFileConfig, ++ objHeadNew.params['exec']): ++ self.setError(_("False template") + ": " +\ ++ nameFileTemplate) ++ self.setError(_("Can not execute") + ": " +\ ++ self.nameFileConfig) ++ return False + return filesApply + # Вверху + elif typeAppendTemplate == "before": +@@ -4909,6 +4949,14 @@ variable 'cl_name'")) + self.textConfig = title + tmpTemplate + + self.saveConfFile() ++ if 'exec' in objHeadNew.params: ++ if not self.executeTemplate(self.nameFileConfig, ++ objHeadNew.params['exec']): ++ self.setError(_("False template") + ": " +\ ++ nameFileTemplate) ++ self.setError(_("Can not execute") + ": " +\ ++ self.nameFileConfig) ++ return False + return filesApply + # Внизу + elif typeAppendTemplate == "after": +@@ -4928,6 +4976,14 @@ variable 'cl_name'")) + else: + self.textConfig = title + tmpTemplate + self.saveConfFile() ++ if 'exec' in objHeadNew.params: ++ if not self.executeTemplate(self.nameFileConfig, ++ objHeadNew.params['exec']): ++ self.setError(_("False template") + ": " +\ ++ nameFileTemplate) ++ self.setError(_("Can not execute") + ": " +\ ++ self.nameFileConfig) ++ return False + return filesApply + # Объединение + elif typeAppendTemplate == "join": +@@ -5011,6 +5067,14 @@ variable 'cl_name'")) + self.textTemplate = objTxtCoder.decode(self.textTemplate) + self.textConfig = objTxtCoder.decode(self.textConfig) + self.saveConfFile() ++ if 'exec' in objHeadNew.params: ++ if not self.executeTemplate(self.nameFileConfig, ++ objHeadNew.params['exec']): ++ self.setError(_("False template") + ": " +\ ++ nameFileTemplate) ++ self.setError(_("Can not execute") + ": " +\ ++ self.nameFileConfig) ++ return False + return filesApply + else: + self.setError(_("False (type append) template") + ": " +\ diff --git a/sys-apps/calculate-utilities/ChangeLog b/sys-apps/calculate-utilities/ChangeLog index 3fe5d0928..294050983 100644 --- a/sys-apps/calculate-utilities/ChangeLog +++ b/sys-apps/calculate-utilities/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*calculate-utilities-2.2.12-r11 (04 Apr 2011) + + 04 Apr 2011; Mike Hiretsky (mhiretskiy) + +calculate-utilities-2.2.12-r11.ebuild: + Update for lib. + *calculate-utilities-2.2.12-r9 (29 Mar 2011) 29 Mar 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest index 47ce9773f..b7cb133c7 100644 --- a/sys-apps/calculate-utilities/Manifest +++ b/sys-apps/calculate-utilities/Manifest @@ -1,2 +1,3 @@ EBUILD calculate-utilities-2.2.12-r10.ebuild 841 RMD160 9c7db57d3c91b692ed6c380080a181287605b136 SHA1 e0dfefdac5b8f77193632430b46f0a6a65436931 SHA256 75cbfd6b96724189843c54e0af18d5c112e6e2f9ae4ab9eb089037284c767e0d -MISC ChangeLog 5603 RMD160 f355f730e6ff6d9c3c736dd6157aacad6a8b3394 SHA1 9569cda75bf80e20e700d41938799a4c33c2b6cf SHA256 dbb1d1512552e7d0be16314c314735b04299ad5364546abddc20ef4077a2e087 +EBUILD calculate-utilities-2.2.12-r11.ebuild 841 RMD160 f493b4ec1b23f355798d14b6a7e1c4dfaa8a8445 SHA1 dfaccf9052b97b7166fd60e8df7b001c0f5308f5 SHA256 83b39d9521e813eef721d8a0a45a3b0bf295e1ed00021ae88f9d77345e9cb369 +MISC ChangeLog 5771 RMD160 90754dad530d80fe8cbbad5991e32331f0557a04 SHA1 04015f20494ebcd1a615154947c22a77de1a5a49 SHA256 a4280fcb2989ee654ffd06032f9e4fd4fda72ddd9a14ebff21f534218cfed4b6 diff --git a/sys-apps/calculate-utilities/calculate-utilities-2.2.12-r11.ebuild b/sys-apps/calculate-utilities/calculate-utilities-2.2.12-r11.ebuild new file mode 100644 index 000000000..993caa68e --- /dev/null +++ b/sys-apps/calculate-utilities/calculate-utilities-2.2.12-r11.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=2 + +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.12-r3 + =sys-apps/calculate-templates-2.2.12-r3 + =sys-apps/calculate-lib-2.2.12-r4 + + cl_assemble? ( =sys-apps/calculate-assemble-2.2.12-r2 ) + cl_builder? ( =sys-apps/calculate-builder-2.2.12-r2 ) + cl_client? ( =sys-apps/calculate-client-2.2.12 ) + cl_desktop? ( =sys-apps/calculate-desktop-2.2.12 ) + cl_installgui? ( =app-misc/calculate-install-gui-2.2.12 ) + + cl_server? ( =sys-apps/calculate-server-2.1.13 ) +" +