diff --git a/sys-apps/calculate-core/Manifest b/sys-apps/calculate-core/Manifest index 70f76f7..ee7292d 100644 --- a/sys-apps/calculate-core/Manifest +++ b/sys-apps/calculate-core/Manifest @@ -4,6 +4,7 @@ AUX calculate-core-3.2.0_alpha4-r2.patch 16188 SHA256 cd2ea5c818f9fa80db9e2164c3 AUX calculate-core-3.2.0_alpha4-r3.patch 16585 SHA256 f51cecc73fd1085e65922a6c17168baf667833a8edcb5d89fbe82dcc88d87716 SHA512 768a3d8a14248755157cdf015e058efee9ae1ab3d018b4a94a081ae154ce15509ebc952cda01ca753a4d31695d2e2d114d118d74a16dc3c0e7ecb9d2dfd03742 WHIRLPOOL 0b9091130641b14c2f06ca4afe61aefc4557126289db59f5e550b2fda1a5298dff3823bdff88d8b5eacad76b0b1bf09f5eba7a6ddb71a2f01a2041ab75530a46 AUX calculate-core-3.2.0_alpha4-r4.patch 18361 SHA256 75de26bd326759971c8f380f04ec69071811eef6232a6b8c46b842734ab7e36f SHA512 52516c14935340d38a3b03ed980b8aa5d58129300f384b63081041634fecdb46ada91ab43d555b437c12a448d8352854a7d26241dc8d8f562157064f2ff46628 WHIRLPOOL 0978882b8fb860d54a922e193aa5dba71b5834a30ac35452f6493a816139b38749107b6b4a1d0a3ec3dc50dd0a6448e784db4a14f84381c5445ab57a7915fc8a AUX calculate-core-3.2.0_alpha4-r5.patch 19063 SHA256 8a04d46c14515b93d44f33cb86f61adc0c97d840250ec9b800d9ce753fea571a SHA512 b6b742012f251e018f399e52bb2dfef7cc1c2f570bc02bef1d57a6d20c840e6f3325ce79cc110f60a7adb7d6e3e8f55d96fb44fd18fd49422db6c0c3b2dca816 WHIRLPOOL af6163d19f5e7c6af050aaf65bfd671c250993212f470a87731a6e6accf512c79b9fce49ff8bd12fbdf2dfb89d4360045690821f6e5aa7e3ba36bbc14278561d +AUX calculate-core-3.2.0_alpha5-r1.patch 4276 SHA256 565ca501d01696d5e3d9ac6eccb80e0cd9efcb9c61b97fcfc592387fc4929c64 SHA512 e16b2f27a706e0d388bf06a6c0fb1c9f794e09d7e5373b16f2e3ecfda9d60a499169acd7271734c12b3b08b08133451902cac7848a13c3bbc6b8603637bdd956 WHIRLPOOL a68619e06a9115e685591bfb5da55bc564d2f8b958ec78baba76d8703a68b54f30a30b5b98ea718fa5bfe4418c410d912be5790b23e46061b596779228863594 DIST calculate-core-3.2.0_alpha1.tar.bz2 83658 SHA256 780a4107fcf2d6ee84be721e571f595ae8eb6cebf313cf6feef9c1d64d3a6575 SHA512 906a653de9286cd4d1d922937aa6afafef9a854ebf49f0636a4ad7e5e7ae136d353fe4b8c196c037688f8df7fd3df213800d184734193058df0ebb42090866d0 WHIRLPOOL ca8fe5f238111d78a65f2d42e8f3c169b7074cd5ebd7b8a653824b23d59cdcbfbfc7146ab7d96cc34300a7d418a036729a8c7931fd020c993e97103440e90c4c DIST calculate-core-3.2.0_alpha2.tar.bz2 84591 SHA256 bed467810d02c14ac9e501a0057b652b8e610960193cf3d64c6a78acc5eb5140 SHA512 e77bf6f102c02006d559b96ca51cdb84d25ba9a4b1170c61fbe5158f2539e91acab2ae857a940b030d5b37d430822aa5e2cfe1fbe903436e284d43a3eeec3e09 WHIRLPOOL b299b1a43dbd70fb68efb6ea21b8d8beeef63985b5e0a5deb66668a76e46b7c621af19bf442bbc6cbb289a05beb59e69e3e3464fa392d4c2da56307daa960c20 DIST calculate-core-3.2.0_alpha3.tar.bz2 84808 SHA256 271d4d5752e26f0e4d435b2cad825fbeedeb146418f42f387fcdfc4ead683a0d SHA512 7dbd5a693eebd5d931f3ec8a377c613a6fbaa757bb48cfa90921fd608ce311deac32dee48d619a05f8b24781551142ca1af4d5fc437bedea4d259eaafb0aa52f WHIRLPOOL 5a2ec89684cfcbdb9afdb860b97e331d39ec4bdae5234bdafe856e2d69aa9e1367a184cce8e98a5b68ee5c108d84f6eadaeb94dfb6bde793af0cbc9be5302139 @@ -19,5 +20,6 @@ EBUILD calculate-core-3.2.0_alpha4-r3.ebuild 1271 SHA256 0ce1729ff0a879ed40c4254 EBUILD calculate-core-3.2.0_alpha4-r4.ebuild 1271 SHA256 951eca9ef8a4e21138f1fe91ba44d71b3d3390550fe36e5624d5b91d8ed8873b SHA512 b6d4d4678f3292516da6d99afea353e1437a5502391746f2ff334af7f259567a8ed3b1ad092a7dc3d50b05bd014576bcdff064283e284a06427ac3afed9eb408 WHIRLPOOL bb2fd032dc4e66bb2c571a6d914c12f38867d0d64236eca212ca6387fdb9a375493393b654079cabce4f04c3339983df0bae5593233b7a4a02a49b457307e843 EBUILD calculate-core-3.2.0_alpha4-r5.ebuild 1271 SHA256 d00f9690196482e10cf788de17c51aaa6581d0040061a22862bd2227f19a0e59 SHA512 6cdc70d1a8aff46dbc2305c377f77fee09adde6612bf2ba01d8ca07a000487958610b7c4fd9e97426df0b81bf1f0eefb7a9277e32e4e6ca2a0eaaa044ed057b3 WHIRLPOOL de0d39e16202a6694c3b62d05ab00a56c3469dd44ce4866ee81dda13255107f0c1a59ac379d4cbcbc756ff601f3a29764ab75752b80ae32f7629d317004384a7 EBUILD calculate-core-3.2.0_alpha4.ebuild 1129 SHA256 5265cd458eaf572bcdc443d19fceaef043ed57855890f0a017810bbbc835523e SHA512 6265973cb9b86ad68d0c2fc6cffceb14e0713fe2b6140c4daff5d18b71286572996332bd6e6b3679238e6e12cedd76f2d0e0b65fd7e0394426bc39ae65bb8d07 WHIRLPOOL d3f62367e9277aae8123efc10a91f4d614568e365ebeceabc22a3782dbbb3711ea3e8686ec8864c2f2f2856a945c66e5125fbb20d1fd07c169d1925e49e7f99d +EBUILD calculate-core-3.2.0_alpha5-r1.ebuild 1271 SHA256 bb6ca565f27cfb89251a9f15fff25d7eb743bb93a3d3646268a0eb19fd85fd07 SHA512 50e812db4e005a1bc3482d89da6e7f6b7e8b60f0d9f97c29a0bc2a7ed4b073609d2cd023c532b9c92bb9f6de5415539e9960ca82344e7ed8e773aba1f95174f0 WHIRLPOOL 605c78863ae19609773e274cdd9c2e4ea0147d9d7b31f7e5cf7079a409c1d6d532a4d99d75a6ee54e79d9dc7f8c314dcca0129ee3f3702b1bc48a920630af0bc EBUILD calculate-core-3.2.0_alpha5.ebuild 1129 SHA256 c7a2a90ddd2749bd33904e2f3cb96d63ae944b41f562d69e17fbd317af0bec16 SHA512 4a0d7f79a3472db765b0057e74186680bfc6a20e55589d5cec3947f6a52e79db361b3eea22d1e67bd4f981efa3316ac79fcf2b577df97e1b1abaa0d619fbbab9 WHIRLPOOL 70cef0293a36be5fe9d25a52f8b29b4aca288b0fc334c59d39ef4627fbdd4b9773f62719f8f61081e203385ae6709febf98faa0004d98867843abab1f9010299 EBUILD calculate-core-3.2.9999.ebuild 656 SHA256 39383ebc527d7155b147355108ec0b069f7cad95d5fcabc33520f0fe1ee0b971 SHA512 e20a8dea6e20615baeb56069331cdc35a7c37a05afa125c7174c5082852242da446830940c962fd890bb6627d9f5cacf0848834b75bfb1a184a6acfef17f95f8 WHIRLPOOL 3e9f06bf7e2f99a46e3c681fa6f381b7b1883bb15e05c535a7acde55f9092418d0b71d95ce4b2906e8505ea73c4157620303e4e4e4e4de430f11bfd6214b4a88 diff --git a/sys-apps/calculate-core/calculate-core-3.2.0_alpha5-r1.ebuild b/sys-apps/calculate-core/calculate-core-3.2.0_alpha5-r1.ebuild new file mode 100644 index 0000000..e8d0594 --- /dev/null +++ b/sys-apps/calculate-core/calculate-core-3.2.0_alpha5-r1.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_alpha5 + >=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_alpha5-r1.patch" +} diff --git a/sys-apps/calculate-core/files/calculate-core-3.2.0_alpha5-r1.patch b/sys-apps/calculate-core/files/calculate-core-3.2.0_alpha5-r1.patch new file mode 100644 index 0000000..0bbb8a6 --- /dev/null +++ b/sys-apps/calculate-core/files/calculate-core-3.2.0_alpha5-r1.patch @@ -0,0 +1,102 @@ +diff --git core/server/clean.py core/server/clean.py +index 25cb323..44f7406 100644 +--- core/server/clean.py ++++ core/server/clean.py +@@ -21,23 +21,19 @@ from calculate.core.datavars import DataVarsCore + from calculate.lib.cl_lang import setLocalTranslate + setLocalTranslate('cl_core3',sys.modules[__name__]) + +-# clear server files after restart +-def clean (SID_FILE, PID_FILE, SID_PID, SIDS_DIR, PIDS_DIR): +- if os.path.exists(SID_FILE): +- os.unlink(SID_FILE) +- if os.path.exists(PID_FILE): +- os.unlink(PID_FILE) +- if os.path.exists(SID_PID): +- os.unlink(SID_PID) + +- if os.path.isdir(SIDS_DIR): +- for filename in glob.glob(os.path.join(SIDS_DIR, "*.sid")): +- os.unlink (filename) +- if os.path.exists(filename): +- print 'Not deleted file %s!!!' %filename +- if os.path.isdir(PIDS_DIR): +- for filename in glob.glob(os.path.join(PIDS_DIR, "*.pid")): +- os.unlink (filename) ++def clean(sid_file, pid_file, sid_pid, sids_dir, pids_dir): ++ """ ++ Удалить все файлы сервера после перезапуска ++ """ ++ for fn in (sid_file, pid_file, sid_pid): ++ if os.path.exists(fn): ++ os.unlink(fn) ++ ++ for dn in (sids_dir, pids_dir): ++ if os.path.isdir(dn): ++ for filename in glob.glob(os.path.join(dn, "*.sid")): ++ os.unlink(filename) + + class CoreWsdl: + # watch for process +diff --git core/server/func.py core/server/func.py +index 9fdee9b..c167af8 100644 +--- core/server/func.py ++++ core/server/func.py +@@ -17,6 +17,7 @@ + import pickle, random + import threading + import sys, os, re ++from os import path + import traceback + from traceback import print_exc + from api_types import ReturnProgress,ViewParams,Integer,ViewInfo +diff --git core/server/replace_class.py core/server/replace_class.py +index aa83294..6e0da47 100644 +--- core/server/replace_class.py ++++ core/server/replace_class.py +@@ -352,7 +352,7 @@ class replaceClass(): + + def _printOK(self): + self.terminal_print('\r') +- self.terminal_print.right(self.color_print.getconsolewidth()-7) ++ self.terminal_print.right(self.color_print.getconsolewidth()-6) + self.terminal_print.bold.foreground(TextState.Colors.BLUE)("[ ") + self.terminal_print.bold.foreground(TextState.Colors.GREEN)("ok") + self.terminal_print.bold.foreground(TextState.Colors.BLUE)(" ]") +@@ -360,7 +360,7 @@ class replaceClass(): + + def _printBAD(self): + self.terminal_print('\r') +- self.terminal_print.right(self.color_print.getconsolewidth()-7) ++ self.terminal_print.right(self.color_print.getconsolewidth()-6) + self.terminal_print.bold.foreground(TextState.Colors.BLUE)("[ ") + self.terminal_print.bold.foreground(TextState.Colors.RED)("!!") + self.terminal_print.bold.foreground(TextState.Colors.BLUE)(" ]") +@@ -368,7 +368,7 @@ class replaceClass(): + + def _printSkip(self): + self.terminal_print('\r') +- self.terminal_print.right(self.color_print.getconsolewidth()-9) ++ self.terminal_print.right(self.color_print.getconsolewidth()-8) + self.terminal_print.bold.foreground(TextState.Colors.BLUE)("[ ") + self.terminal_print.bold.foreground(TextState.Colors.YELLOW)("skip") + self.terminal_print.bold.foreground(TextState.Colors.BLUE)(" ]") +@@ -379,13 +379,12 @@ class replaceClass(): + self.spinner.stop() + self.spinner = None + self.setProgress(100, progress_message) +- if self.progressbar and self.progressbar.finished: +- self.terminal_print.up(1).clear_line("") +- self.terminal_print.up(1)("") +- self.progressbar = None +- +- # если result - сообщение + if self.currentTaskMessage: ++ if self.progressbar and self.progressbar.finished: ++ self.terminal_print.up(1).clear_line("") ++ self.terminal_print.up(1)("") ++ self.progressbar = None ++ + self.displayResult(result) + self.currentTaskMessage = "" + diff --git a/sys-apps/calculate-update/Manifest b/sys-apps/calculate-update/Manifest index 8d5cd83..ce69636 100644 --- a/sys-apps/calculate-update/Manifest +++ b/sys-apps/calculate-update/Manifest @@ -6,6 +6,7 @@ AUX calculate-update-3.2.0_alpha4-r2.patch 6582 SHA256 57e9b6f162ca9f1c1e9295cc4 AUX calculate-update-3.2.0_alpha4-r3.patch 6988 SHA256 148483a99fa374a3f0e75fbc9ea5cd024171fc9ef973fa200bbcb8d997f71935 SHA512 0c79191712b2cb1aa1c2a3f3cdd4a4d9ae144ae5c1749707cc4dcf6fadbdbe638436136698228c979338ab365d4b7c54d17151697ad844af9ecc697f484853e5 WHIRLPOOL 4be6ce6f917065702052bbbd97ae9ee67afc59a2a1554772e163a5a40f525f33667db2754e4a1358b3f75de0373946a07a448079674806d703121002dca7c38b AUX calculate-update-3.2.0_alpha4-r4.patch 19180 SHA256 7e01cd3e5c02f7490fc11f301f8a5a2dd52ea6901918dab580429139ac9ea024 SHA512 72ceb57d48e9ca17646fef56f785adbe929007664d569b8c27e15dd4433a7dbc94e8942a18af333bb8a319fe50d2c4329c2c8fdebd0c9774923fcba9df694aa0 WHIRLPOOL ef0d5bf3161a4450a5f240ddeef502fab0bdb605d1f8d3852f99dfd8db893e74d5ba000252adb1af398609b421c22d6a37e76719d43dd8bda79f5c5535eb879b AUX calculate-update-3.2.0_alpha5-r1.patch 488 SHA256 dc3ef84b48f1b4d9ff57263c4d6f45f0b3752f79b0afc8feb8a527cc16e1a5a9 SHA512 0bd80a9e2d9b54a0f5f11809a85645c22afc2094086004a7375212e5edde089799fab3e5bcd250a0609725741d0ecc3c6c90a83940161a924011d217ae3c5ff1 WHIRLPOOL 0d78cb993d7567629a819d08042ffcfd1f7a3e66e0532fcb717b48f29a73d7132e73fbebfbaef646125ded98ea2ac035309a49b5f45af3a72a4e59008351e183 +AUX calculate-update-3.2.0_alpha5-r2.patch 2649 SHA256 537d81d1352453f0f11fca1fa3558b11c4bca96167e97ace04bfab1689133bdb SHA512 fde7a804943ff48765746b6d5fd1960850c717ce2289c43568af84cfe3d9934d4a7c0f1d92c469b99bcfff478297dbd2716353e93fd1d1e25939d1ca6a9e6723 WHIRLPOOL 17cccb453c8e3ff3d42548c02b5ddf849a9bfd456db7e68773bb10235dccb235a0e74125b7b95946146d5fe103010cb7b10180328bf582c314965e0ca40e9bc6 DIST calculate-update-3.2.0_alpha1.tar.bz2 14159 SHA256 6c5e73041029e93f04fe897447984c1f52f66f3486309d4e3bb741c0151dc44d SHA512 aac77b42e51f3be5f266bc3a7c233d2fa443b6316a7a618c61ef07be8e25704322bec6c39352184ee8fae227e4b2bbf276dfa038d4006be12079c71e983d16d4 WHIRLPOOL 8f395718c3332286ce47783fc42601f3dea9b9f7fd7225e5549ff8d04013a4d6a2208f103fde112b6ebf6791650a61aa5974dbfa435aecfd7d8e7b2d7ff9ae8b DIST calculate-update-3.2.0_alpha2.tar.bz2 24294 SHA256 b626f371db8def2823f5f2a5081122a0746a9dae5f04bb1e38bc82c618d69042 SHA512 32e216097ad19444b16200082a8796a6a7a2d824310e271df51e931e73eef1b13a57cbe9b6eaeddd6bf4e8b0e3a3d3f4a41def509ed1c55a960a3df524afd472 WHIRLPOOL 7b241545ce18af117481a813b2b0b2d9450f0b638068867fc60d2a759f4345d50114459646f51f6972267586678149efc5f4c26f1090d8f1fa4485b3bc4b4d5f DIST calculate-update-3.2.0_alpha3.tar.bz2 24313 SHA256 934f4b55f9df42090a128c524e2874b27f2e91b7f5b9c0eb2170ad8ee899362e SHA512 31c593b8d70592aa5f05011583317054c7bb75f558ae792cc3289820eaa87d85f4be91e29485c2aa824d1f2d7cbde942ed7f66fd9937d8950e59d83d41f6f7a2 WHIRLPOOL b995a3806cf7c964a26d979ad6c1416ec4b7315e79546c079c72c0ee12eb7dcc589198149186aba65ab860736389bfd9f0c3b534d88c97769d0ece5d8f013c1a @@ -23,5 +24,6 @@ EBUILD calculate-update-3.2.0_alpha4-r3.ebuild 767 SHA256 f5dc6601800363d095a93e EBUILD calculate-update-3.2.0_alpha4-r4.ebuild 767 SHA256 8e9a3d77977a81cc529baa562a436d630da8709d9c00488e9cb750e83279f826 SHA512 b78245627614453aa9631ac12f548c1f4b531b81d8e770b8aa297c7af167e06944b10451bd976fe57ec22cd94cdcf114ddba419a5cdac5b2a1cced726d520a82 WHIRLPOOL 0a0d3cfb6e1c7098a393891d623d114cc1badee121e4bc414a23e701b9b9af784fe45997207335fe83833c8fbb248e2a3a1af91c932d41672375b84d1b7767cd EBUILD calculate-update-3.2.0_alpha4.ebuild 623 SHA256 51f176a0b12ff53b612634c391e3504059bb8f5bfba20325e86efda1cd0f2787 SHA512 f693242808a683f9bfb895dd4a5330b9bb50a27d51ab51a272619724a03ad5a531cc23434abbaae6773f974dc5d699f1aee7d9062d2b19076335ccbe4bd7febd WHIRLPOOL 39ce52a3ae9fe1f7bca4b00a96929a58cb50cdd9c0a22f801bd9b8fdafbece62f9033c48f9e3a549136d4b838f4ace423710cbd63e2e3b7da9fa72fa81802255 EBUILD calculate-update-3.2.0_alpha5-r1.ebuild 767 SHA256 fe240b29d75a1e24f3d0260d2556687dd1a86b208b717999a7d31b2b834140e4 SHA512 46cf6287a4021421c75b2cd8852499bb6f0a31f3f02fe9a950d6f2e16a660669501a4c46f79bfb96bf1540b3be20f416c6b42a5159db761c8d628e4294da2535 WHIRLPOOL 466fdb29dfad3fffb4e377fa58fc5f5b0bb074571c38fb58f008f1971909b8ce30578ec53b32e4160b6a59256cd8acb3c80cc46eb34a5d8e899a272486fe3858 +EBUILD calculate-update-3.2.0_alpha5-r2.ebuild 767 SHA256 03ddecb52d21af5d8c2a5dd8b96ad87d1fead18a2630bd68f419f8ed3f0af7e7 SHA512 c2d80544c91bdf470b039a0dc81439a4b721977b281c80e411e2883ee73965f68b2bf4d75140e30c975271cd37d310d6df4bc2f585ff3632f687ccd4c6746d4a WHIRLPOOL fd87d40c1b44aa1ecef848f1c34a40bf8ba6603c3ce51716c1446000ed3f96a15421ddeb312943c6d21dbaeef39d5bc6983ebb58218d2de62e58a9a24c5c2e1b EBUILD calculate-update-3.2.0_alpha5.ebuild 623 SHA256 b5b09dcf5177124e9e521154ab3e7e63e0052fc58dfeec1cacb6462f96112a3b SHA512 57c022bf4951fc6d341eb8df33d527a7f5d16f629b3ca1cd71710947eac3499fc0604f34ec666193a8222d6347914fdd38363364827d01db6c8e16af6b0c2a01 WHIRLPOOL 470fad0fdc631d4bcb52e370e3351adde95df42a56f23875945cf72c9e23fee0b8adad26ad592d5b9d17f6eed056bbfcafa3086f549aea6ef5f3e8e5fd7f027b EBUILD calculate-update-3.2.9999.ebuild 530 SHA256 9558d49a6b95f73c67f79c835e4003725ba7ae7e0492ea336737da16fe2f5005 SHA512 466bce621f4073bfbf4d34063cbb54077910baa5e40637d5d8d23044edccc9d79bb764db25e05b68969f1bd63573a1c0bc04676f45a6bbeca173503df6887767 WHIRLPOOL 0107e9b7746739a9be77664aa9e6907c9e511ac0422721d709fe63ffb4a55246a2d6c494280bd3b72e50d8e1aecb7f811cfdd112c482168bd9fa17c4ff0d5eaf diff --git a/sys-apps/calculate-update/calculate-update-3.2.0_alpha5-r2.ebuild b/sys-apps/calculate-update/calculate-update-3.2.0_alpha5-r2.ebuild new file mode 100644 index 0000000..a855b4b --- /dev/null +++ b/sys-apps/calculate-update/calculate-update-3.2.0_alpha5-r2.ebuild @@ -0,0 +1,33 @@ +# 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 update Calculate Linux" +HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" +LICENSE="Apache-2.0" +SLOT="3" +KEYWORDS="amd64 x86" +IUSE="" + +DEPEND="~sys-apps/calculate-core-3.2.0_alpha5 + ~sys-apps/calculate-install-3.2.0_alpha5 + dev-python/pexpect" + +RDEPEND="${DEPEND}" + +src_unpack() { + unpack "${A}" + cd "${S}" + + # apply revision changes + epatch "${FILESDIR}/calculate-update-3.2.0_alpha5-r2.patch" +} diff --git a/sys-apps/calculate-update/files/calculate-update-3.2.0_alpha5-r2.patch b/sys-apps/calculate-update/files/calculate-update-3.2.0_alpha5-r2.patch new file mode 100644 index 0000000..6b768a8 --- /dev/null +++ b/sys-apps/calculate-update/files/calculate-update-3.2.0_alpha5-r2.patch @@ -0,0 +1,66 @@ +diff --git update/emerge_parser.py update/emerge_parser.py +index 597ba55..204e758 100644 +--- update/emerge_parser.py ++++ update/emerge_parser.py +@@ -57,7 +57,8 @@ class CommandExecutor(object): + + def __init__(self, cmd, params, env=None, cwd=None, logfile=None): + self.cwd = cwd +- self.env = env ++ self.env = env or dict(os.environ) ++ self.env.update({'EINFO_QUIET':'NO'}) + self.cmd = cmd + self.params = params + self.child = None +diff --git update/update.py update/update.py +index ce66dd7..f9b1628 100644 +--- update/update.py ++++ update/update.py +@@ -16,6 +16,7 @@ + + import sys + from os import path ++import os + + from calculate.lib.utils.tools import AddonError + from calculate.lib.utils.colortext.palette import TextState +@@ -124,15 +125,21 @@ class Update: + if e.addon: + self.printWARNING(str(e.addon)) + self.printWARNING(str(e)) +- self.printWARNING(_("Re-fetch {name} repository" +- ).format(name=repname)) ++ self.printWARNING( ++ _("Re-fetch {name} repository").format(name=repname)) + try: ++ rpath_new = "%s_new" % rpath ++ self._syncRepository(repname, url, rpath_new, revision, ++ branch) + removeDir(rpath) +- except OSError as e: ++ os.rename(rpath_new, rpath) ++ except OSError: + raise UpdateError(_("Permission denied to change " + "{repname} repository").format( + repname=repname)) +- self._syncRepository(repname, url, rpath, revision, branch) ++ else: ++ if not self._syncRepository(repname, url, rpath, revision, branch): ++ return "skip" + return True + + def syncLaymanRepository(self, repname): +diff --git update/utils/cl_update.py update/utils/cl_update.py +index 033a3bd..82d9247 100644 +--- update/utils/cl_update.py ++++ update/utils/cl_update.py +@@ -133,8 +133,7 @@ class ClUpdateAction(Action): + 'group': __("Updating Calculate Utilities"), + 'tasks': [ + {'name': 'update:update_calculate_pkgs', +- 'message': __("Updating {0}").format( +- pkg_color("sys-apps/calculate-utilities")), ++ 'message': __("Calculating dependencies"), + 'method': 'Update.emerge("-u","sys-apps/calculate-utilities")', + 'condition': need_upgrade('sys-apps/calculate-utilities$') + }, diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest index 59ce004..39d6269 100644 --- a/sys-apps/calculate-utilities/Manifest +++ b/sys-apps/calculate-utilities/Manifest @@ -15,5 +15,6 @@ EBUILD calculate-utilities-3.2.0_alpha4.ebuild 812 SHA256 c3528f2fcb9980d90b8948 EBUILD calculate-utilities-3.2.0_alpha5-r1.ebuild 818 SHA256 b883f1bb51b945221b8da752f958f89ed946cd7ed6188cc4c6105ade5659aee6 SHA512 2d0241ee5047ec1b1c3fd5ed6dea1fef4fbe82c45a339e7b9e5ec3b32a50abe81fd3c8cb3e821b0174887deffca04b2ca2122fbc19d67684acfacacdc6ea4be7 WHIRLPOOL c29b1ed8054b00c3583562a5c03ce624f5181093debfabe6dc750bb48a75186fd2bc1bd14575c5d58313c6640cb871e640ac0ed2c9e9874c75c2ba24e3dd8433 EBUILD calculate-utilities-3.2.0_alpha5-r2.ebuild 821 SHA256 181d9ecd6cc94acd0287d4d912df779c8ca89a4b7b85c8fc3db27237bc5c5e54 SHA512 9da3679e299542655f3cdc4df8f2ad3ac6c58cc5a26d96a858e5d977faf1f1a533bacc9b1b5f361cd6a4f15e811e5efb831522c3738b76743c98ce88671b1778 WHIRLPOOL f5f4b74b6eb8d558ea1a02310776c5a7e4568b043e437e992a6f429546167ca98a4d7e5a06dd42d322b7500fe2086601dbceef6fe48af5ea637d2aa3f1af473f EBUILD calculate-utilities-3.2.0_alpha5-r3.ebuild 821 SHA256 c0965deeb8bfeed1af83ab921fbd9358c18fa17ff641db34d37cb24d3978849e SHA512 f2e81ddc3c0d4fe55c4a441aff135633bb91b02cd2c7da4ec40c87bb733afc2a7b98b833ddc72413440dc9938494ad0baf86ca22bb706861b00e32f6a8d3f99e WHIRLPOOL e46b717982cd526c85fc4c9ae9f16fa23fb819a07cbf75b988801b83d6522064def9ef2682b7d9d2dadc8b0da603dc246b680aecad1f197963b303145f11452d +EBUILD calculate-utilities-3.2.0_alpha5-r4.ebuild 824 SHA256 f1eab1bb8ad2f7b267e743cba39e4e183814ef0f96c7b72136aa9bd9e3961247 SHA512 48c8a7777ca47cde51f8a9accef7b1b35aa971be612582889f80c712dc079c1a0bdd0c63749b35457cb722de1e6cc47f8595c87a595cce4b26ddc5e01aaf241f WHIRLPOOL cfac6cee9308f941feea1f2f65d2d4665fcf2e7c80749d352a9507d79e5631551803c02dec6be8e43cca117d6bbddeb681743fdce2f8891c67e00f2b7dd42a34 EBUILD calculate-utilities-3.2.0_alpha5.ebuild 812 SHA256 63daca77ef430fde9004129bc823f23db03d55d1da05f06a6956d5492658cefa SHA512 0dd86877552a553982a5693f5bc47606b66f15974693cb6525dd8d61a4d6e4f8d27cb7dfda19b567329deec1515095f79c7ef55dfa0d4eef87d90c9d5b9b1db3 WHIRLPOOL 2cf662e15e5a0be84ccf5f3a32ccd87e56bd07bdff938bb188c0097a7fd1a88252799e5974019c0175bb1d04b374d5b78e444d69371dc8b5655e85e858bb5690 EBUILD calculate-utilities-3.2.9999.ebuild 800 SHA256 acbb7a4e34387baa1ade9bf97637972fbfc97afa56367381d622198b5237e983 SHA512 9e0c74eb499157b6d3ace20d7e9da630660e46b74a6d575e222e1638c87f85660635187489b9312a45f193780c301d87c1dbb9a0f60414e178e8f54080c71ffd WHIRLPOOL 9b56f590f36d29d3518c66c453f97b14d083e36b62adb70a8916ae4e30b527431602a9edd40d703e5cb4296a01f8c982157b602651ee57a9c0ddb7a4c6aa2fe1 diff --git a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha5-r4.ebuild b/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha5-r4.ebuild new file mode 100644 index 0000000..ed86e50 --- /dev/null +++ b/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha5-r4.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_alpha5 + =sys-apps/calculate-i18n-3.2.0_alpha5 + =sys-apps/calculate-lib-3.2.0_alpha5 + =sys-apps/calculate-core-3.2.0_alpha5-r1 + =sys-apps/calculate-update-3.2.0_alpha5-r2 + cl_client? ( =sys-apps/calculate-client-3.2.0_alpha5-r2 ) + cl_desktop? ( =sys-apps/calculate-desktop-3.2.0_alpha5 ) + cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.0_alpha5-r1 ) + cl_console? ( =sys-apps/calculate-console-3.2.0_alpha5 ) +"