diff --git a/sys-apps/calculate-core/Manifest b/sys-apps/calculate-core/Manifest index 043ec04..28bc38a 100644 --- a/sys-apps/calculate-core/Manifest +++ b/sys-apps/calculate-core/Manifest @@ -6,6 +6,7 @@ AUX calculate-core-3.2.0_alpha10-r5.patch 7494 SHA256 0ce43d8224514264b71afed7e4 AUX calculate-core-3.2.0_alpha10-r6.patch 7538 SHA256 b6b86ffd035380b2c769b9dd8f4ea05d901bcf22de685072a0d203d47b7ada9e SHA512 9bbdf8829c5e835cc6b0265431f5c212d4244922a6c3b49ebba72de0d3967998c6f4f853d865733e7a4942a390bcb40044c03501305d2039dcb6f5dbb733507e WHIRLPOOL e09ae2e202725ebfffa516f98bf37cf07ae525ffdb0d1fe73f36f9585a228ae07465c0c94431b1de41c4d2aa3a58fd42b05de7dc6fd2a9cfa49d71fbe0415e57 AUX calculate-core-3.2.0_alpha10-r7.patch 7682 SHA256 230d15ba43129ca002d6dbbc4379172a7adc3b7559788ab0305ea70680d16e23 SHA512 082c8004d07ffc0e8534c5b10b570167f56d96fc4f7e173b018f37ba16b81e635d2e749d7f6116e25f06789d40fafe800b93c853ba471453a821c180c3c6c4a5 WHIRLPOOL b4a4f80f0bdb3bbe8144dc763faa7b09f7cf4f699f227f7a290585a5fbfebe0aa979db225d9fe37436347edead423f2672d69752dd0bdeff5c605b97f72f23af AUX calculate-core-3.2.0_alpha10-r8.patch 7601 SHA256 2003ebd86b93bb183ee633b657304735cf03dd8c94789d74057a36bd786537d4 SHA512 22228440d6c5b531b0ceebe1694923bfe7f9346ccea3eb7d17dfb769999f0dea4d37f46c7b46c54c801b10f8b5c27130ab6b64cabc1185c89cf393333915f371 WHIRLPOOL 489ee256aa1c827b2d0beb9f9a46b9377c19883eb03d8c64f13b8de4c9c53e4c474d000cf537de36d648735a0bb891166f2603478c3ae1b920a47336383a0670 +AUX calculate-core-3.2.0_alpha10-r9.patch 7970 SHA256 20563e7d4530c9e094ca26dfd1c2d1311935a91ecc2ea2e8fcaa9f22b6910120 SHA512 8456b65061889b16c6876cbe734b5bac510db2cd7bb3ea704c8f1b6a46edab7e3318c892f2756c028f8d2fa460a9d7a0d634770578e9d3148448d90ca870c243 WHIRLPOOL 220ef305ef7822353c9f52fad27632bfd18ee6041ae5cd64e0b5f135b88652086d73e934fec109cb25a8e6fd04df10b6da6040ae572f345cb84a34883fd226c0 AUX calculate-core-3.2.0_alpha6-r1.patch 28016 SHA256 d99381bd316fba8256b5eb54945124c5f32d816b06ad3d32c7d972ff0d01e71e SHA512 a60106837082dd4e4f2794f71cf69a782fcb22f823a1f9f325e14145cbb195fd79e2b0bf5cfb1de486c0bb76b7b00c4694c33c1a9a639a7022f4b34c4f08f3b5 WHIRLPOOL d96a915b3755b061667e1ce8234c480e677429b6bae118774027a4d58930a9b2c13af635638d0c3a972e6ff64a7a19cbadf6abe1d048eb9c55e0e41ecfa522e3 AUX calculate-core-3.2.0_alpha7-r1.patch 1253 SHA256 d1fa9b92b9616e22f7ff48de153a0b07e5c5f30727784048c341135e2b992869 SHA512 b0fd0053961d62a0eba396ca34d7bd41551b3430bae1a8467410758222c8367809e16edc2b1282fe2ef31f469a0cc3619ecbf0581952f9a1a8c5fed4102e9477 WHIRLPOOL 9e90ce6979ac1e8db54a12bd04eac784650a0feffaffdc51569a52a4a84fdfa7f0afc60c2f370e18798a7cadf0d638530f1dd1d014aa23af6810507706792b1e AUX calculate-core-3.2.0_alpha7-r2.patch 2540 SHA256 89541f9da25b7b4fd71410c5369f8e53f5e589740a644150e78d685c7d867fb4 SHA512 d40195a176c24a891cb6fa84e215c45a6961853fcce775727c39c55a7abe851ba35e2582e11aeb43ee84f7565bc4006f9376136c9570f61710d0b3487ecdd630 WHIRLPOOL c6912581585122ef4759b51d19b20aeea8befa7b96d67431b6e7a88f33908f2eed4c14172bd41a62e6fc836447263d0203936f80728e268f208ab79dc20aa167 @@ -22,6 +23,7 @@ EBUILD calculate-core-3.2.0_alpha10-r5.ebuild 1273 SHA256 d23dbd51ab4c413a903a65 EBUILD calculate-core-3.2.0_alpha10-r6.ebuild 1273 SHA256 008ca91f07c3703f83ccab53257e52942922b9a9112378f6e4dbf9180cfca00a SHA512 e8b5a266b62fc346fab7833cd59d0ab578af4068d33506fd2c9ac50a31dfa6903c520ac910bda388e3728347ac59a3fe9274d3be87bfc558ac051d499faeb14e WHIRLPOOL 56c56c91b5abe5bf32d1fd09e07b99e5b6e0e11fd9dcd461ed745dfef9c1ada69f90f0eea826faed45b160f1188b22c89866ba85471112f14532f9a75892b47a EBUILD calculate-core-3.2.0_alpha10-r7.ebuild 1273 SHA256 c5b07da36507a718eb250f2ee5e3462b670a402055fa60fa00bfa911c0fdc03f SHA512 f26201d72d04861f3c5b518bf7f5c0d69bc95b15fcc1207170d462b4ef6d4727884c58dd3e8c654b63298cfee893b43153f4341a4a8fb85e634b1341a876aa2a WHIRLPOOL adb6d8ba63abc182f5f31f34c725e96dd5f1fbb5aff8433ee684018d6cb1ce2b56a00e3fa6785d2af3dbe8da373152829ffa46f30815cea2f904f46b4013fb74 EBUILD calculate-core-3.2.0_alpha10-r8.ebuild 1273 SHA256 0eb4154aff831810281227b2f9c66e7da56c1fa02e6d54ddb5ce797634d30b47 SHA512 404b3f46f631b5d12b9895e72a5965a5c2a68863540b24cb93a24ade582af1066a9d595b36cf46ecaee460ac8f5c5569134c0739fe55d939bae82425d7d09f10 WHIRLPOOL 32c19663dd8995ebe3b2e5ff04a5a2cc9a16a3ce28f05c5ccf5a527f1b8a243398a73e553c5600eddfbf766d03cec3780042fa71ed5123bf1a21d68dea83cd34 +EBUILD calculate-core-3.2.0_alpha10-r9.ebuild 1273 SHA256 d8fa032297b312cf9656111d77981743914ea0bbf57b532b91931aa464c7c16b SHA512 0fea1937c7a4b395e476d2cdfb63c94fbabd88b064da9c08a95f4eafad70d2680a464b4806c91e76509b666813171f5d2e3a62f198a21c130e017db2b01115c5 WHIRLPOOL ad2ae2f8c23e76a9efed680aa0e35339e23a07144ccf958de461ca137f152d9959fdfc1799afc41c6aa7f118602846cb89afeeeeafc40e98b25c4f08456a84c1 EBUILD calculate-core-3.2.0_alpha10.ebuild 1130 SHA256 b5fd665e9bdd2768881d7036b4fd6b6a1951d80c1f35ce4a3d718f7be7d0696a SHA512 317e92465c4a563a9f8f0f77d9026c8d7bebdec046cf6b5e18fc4d64db7ed025ca868b047468e511b81c282812813300d4a7f09956dec6bc8f0e732513422d31 WHIRLPOOL 56a65ee5a91ed9044eb8d45e519b72e46a50a8cd12de8f88c70553b928c71a68f0593d2246e83808b97ec180182e9a78eb021b2c38f5e48ad0fa4cf09caff0bf EBUILD calculate-core-3.2.0_alpha6-r1.ebuild 1271 SHA256 eeb673d23352cb9df02b93f47eaf3c2e3558a89fa94867fb1f3d1f8b5bfcf096 SHA512 ae4b2dc1f27e84c18e35fc0674ff522398f4c90965f67e278c830da707d9d00cb885b5b11deaabde32f3646e8de9929d38605cf35f14a755b1e772e19fce8b21 WHIRLPOOL ec4d78b528eafc85f1bbdc139d0ac5847b1470ca74a2d1db62b5bf00d54af937ac6c8228256cb2643180f477670efdb230834d2294a097558bb1c84e42992cdb EBUILD calculate-core-3.2.0_alpha6.ebuild 1129 SHA256 e97ed753f108f340b41475c02a65fd4a05576e6f112e677271df991a680143fd SHA512 ce1f5eb6fdade47f2dd8d2a2a306eaa8ad9b57e52ea88fe5cf5fcabd933fbdec2e7cc114a2ad8e242aacb2bf2b90f5e74c7f22dae743ff063f29c71dcc01714e WHIRLPOOL c47b85f17c567c550bfec337f5d241593fd789c441af1ecaf366f20c5c594f21367e381610a7ca1901e6fded6b1c159b16a8f5645b0d7af812679175b40b9ea8 diff --git a/sys-apps/calculate-core/calculate-core-3.2.0_alpha10-r9.ebuild b/sys-apps/calculate-core/calculate-core-3.2.0_alpha10-r9.ebuild new file mode 100644 index 0000000..37e6c24 --- /dev/null +++ b/sys-apps/calculate-core/calculate-core-3.2.0_alpha10-r9.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.2.0_alpha10 + >=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.2.0_alpha10-r9.patch" +} diff --git a/sys-apps/calculate-core/files/calculate-core-3.2.0_alpha10-r9.patch b/sys-apps/calculate-core/files/calculate-core-3.2.0_alpha10-r9.patch new file mode 100644 index 0000000..4a3887b --- /dev/null +++ b/sys-apps/calculate-core/files/calculate-core-3.2.0_alpha10-r9.patch @@ -0,0 +1,179 @@ +diff --git core/server/api_types.py core/server/api_types.py +index b5d7e76..d9f268c 100644 +--- core/server/api_types.py ++++ core/server/api_types.py +@@ -531,8 +531,8 @@ class CoreWsdl: + checkall = info.CheckAll + errors = map(lambda x:ReturnedMessage(**x), + dv.checkGroups(info,allvars=checkall or not checkonly)) +- if dv.Get('cl_env_debug_set') == 'on': +- dv.printGroup(info) ++ #if dv.Get('cl_env_debug_set') == 'on': ++ # dv.printGroup(info) + if errors: + return errors + if checkonly: +diff --git core/server/func.py core/server/func.py +index 00249b8..965a387 100644 +--- core/server/func.py ++++ core/server/func.py +@@ -20,6 +20,7 @@ import sys, os, re + from os import path + import traceback + from traceback import print_exc ++from calculate.lib.cl_log import log + from api_types import ReturnProgress,ViewParams,Integer,ViewInfo + from loaded_methods import LoadedMethods + from calculate.lib.cl_lang import setLocalTranslate,getLazyLocalTranslate +@@ -140,7 +141,9 @@ class CommonMethods: + # определение каталогов содержащих шаблоны + dirs_list, files_list = ([],[]) + useClt = useClt in ("on",True) +- clTempl = ProgressTemplate(self.setProgress,self.clVars, ++ self.addProgress() ++ nullProgress = lambda *args,**kw:None ++ clTempl = ProgressTemplate(nullProgress,self.clVars, + cltObj=useClt, + cltFilter=cltFilter, + printSUCCESS=self.printSUCCESS, +@@ -707,9 +710,20 @@ class Action: + + def run(self, objs, dv): + """Запустить список действий""" ++ class StubLogger: ++ def info(self,s): ++ pass + result = {} ++ + self.group_name = "" + self.clVars = dv ++ if dv.Get('cl_env_debug_set') == 'off' or \ ++ dv.Get('cl_ebuild_phase'): ++ logger = StubLogger() ++ else: ++ logger = log("core-action.log", ++ filename="/var/log/calculate/core-action.log", ++ formatter="%(asctime)s - %(levelname)s - %(message)s") + for obj in objs.values(): + obj.set_link(self) + obj.clVars = dv +@@ -717,6 +731,8 @@ class Action: + obj.init() + try: + self.beginFrame() ++ logger.info("Start {methodname}".format( ++ methodname=self.method_name)) + for action in self.get_tasks(result): + foreach = action.get("foreach","") + if foreach: +@@ -732,6 +748,15 @@ class Action: + task = False + try: + run_context = self.get_condition_context(action, result) ++ actinfo = "Run" if all(run_context.values()) else "Skip" ++ logger.info( ++ "{action} {name}: condition: {condition}, " ++ "depend: {depend}".format( ++ action=actinfo, ++ name=name, ++ condition=run_context['condition'], ++ depend=run_context['depend'])) ++ + elsePrint, elseMessage = ( + self.getFormatMessage(action,"else_error", + "else_warning","else_message")) +@@ -810,6 +835,8 @@ class Action: + failedPrint(failedMessage) + if task and res in (True,False,"skip"): + self.endTask(res) ++ logger.info("{name}: Result is {result}".format( ++ name=name, result=res)) + if res is True: + on_success = action.get('on_success',None) + if on_success: +@@ -822,15 +849,19 @@ class Action: + self.endTask(False) + self.printWARNING(_("Task interrupted")) + result["interrupt"] = False ++ logger.info("{name}: Interrupeted".format(name=name)) + except self.native_error as e: + if hasattr(e,"addon") and e.addon: + self.printERROR(str(e.addon)) + self.printERROR(str(e)) + result[name]=False ++ logger.info("{name}: Native error".format(name=name)) + except BaseException as e: + result[name]=False + error = shortTraceback(*sys.exc_info()) + self.printERROR("%s:%s"%(name,error)) ++ logger.info("{name}: Unknown exception {exp}".format( ++ name=name, exp=e.__class__.__name__)) + finally: + dv.close() + self.endFrame() +@@ -1087,7 +1118,7 @@ class CoreWsdl(): + self.process_dict['counter'] -= 1 + return res + +- def addProgress(self,message): ++ def addProgress(self,message=""): + id = random.randint(1, self.Num) + while id in self.progress_dict: + id = random.randint(1, self.Num) +@@ -1240,6 +1271,7 @@ class CoreWsdl(): + hasattr (com.__class__.__bases__[1], '__init__'): + com.__class__.__bases__[1].__init__(com) + # start helper ++ com.method_name = method_name + p = multiprocessing.Process(target = self.target_helper,\ + args = (com, getattr(com,method)) +(method_name, )+ args_proc) + +diff --git core/server/methods_func.py core/server/methods_func.py +index 5a25e4e..fb9565b 100644 +--- core/server/methods_func.py ++++ core/server/methods_func.py +@@ -237,7 +237,8 @@ def get_method_argparser(view, args, cl_core = False): + # data['metavar'] = field.name.upper() + if "choice" in field.type: + data['help'] = "%s (%s)" % ( +- data['help'], _("'list' for display possible values")) ++ data['help'], ++ _("'list' for displaying possible values")) + if field.element in ['check']: + data['metavar'] = "ON/OFF" + try: +@@ -388,7 +389,7 @@ def display_error(error, args, groups): + elif error.type != "commonerror": + colorPrint.printERROR(params_text % error.message) + else: +- colorPrint.printWARNING(params_text % error.message) ++ colorPrint.printWARNING(error.message) + + + def check_result_msg(method_result, view, input_error_dict={}, args=None): +diff --git core/setup_package.py core/setup_package.py +index f920af7..3285b52 100644 +--- core/setup_package.py ++++ core/setup_package.py +@@ -113,7 +113,7 @@ class UpdateConfigs(UpdateLogger): + """ + Получить пользователей в X сессии + """ +- return self.clVars.Get('desktop.cl_desktop_online_user') ++ return list(self.clVars.Get('desktop.cl_desktop_online_user'))+["root"] + + def getConfiguredPasswdUsers(self): + """ +diff --git core/variables/setup_package.py core/variables/setup_package.py +index ac6daf6..9da4e0d 100644 +--- core/variables/setup_package.py ++++ core/variables/setup_package.py +@@ -201,7 +201,7 @@ class VariableClCorePkgDesktopSet(Variable): + def check(self,value): + if self.Get('cl_templates_locate') == ["clt"] and value == "on": + raise VariableError( +- _("You shouldn't choice only clt location " ++ _("You must not choose only clt location " + "for desktop templates")) + + def init(self): diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest index 315a9ca..9ceab6d 100644 --- a/sys-apps/calculate-utilities/Manifest +++ b/sys-apps/calculate-utilities/Manifest @@ -5,6 +5,7 @@ EBUILD calculate-utilities-3.2.0_alpha10-r12.ebuild 842 SHA256 b27e330181bfa3cb7 EBUILD calculate-utilities-3.2.0_alpha10-r14.ebuild 842 SHA256 9290566cf399b27e975fdc83afed13ac1a3435810325a02a9df13b6397a6167a SHA512 323963dacce40fd66b49a90859df0932de64e2dbf9f81ff0ad2bbe8e2c10e7fd45c2e73d7053720d7e82ce3a3dcc07784929f582474436fe0c2ce9a096df7f94 WHIRLPOOL bd8c0c90b9f2952903985eb80f77c9998728627ef46019ceb90e4b51f6c94c08f702ce247a1ecbc35b63ef764e5fa2412f14d9f6df4f2d8b3f5681263f546487 EBUILD calculate-utilities-3.2.0_alpha10-r15.ebuild 842 SHA256 dd78206b63c19f01fe01255799c5aeff09f0b75c3ff2798ead4e8692549f0171 SHA512 3cb797323110aad036632e032a120a0558ba13cc6912c5149329aac61853ab23699451297c0615fe0eb3014b4e790758c2bb1fad079ddbef046555c8f1c6391d WHIRLPOOL c96df4c7e08736ae9bd012f6b77e176866726dc4127157e72e0c8ae46cb508103430e67420c8a959a642ac6d61d247add1c4b4a4e0289fba9ee5566621828a7e EBUILD calculate-utilities-3.2.0_alpha10-r16.ebuild 842 SHA256 8e24ee93a1b2fa4a183b6e8ada0ed6b0175cf89b8c9cee2e95ae84b4949bcddd SHA512 1242da4816942ddbcaab7ac207888cd92057f70582b46196923c7d512a4fb196f7abcb3c7c42e97fb620347725cbfe1abac16fc69883c7c68aa6ed11ad067a9e WHIRLPOOL 372fc7c75e69676aa81ff9f8c884ad1497f9fef761a89220346c0ffb56051e16c2f6592cfedb0645ceb8306a3459eab76078a50a3afcfcbfa5be65e2f3dc0fd0 +EBUILD calculate-utilities-3.2.0_alpha10-r17.ebuild 842 SHA256 a1dceee3faff64e7391901339da6b7c9abf9c8f23ccdb7b9602ea3de43058a0f SHA512 a295b7a39ca8bd33255a5e582a8f695e952ec713a36c0565b1b5994a441bbf8adb180b976c33026014de0802f2f3b2a7ef91840a2a2dabc5488520f77b2bf6c4 WHIRLPOOL 734ba2fec06be02f8de832b3e636e076c0cdb2fd728d3b002443bb03816a97d09b5766eda3f216f5665394720d1ff9d2635f56f859a6f30d90504ab8cdab17cd EBUILD calculate-utilities-3.2.0_alpha10-r2.ebuild 842 SHA256 62a6fa86d44b51242d08753510c382076378aeaaba1b927f322d06fa0b17bca0 SHA512 5a39b25013adfe53d1d50efa87354308b384e956aff0a3a2b7072345df7b9c67d2642666a9dae2ccd77406870161ff88c150cf07eedacd9a6b541631d11de940 WHIRLPOOL 66ecd6e470ad72a7643227deba42125baa8ee72bfa67c7e4fbed71b6095c10a51ea601045f66f8612404cef60cdeb77372eb63a6a0cf932cfab759fd5d09cd6e EBUILD calculate-utilities-3.2.0_alpha10-r3.ebuild 842 SHA256 5e86b76bac016fb80d9e8ea2f87f2e3281b15e66f30db317dc0f4c13194df150 SHA512 37c86dd04ef452ac88ea65fb0c978a7ce71461d20bcd90d6f492f0a063f2535510f6f33cd3d7331961b6857b699b24e15264356ec38e2c6192fdd993d8328d66 WHIRLPOOL bd3ecf0452354e0e2bf27d3d169885ab2940d7a196a85551d71c2f9607e19177e7cc867324fed824c4ac0c7fb534fbf3a4d90a361de86162e2b82ee676f17d97 EBUILD calculate-utilities-3.2.0_alpha10-r4.ebuild 842 SHA256 784b3b5e67ff3615090ea96c8b85b558bd8dbef4d1fabdcba58d5d5ff1139d52 SHA512 2d93039b127c977541a955a69a22ebdc3cb965489c75e6e125f8356fcafc1e934c2a8cc21ffe8ad8f75db26971b79adac8e25c13007b39d5ebecaee2dde78115 WHIRLPOOL caff4b42d86c465e5271099f2adf3b7347a62868e8828465922b0e6b09189f6787dcf5f4ee6f262787650ee5ee76e7317b5f147909e59c6230fc7fb6394516ed diff --git a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha10-r17.ebuild b/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha10-r17.ebuild new file mode 100644 index 0000000..ad1d6b8 --- /dev/null +++ b/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha10-r17.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.2.0_alpha10-r3 + =sys-apps/calculate-i18n-3.2.0_alpha10-r4 + =sys-apps/calculate-lib-3.2.0_alpha10-r5 + =sys-apps/calculate-core-3.2.0_alpha10-r9 + =sys-apps/calculate-update-3.2.0_alpha10-r7 + cl_client? ( =sys-apps/calculate-client-3.2.0_alpha10-r1 ) + cl_desktop? ( =sys-apps/calculate-desktop-3.2.0_alpha10 ) + cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.0_alpha10 ) + cl_console? ( =sys-apps/calculate-console-3.2.0_alpha10-r1 ) +"