From e738f6fb1cadcb4a64d6b676b08068ea5c83f4e6 Mon Sep 17 00:00:00 2001 From: Mike Khiretskiy Date: Mon, 8 Sep 2014 11:48:29 +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=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA?= =?UTF-8?q?=D0=B0=20calculate-core?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sys-apps/calculate-core/Manifest | 2 + .../calculate-core-3.2.0-r1.ebuild | 52 +++++++++++++++++++ .../files/calculate-core-3.2.0-r1.patch | 13 +++++ sys-apps/calculate-i18n/Manifest | 2 + .../calculate-i18n-3.2.0-r2.ebuild | 32 ++++++++++++ .../files/calculate-i18n-3.2.0-r2.patch | 32 ++++++++++++ sys-apps/calculate-utilities/Manifest | 1 + .../calculate-utilities-3.2.0-r3.ebuild | 26 ++++++++++ 8 files changed, 160 insertions(+) create mode 100644 sys-apps/calculate-core/calculate-core-3.2.0-r1.ebuild create mode 100644 sys-apps/calculate-core/files/calculate-core-3.2.0-r1.patch create mode 100644 sys-apps/calculate-i18n/calculate-i18n-3.2.0-r2.ebuild create mode 100644 sys-apps/calculate-i18n/files/calculate-i18n-3.2.0-r2.patch create mode 100644 sys-apps/calculate-utilities/calculate-utilities-3.2.0-r3.ebuild diff --git a/sys-apps/calculate-core/Manifest b/sys-apps/calculate-core/Manifest index 876f77aa4..4a79d5da0 100644 --- a/sys-apps/calculate-core/Manifest +++ b/sys-apps/calculate-core/Manifest @@ -1,4 +1,6 @@ +AUX calculate-core-3.2.0-r1.patch 500 SHA256 fc14cd933ec304faa4d727d0724dcd04225142982d83900e76dfe10230ba427a SHA512 731a49000c4a8b96ea0d7f5f207ccfc1f279fb82a6d22d241e4214c7ca1fc65d1cd08e5bdb75f350ec176c8aabed7869b8881622e5bf90cbeac31acb1deefd87 WHIRLPOOL 9fd3800f8b6ca06348784dee88302c45b623f9f8a73d3fb0046445a770fc85e23b36f14100d38c82f1640fd80dd91f82ad418866dc938eb2576b481ea756b6a1 DIST calculate-core-3.2.0.tar.bz2 88676 SHA256 fe8cc96b58851bb272c4c6c8107c73227f5825e0b86791b94e4ea2fd3a6e4ba3 SHA512 16c0c2241555221e7f8e3438035155eda193af17fc7d21329a174b4c9d4628e96db86124449be22aa3925ee7543e07937db99b45fa93933e2cc8cd7e50b91aec WHIRLPOOL 604397a7d7efdbf7d291b01445ed2f57883ac92a17ab99958131cec961e92215f85d8a6faaf5567f56eb6b92c657877efcb486423f6235ef32281bc3a41edce1 +EBUILD calculate-core-3.2.0-r1.ebuild 1333 SHA256 9b7707f8f4fe0e7fc763e26ab1f82e0a9e49a594f9f71ea9795e16d3b5e26cbd SHA512 18224f8091c3735a041afd9c4a56eeb0d81ba2ff7bd8f103011938390b536ac13221b9e7ec6664a31de236b9413b6126aef98d413cf6f2da1cf1e059929dc68e WHIRLPOOL 04bda096b5fa24b9607a86e6667958cbd1575793f966e514997b8041c8f2027dfefc38869bf735020ba34e49822b63bb9f0a52c40c054d509dc15d51b17041af EBUILD calculate-core-3.2.0.ebuild 1198 SHA256 272537f6c53b7c2baca5b1e797978d52c18bf46d1ff630d763d9a0f83d95af81 SHA512 e9c447dc61ec99b3e0d68f94b395498cce86ad9fa6594e85a65d52b7acf60cc90ac0c1f5b8e1b54e6c367321d6f4809b0f1fef254d59a3517e5670f6ed9df1e5 WHIRLPOOL 3830c14cede148cdc16c02aa9a9cf1dc5d88f55e4053923cfc39bf52aee1015b813b6a36c99ec436805df7d2d908b6b765544c0d7e42accaf51618519f0b4cf9 EBUILD calculate-core-3.2.9999.ebuild 667 SHA256 f3a018c25ef0e308bfd9fae1baa1f48b9bfd9881e2b902a2bdf303ed51c94860 SHA512 bc463857f5f83a91178c4d30e1bea32f15fc4204930b1589ed40d7987a2c706fe7fbe3e4591702fd30b25bce49e56c02c9a0d6a61cf83215ed278f47511ef293 WHIRLPOOL 187c583696d5030a261e3cfdcdb38d66055c68ccf1ac8e8ae3ce418b34784f91922cedefeaa9f367f649ffcd0dd1f330a80d98afd734081a505ee472134335fd MISC ChangeLog 382 SHA256 ce74a6d08ec1ea80ee021f5378f705102435abfcd5304d851c3f7932a967065e SHA512 f5531edead30072e8fb8f278cad1d265762b8ecdf146b86cf514704f373f2bd8068b3ed35e68186687f83129814b73c6269024d442fb592515c72a9d0e6d3ca1 WHIRLPOOL 48571b2986c2f8797109a3a3440a43f4f87b601e8e52bd41a470bd077b37eb2b6118e6baf86179df065aa2e4a840d9501b2b2455b990a19dfaa2d4ee7784c922 diff --git a/sys-apps/calculate-core/calculate-core-3.2.0-r1.ebuild b/sys-apps/calculate-core/calculate-core-3.2.0-r1.ebuild new file mode 100644 index 000000000..ae838f88c --- /dev/null +++ b/sys-apps/calculate-core/calculate-core-3.2.0-r1.ebuild @@ -0,0 +1,52 @@ +# 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 + http://mirror.yandex.ru/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 + >=dev-python/soaplib-1.0 + !minimal? ( dev-python/sudsds + net-libs/dslib + dev-python/pyopenssl + dev-libs/openssl + =dev-python/m2crypto-0.21.1-r1 + 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-r1.patch" +} diff --git a/sys-apps/calculate-core/files/calculate-core-3.2.0-r1.patch b/sys-apps/calculate-core/files/calculate-core-3.2.0-r1.patch new file mode 100644 index 000000000..3c34e57e9 --- /dev/null +++ b/sys-apps/calculate-core/files/calculate-core-3.2.0-r1.patch @@ -0,0 +1,13 @@ +diff --git core/server/gen_pid.py core/server/gen_pid.py +index e0915da..865d991 100644 +--- core/server/gen_pid.py ++++ core/server/gen_pid.py +@@ -65,7 +65,7 @@ def clear_finished_pids(clVars): + d = pickle.load(open(pidfile)) + if path.exists(path.join("/proc", str(d['os_pid']))): + continue +- except (ValueError, KeyError, EOFError, OSError): ++ except BaseException: + pass + with ignore(OSError): + os.unlink(pidfile) diff --git a/sys-apps/calculate-i18n/Manifest b/sys-apps/calculate-i18n/Manifest index 576e9c5e7..f62923499 100644 --- a/sys-apps/calculate-i18n/Manifest +++ b/sys-apps/calculate-i18n/Manifest @@ -1,9 +1,11 @@ AUX calculate-i18n-3.2.0-r1.patch 379 SHA256 4bd21766a6cb05c5e99e4d3b69acf5990b025ac91d50361f92c70aaa7172d453 SHA512 66fae6b57aa1e5e3cabe99b7c480600174317eb0aa746ab0baa6149ab7b700a93ca5b62f41bbee1004661483be9efc5e7bca6238ad20a20590179e51af1d0031 WHIRLPOOL 03652e78789d21b03848cf49f6ca2fd1410ba2475514db08aee7b46ee1bd6da553a30949b2d7845d608e78564c0fd1632d5fd08cd2374dd81d8adc9470d3bffc +AUX calculate-i18n-3.2.0-r2.patch 1292 SHA256 bcef98bfffce2f9488f1dd3c5597a078d866d41b4e04024428bd2b7ad4cc17ae SHA512 c0fe9f239b30f34c6a8d29d6db7f566cb56a6e209f50b88f1b96d0cf45378bb6ff3a8fa2106b7a91f9b3ed510b7f3ab49b71bba4c1bf323fed889161218f60bf WHIRLPOOL 1d6c00616f10787335a3c29f2076030ef686321bd82be2ec50598a38af7a1bf062433bdd34b9c965aaed897b847f52d31df53beea80824fcc7d429904580b29d DIST calculate-i18n-2.2.32.tar.bz2 34059 SHA256 cd21ff9dd1f429327a8651691e44dc1a1b37f48705962ff4c61e53605ebe4b14 SHA512 377ae5a67b6b4a86b947a5b7465a3704ccecca9bbdacf3d8e0040190689d0e312d48d2e7824883ab9e787e1bcad0b3c61ba553ac33ccee1fe5e27c7b0e419844 WHIRLPOOL 215727ec25d0f79ad5a35994562ee8ca621242fcfeeec2c905411203883593cb3eb60a2671747c3addc736524673000ea399cd0be73e4cf818f6af53788e5b2a DIST calculate-i18n-3.2.0.tar.bz2 130580 SHA256 f2243ce8eff9afe7813bd02026c5c88604db572e6786554f4cca27afaf4c21b3 SHA512 a0f18c0766a58920cf023dbc833508c4a2ac3ce8bdae059e68807ac424002aeec670a4e077649de7d27ee419043e637f3bf545eba752d0c95925d9e9d0d58c84 WHIRLPOOL caf472008539152423ac6979c8cda24213b09cc0e2663b86a0ab83b1a15ff30ac86551c627c17eb00360dbed1324a63b7e7220e103bf383a0730a516ba5cd90e EBUILD calculate-i18n-2.2.32.ebuild 832 SHA256 09ea7ff84e6c8d265f85ccaa6916ade59d7709de1270b31cfd2c722505e71375 SHA512 b742cf1ae95b29bf6eb8de5d44bfac3cac490d1ec082cbda8579d038a2a01db262a51e63b132dbba0a36b0e57e06d5bba2ae552ae8273cfddd28a6441847c2c7 WHIRLPOOL 064cbae668f2d8f9a7d02eea6f69be12aafa2620d07429a86529e419b5fb2e7bc330aeef93bb00c7d931820c36ef33ce56413bda86c3b35aa43c38ff973e147f EBUILD calculate-i18n-2.2.9999.ebuild 770 SHA256 2c38668205a788dd9d1ed413eba96a4f628a14e6f6c7a1ba8718bbcb0842a1ca SHA512 4ddb81ebd5b5c488d7eaad86172394d502e965f5348594054ba104bf706b830987e8f57b60893898e5167184eba1b0b108a683c954c8f80498665fe069504810 WHIRLPOOL 8c0063a90e103e6bf34d4be221aeb086703688830fe3179dbd177750cb179432ec2055886330f99ba8eada65abe97fc805da90ed9f257f8c87d7384611fa677d EBUILD calculate-i18n-3.2.0-r1.ebuild 782 SHA256 b1c0544805946632141f3ee7c3683d5248e5f2cff4080dcc3e7bd57a08544c85 SHA512 64fe77c32297ae8973028438152c4cc49a664c69a91962c538ea4b7bfc44a57cbcbe89498792e675b1e2721c200f18cb525bdd108d961266c5a15ed1afda09e2 WHIRLPOOL 94c3025b19e36a1ea08bef9b58ac3f3d826dea1b15f702cebfc52b3600735d71c0fb07544b36e65752cfa0d58c0868482b5ff921a43c109b5176c67821d478e5 +EBUILD calculate-i18n-3.2.0-r2.ebuild 782 SHA256 197a6d86cd3372c9960062e042610c700abb21e22b1e69dff03d5c260bdffded SHA512 ddb16492bbee9d06b75b217ba3087db609912bab7ed00379957ccf91fa9f004a4a4951efac406b3acc3766e9092ac98821aa8e767f0d4e5fb171049e8c4e1144 WHIRLPOOL a6ba992464f24bfed0eb4ef49bf978e8bd1f95c62bf8a72cba2bbfc91efa495c54b4d792094108e44b0307f9d6d75fc471314f635e94b239ab20fe48ec7cec70 EBUILD calculate-i18n-3.2.9999.ebuild 583 SHA256 aa60c513b0f672aa9618bfd8099fefaf49fa5ef9b24ee2645356da69563032fa SHA512 14b87ddb0f910e1b983ef465efdc56347abe01d4cdc11d6d81d593a2e65dcba1b79357d37952d7aa7f800fad8d30592db2e337d0fc6ca9807bdba618aff48528 WHIRLPOOL 14a1c4f1ef646aee28934e820763bd149e37860cce1ee34ac2229742980ec178fc43ba284b59a2f71a740cfa8e48ff7658a613b03eb0f84d4a10cefdd65450da MISC ChangeLog 6384 SHA256 effc6918170f5331b649c7c25ccbbc971a71320be1be056da843adff998c5054 SHA512 5cca782e736ad7b526e434e7f4e1a3ed32bebf98704fda17751f3a8aa8b94896a2864f12edd4aa3fafdbc567db8282efa6355b2313cc119b275b87a756991d31 WHIRLPOOL e24811fac9e15f95144c27b27ae2509effcb3359aa24a9338ec88faffbe0588049367ac3fb8e2c9d823a1e259b1cac3c8503124aa161a9be598a209adffab56e MISC metadata.xml 276 SHA256 a2312171d1cbfac41a263c0be692d3d12cfa3aab51979af64487824ae674bc2c SHA512 245463edebeceaa340b3e908e9d9a867be6468f00a1f1371b0c81c34e8f0adab2fa0985a2d47bcea7ae222bc481a4da934b8c1386ea664caed110058fb5cbf03 WHIRLPOOL 6b92e6af676bdd0f173df32a5751a16b88c39e8d10f16b7c8867d18a3c4cb4a44938231c315d9e76c8995cb68a8680e858bd984e6649a4470e03d594a0e23ba2 diff --git a/sys-apps/calculate-i18n/calculate-i18n-3.2.0-r2.ebuild b/sys-apps/calculate-i18n/calculate-i18n-3.2.0-r2.ebuild new file mode 100644 index 000000000..10bafffff --- /dev/null +++ b/sys-apps/calculate-i18n/calculate-i18n-3.2.0-r2.ebuild @@ -0,0 +1,32 @@ +# 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 + http://mirror.yandex.ru/calculate/calculate3/${PN}/${P}.tar.bz2" + +DESCRIPTION="The utilities for assembling tasks of Calculate Linux" +HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" +LICENSE="Apache-2.0" +SLOT="3" +KEYWORDS="amd64 x86" + +RDEPEND=">=sys-apps/calculate-lib-3.2.0" + +DEPEND="sys-devel/gettext + ${RDEPEND}" + +src_unpack() { + unpack "${A}" + cd "${S}" + + # apply revision changes + epatch "${FILESDIR}/calculate-i18n-3.2.0-r2.patch" +} diff --git a/sys-apps/calculate-i18n/files/calculate-i18n-3.2.0-r2.patch b/sys-apps/calculate-i18n/files/calculate-i18n-3.2.0-r2.patch new file mode 100644 index 000000000..b227cbd80 --- /dev/null +++ b/sys-apps/calculate-i18n/files/calculate-i18n-3.2.0-r2.patch @@ -0,0 +1,32 @@ +diff --git ru/cl_update3.po ru/cl_update3.po +index 27eefc2..7e2ca0d 100644 +--- ru/cl_update3.po ++++ ru/cl_update3.po +@@ -177,6 +177,9 @@ msgstr "Обновление системы" + msgid "Update the Profile" + msgstr "Обновить профиль" + ++msgid "Change the Profile" ++msgstr "Сменить профиль" ++ + msgid "Repository" + msgstr "Репозиторий" + +@@ -262,7 +265,7 @@ msgid "Updating Python" + msgstr "Обновление Python" + + msgid "Find & rebuild packages broken due to a Python upgrade" +-msgstr "Поиск и пересборка пакетов, испорченных при обновлении Python" ++msgstr "Поиск и пересборка пакетов, повреждённых при обновлении Python" + + msgid "Updating Perl" + msgstr "Обновить Perl" +@@ -270,7 +273,7 @@ msgstr "Обновить Perl" + msgid "" + "Find & rebuild packages and Perl header files broken due to a perl upgrade" + msgstr "" +-"Поиск и пересборка пакетов и Perl header файлов, испорченных при обновлении " ++"Поиск и пересборка пакетов и Perl header файлов, повреждённых при обновлении " + "Perl" + + msgid "Updating Calculate Utilities" diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest index 399f1c8ef..36d88bb9a 100644 --- a/sys-apps/calculate-utilities/Manifest +++ b/sys-apps/calculate-utilities/Manifest @@ -1,5 +1,6 @@ EBUILD calculate-utilities-2.2.32-r6.ebuild 675 SHA256 ad5c020a54fc0107ff95cdc23aea81f94b89759522e172673e12b58622dbbae9 SHA512 990c05be06538a7e4ed475b748f865e64e0d2b705db00494f22bce7d84595a95d2d78ab5981b0e40b8f7ea0efa8ce285ed0e0125ad92b6c0a0033f85f1f39c60 WHIRLPOOL a979abab285a8b264476680ad75188cc5d272ebd47c0712b39f9cd153cb317421fb87cbbea96671eb6ec31da4e140e2443be9a5b67b27d11d95f2a7168557cc9 EBUILD calculate-utilities-2.2.9999.ebuild 831 SHA256 630a2373531bdbda2cac289c82332b3688d57d00b403795b93f68cce36824265 SHA512 cf7553e27cd0772548f746d97ab90093c2aa945e34273aa29df222727684451b6ceadda577e2ac0af943a61f84871286d1505ee3682020437a449542f2750255 WHIRLPOOL c48a8b8d9b64ebd3e32105cfad5b86db16373e3ab90e2fc50c7d2cf8908840ea91ba7a32c537a6406feb1f37d03a21619e0b1e33f1ef11a1047c21a6393d0284 EBUILD calculate-utilities-3.2.0-r2.ebuild 758 SHA256 ad7de322882e45b1398f47195f1516432f087862f7d43fc8f737fdccdb8b1e3f SHA512 1d17d53754f3ee3474332bbb82e8df9a156d0ab146a37a5f138d8be3246f40f14d77ede5c98b9993b76234bd12135992da29b8de574cb38ec6067da9d392cbd6 WHIRLPOOL 24ac09b4935c05dda5142e938b233f8786969aeb62acda9e0b007c5e7900115a2c2d5f0019fe0aea3175fe287bc93713f30ae0153a604abc11acf80d889a5cac +EBUILD calculate-utilities-3.2.0-r3.ebuild 761 SHA256 585bc0cbde7f83d857042b123575da16afa3ff0df91d3a89cbfa6d8d47b06648 SHA512 8db074e4cfcaa21440fa3090dc5c3a21ae40f819fe38613dc9f369bd71bccb288da2e980302a60426846a8575814460156d317ed46ec93e2453a73df46df01bc WHIRLPOOL 5d66ece1e64af3cb4fc2ed5eab8aac80145b5823ec8670399f069bfaecd5e8f2132d65d880e8aba5a37f7db036404a6d0ca27be2ccdb8c183a59d5532a98f0ee EBUILD calculate-utilities-3.2.9999.ebuild 800 SHA256 acbb7a4e34387baa1ade9bf97637972fbfc97afa56367381d622198b5237e983 SHA512 9e0c74eb499157b6d3ace20d7e9da630660e46b74a6d575e222e1638c87f85660635187489b9312a45f193780c301d87c1dbb9a0f60414e178e8f54080c71ffd WHIRLPOOL 9b56f590f36d29d3518c66c453f97b14d083e36b62adb70a8916ae4e30b527431602a9edd40d703e5cb4296a01f8c982157b602651ee57a9c0ddb7a4c6aa2fe1 MISC ChangeLog 38731 SHA256 7e70a0bc1f3b34c0011f3874773a698a4bb96eb6d3dad10903575156bb8578bc SHA512 2de466ea990b9eac702b81fd097c3f5d06d1f4db1a4bd1d1b7380b45e551f6fd62c16564ecfc810246157d3ef1113ae373041580e70981d44752e50ed6134bc0 WHIRLPOOL 5ca0cee1ad0e9419f91ec11a9629b9a29db9fcbed4f5ae0aef1f8a2170ff58112c8580d61884c56ee410a0abc201fa8f4419cea35077fc8bb84e733f6fa6f4db diff --git a/sys-apps/calculate-utilities/calculate-utilities-3.2.0-r3.ebuild b/sys-apps/calculate-utilities/calculate-utilities-3.2.0-r3.ebuild new file mode 100644 index 000000000..398158597 --- /dev/null +++ b/sys-apps/calculate-utilities/calculate-utilities-3.2.0-r3.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 + =sys-apps/calculate-i18n-3.2.0-r2 + =sys-apps/calculate-lib-3.2.0-r1 + =sys-apps/calculate-core-3.2.0-r1 + =sys-apps/calculate-update-3.2.0-r1 + cl_client? ( =sys-apps/calculate-client-3.2.0 ) + cl_desktop? ( =sys-apps/calculate-desktop-3.2.0 ) + cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.0 ) + cl_console? ( =sys-apps/calculate-console-3.2.0 ) +"