From b69d506fa8e1e0712413295c5f035258bc8c22a0 Mon Sep 17 00:00:00 2001 From: Mike khiretskiy Date: Fri, 27 Sep 2013 13:17:32 +0400 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D0=BA?= =?UTF-8?q?=20=D0=B2=20=D1=83=D1=82=D0=B8=D0=BB=D0=B8=D1=82=D0=B0=D1=85=20?= =?UTF-8?q?3.1.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sys-apps/calculate-core/Manifest | 2 + .../calculate-core-3.1.7-r6.ebuild | 51 +++ .../files/calculate-core-3.1.7-r6.patch | 125 +++++++ sys-apps/calculate-install/Manifest | 2 + .../calculate-install-3.1.7-r5.ebuild | 44 +++ .../files/calculate-install-3.1.7-r5.patch | 316 ++++++++++++++++++ sys-apps/calculate-utilities/Manifest | 1 + .../calculate-utilities-3.1.7-r11.ebuild | 26 ++ 8 files changed, 567 insertions(+) create mode 100644 sys-apps/calculate-core/calculate-core-3.1.7-r6.ebuild create mode 100644 sys-apps/calculate-core/files/calculate-core-3.1.7-r6.patch create mode 100644 sys-apps/calculate-install/calculate-install-3.1.7-r5.ebuild create mode 100644 sys-apps/calculate-install/files/calculate-install-3.1.7-r5.patch create mode 100644 sys-apps/calculate-utilities/calculate-utilities-3.1.7-r11.ebuild diff --git a/sys-apps/calculate-core/Manifest b/sys-apps/calculate-core/Manifest index 957d9befd..4051bb6ff 100644 --- a/sys-apps/calculate-core/Manifest +++ b/sys-apps/calculate-core/Manifest @@ -9,6 +9,7 @@ AUX calculate-core-3.1.7-r2.patch 1952 SHA256 0ae2f519985954f88e29ffff68311f00c2 AUX calculate-core-3.1.7-r3.patch 2433 SHA256 5faaf6d9645dd864f22d1337e2b29bbefa6c6a5889653500832f6b0cc8e0e8b7 SHA512 247fce48e20f36d15d78c1733f3aec8d6df5150a75912aa7bd6420f9c11c18a53b6fec094160db295542e5642f5a2ed21e422e8a43f6d86ff42a4c2be2eba0f4 WHIRLPOOL da927b1e435266fe8b0dc9f3df29c1a1f4675da2b0d2c558c1b96b4e6ed45df4c68e0833116df3d06543705e56af1603ec5aac8aff5bbef530bb1be890799ec2 AUX calculate-core-3.1.7-r4.patch 3538 SHA256 af83b8abb18e6d8f6d27dcaac950846a38026e8b39d78c3f360d345446aa7c96 SHA512 80f1ce0bac6c03892d3707a981b3b577b9df185d6d4e0328db229cbb617137aa5689c8343a742e999b61038fbf07a65641a682d9475a9aa57ad10123bbaab31b WHIRLPOOL 5d5f75dd5bf8a3d244b67142d61fc38bee1dbfc52f617d15fcc36d921d5f04005b95d7f5862927e01b52ecafadbeeb91b97f054d7d7ec09c363028a7ccd52118 AUX calculate-core-3.1.7-r5.patch 5358 SHA256 99c1a435a1525567d2a3dd0a1e8c564eb030a765431a15a8486483581d2dbb07 SHA512 95a061a6b51cdf0083b8f736c337b24abacfa9c119f8080b2de953eb4b64a7490e7387ad10f412e5fdf0b8272dbcbd80bc080b2760c1386df50ba1d44f723ce4 WHIRLPOOL 289e91784146d2cd01ca8dc0ae449e078c56c5e327e1a6f86b8f28ac5f2eea88b06942a5f8f0132200f9fb1fc234c75903a015a2e0a7ea35b3c93e88471cceb0 +AUX calculate-core-3.1.7-r6.patch 5569 SHA256 5a160d36459405c04b95262ce0842f69af4447e10b1dbef037791394edfcc728 SHA512 4525e4f8d3e234064b0f385f983c6e095fe6f791535eeeb921375551368625ca60724332872376bb52c187147d0fc3ce863652ba9e6d1281cd59e34194ac86aa WHIRLPOOL 8173ed90e1dc0427cbb288c5d505b92fdcad33ec6da018d75a8cfca3f1eb3e95d1d48ac95808f0f2efd6240847598ba13f377ff91c76e598bd4fea464ea66bfd DIST calculate-core-3.1.5.tar.bz2 85114 SHA256 afee468462f6e838e2f165cacf675f7134f48302e0a7d74e9f910093ee1ec25d SHA512 c3218116abd4fc1e864df1abcad2959042f67eb1847ddce6b28237bebbd354a10720562c96820ea7ba22488630ee7c5abb1a8507cb1ddf88019d8a50007c6a0b WHIRLPOOL cc605fe5d9a50a210f97462f8c059efbf40984d17f1d18ecbf432ba2fcfc3112d034a09bfc43de3b0983d1c742735182870f48626f7897b8f36c522491af4fac DIST calculate-core-3.1.6.tar.bz2 85099 SHA256 d582745a4b211202587cc8eda828bac8d69d5cf533e71ff51e0f3b27b15571a5 SHA512 63f9503be189af52cdcf917ab95841fa7030d181e25ff3910dba68ee0289590867ce1fe865a7c4dba778809ee43311067d4671330e8c5788397c83e162cd54e4 WHIRLPOOL ca9556855388168eb1b2b6cd4e4c7c8c879ac21cd79bede8ca6b2d765e57a52841ad1ac165bdbb9b99a8130942fa2b712bf7f09bb25e9941993225061bce97ab DIST calculate-core-3.1.7.tar.bz2 83298 SHA256 3ecda86e199fe360362de9a43c9a0a53250512c430c8f5da42c611dc9f932f86 SHA512 fc197cc253ea4ad15e5010b894c516d07745155b78ea7d365eeb656dc680b0d2815596bb9de2d8c9e95dd9da27d10205651f8d199e9ec5a8fbaf410167f39a11 WHIRLPOOL e8b8b2f1031919e3d2832bce12b23b7cceae8216aa95c39f571afb88afdf745546d0afa4d6588f8236b772c04bde0babbf8ce6e1b6be996eac035328b307f86b @@ -21,6 +22,7 @@ EBUILD calculate-core-3.1.7-r2.ebuild 1257 SHA256 bc88f4422a5daeadcf7731e3f71c5c EBUILD calculate-core-3.1.7-r3.ebuild 1257 SHA256 a1f9438879f5a1d98c315edf27a1059644170e90566a7fb9c84e676e604df73f SHA512 1863adf0ee3380580111aeb497508ecd9e2b8768aeab4ed2ec7a1d97bcdf56d2f97ead9c7a8628e897bbe407bac0e5d9ceabb7507509deba810632ea0174af6e WHIRLPOOL dd3109d22cdf414aa1c9bb9ddadb241061bc74fa3ce9a825ca9396a1cb2e58063a724ebe4598fe3f68b51c1d9b9ef08335a88695788a92978db6fb93059a066c EBUILD calculate-core-3.1.7-r4.ebuild 1257 SHA256 bb3ef11815ab41231aaafa9231a24be5e9f8655ceaed371a3abd0ac47256304c SHA512 872c29932cb8103c8d06bbc575365648704781c916c67dd49f298ccb723f7eeec618849af8b3cb79c8fed0f84997972c77b43d6ff89fa3dcad8dcf70ba0b85c4 WHIRLPOOL b822f0d1fdc0c24d88d0f5b2d7387aa083bb150ba36af8aa507ffe460c4e7e2ea63d08bb1cdfb67ad1b1746710406a64ce29a272fd3d099620e70de17ab982eb EBUILD calculate-core-3.1.7-r5.ebuild 1257 SHA256 1adb9c6dc37f276d74e8b60bcae16fc7837dc14aeec994e72c10e369fc9ec950 SHA512 1ab42c6aff2fe1e282b92109146e948350b3d4eea22432df165adba99743afca317bb9c931621de08ad87d8de39e0ef2266004e5b6d52c38a1f588865bc53707 WHIRLPOOL 6f400f190bb49042b1080db487660df525dbe19ee1a8d66bf4484822defc1d0d1ebeeaff30a61f1915474dce4530c73300a9d90efc9f547095ec5e173aa62af2 +EBUILD calculate-core-3.1.7-r6.ebuild 1257 SHA256 60fb50b296af705679aef860a39a8fc400334ec1cde5fd56e3585160c19e2d87 SHA512 563185557b43757ee07d7f586bf686c4201043a2ae9b2e6d54769d4fb15c2f41ea4a770309da1951152af072583808495a890798373e2a8659060ee9c5a75d7f WHIRLPOOL 5af50f7d7477e0ce5d0d173699d33c243171e224a61d75040d34ada202c79a1152e5553481d58798dc7809576309f51628e4245eacb3bd4fd0ebf3a47c67b40c EBUILD calculate-core-3.1.7.ebuild 1122 SHA256 b1273517f9e91b41e2b0ed784e3e16d259486ea68db3612b49d96c557c0005a9 SHA512 55ab3996f0c69f9240a3c6b09ff2a28929b8f814b4f23dcc5ac3d0fc23e914f782eac61979a3eee6a56ae718fa8e3fa94a4e3775b2719756ac6278c4fdfa41fe WHIRLPOOL 5f114887f6a3ccb4bc684603a30f48dfcc501d2054fd290011bb849757e5cbb2ee667eabc5d7cf228f16af468e1ec55df1dbc67208e8169188e6f3121a945e7b EBUILD calculate-core-3.1.7_alpha3.ebuild 1120 SHA256 159f295c2aa1ec1d15bc9c8f3cba33a6c5d86272af4f1c7a91de84541cd4bafa SHA512 271430ec591da7aba0a1c39f60b2198b06a2dbbe6afe0a4b3ec3bd0d98fce63c4ea5f6ef1a26bc1046ad6aa6752cc9d7d203cf196b0da485dfb17d710c2e0b72 WHIRLPOOL fa06221b99e50b8aa5a5ebc1db4d14aa1ddae7a4d9e49fe4cfa3a51cf5c38ea9a5fb845bdd2f47efcc6552cde686c08803b35c3069687354bfb68ad35bda7edb EBUILD calculate-core-3.1.9999.ebuild 656 SHA256 475e34d10141354a4c60e029fc1cb74b080c3a1371d9e1e44a5e2936b7130ed4 SHA512 9ba865c5effa56079a3841a96d1a4a89d4bbc27e092042aa4a87d1b4ecde9d3a690c92c73e10b330724258aaf3138d2a58d50d18d2fbea9e657c3c5d2f8395ee WHIRLPOOL 89d3bcc657324d1ffb4265eab3e28e94e3d00fb7530c6654e75b52fe002d70f72998930729cfe3320a3ff571277e6e59c649b0df2fe071bcd9b050f9d42608eb diff --git a/sys-apps/calculate-core/calculate-core-3.1.7-r6.ebuild b/sys-apps/calculate-core/calculate-core-3.1.7-r6.ebuild new file mode 100644 index 000000000..f157e77b2 --- /dev/null +++ b/sys-apps/calculate-core/calculate-core-3.1.7-r6.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="3" +SUPPORT_PYTHON_ABIS="1" +PYTHON_DEPEND="2:2.7" +RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 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.1.7 + >=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 + dosym /usr/sbin/cl-core /usr/sbin/cl-core-patch +} + +pkg_postinst() { + einfo "For autoconfigure calculate-core for adminuser perform:" + einfo " cl-core --bootstrap " + 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}" + + # apply revision changes + epatch "${FILESDIR}/calculate-core-3.1.7-r6.patch" +} diff --git a/sys-apps/calculate-core/files/calculate-core-3.1.7-r6.patch b/sys-apps/calculate-core/files/calculate-core-3.1.7-r6.patch new file mode 100644 index 000000000..1521c994b --- /dev/null +++ b/sys-apps/calculate-core/files/calculate-core-3.1.7-r6.patch @@ -0,0 +1,125 @@ +diff --git core/server/api_types.py core/server/api_types.py +index 8161a9e..0bca760 100644 +--- core/server/api_types.py ++++ core/server/api_types.py +@@ -359,7 +359,7 @@ class ViewInfo(DataVarsSerializer): + varGroups = datavars.getGroups() + lastGroup = len(varGroups)-1 + # interate all vars group +- if not onlyhelp and (step in(0,-1,None) or allsteps): ++ if step in(0,-1,None) or allsteps: + briefData = datavars.getBrief() + self.groups.append(self.stepGroup(varGroups,brief_label, + help_value=briefData.get("help",None), +diff --git core/server/func.py core/server/func.py +index fdee9d5..be7c323 100644 +--- core/server/func.py ++++ core/server/func.py +@@ -1659,7 +1659,7 @@ class WsdlBase: + def clearDataVars(func): + def wrapper(*args,**kwargs): + try: +- func(*args,**kwargs) ++ return func(*args,**kwargs) + finally: + WsdlMeta.closeDataVars() + return wrapper +diff --git core/server/methods_func.py core/server/methods_func.py +index d546c1f..72014a2 100644 +--- core/server/methods_func.py ++++ core/server/methods_func.py +@@ -501,10 +501,10 @@ def collect_object(client, param_object, view, args,wait_thread = None, + val) + + elif field.element in ['input', 'openfile',\ +- 'file', 'radio']: ++ 'file', 'radio','combo','comboEdit']: + param_object = set_obj_item(client, param_object, field.name, + _getattr(args, field.name)) +- elif field.element in ['password'] and _getattr(args, field.name) \ ++ elif 'passwd' in field.element and _getattr(args, field.name) \ + or field.type and "need" in field.type: + if wait_thread: + wait_thread.pause() +@@ -517,21 +517,6 @@ def collect_object(client, param_object, view, args,wait_thread = None, + password) + if wait_thread: + wait_thread.resume() +- elif field.element in ['combo', 'comboEdit']: +- value = _getattr(args, field.name) +- if value: +- if hasattr (field.choice, 'string'): +- choice = field.choice.string +- else: +- choice = field.choice +- for item in choice: +- if item: +- if value.lower() == item.lower(): +- value = item +- break +- +- param_object = set_obj_item(client, param_object, field.name, +- value) + elif field.element in ['multichoice', 'multichoice_add', \ + 'selecttable', 'selecttable_add']: + val = _getattr(args, field.name) +diff --git core/server/replace_class.py core/server/replace_class.py +index 860ede2..02ea194 100644 +--- core/server/replace_class.py ++++ core/server/replace_class.py +@@ -515,7 +515,7 @@ def call_method(metaObject, args, unknown_args, colorPrint): + view_obj.step = None + view_obj.expert = True + view_obj.brief = None +- view_obj.onlyhelp = False ++ view_obj.onlyhelp = True + + try: + view = getattr(metaObject, method_view_name)(0, view_obj) +diff --git core/utils/cl_core_setup.py core/utils/cl_core_setup.py +index 7d84869..900a213 100644 +--- core/utils/cl_core_setup.py ++++ core/utils/cl_core_setup.py +@@ -31,7 +31,7 @@ class ClCoreSetupAction(Action): + # ошибки, которые отображаются без подробностей + native_error = (FilesError,TemplatesError,VariableError,DataVarsError) + templateTaskMessage = __("System are being configured") +- successMessage = __("System configured!") ++ successMessage = None + failedMessage = __("Failed to configure the system!") + interruptMessage = __("Configuration manually interrupted") + +@@ -66,6 +66,7 @@ class ClCoreSetupAction(Action): + 'cl_template_path_use,cl_ebuild_phase,' + 'cl_template_clt_set)', + 'condition':lambda dv:(dv.Get('cl_core_pkg_desktop_set') == 'on' and ++ dv.isModuleInstalled('desktop') and + not dv.Get('cl_ebuild_phase') in ("preinst","prerm")) + } + ] +diff --git core/utils/cl_core_variables.py core/utils/cl_core_variables.py +index 38c3dfd..d0c5ef3 100644 +--- core/utils/cl_core_variables.py ++++ core/utils/cl_core_variables.py +@@ -31,7 +31,7 @@ class ClCoreVariables(Action): + native_error = (FilesError,DataVarsError,VariableError) + successMessage = None + failedMessage = None +- interruptMessage = __("Setting manually interrupted") ++ interruptMessage = __("Variables modification manually interrupted") + + tasks = [ + {'name':'write_vars', +diff --git core/variables/certificate.py core/variables/certificate.py +index a9efbb5..4511ff6 100644 +--- core/variables/certificate.py ++++ core/variables/certificate.py +@@ -165,7 +165,7 @@ class VariableClCertPerms(Variable): + return results + + def uncompatible(self): +- return _('You can not change the certificate certificate') ++ return _('You can not change the certificate permissions') + + class VariableClCertGroups(Variable): + """ diff --git a/sys-apps/calculate-install/Manifest b/sys-apps/calculate-install/Manifest index 78858a21c..234a911be 100644 --- a/sys-apps/calculate-install/Manifest +++ b/sys-apps/calculate-install/Manifest @@ -23,6 +23,7 @@ AUX calculate-install-3.1.7-r1.patch 520 SHA256 8f8e8652715f83fe252caa3bd06dc307 AUX calculate-install-3.1.7-r2.patch 1036 SHA256 ea47ef462c5e2e823a6ab25dbea67cd4fbac2a3488bc24c5a2667b979f05bc3b SHA512 fefaed934fa392d446855e3bb2d8656ee08187ae1c4166a1d65b469eca6c46737436b8dd0190c4956725b6dbe78af9967c15d76dd8cb66507f6e253448e44fc8 WHIRLPOOL c2835c153e17962a60dd36e632cbf8651450b5788694cf5d5697f9ba14c110cd51e20c3a5232cc140adbce6b3296c6e9f87728ddd79f77321680b2f90ae65d4d AUX calculate-install-3.1.7-r3.patch 8292 SHA256 d40e8fc5c970e0fbfda665af5d162c86ce82813c0a77753ab40c5a2b3b558617 SHA512 7999f8a607d5636153a5586746e3a0dd7d60cfc810418028a20e69aa13cde91132f4626dda3df3abcd24070f028372a445719bca2d84c9178b12a41380e0bdee WHIRLPOOL 31cc1c82a0f09eb679d28cb641e05c0a4a36c99a4f6c82c21f8ed9c4ab8412ce592cbc08f5dcec650ea897eadd96347954a3e4d9cb94f0c60d394cb3d31b6665 AUX calculate-install-3.1.7-r4.patch 12981 SHA256 63ee0a2d33ae17b71488274b5369b7acadb3f5afdc19051583ceabe5cc7a583b SHA512 7a5abc8ccc858dc170a16262c13b6848ed1e27d8303ec62d818bc41dfb1f20a2f19728f417060acacfe9d5587426ed0e72a68b509b0aee88e9507ee639249724 WHIRLPOOL 15db8226fa82f943ffb63ee19ea97f096db20ce7c3cdbeb4c03e11ab69b2f6ef9b7ec73152eea7a0a9840596862b96996a8b39f9f4b8d28d086a0916e15a3a32 +AUX calculate-install-3.1.7-r5.patch 14146 SHA256 90005518b752d4f0e079ce54a16210d4f67cb5efb0525c083bca06e82898687f SHA512 0c00b6cfd495cc86975243b73f94dac43b62eb9a3143ab5ab3e043f09466dfdaa2206bd61aaf9539a9d5859220c51b05f174c904158fa6e957becd4adb60150b WHIRLPOOL 839052bd9e65a904e70ee0ae6e1d91af28ca55ffa52cb1528fe6fe0b8db89d959d4eb0142c7f407e2769ac035865636ca0c0c77ea94831440600056dddf06758 DIST calculate-install-3.1.5.tar.bz2 77476 SHA256 e423d2728cf7d6a7d1a3819adcb970da3f4af8b1c380bc81e92f94754d64115f SHA512 bd8b25799d0f6881691123dc04d2ce78c244d666e9da006b1f9d0ac37581f46d0b5bd4d0e671af650bdcd1018b8c463d4fcb0032d5da0ed24cc5e0df48030af6 WHIRLPOOL 5b1ea10254689614722aeeac398169ffb23d9302ad3e2800e558ae5beeeb4f24644fdaf74260134e89896ebc11cb527b4d66b80424500565a9036237808086b8 DIST calculate-install-3.1.6.tar.bz2 77530 SHA256 799a353e4ca01318508183d5e8a1eb205eba071dc60da00788dfc20449fdffbc SHA512 cd824bf699c63aeec3527fb51fa01737d44d5b41d50126b5553ed6d175a2ce8d46fedbbaf0b69a973f951bee559cce38c974c803c171493f0a9a4c76cd174ed4 WHIRLPOOL db65b051b7c354c35484d957d1c5f25ec04dd8be8246d6ee8551bc8c3fee8cfab98cacb8ca3ac653641d81318d17895edfc155aa45b522460be5f538bb357062 DIST calculate-install-3.1.7.tar.bz2 76300 SHA256 d8c7e4fa93bb7e039b35af18f4febe3f12c7286265adde7e3de6c46591227858 SHA512 06374b95631061e16d98315921b98cd6e5902154ec2ec7a30a8382782a0ffbb54b49a1a32cca4000dfaf9f9f10121df0869fc00520c176f348220b8d6a952026 WHIRLPOOL 3cd6a87766e61c158aa4d75da86bc7761c2309cffaf49c4a0e11fbcfa3e70a39a46bf5640758e2f6e8a260b1e5244a45d72263199e8507068a54e9abdd93c9ce @@ -36,6 +37,7 @@ EBUILD calculate-install-3.1.7-r1.ebuild 1043 SHA256 669aeedb9156306211aee21c6ec EBUILD calculate-install-3.1.7-r2.ebuild 1043 SHA256 66774a8f1889b74dae99829421ef49c9117e075a5f74751cf0f558bf91d2cf3b SHA512 88452482bd3ce6e0f31b605ceff66e7762064935cde63e6dd0f21e9adf6696fcf166ee924d8b2da6bcb50650d23f034998657122f42ee825a3c91a5e5de73f24 WHIRLPOOL 28d5b6de77053360f29876f80ff2adb28930347aa8bb272f7253e781feb42f7c2a77dc1d3556443da38c2be5d97d5dadfbdd0e1fefe4a5c3e83023ba1b0523ff EBUILD calculate-install-3.1.7-r3.ebuild 1043 SHA256 9024673092da48146f97a8a23dcbbad6558cb36cff5a0877773059ccb6d73bee SHA512 338503e9499720ebc553d645b0c551f930b510644205f30badfd5a89702f158bcbaa77bd215315fb985e4a803ca0cc5af062b4bd8dee29e82cfcbb4b22690410 WHIRLPOOL 2750a5d7c732faaeee5db1256d6602ec1c23f787437f57858282710e22ca8e4e130ceb16540fba1a1279202305c8ffd180f4fe029231bef4460308432d0ea4ee EBUILD calculate-install-3.1.7-r4.ebuild 1043 SHA256 5626babb505f3f10e2de7ec748ec6c89b84c9e4d1edbeda36423924bb4f55028 SHA512 9df4b39bc1d8bed64f6b93f405db1c2c857fe0550a343a92b6f0a4ffb7bec94918f9775a0d077d8aaaaaab00867c2716a2221c6cf14080a8b5a3db74bb938d2f WHIRLPOOL 59d640d36b7fe4a9f40a8dd0e5743b572b8456513f2de9a2aee793490b4a2f1513a0aa985a07adb9749c11e29c3660d784fa0482f65270b4afcfa5ff8c7cac9c +EBUILD calculate-install-3.1.7-r5.ebuild 1043 SHA256 47f2f9e3ac08954f5926c502316600037b04e5100e74e8c153002c7e11f682d1 SHA512 553056564678a5ab29fdf5ed1761fbc0733edf7dce375aaf901bc3cabb34458311896656593ddf27d8007adcbaada3b77d075fd656ce4593f1addb0677f1e8f8 WHIRLPOOL cf47f8cf701416ebc13964f9933536a30e80141de1e1ddd2f86250ed8dce71fb6bec523e6bc991b9a8b3e5f2294e6119884df649e7de7ce500cd46b8265e582f EBUILD calculate-install-3.1.7.ebuild 905 SHA256 0b2c216b63a22a08c992c79f29716bb30c707dd16ef1fb6ad4d96b7f8dee4e12 SHA512 197e6a774b11b3bc132406b9f8ea6db0d75a65705b2f49eaabd639c20268ade04693e237b1f7aad394a58d4435c67fb5a7d69f4a4d8b9eaff0258a4cfc7c0b96 WHIRLPOOL f699d1dd054775dd99a0d887b6e1dbad75a930f40d43f17be1923bd6757fddb69872733eebc6dddbbc97fac316d43183da5bf9788c5300c7df48b72c94a34077 EBUILD calculate-install-3.1.7_alpha3.ebuild 903 SHA256 f46a82b8ce98a91fb985b89842c4dc9fdf9df9270cccb0f29a20356461926526 SHA512 4a773306fb813922ca15f988659db910ab5abf923d73b9393851410afaffc7623f6d5f7d6f8e89e6add737b04d0a9444a32465815a26b4a3c808f0c523fba7f0 WHIRLPOOL 57680c7304dab947405672dd3ddd15459a49b41b71e8f6496c4e004820c66b9aeaf4b4af3032603338c33af28a1863dcf9fec9d0c57608500bd9352b781070a3 EBUILD calculate-install-3.1.9999.ebuild 683 SHA256 e97dd6f046d54a16eee281fa35790c92507b150bc940f3c2b36117e6f44f0a8d SHA512 c1179c500dcaa48506f6334e9e2ccc3cc70d712b2899d7e1d9265bc202f088ab71baa1aaea462deee56fdd5244bee4ab9b9a9da72f25ec511d4f2fa0c3c35f43 WHIRLPOOL 010d35b929fce496b5f16228688e23a95c9c87ebed0d290eeb454e5c1432b55b3b276dfb5786a27222543446a1090ce2f133d80373649fe72341b508d1e16a78 diff --git a/sys-apps/calculate-install/calculate-install-3.1.7-r5.ebuild b/sys-apps/calculate-install/calculate-install-3.1.7-r5.ebuild new file mode 100644 index 000000000..c6da302b2 --- /dev/null +++ b/sys-apps/calculate-install/calculate-install-3.1.7-r5.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="3" +SUPPORT_PYTHON_ABIS="1" +PYTHON_DEPEND="2:2.7" +RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 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-core-3.1.7 + !=virtual/udev-197 + !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 )" + +src_unpack() { + unpack "${A}" + cd "${S}" + + # apply revision changes + epatch "${FILESDIR}/calculate-install-3.1.7-r5.patch" +} diff --git a/sys-apps/calculate-install/files/calculate-install-3.1.7-r5.patch b/sys-apps/calculate-install/files/calculate-install-3.1.7-r5.patch new file mode 100644 index 000000000..d781e095b --- /dev/null +++ b/sys-apps/calculate-install/files/calculate-install-3.1.7-r5.patch @@ -0,0 +1,316 @@ +diff --git install/distr.py install/distr.py +index be23d8e..545168b 100644 +--- install/distr.py ++++ install/distr.py +@@ -458,7 +458,7 @@ class Distributive(object): + PartitionDistributive:"partdir"} + extname = mapExtName.get(distr.__class__,"") + image = distr.convertToDirectory() +- except Exception,e: ++ except Exception as e: + if distr: + distr.close() + return {}.copy() +diff --git install/install.py install/install.py +index 9456d36..3ae3eb9 100644 +--- install/install.py ++++ install/install.py +@@ -400,7 +400,7 @@ class Install: + 'lvm_vgname' название группы томов LVM, bios_grub - создавать + bios_grub раздел + """ +- ap = Autopartition() ++ ap = AutoPartition() + ap.clearLvm(devices,self.clVars) + ap.clearRaid(devices,self.clVars) + ap.recreateSpace(table,devices,data,lvm,lvm_vgname,bios_grub) +diff --git install/utils/cl_setup.py install/utils/cl_setup.py +index 39b8ba6..c5622dc 100644 +--- install/utils/cl_setup.py ++++ install/utils/cl_setup.py +@@ -25,19 +25,48 @@ from calculate.install.install import (MigrationError, TemplatesError, + setLocalTranslate('cl_install3',sys.modules[__name__]) + __ = getLazyLocalTranslate(_) + +-class ClSetupSystemAction(Action): ++class ClSetupVideoAction(Action): + """ +- Объект настройки всех параметров системы ++ Действие для настройки параметров видео + """ + # ошибки, которые отображаются без подробностей + native_error = (FilesError,MigrationError, TemplatesError, + InstallError, AutopartitionError, DistributiveError) +- addon_tasks = [] +- templateTaskMessage = __("System are being configured") +- successMessage = __("System configured!") +- failedMessage = __("Failed to configure the system!") ++ ++ templateTaskMessage = __("Video settings are being configured") ++ successMessage = __("Video settings configured!") ++ failedMessage = __("Failed to configure the video settings!") + interruptMessage = __("Configuration manually interrupted") + ++ addon_tasks = [ ++ # проверить и настроить параметры для nvidia драйвера ++ {'name':'check_video', ++ 'message':__("Checking the video driver"), ++ 'method':'Install.checkVideoDriver()', ++ }, ++ {'name':'setup_opengl', ++ 'message':__("Configuring OpenGL"), ++ 'method':'Install.setupOpenGL()', ++ }, ++ {'name':'reboot', ++ 'warning':__("To apply the changes, reboot the system"), ++ 'condition': lambda dv:(dv.Get('os_x11_video_drv') != \ ++ dv.Get('os_install_x11_video_drv') and \ ++ (dv.Get('os_x11_video_drv') in dv.Get('os_x11_kms_video_drv') \ ++ or dv.Get('os_install_x11_video_drv') \ ++ in dv.Get('os_x11_kms_video_drv'))) ++ }, ++ {'name':'restart', ++ 'warning':__("To apply the changes, restart the X server"), ++ 'condition': lambda dv:(dv.Get('os_x11_video_drv') != ++ dv.Get('os_install_x11_video_drv') and ++ (not dv.Get('os_x11_video_drv') in ++ dv.Get('os_x11_kms_video_drv') and ++ not dv.Get('os_install_x11_video_drv') ++ in dv.Get('os_x11_kms_video_drv'))) ++ } ++ ] ++ + def __init__(self): + # список задач для дейсвия + self.tasks = [ +@@ -52,10 +81,20 @@ class ClSetupSystemAction(Action): + self.tasks.extend(self.addon_tasks) + Action.__init__(self) + ++ ++class ClSetupSystemAction(ClSetupVideoAction): ++ """ ++ Объект настройки всех параметров системы ++ """ ++ templateTaskMessage = __("System are being configured") ++ successMessage = __("System configured!") ++ failedMessage = __("Failed to configure the system!") ++ + class ClSetupAudioAction(ClSetupSystemAction): + """ + Действие для настройки аудио параметров + """ ++ addon_tasks = [] + templateTaskMessage = __("Audio settings are being configured") + successMessage = __("Audio settings configured!") + failedMessage = __("Failed to configure the audio parameters!") +@@ -64,6 +103,7 @@ class ClSetupLocaleAction(ClSetupSystemAction): + """ + Действие для настройки языковых параметров + """ ++ addon_tasks = [] + templateTaskMessage = \ + __("Localization and time options are being configured") + successMessage = __("System configured!") +@@ -73,6 +113,7 @@ class ClSetupNetworkAction(ClSetupSystemAction): + """ + Действие для настройки аудио параметров + """ ++ addon_tasks = [] + templateTaskMessage = __("Network settings are being configured") + successMessage = __("Network settings configured!") + failedMessage = __("Failed to configure the network settings!") +@@ -81,6 +122,7 @@ class ClSetupUsersAction(ClSetupSystemAction): + """ + Действие для настройки пользовательских параметров + """ ++ addon_tasks = [] + templateTaskMessage = __("User settings are being configured") + successMessage = __("User settings configured!") + failedMessage = __("Failed to configure the user settings!") +@@ -98,53 +140,17 @@ class ClSetupBootAction(ClSetupSystemAction): + {'name':'prepare_bootloader', + 'message':_("Installing the bootloader"), + 'method':'Install.prepareBoot(cl_image)', +- 'condition':(lambda dv:dv.Get('os_install_mbr') or +- dv.Get('os_install_uefi_set') == 'on') ++ 'condition':(lambda Get:(Get('os_install_mbr') or ++ Get('os_install_uefi_set') == 'on') and ++ Get('os_root_type') != 'livecd') + }, + # изменить IO планировщик + {'name':'change_ioscheduler', + 'message':_("Changing the I/O scheduler"), + 'method':'Install.changeScheduler(os_install_kernel_scheduler)', +- 'condition':(lambda dv:dv.Select('os_disk_parent', ++ 'condition':(lambda dv:dv.Get('os_root_type') != 'livecd' and ++ dv.Select('os_disk_parent', + where='os_disk_mount', + eq='/',limit=1)) + }, + ] +- +-class ClSetupVideoAction(ClSetupSystemAction): +- """ +- Действие для настройки параметров видео +- """ +- templateTaskMessage = __("Video settings are being configured") +- successMessage = __("Video settings configured!") +- failedMessage = __("Failed to configure the video settings!") +- +- addon_tasks = [ +- # проверить и настроить параметры для nvidia драйвера +- {'name':'check_video', +- 'message':__("Checking the video driver"), +- 'method':'Install.checkVideoDriver()', +- }, +- {'name':'setup_opengl', +- 'message':__("Configuring OpenGL"), +- 'method':'Install.setupOpenGL()', +- }, +- {'name':'reboot', +- 'warning':__("To apply the changes, reboot the system"), +- 'condition': lambda dv:(dv.Get('os_x11_video_drv') != \ +- dv.Get('os_install_x11_video_drv') and \ +- (dv.Get('os_x11_video_drv') in dv.Get('os_x11_kms_video_drv') \ +- or dv.Get('os_install_x11_video_drv') \ +- in dv.Get('os_x11_kms_video_drv'))) +- }, +- {'name':'restart', +- 'warning':__("To apply the changes, restart the X server"), +- 'condition': lambda dv:(dv.Get('os_x11_video_drv') != +- dv.Get('os_install_x11_video_drv') and +- (not dv.Get('os_x11_video_drv') in +- dv.Get('os_x11_kms_video_drv') and +- not dv.Get('os_install_x11_video_drv') +- in dv.Get('os_x11_kms_video_drv'))) +- } +- ] +- +diff --git install/variables/X11.py install/variables/X11.py +index cd8ef73..3634b02 100644 +--- install/variables/X11.py ++++ install/variables/X11.py +@@ -26,6 +26,7 @@ from calculate.lib.utils.common import (getVideoFromXorgLog, + getAvailableVideo, getValueFromCmdLine, + getCompositeFromXorgconf, getVideoFromModules, + getVideoFromVendor,getInstalledVideo) ++from calculate.install.distr import DistributiveError + + from calculate.lib.cl_lang import setLocalTranslate + setLocalTranslate('cl_install3',sys.modules[__name__]) +@@ -109,10 +110,13 @@ class VariableOsInstallX11VideoAvailable(VideoVariable): + image = self.Get('cl_image') + if image: + with image as distr: +- distrPath = image.getDirectory() +- if isPkgInstalled('xorg-server',prefix=distrPath): +- return sorted(filter(self.supported.__contains__, +- getAvailableVideo(prefix=distrPath)))+['other'] ++ try: ++ distrPath = image.getDirectory() ++ if isPkgInstalled('xorg-server',prefix=distrPath): ++ return sorted(filter(self.supported.__contains__, ++ getAvailableVideo(prefix=distrPath)))+['other'] ++ except DistributiveError as e: ++ pass + return [] + + class VariableOsX11KmsVideoDrv(ReadonlyVariable): +diff --git install/variables/kernel.py install/variables/kernel.py +index 9f8c395..2e844ac 100644 +--- install/variables/kernel.py ++++ install/variables/kernel.py +@@ -30,6 +30,7 @@ from calculate.lib.utils.common import (getKernelUid,getTupleVersion, + getValueFromCmdLine) + from calculate.lib.utils.device import getUdevDeviceInfo + from itertools import * ++from calculate.install.distr import DistributiveError + + class VariableOsInstallKernelScheduler(Variable): + """ +@@ -85,11 +86,14 @@ class VariableOsInstallKernelBfqSet(ReadonlyVariable): + image = self.Get('cl_image') + if image: + with image as distr: +- distrPath = image.getDirectory() +- kernelConfig = path.join(distrPath,"usr/src/linux/.config") +- if filter(lambda x:"CONFIG_IOSCHED_BFQ=y" in x, +- readLinesFile(kernelConfig)): +- return "on" ++ try: ++ distrPath = image.getDirectory() ++ kernelConfig = path.join(distrPath,"usr/src/linux/.config") ++ if filter(lambda x:"CONFIG_IOSCHED_BFQ=y" in x, ++ readLinesFile(kernelConfig)): ++ return "on" ++ except DistributiveError as e: ++ return "off" + return "off" + + class VariableOsInstallKernelAttr(Variable): +diff --git install/variables/net.py install/variables/net.py +index a7f2df2..d5cec22 100644 +--- install/variables/net.py ++++ install/variables/net.py +@@ -35,6 +35,7 @@ from calculate.lib.utils.portage import isPkgInstalled + from operator import itemgetter + from itertools import * + import hashlib ++from calculate.install.distr import DistributiveError + + class NetHelper: + """ +@@ -649,11 +650,14 @@ class VariableOsInstallNetConfAvailable(NetHelper,Variable): + image = self.Get('cl_image') + if image: + with image as distr: +- distrPath = image.getDirectory() +- return map(itemgetter(0,2), +- filter(lambda x:not x[1] or isPkgInstalled(x[1], +- prefix=distrPath), +- mapNetConf)) ++ try: ++ distrPath = image.getDirectory() ++ return map(itemgetter(0,2), ++ filter(lambda x:not x[1] or isPkgInstalled(x[1], ++ prefix=distrPath), ++ mapNetConf)) ++ except DistributiveError as e: ++ pass + return sorted(map(itemgetter(0,2),mapNetConf[-1:]),key=itemgetter(1)) + + class VariableOsInstallNetConf(NetHelper,Variable): +diff --git install/variables/system.py install/variables/system.py +index dd5a974..c54bd87 100644 +--- install/variables/system.py ++++ install/variables/system.py +@@ -25,7 +25,7 @@ from calculate.install.fs_manager import FileSystemManager + from calculate.lib.utils.files import (readFile,getProgPath,process, + readLinesFile) + from calculate.lib.utils.common import getPasswdUsers,getUserGroups,getGroups +-from calculate.lib.utils.common import getValueFromConfig ++from calculate.lib.utils.common import getValueFromConfig,getValueFromCmdLine + from calculate.lib.utils.portage import isPkgInstalled + from calculate.lib.utils.device import getUdevDeviceInfo + from crypt import crypt +@@ -319,7 +319,10 @@ class VariableClAutologin(UserHelper,Variable): + + def get(self): + # autologin enable for livecd and all install type CMC +- if self.Get('os_install_root_type') == "livecd" or \ ++ cmdDomainSet = (getValueFromCmdLine("calculate","domain_pw") or ++ getValueFromCmdLine("calculate","domain") or "") ++ if (not cmdDomainSet and ++ self.Get('os_install_root_type') == "livecd" ) or \ + self.Get('os_install_linux_shortname') == "CMC": + nonRootUsers = filter(lambda x: x != "root", + self.Get('cl_migrate_user')) +@@ -766,6 +769,6 @@ class VariableOsAudioDefault(Variable): + """ + Audio setting up unavailable for flash installation + """ +- if self.Get('os_install_root_type') != 'flash': ++ if self.Get('os_install_root_type') == 'flash': + return _("Audio configuration unavailable for Flash install") + return "" diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest index 4980230af..f54b7c3b5 100644 --- a/sys-apps/calculate-utilities/Manifest +++ b/sys-apps/calculate-utilities/Manifest @@ -21,6 +21,7 @@ EBUILD calculate-utilities-3.1.6-r9.ebuild 770 SHA256 6e7549041c73f70faaf165cd31 EBUILD calculate-utilities-3.1.6.ebuild 751 SHA256 2d16a50709c95db821dfd8ab018ba3091cadc598beddb4ae5e11a22d00ce369f SHA512 f420988a061c8a424b69a8cc890690d44052497b317082d5c8f7bada302caf3bcb38cf59e5f7ab4a2ba35b9f44c84917ca3b6fa6faf3899920bbed7be53611bd WHIRLPOOL b03385eaaa7b8b54ad3a1cb4761a20e16913526f6fb1005498c2de1260ac067ad178085fb9efa73b77617dc94fe1dcc884670a45d6664ccd48e89b527e78b21c EBUILD calculate-utilities-3.1.7-r1.ebuild 752 SHA256 506f1d908e8c5bce6fae29056c68c1d272d2f79be5ebf1374d964dbc7f8a5adf SHA512 b33d779d2194092436839443d90b125ce8152a49a12ff1f214ea608c14145a74714b927c25ab264a06ddb0239c981f7ff75acd25a6f6d904f09de225f577124f WHIRLPOOL cb93847cfddc36722adc7018f436c84cffb4f9a8831cce7ba55acfe52989dea177060d964098a979f0d7ce54db8505081f2196e20fc91c8475323215f6c9988a EBUILD calculate-utilities-3.1.7-r10.ebuild 767 SHA256 e1f47b8b3b33f155ac757cd5400a941cdeed278da3f302cf47866bd41a60cec8 SHA512 b098f9f1e45dddfa8a87a41b717eabafc147954cefdd5be82e09cfe1e943e119d46a1766d78e0ed6e6c0993c92596ddfe1e7bdf40113e87edb0bbc5156997d8e WHIRLPOOL ab12ec4b6e2c9bccb9c47d6da021b776ca7a6928d12453815e97831b33ac9588d26ea3a2e9e1d576e10595be5eddef1176d9a299f266472b7a7c6e71fb105be2 +EBUILD calculate-utilities-3.1.7-r11.ebuild 767 SHA256 0adbefc3a2cb3bf54e34080cc585128bd8dc6163f9b5134e0a51e732d4f13c23 SHA512 0fa44aeb4cdf6d7702b38fa4cd8094b47271ebf90f4535dfc76f8bbac9e34e34909259128b83783040a664f86dc13f1e926f2e93a46ae2c687804b7cb5ca6756 WHIRLPOOL 0c8fbfab18a50e34379829ee4863f8f4af76fc96fde30820ee9658d6294b2c87b15f179d4de9161d600c4e05857a2255e4a21aa249f96762ce2311cc113ba2f7 EBUILD calculate-utilities-3.1.7-r2.ebuild 761 SHA256 a8d68add7993bf5b4db8235dbad7158cd9b4b6b803af9c1bb9c690b40d0033d7 SHA512 13458804fbd04a44ac5a253edfa3877b8c31b665d8b5f6c9983066d5a6c3fdfcfc7f4ef57b89be4ec6c5343cb0faad6dce31bb5897fefa4b68eab33e6140ac3f WHIRLPOOL 7a73cb1dde57bc32faf28a2b90bde17e5f91dfa94b3ee49e9a56693a33152b6d08ca06ed3ee5ec39a4e98e62a6e612f0a62b3ef8ea28d690456ed3016f4f699f EBUILD calculate-utilities-3.1.7-r3.ebuild 761 SHA256 2bd5a011805391c9ea03f0a58b622ab8ebb8906f288abdc0c1ce7031ae930657 SHA512 ddc9ee47a3d04e112036e175986e8bf01fb1e8ef33cddd2fc69cc01f56df22bf7c20c1db144da8abedb2b15e7ec9644615a0676c267f47842498496e0c9d88ea WHIRLPOOL f1db0c0573abf5c238b9c76a4112313b0f57f4a43599e8a082a0e19bdfbcf991b5f3f4452f0473d30a6808a48e18933f0734331e2bb5ff2cdb9e88a7a2f66f0b EBUILD calculate-utilities-3.1.7-r4.ebuild 761 SHA256 eb606a6659e4d07aa32047105ce661fa6c9e38559aecbb9c32ce606d307e2a75 SHA512 4f9d7a6099c6eaffacaf358ff0e6ba82b0565c1f5f5c9783ed31c59c4d47b4ba921e575d850f34abd1e29676044443bcaa835c83ab432ac7499c4f7f193b8605 WHIRLPOOL ef63faaf1967f416fbe4b1d3841725c57979c100a9b8b8ec391f0b0d4cc90ebbc795d3d23f6cf229088892bf1732a8f3fd0d52772c8626560ff5b50eb7510138 diff --git a/sys-apps/calculate-utilities/calculate-utilities-3.1.7-r11.ebuild b/sys-apps/calculate-utilities/calculate-utilities-3.1.7-r11.ebuild new file mode 100644 index 000000000..cb72ead6d --- /dev/null +++ b/sys-apps/calculate-utilities/calculate-utilities-3.1.7-r11.ebuild @@ -0,0 +1,26 @@ +# 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_client cl_desktop cl_console" + +RDEPEND="${RDEPEND} + =sys-apps/calculate-install-3.1.7-r5 + =sys-apps/calculate-i18n-3.1.7 + =sys-apps/calculate-lib-3.1.7-r1 + =sys-apps/calculate-core-3.1.7-r6 + =sys-apps/calculate-update-3.1.7 + cl_client? ( =sys-apps/calculate-client-3.1.7-r2 ) + cl_desktop? ( =sys-apps/calculate-desktop-3.1.7-r1 ) + cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.7-r1 ) + cl_console? ( =sys-apps/calculate-console-3.1.7 ) +"