diff --git a/sys-apps/calculate-client/Manifest b/sys-apps/calculate-client/Manifest index b900d34..02e5806 100644 --- a/sys-apps/calculate-client/Manifest +++ b/sys-apps/calculate-client/Manifest @@ -1,20 +1,6 @@ -AUX calculate-client-3.2.0_alpha5-r1.patch 923 SHA256 d03f7f8f871fd399e357ccdf65e8dc8576b3665c9b41e022f808728f879fffc5 SHA512 a9fdb709f2d85bad67ecb703b808580e0644fca403ddf0cec22ba0bfd9d66eebead423288f2ac3b3ceeb5542e6f6c37aea70ae8487e02aae704abab37863a4b4 WHIRLPOOL 550b4d0e7a9bc15e34a4da67533fd92c26fdde2302636a8808cf5d0018ede5106837780dc4238841093285d4da951849f4f0d241036ffc4905fdb0fe5a945f53 -AUX calculate-client-3.2.0_alpha5-r2.patch 1606 SHA256 3958bba1ed3b73befebb7d1317fe1488a4568ad49ffcbdb0ebd4879052967c8d SHA512 890fd6d886eb1672b38ed0e6d5c10a8f273b7849a44736717c0f5cce9b7898a43757687ff5c64384ef36e8765ad44fa58bc060d9cbe544a309ef6171a54e1b08 WHIRLPOOL 6061dc34ad46be179064ea9d01e2c7d27442b3d4a75007057bb483a757ffa178ea3f79356c29057688742b80ef549e54492450e2214c1537e52ce45063c0c5f3 AUX calculate-client-3.2.0_alpha6-r1.patch 995 SHA256 9dbd39647220dfd93fb759b039b583c724abcfb25910813783635a6707421c31 SHA512 3b2ccd132cf820b016c1d103bbf7e9fc66b2fd82e967da930eb5149f7b0e3e40d752371c077be9fa9e548433716a47ac0791c5eebd4976ab1d926ad9df42a137 WHIRLPOOL 2c24d021aa5fa5c696b65d5c2a747fb564d1697c8343ff8d65328dff64fec6bf176cf9cd32333e7f56a67e68c2bb25349be3f194afc532576857cdd29d1fa77a -DIST calculate-client-3.2.0_alpha1.tar.bz2 30724 SHA256 7a18e17eccaf39f562cfb4d8519cb53771b072dcaf8fd0d3870459ba7d860977 SHA512 2900d0a67b895bd300a2b8b726b698c0997634229516d163ea832fd58cbefbde69675ac309b8d25be728ef9048647c8b157d8daec60b61e62046c261526f0ab9 WHIRLPOOL 41e7758b0a7ab62667ffa4926cb5e70b86d357b0bad3bee0c216aa5821e943cf6b27cf4b5ec212c6edc85fec0c6abd405037856058b3dc9766aa0cc9a6d73fdb -DIST calculate-client-3.2.0_alpha2.tar.bz2 30717 SHA256 f8b77a56913ddbd8d1cd1d5b73b2559b0bb03c7d591d2e90fbff706e5c5e3f4d SHA512 46e0c32f92e6323d8acdf08cfc19c86d7d4a0c2f6f14df465a05ef9a7cef8aec357ee2e0b25dae6db83ba6315488e60cc03b1bb4c946bc135fd7041b30d55072 WHIRLPOOL a4a39cb93ff107a36c1acaee3c80d6a03312be0eda19060528afe2d3c880245778e5b765f1bc99c093ca50d83092fad0c53c55558170d29465fc8cfe446cce6f -DIST calculate-client-3.2.0_alpha3.tar.bz2 30738 SHA256 547abf55a5ccfa907240545731584a5cb9147b8d3d61d7075268fe26708a2750 SHA512 6240f350779617961dd11eed65c4f30036e1517f87f58f171450f3b7b1fd46a54f2042469e07aa4b6482f5a7f1b55ad6efc1f7170810f4c1fe16428775689343 WHIRLPOOL d03ade233f1bd2af892fad8863cf89b73aa32040543be96e61baf2eb7908f03ba575357790366d1819e592799c6025a793d9661c7c54e7457e05b8f84ec4f101 -DIST calculate-client-3.2.0_alpha4.tar.bz2 30734 SHA256 520425ebd76fec5048f65164ce3450c16a082ab9ba5904259593bfbe00ce4dce SHA512 fa3aed01c759490deea9a2b6808e8ea5955214cb857c30b0996f21fa2f16ce3d9951e3d0c56c1d53b544f4a0e933aa6128627e9c79463eacacf08b09033a17bc WHIRLPOOL 39331537f2d1a7f19d262ee4c823989114528c43ac34dc34d419de4c88b7aee21428ae5cc4a0de01e9c9fe1d6ad3d93d167e408c09351b0e22a2bc8f97c13b50 -DIST calculate-client-3.2.0_alpha5.tar.bz2 30734 SHA256 798c382baf2677a55dd78c57e72c021f830823ce0834e9d478f1b64ee723bea0 SHA512 94c3c43ad97d06e14719f2da26f694de9efa9e50f9cdf575e74965fef9ea33c044c2fa9d57e1661dc3bc43e1be91644aba7ab600ef4070a7dbc8611de848f551 WHIRLPOOL 825516fa108de8fd4693afebbb558a1b2d59dd78fc2a7c24ef9c357b220e78643b97282dabe96ff0746f743d3cb2ace8b4428f4ef287893568ba8dd8f76978b6 DIST calculate-client-3.2.0_alpha6.tar.bz2 30759 SHA256 aac019ef714289bb078533875b2306f0c2b5f0c8e7aedb53661915885b5a3f40 SHA512 f4340b67db93a5d19bfdd0ce9143a9dfb7112a6bbfaa4b4f50cbce7e2253771054e1f19d9e8dbb00a4b75553578c31d5987192c8e23bf9c83987cae9ccc3d738 WHIRLPOOL 05d2b92f74b8b19de1612a449192458f6bcdfec13f4ccf10d779e8e6c96a617d64cd4db45d2cb1bfc964dc9a1d279e4af80696884681d065b08d1d4d4c450d3a DIST calculate-client-3.2.0_alpha7.tar.bz2 30805 SHA256 9ef873ec020afddbdfee38ff56cb448ee6b10bd0eccdfb5853e5dd17d885aa3b SHA512 bdc0b50976c035affb7bf1bc4c00e80d381d124397d480d4810b257ed8186ce50e8e51eff77ccad5523fa719e64ee73b59a35a65997dd1850143a4de5db4c69c WHIRLPOOL 89fd15427122c1df21e27ed0512d9abcdf56cedce1bad23f97f185a39c652cdcd7930acc6d61d72cd47c29c733fb684847479f1128c5e15b49c71f458c639bd3 -EBUILD calculate-client-3.2.0_alpha1.ebuild 830 SHA256 2c2266ea62a8d9e20cffd4de712f99a99b45fb39e150492e44015980d0fcaaea SHA512 dff3ab4a9a6637322d6fbc4ed2a6e9bd105795206167b6570b09a97f864dc611d6b6baefd3fef244275511154b60d555a973d996ca75724dcea8afaf8c3360e7 WHIRLPOOL eddc6aac56d42b0de1ccb0deed43de4b4dc4862c9f67c3c07cde426792f60679eb2f4597a71f24ceed5e652507dd8a3554391165ef68adbd1e7da43ee4293859 -EBUILD calculate-client-3.2.0_alpha2.ebuild 828 SHA256 6a01af2ed5e71b5016b90d3f7c43e8356a62b5c52a381f18d0ed989f39b79efe SHA512 2d2500684296286eb716a892dd2d1fffd2aec90de8672db0a5a6a08336ed1c49a1938e59b21c5cdb0ca52ef72f7158d1de5eac7eaa39977811606dfe332452de WHIRLPOOL 402dd5b777651ac333f925a54231022e1fc7e7a883448910c88d064c5689e3b1792848fdbb3131d2d77a655f381d340d5f75bd27c4a0236f0852fcf71cfdf71c -EBUILD calculate-client-3.2.0_alpha3.ebuild 828 SHA256 89f8291eb08d6545d3e55c426cc6dcdb40b7eec0304a9c5b5424899f04d433a3 SHA512 42398e49bf2d8e6f3b4d6de04f35d1badc2585ea764a29648e05dbb490c80e6454f03c6f900a9494d54955adfa7bf3ff1ef916a98aac49be761b10dcf198616e WHIRLPOOL 788be170ff55ad68c03362fe7ac90f19a123aac6beed1bda1835f65ebedc6684daaf6393a8a76becc5a6267cd512f41a9f2f8b509451817e023cc452de23e657 -EBUILD calculate-client-3.2.0_alpha4.ebuild 828 SHA256 65b79560b41367242088b853d0f78c3837f92abee08c6c1540b421d8ba922aaa SHA512 677c7af85cb77ee07de82dc6d46cb0f3128b228393ade4b446f27420be7e4d4d30cbe82ef9d0636790fdc4a8ee9dd6c021a88826337a75e75ade598415d1648d WHIRLPOOL 82e8e96a60cb904def089a5ae8f2d4a26c206d585dd4807a5686602322893a954ed0ea858da01800b811c6030f42a0b61cc3dff16f3c81e1cc471886fe74b513 -EBUILD calculate-client-3.2.0_alpha5-r1.ebuild 972 SHA256 5995870a555358457db392cf18b1457f59bea39d7209d3d42b6fd6cdd5fae3b5 SHA512 944c2158c65321925c3776f58ca0dbca183adfe7b8208e846bf10baff735c9d2b5d912d07a98b389ecc8b090527232dac1bfd2baaf7d1624db33211aad954394 WHIRLPOOL 873388d4b5109bbc2decbf60e260f1a8434356d5de0afd094ea1db4edd79207c385df8dbdeaea22ff2f9a382c90481c8f51435fafd8f3809e533df25f9f850e7 -EBUILD calculate-client-3.2.0_alpha5-r2.ebuild 972 SHA256 4f2940a3e3e0c79d18f5b3fc82b5c97ef719888343515ad3eb7b7560fd5d985f SHA512 b215d6ec70655d60db35aa94efb6ffe99f5fc8d512b08f2096ba7e9af4538ec7b8afd97c2dca7bd8d251ebffee1cbba863073e758960aeff69acc61317857dff WHIRLPOOL c66d3586ad3263dc84d55f4efb3c5a352ce0bd4918dca10c4d98696c2e9806dc36b934d34088a1748559753dd6175b024f11e0229266ddd61ebac7232bf3c423 -EBUILD calculate-client-3.2.0_alpha5.ebuild 828 SHA256 f5043b208fca10e64fc8a6d88b9433d3107ab92da386c0c5e2c69805a26919a6 SHA512 dd200efcd2caead853bdf776b3ac04a248ed08f2ca47f245e683a574ee967fa0f346a40b8b34ce82a10af71d8459ec97235d0e72ee70603a5a55df87487341a0 WHIRLPOOL 472df7c480edc9f9c0fb30effda52b17d95a4a547db9acf30cc107724e009238a07fa6479524bc89e5245969be7780d5773c8d43cf962e9f35dbcc337b44f05f EBUILD calculate-client-3.2.0_alpha6-r1.ebuild 972 SHA256 faf0027efb77d952c02fec5bbb4c291da37dc17a0fc7b1f45c68c86e801bbc65 SHA512 09c9e029d225fbe036980c8ba6e0aa5a023d6ed845e8dba7594844f182a03a53826bd01fa3c25e8e40a0f6ec759e222de7c94adfd5e8637b30f036f9f5108674 WHIRLPOOL f1146e1262d43d6d2d5d49d5101b47a755622e20ea01a412470ae0afc2474bbde6f2106ca902ff2063c65ba74be2f470f58170d4b112367e73edb2dee854c3ce EBUILD calculate-client-3.2.0_alpha6.ebuild 828 SHA256 2f7ed2e2aaad344adf47f37e5b67f6e3d59505528c979bbed19febe0bc4d3e88 SHA512 365d6065ded45945f6d2f6c68bb09e4afb888014a020bba6cc1b0ba843c2c66d2dc37979f5feea8bf8fffa3ac7a4e347c9a2668822c84d2f32aa55afa4ca524f WHIRLPOOL af3711a7bc070ca95b5115539ad50f76a8fa64fe62779657328d6a8ddc97b1dc57f0d81ef3b1d0c90e93078faeff61f4446936d92fb5eba5ec47ea6bae8a4fb9 EBUILD calculate-client-3.2.0_alpha7.ebuild 828 SHA256 c39c845a8fbfe2b332616a4cc5deebb943639503305a14d7f5e55fe874c76ee1 SHA512 c109f55b2bf7a5fe0cfa57aed43e58584ef6fbc4cb9215e328b624e3f9453513a17942200c72a3c35728de6a9b6a388262f5b53b5a29f49132779ceef19697e3 WHIRLPOOL a3f12e67d63755c409196864ecf45af4d31f2defad74e3e30ec4be335a03e55324cd7804cbdb8e5eab1c13a3c92e15e4ac5de56b0d9ef4f6ace62fae97ee995d diff --git a/sys-apps/calculate-client/calculate-client-3.2.0_alpha1.ebuild b/sys-apps/calculate-client/calculate-client-3.2.0_alpha1.ebuild deleted file mode 100644 index 40da681..0000000 --- a/sys-apps/calculate-client/calculate-client-3.2.0_alpha1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# 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 setting and storing the user account in the domain" -HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" -LICENSE="Apache-2.0" -SLOT="3" -KEYWORDS="~amd64 ~x86" - -DEPEND="~sys-apps/calculate-desktop-3.2.0_alpha1 - !=dev-python/python-ldap-2.0[ssl] - >=sys-auth/pam_ldap-180[ssl] - >=sys-auth/nss_ldap-239 - >=sys-apps/keyexec-0.1.2 - dev-qt/qtdbus - sys-apps/keyutils - sys-auth/pam_keystore - sys-auth/pam_client - dev-lang/swig" - -RDEPEND="${DEPEND}" diff --git a/sys-apps/calculate-client/calculate-client-3.2.0_alpha2.ebuild b/sys-apps/calculate-client/calculate-client-3.2.0_alpha2.ebuild deleted file mode 100644 index 04f9da2..0000000 --- a/sys-apps/calculate-client/calculate-client-3.2.0_alpha2.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# 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 setting and storing the user account in the domain" -HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" -LICENSE="Apache-2.0" -SLOT="3" -KEYWORDS="amd64 x86" - -DEPEND="~sys-apps/calculate-desktop-3.2.0_alpha2 - !=dev-python/python-ldap-2.0[ssl] - >=sys-auth/pam_ldap-180[ssl] - >=sys-auth/nss_ldap-239 - >=sys-apps/keyexec-0.1.2 - dev-qt/qtdbus - sys-apps/keyutils - sys-auth/pam_keystore - sys-auth/pam_client - dev-lang/swig" - -RDEPEND="${DEPEND}" diff --git a/sys-apps/calculate-client/calculate-client-3.2.0_alpha3.ebuild b/sys-apps/calculate-client/calculate-client-3.2.0_alpha3.ebuild deleted file mode 100644 index 749a72f..0000000 --- a/sys-apps/calculate-client/calculate-client-3.2.0_alpha3.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# 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 setting and storing the user account in the domain" -HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" -LICENSE="Apache-2.0" -SLOT="3" -KEYWORDS="amd64 x86" - -DEPEND="~sys-apps/calculate-desktop-3.2.0_alpha3 - !=dev-python/python-ldap-2.0[ssl] - >=sys-auth/pam_ldap-180[ssl] - >=sys-auth/nss_ldap-239 - >=sys-apps/keyexec-0.1.2 - dev-qt/qtdbus - sys-apps/keyutils - sys-auth/pam_keystore - sys-auth/pam_client - dev-lang/swig" - -RDEPEND="${DEPEND}" diff --git a/sys-apps/calculate-client/calculate-client-3.2.0_alpha4.ebuild b/sys-apps/calculate-client/calculate-client-3.2.0_alpha4.ebuild deleted file mode 100644 index 712a46a..0000000 --- a/sys-apps/calculate-client/calculate-client-3.2.0_alpha4.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# 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 setting and storing the user account in the domain" -HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" -LICENSE="Apache-2.0" -SLOT="3" -KEYWORDS="amd64 x86" - -DEPEND="~sys-apps/calculate-desktop-3.2.0_alpha4 - !=dev-python/python-ldap-2.0[ssl] - >=sys-auth/pam_ldap-180[ssl] - >=sys-auth/nss_ldap-239 - >=sys-apps/keyexec-0.1.2 - dev-qt/qtdbus - sys-apps/keyutils - sys-auth/pam_keystore - sys-auth/pam_client - dev-lang/swig" - -RDEPEND="${DEPEND}" diff --git a/sys-apps/calculate-client/calculate-client-3.2.0_alpha5-r1.ebuild b/sys-apps/calculate-client/calculate-client-3.2.0_alpha5-r1.ebuild deleted file mode 100644 index 927b039..0000000 --- a/sys-apps/calculate-client/calculate-client-3.2.0_alpha5-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# 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 setting and storing the user account in the domain" -HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" -LICENSE="Apache-2.0" -SLOT="3" -KEYWORDS="amd64 x86" - -DEPEND="~sys-apps/calculate-desktop-3.2.0_alpha5 - !=dev-python/python-ldap-2.0[ssl] - >=sys-auth/pam_ldap-180[ssl] - >=sys-auth/nss_ldap-239 - >=sys-apps/keyexec-0.1.2 - dev-qt/qtdbus - sys-apps/keyutils - sys-auth/pam_keystore - sys-auth/pam_client - dev-lang/swig" - -RDEPEND="${DEPEND}" - -src_unpack() { - unpack "${A}" - cd "${S}" - - # apply revision changes - epatch "${FILESDIR}/calculate-client-3.2.0_alpha5-r1.patch" -} diff --git a/sys-apps/calculate-client/calculate-client-3.2.0_alpha5-r2.ebuild b/sys-apps/calculate-client/calculate-client-3.2.0_alpha5-r2.ebuild deleted file mode 100644 index bb9d59a..0000000 --- a/sys-apps/calculate-client/calculate-client-3.2.0_alpha5-r2.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# 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 setting and storing the user account in the domain" -HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" -LICENSE="Apache-2.0" -SLOT="3" -KEYWORDS="amd64 x86" - -DEPEND="~sys-apps/calculate-desktop-3.2.0_alpha5 - !=dev-python/python-ldap-2.0[ssl] - >=sys-auth/pam_ldap-180[ssl] - >=sys-auth/nss_ldap-239 - >=sys-apps/keyexec-0.1.2 - dev-qt/qtdbus - sys-apps/keyutils - sys-auth/pam_keystore - sys-auth/pam_client - dev-lang/swig" - -RDEPEND="${DEPEND}" - -src_unpack() { - unpack "${A}" - cd "${S}" - - # apply revision changes - epatch "${FILESDIR}/calculate-client-3.2.0_alpha5-r2.patch" -} diff --git a/sys-apps/calculate-client/calculate-client-3.2.0_alpha5.ebuild b/sys-apps/calculate-client/calculate-client-3.2.0_alpha5.ebuild deleted file mode 100644 index 3171ec3..0000000 --- a/sys-apps/calculate-client/calculate-client-3.2.0_alpha5.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# 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 setting and storing the user account in the domain" -HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" -LICENSE="Apache-2.0" -SLOT="3" -KEYWORDS="amd64 x86" - -DEPEND="~sys-apps/calculate-desktop-3.2.0_alpha5 - !=dev-python/python-ldap-2.0[ssl] - >=sys-auth/pam_ldap-180[ssl] - >=sys-auth/nss_ldap-239 - >=sys-apps/keyexec-0.1.2 - dev-qt/qtdbus - sys-apps/keyutils - sys-auth/pam_keystore - sys-auth/pam_client - dev-lang/swig" - -RDEPEND="${DEPEND}" diff --git a/sys-apps/calculate-client/files/calculate-client-3.2.0_alpha5-r1.patch b/sys-apps/calculate-client/files/calculate-client-3.2.0_alpha5-r1.patch deleted file mode 100644 index e4aa7db..0000000 --- a/sys-apps/calculate-client/files/calculate-client-3.2.0_alpha5-r1.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git setup.py setup.py -index 1209a33..f873cdf 100755 ---- setup.py -+++ setup.py -@@ -24,10 +24,16 @@ from distutils.core import setup, Extension - from calculate.install_data import install_data - - data_files = [('/etc/init.d', [('data/client',0755)]), -+ ('/usr/sbin', [('data/logout', 0755)]), -+ ('/usr/sbin', [('data/cl-client-resume-remount', 0755)]), - ('/usr/share/calculate/xdm/login.d', - ['data/login.d/10client']), -+ ('/usr/share/calculate/xdm/login.d', -+ ['data/login.d/15resume_remount']), - ('/usr/share/calculate/xdm/logout.d', - ['data/logout.d/10client']), -+ ('/usr/share/calculate/xdm/logout.d', -+ ['data/login.d/15resume_remount']), - ('/usr/share/calculate/xdm/',[('data/wait_domain',0755)])] - - setup( diff --git a/sys-apps/calculate-client/files/calculate-client-3.2.0_alpha5-r2.patch b/sys-apps/calculate-client/files/calculate-client-3.2.0_alpha5-r2.patch deleted file mode 100644 index 0110801..0000000 --- a/sys-apps/calculate-client/files/calculate-client-3.2.0_alpha5-r2.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git data/logout data/logout -index 09abf5d..18bb8b6 100644 ---- data/logout -+++ data/logout -@@ -21,8 +21,8 @@ then - # переменная online_data возвращает строки пользователь,дисплей - for user_disp in $(variable_value desktop.cl_desktop_online_data | sed -r "s/;/ /g") - do -- user=$(echo $user_disp | cut -d, -f1) -- disp=$(echo $user_disp | cut -d, -f2) -+ user=$(echo $user_disp | cut -d: -f1) -+ disp=$(echo $user_disp | cut -d: -f2) - # завершаем сессию пользователя - /usr/sbin/cl-core --method desktop_logout $user &>/dev/null - # удаляем запить о пользователе -diff --git setup.py setup.py -index 1209a33..f873cdf 100755 ---- setup.py -+++ setup.py -@@ -24,10 +24,16 @@ from distutils.core import setup, Extension - from calculate.install_data import install_data - - data_files = [('/etc/init.d', [('data/client',0755)]), -+ ('/usr/sbin', [('data/logout', 0755)]), -+ ('/usr/sbin', [('data/cl-client-resume-remount', 0755)]), - ('/usr/share/calculate/xdm/login.d', - ['data/login.d/10client']), -+ ('/usr/share/calculate/xdm/login.d', -+ ['data/login.d/15resume_remount']), - ('/usr/share/calculate/xdm/logout.d', - ['data/logout.d/10client']), -+ ('/usr/share/calculate/xdm/logout.d', -+ ['data/login.d/15resume_remount']), - ('/usr/share/calculate/xdm/',[('data/wait_domain',0755)])] - - setup( diff --git a/sys-apps/calculate-console-gui/Manifest b/sys-apps/calculate-console-gui/Manifest index 36bbd1f..97eb2fa 100644 --- a/sys-apps/calculate-console-gui/Manifest +++ b/sys-apps/calculate-console-gui/Manifest @@ -1,19 +1,5 @@ -AUX calculate-console-gui-3.2.0_alpha5-r1.patch 752 SHA256 cc1ce918363673baa06b83e07237a234ea46663a779d5636733143525be9776f SHA512 a13e3c74a17840b95856d8b981ceddf5924178fe647cf7699f3ff4626b252d520a305c25baa26ae16a3c2e9aa2d49b8140c45607be138f1d513dfd9cbb1a0c11 WHIRLPOOL 5c2861bd7663b0355196e604dae304b8e5ecdf446cefdefde67f515157785e7565874907b0ec2cb7f3ed2dc3be1747c5a4f281b828f76b2d5537552a2908bdee -AUX calculate-console-gui-3.2.0_alpha5-r2.patch 3780 SHA256 76f8d2cdef3bdad3fee4f29b828f268561a0cecb41304f7617ea80189cc4b82c SHA512 bb6ffd23be55db7947e12c3319f6c7e2c9c71853e158236c8b8b33e7ac4be049c1b2a5cb0e75702e09bbe4f20455c5c13000905e4b750a345773ff2e15cc7608 WHIRLPOOL a41315ce832dec8e18d81eb4dbdd2471ca097db801f03ffeefade2bbce911ff25f4ebb4d8776b9c033fc19901ccf40d0c013bb86058c84cd8c6d4510127a8576 -DIST calculate-console-gui-3.2.0_alpha1.tar.bz2 320250 SHA256 8399ccbe7e1674f969f23eed8c55553cfd0b95a7f4b48ed1fa20d8f5b99996e4 SHA512 c8681b4261b4fb759e7db11c75c6c05cb84dfa21fc49a178b396e4ee255bc88c048b0030ecb51b18e6163a100ecff27466916bcf585bc41310d1d54c9a13fa5c WHIRLPOOL ac7a815f7937bd68d2e3f9d7ef6823c87933dd64b7268a16ca65a151fe17d454aec77fa6e315607b554c372e6b9cf51dd6b4e26ecdbe0143fecc5219770ddc7f -DIST calculate-console-gui-3.2.0_alpha2.tar.bz2 319438 SHA256 73a0a472866a6bcdca5e2f3e9a10229d7d773604a0026807c293829264ac7be9 SHA512 d3064e751bb83a16560942b7e193e4ae1b421a7525f70001990ee7060401d14c7be511ed0eaedaf76cf5e6ac5fbe2782bdbbc5042911c6c5ca7b9b55acc910ef WHIRLPOOL c4d72c404ab61f44537f246b86fa15b7ad9fb6e4c3a2b8661d07a72b1b1a10ca380ccd5239eed652f501f9eee7e2508e8fc6bac2f8560635e809c6da2608529f -DIST calculate-console-gui-3.2.0_alpha3.tar.bz2 319575 SHA256 f808ec79be33f2b81bce0fbff2ef707f92b5c0fbedbda04511283e3bfdf04818 SHA512 151722d110a8f517b94e07010e0d4d93d29c98160e6efaf7558e4d586bafa416bfb1f44e5b21a683492dc66ed9ed37fcb9f81117397f14c8519aa5c1b4ea1940 WHIRLPOOL cb797f7b03d125146c4d875608f3ee8bd6b064d7751762f14fea748abca0f93591808a2a01f149ddc3b4a6574b9aa98fbf66ffd21d821b8b5cf1638e12bc8d91 -DIST calculate-console-gui-3.2.0_alpha4.tar.bz2 319434 SHA256 0b379df628302ab9afcdb975ecf4c787a95422e80884a030860f636200e60738 SHA512 e04516251302bd4dcc4e71604039dc0ce535208e0f2a0bdf89c45048ae7782ead1d460dbadcc8044d56de403535f8b3f69faa2d18ea4b4d2893c5f08dfa28a18 WHIRLPOOL 3b9fae3f41e9ed0a330352f1a8a21c046d49b45f26e2665bc7105188c17d9911e480e183e36a1530b0ff2e7026c3939ed4aa7f9da1c3a053e6ddbd85716e3ac5 -DIST calculate-console-gui-3.2.0_alpha5.tar.bz2 319409 SHA256 65eda4164c9f857746877073ade5faee595bd687874e043a0b4752ee91237c28 SHA512 9a687c620bf31a4b781ea627fb079dac7d8f8f48c9f3e38256ba6e8bf2bc9e1dbb88ca3995ee3f4d34a11d93757ed4dd49d68eee2dfc3fad48e480f6917d56df WHIRLPOOL 45aa450af761f2c4590204fe37d99d10c68a8754075ad5c67237dcb8833f9e1dfc07ea597bf3abe5720eadca2ff99aef8d0301d77eff0edc37e4c5ec5e150c34 DIST calculate-console-gui-3.2.0_alpha6.tar.bz2 319528 SHA256 3e17f90e7dd32f66268a40de12184fa7b7e4a2bdb6545695d99f16633ade00f0 SHA512 0a2d28551b2536889d6aef9d1ddc751d55e3ef34cfc9c25f2f2a85ced132570bcad5864776bedf93359193de5a1690f7f194f75d6d09777429120e88feaf6026 WHIRLPOOL a5095f2e385eecad4a3170d3d0c52614502d57c9e1a9dd52e7f4ff1d1dfda6c17122f31cf312b2fd1f75eee84b6beeb0e3d0b12cbb71f9375b1ee702c2fcc305 DIST calculate-console-gui-3.2.0_alpha7.tar.bz2 319586 SHA256 6a7ab60c3340804144a7429d074c522585a6bd79e69a7686b353e88f57df7be6 SHA512 3c60f3e6cea103906a02429d094c6df3f60816f42848ea69ab475c91e76081ed451a191a946b718b4ee135cd42aa52bed74a4c01698495140b28fe34136c2d62 WHIRLPOOL b44941e00f8cea7f4a45d1d7bc641ea4ad4da027b0bec7dafaffe81ee38517543c26be8d8c3784dfc66342ee5de77a4bc2feb60bc4edd87ef885d96d8be0060f -EBUILD calculate-console-gui-3.2.0_alpha1.ebuild 634 SHA256 795f6e1e109fdc34e5b869de81aad5763c046e464890e4adf6496eb8f29b22cf SHA512 ae799087669681e86c56d52b8aaf5b30b24e82f2053b9965c03314899b5f80c75f66dcf1ec0f87e1965bf0f94a26967607a984dd9650ebdbaade357e7c18a870 WHIRLPOOL 7b3d60a6a186b485e5b98e1041cc71568fea2b3e9ad8cfa68450133dee1ca1a254bf649e556404fdd48556dacd0a1bfbf311cd41c19f485600cd3b2c2d793fdc -EBUILD calculate-console-gui-3.2.0_alpha2.ebuild 632 SHA256 b4ff01b5e24307b2a9428ff003745e5307fbe86fbe7da9a0ce37a92ccfb21f17 SHA512 e3308bbe7a6751e5294d162b4ef6cc8efd77244a76cd91e8a1fb6d7a2d61ac0297cf6f5347388bc36157cd99fb7337eb5560b9689294d7d3c8dde1ea3ac41489 WHIRLPOOL 1cc82edc53b7dc59db6aee608855226f5f235d440a206661e1835ed3daae43c21c22ab64a64e8f2e052cb379fb4561c013c15753480c131f35147587b826ecd3 -EBUILD calculate-console-gui-3.2.0_alpha3.ebuild 632 SHA256 8889c22fff2c7632965b02c4f8a76a53f4a8fe5118f599e70c7f7e6d8e7b7fde SHA512 7a25fc80f81838cc2e7fd10637165303b41b25e507071297ebc5843d2bead0fec66df5557056974c4c09c532810fa6a028e62c5603ebfd1417a4b0ffc6401a1f WHIRLPOOL 15e2060c11d0371c2eb4b67f8fd21cf1bfd633984a7a3aaa62b98ceafcce7dda941653a89142a8acc8d14fb99a78cd02de65fa62156d7eb8972eb8d8d6928e22 -EBUILD calculate-console-gui-3.2.0_alpha4.ebuild 632 SHA256 36914290a8191390ce98af80bc9b313c5eeca68713a79d625b7506713137f8df SHA512 5fa1ecca0df9c1c5e54963ad5371e2c90814b3323ff409da1147822b91eed462bf941c78d5fc2b02bf55d1a801e38dfeea3ad7d18f010b740423d19f6b9a722f WHIRLPOOL 4a2f14a5d683ba46f028917f9583f2d37996063fe7edcf6b0159ce0581c69940fcb7a0dedb2be7329841b2f816dc7c60a87c79ded4adb6b210d57fe5d3a30ea2 -EBUILD calculate-console-gui-3.2.0_alpha5-r1.ebuild 781 SHA256 189eb57587526334fc9c313f8d6cd2ff269bd0cd9b065e6923289c57410ff082 SHA512 63b2a58e6a76f260a14b5f144d7fdb285ff26420286bc22f213cd77549eea63b82d5bd28cb7715bc26bca7788592d864c4cc0160904b984a73f951ccce8cedd8 WHIRLPOOL 8a6ff7e2a87a78dbf14463e348989e508828165b0abfdc023b914bf717282e0620707ec31b33dc312f5031a16877d22ff428a8b6b13933779497cfe5ba78f7cd -EBUILD calculate-console-gui-3.2.0_alpha5-r2.ebuild 781 SHA256 74de6a6cf7819db7ba6601e6c34a35bee8e91be4bcd5ee75e12993dce3988897 SHA512 c7ef13d78b9219d7c0583f97f133d3141a67b8ef22e9399023efa06fd8f0a453f2f85a6d3dda135b647830ab9e40c28fe5b1776dc471be48caf595662956bed5 WHIRLPOOL 9f0f9a3e605df72066ffcdec11ac68a6d4c4969deda19e5a2e1ebe0398746a07cdfa5dc59e6aff881fedaa366f97551d3aa867ff8ab121577f463e56960b3d23 -EBUILD calculate-console-gui-3.2.0_alpha5.ebuild 632 SHA256 efebd40d478fee0259a18b0fe1a674aebd5db2efed085ef291d50673a8eb385b SHA512 d8a987dea6d0a4eac99e0977c7ac594931b961b1acd90cbf2ce00d8dd11e878f2b6ec9093b208be5cc6ba90077b5cd4d1b9d14b34f2cb057cbd9ed2a7de3c1e7 WHIRLPOOL e837e98ec4d7906a8f01813bfdcf7c49ca1adfac512c80de6aad4afa3d1893b5ad36fcd174b2f12b8eb56a5787385ded0bae179cd8b8ea6992ce634677e5ec9b EBUILD calculate-console-gui-3.2.0_alpha6.ebuild 632 SHA256 b6180003b983a8ab9a36df923fddba563537dfabca77af6242cef8fcb89fa797 SHA512 27b304406e5605eb2cd6bf31956c0bf29a854e5dcacd44bc1b7564ccbc9479cd9004f34ea6dd702de0400baf4d24725e25e149ead9eaf4e8c7d866622450e796 WHIRLPOOL ca6f7e35b51ae773260bd24d521936f4e4d95c424cdb535528973e13852a87bd2175fa5c1de86816c97f3b32aaa14dada7ccf142ab45b50391327f0fc383abce EBUILD calculate-console-gui-3.2.0_alpha7.ebuild 632 SHA256 d29fc2c4465b2ff8131525adced24ef7cc36950b52cd51d70c9e9ff78ae284c8 SHA512 b865474eba6c20e1facedf88ab4090a1ce4a61809cdae0eeafc49b45df2f47220d8904e9e1e3255d81b309c1ea1d732c5972270ad97caacc861c984db1b76fc0 WHIRLPOOL 9b0c1063e5ac11911373f18870270fc4e15f1395749d35d9a2ddf95b0ab1b8b63dd6d7bd4b03381ee180b6e2bd81065ed7f151f38e77fdabbeeffe51164d2f2d EBUILD calculate-console-gui-3.2.9999.ebuild 578 SHA256 2a87e98828f92ae2e971b1f5f2927af077e93ed7d3fadacea7f7e232c7a09348 SHA512 15da60d40befc9bba51232dd388df2397aea92ec2b25d951a34fc1a298049602370ac53a98bef42995e3ba911c76bb3a838cf5bfd5a3c4a6af7fc33e0fab34fa WHIRLPOOL 895ac120cb615db6493156e16f0a634da178a667b5c45e122218ce0cc0d6abd096827c506d7cad94f0f613b324cf5d4848e11671caf9b34bbc352ba91d9aa20c diff --git a/sys-apps/calculate-console-gui/calculate-console-gui-3.2.0_alpha1.ebuild b/sys-apps/calculate-console-gui/calculate-console-gui-3.2.0_alpha1.ebuild deleted file mode 100644 index 3284d39..0000000 --- a/sys-apps/calculate-console-gui/calculate-console-gui-3.2.0_alpha1.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# 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="Qt gui console client for WSDL Calculate 3" -HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" -LICENSE="Apache-2.0" -SLOT="3" -KEYWORDS="~amd64 ~x86" - -DEPEND="~sys-apps/calculate-core-3.2.0_alpha1 - dev-python/dbus-python - virtual/python-imaging - dev-python/pyside[script]" -RDEPEND="${DEPEND}" diff --git a/sys-apps/calculate-console-gui/calculate-console-gui-3.2.0_alpha2.ebuild b/sys-apps/calculate-console-gui/calculate-console-gui-3.2.0_alpha2.ebuild deleted file mode 100644 index 1dd5ec1..0000000 --- a/sys-apps/calculate-console-gui/calculate-console-gui-3.2.0_alpha2.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# 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="Qt gui console client for WSDL Calculate 3" -HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" -LICENSE="Apache-2.0" -SLOT="3" -KEYWORDS="amd64 x86" - -DEPEND="~sys-apps/calculate-core-3.2.0_alpha2 - dev-python/dbus-python - virtual/python-imaging - dev-python/pyside[script]" -RDEPEND="${DEPEND}" diff --git a/sys-apps/calculate-console-gui/calculate-console-gui-3.2.0_alpha3.ebuild b/sys-apps/calculate-console-gui/calculate-console-gui-3.2.0_alpha3.ebuild deleted file mode 100644 index ec1da33..0000000 --- a/sys-apps/calculate-console-gui/calculate-console-gui-3.2.0_alpha3.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# 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="Qt gui console client for WSDL Calculate 3" -HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" -LICENSE="Apache-2.0" -SLOT="3" -KEYWORDS="amd64 x86" - -DEPEND="~sys-apps/calculate-core-3.2.0_alpha3 - dev-python/dbus-python - virtual/python-imaging - dev-python/pyside[script]" -RDEPEND="${DEPEND}" diff --git a/sys-apps/calculate-console-gui/calculate-console-gui-3.2.0_alpha4.ebuild b/sys-apps/calculate-console-gui/calculate-console-gui-3.2.0_alpha4.ebuild deleted file mode 100644 index 014a614..0000000 --- a/sys-apps/calculate-console-gui/calculate-console-gui-3.2.0_alpha4.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# 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="Qt gui console client for WSDL Calculate 3" -HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" -LICENSE="Apache-2.0" -SLOT="3" -KEYWORDS="amd64 x86" - -DEPEND="~sys-apps/calculate-core-3.2.0_alpha4 - dev-python/dbus-python - virtual/python-imaging - dev-python/pyside[script]" -RDEPEND="${DEPEND}" diff --git a/sys-apps/calculate-console-gui/calculate-console-gui-3.2.0_alpha5-r1.ebuild b/sys-apps/calculate-console-gui/calculate-console-gui-3.2.0_alpha5-r1.ebuild deleted file mode 100644 index f38468a..0000000 --- a/sys-apps/calculate-console-gui/calculate-console-gui-3.2.0_alpha5-r1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# 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="Qt gui console client for WSDL Calculate 3" -HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" -LICENSE="Apache-2.0" -SLOT="3" -KEYWORDS="amd64 x86" - -DEPEND="~sys-apps/calculate-core-3.2.0_alpha5 - dev-python/dbus-python - virtual/python-imaging - dev-python/pyside[script]" -RDEPEND="${DEPEND}" - -src_unpack() { - unpack "${A}" - cd "${S}" - - # apply revision changes - epatch "${FILESDIR}/calculate-console-gui-3.2.0_alpha5-r1.patch" -} diff --git a/sys-apps/calculate-console-gui/calculate-console-gui-3.2.0_alpha5-r2.ebuild b/sys-apps/calculate-console-gui/calculate-console-gui-3.2.0_alpha5-r2.ebuild deleted file mode 100644 index 2cdaa82..0000000 --- a/sys-apps/calculate-console-gui/calculate-console-gui-3.2.0_alpha5-r2.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# 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="Qt gui console client for WSDL Calculate 3" -HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" -LICENSE="Apache-2.0" -SLOT="3" -KEYWORDS="amd64 x86" - -DEPEND="~sys-apps/calculate-core-3.2.0_alpha5 - dev-python/dbus-python - virtual/python-imaging - dev-python/pyside[script]" -RDEPEND="${DEPEND}" - -src_unpack() { - unpack "${A}" - cd "${S}" - - # apply revision changes - epatch "${FILESDIR}/calculate-console-gui-3.2.0_alpha5-r2.patch" -} diff --git a/sys-apps/calculate-console-gui/calculate-console-gui-3.2.0_alpha5.ebuild b/sys-apps/calculate-console-gui/calculate-console-gui-3.2.0_alpha5.ebuild deleted file mode 100644 index 376123a..0000000 --- a/sys-apps/calculate-console-gui/calculate-console-gui-3.2.0_alpha5.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# 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="Qt gui console client for WSDL Calculate 3" -HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" -LICENSE="Apache-2.0" -SLOT="3" -KEYWORDS="amd64 x86" - -DEPEND="~sys-apps/calculate-core-3.2.0_alpha5 - dev-python/dbus-python - virtual/python-imaging - dev-python/pyside[script]" -RDEPEND="${DEPEND}" diff --git a/sys-apps/calculate-console-gui/files/calculate-console-gui-3.2.0_alpha5-r1.patch b/sys-apps/calculate-console-gui/files/calculate-console-gui-3.2.0_alpha5-r1.patch deleted file mode 100644 index ec352be..0000000 --- a/sys-apps/calculate-console-gui/files/calculate-console-gui-3.2.0_alpha5-r1.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git consolegui/application/ControlButton.py consolegui/application/ControlButton.py -index 3e42fe9..84b2511 100644 ---- consolegui/application/ControlButton.py -+++ consolegui/application/ControlButton.py -@@ -289,7 +289,7 @@ class ControlButtonWgt(QtGui.QWidget): - self.clear_proc_cache_button.setDisabled(True) - sid = int(self.ClientObj.sid) - res = self.ClientObj.client.service.clear_pid_cache(sid, self.pid) -- if (hasattr(self._parent.ClientObj.sys_update_pid) and -+ if (hasattr(self._parent.ClientObj,"sys_update_pid") and - str(self.pid) == str( - self._parent.ClientObj._parent.sys_update_pid)): - self._parent.ClientObj._parent.sys_update_pid = None diff --git a/sys-apps/calculate-console-gui/files/calculate-console-gui-3.2.0_alpha5-r2.patch b/sys-apps/calculate-console-gui/files/calculate-console-gui-3.2.0_alpha5-r2.patch deleted file mode 100644 index 5137bb7..0000000 --- a/sys-apps/calculate-console-gui/files/calculate-console-gui-3.2.0_alpha5-r2.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff --git consolegui/application/ControlButton.py consolegui/application/ControlButton.py -index 3e42fe9..ccd7576 100644 ---- consolegui/application/ControlButton.py -+++ consolegui/application/ControlButton.py -@@ -146,6 +146,11 @@ class ControlButtonWgt(QtGui.QWidget): - self.break_button = wgt - self.hlayout.addWidget(wgt) - -+ def close_break_button(self): -+ if self.break_button: -+ self.break_button.close() -+ self.break_button = None -+ - def _hide(self): - if hasattr (self, 'button_widget'): - self.hlayout.removeWidget(self.button_widget) -@@ -289,7 +294,7 @@ class ControlButtonWgt(QtGui.QWidget): - self.clear_proc_cache_button.setDisabled(True) - sid = int(self.ClientObj.sid) - res = self.ClientObj.client.service.clear_pid_cache(sid, self.pid) -- if (hasattr(self._parent.ClientObj.sys_update_pid) and -+ if (hasattr(self._parent.ClientObj,"sys_update_pid") and - str(self.pid) == str( - self._parent.ClientObj._parent.sys_update_pid)): - self._parent.ClientObj._parent.sys_update_pid = None -diff --git consolegui/application/MainFrameResult.py consolegui/application/MainFrameResult.py -index 8a6498b..44e6c8f 100755 ---- consolegui/application/MainFrameResult.py -+++ consolegui/application/MainFrameResult.py -@@ -884,13 +884,14 @@ class MainFrameRes(QtGui.QWidget): - self.send_password_thread.wait() - - def closeDialogs(self): -- if hasattr(self,"message") and self.message: -+ if hasattr(self, "message") and self.message: - self.message.close() - self.message = None -- if hasattr(self,"passwd") and self.passwd: -+ if hasattr(self, "passwd") and self.passwd: - self.passwd.close() - self.passwd = None - self._parent.control_button.close_confirmation() -+ self._parent.control_button.close_break_button() - - def closeEvent(self, event): - self.timer.stop() -@@ -1042,7 +1043,7 @@ class ButtonDialog(QtGui.QWidget): - show_msg(_('Failed to send the message (password) to the server')) - self.close() - return 1 -- self._parent.show_result(result) -+ #self._parent.show_result(result) - self.close() - - -diff --git consolegui/application/TrayIcon.py consolegui/application/TrayIcon.py -index 9dfe126..fca4379 100644 ---- consolegui/application/TrayIcon.py -+++ consolegui/application/TrayIcon.py -@@ -21,7 +21,7 @@ import dbus - - from ReturnMessage import ReturnedMessage - from calculate.consolegui.application.pid_information import client_pid_info --from more import show_msg, get_sid -+from more import show_msg, get_sid, _print - - #class MySignal(QtCore.QObject): - # sig = QtCore.Signal(str, str) -@@ -48,7 +48,6 @@ class TrayUpdateSystem(QtCore.QThread): - try: - param_object = create_obj(self._parent.localhost_ClientObj.client, - "update") -- param_object.cl_update_precheck_set = True - meth_result_temp = \ - self._parent.localhost_ClientObj.client.service.update( - sid, param_object) -diff --git consolegui/application/more.py consolegui/application/more.py -index c50fbac..e82a91e 100755 ---- consolegui/application/more.py -+++ consolegui/application/more.py -@@ -2301,7 +2301,7 @@ class TaskWidget(QtGui.QWidget): - self.text.setMinimumHeight(self.text.sizeHint().height()) - self.text.setMinimumWidth(d_w) - self._layout.addWidget(self.text) -- self._layout.setContentsMargins(0, 4, 0, 4) -+ self._layout.setContentsMargins(0, 0, 0, 0) - self._layout.setSpacing(8) - self.status = False - diff --git a/sys-apps/calculate-console/Manifest b/sys-apps/calculate-console/Manifest index 8bc505d..7c859cd 100644 --- a/sys-apps/calculate-console/Manifest +++ b/sys-apps/calculate-console/Manifest @@ -1,18 +1,6 @@ -AUX calculate-console-3.2.0_alpha4-r1.patch 6417 SHA256 3350c0dc40cde2fabdd6144825f98185d47f8a7ae4c68c68063b9fafe651aade SHA512 8ef91403e053f7dda2ec4fc04d222f8aedaf0d2dca5d8524c21bb19070196a2b4cc48ee72acc0f9a6010796a1555d3bb8a4cf24faa8ea1be4383f5ee03a37630 WHIRLPOOL 8746a2d272fec180b6bf79c0fd41fd18fff56551ff3160862ee019e3a1f88ac80bb6b7d6d0af17120a0164eac189fb990a868326b05c1c83a3df5dc8e93465fe AUX calculate-console-3.2.0_alpha6-r1.patch 4302 SHA256 af8fb4078dbb7fe529abdf9d3888d29fb782948cb2e2be15019aacf13b6d9392 SHA512 1ad1bdde06497dc3f35d1ede5a9a72e3866b7c5913045b65c5e6c512fa789c85069b415d873318b6cb6439f5e9cb78cba0b09cb4cf2540168fda40f39227760d WHIRLPOOL c53470f48683632bad944188e86566582d3a3c92df4dac5dc8a85930f3cb7a29b8f9708cb741d074d07b757544ec0bc63c5f78f5c7c21ef303bddeaf66be441a -DIST calculate-console-3.2.0_alpha1.tar.bz2 26068 SHA256 7d100a5091b68363c326ea002bd16ad77453c1ab9146350bde0a2d31394f1a42 SHA512 1d03db28fef82ba45547e1a5ffeed8a588f7e6cc0121edc4d85140332899526f50eeae347d8ba10406929b1c71a6760d2d9152ef70e8b29335b9085d2b8c3006 WHIRLPOOL 762eca57fc707d9234f10ce8f2e4f709bd6f0be0c01299aafd1b7b16233166fb13d26a3503be77482e8cbf3c9269a3b62240e538e00a0984f782fa2cb2d59461 -DIST calculate-console-3.2.0_alpha2.tar.bz2 26006 SHA256 e05f817beca947e67aa64e42bcf0f370dc4ce1a87306fee3d9b9b83fe93fd7e6 SHA512 962e2e9947326a54cc409cbd3a1e52504338be3634267ca6db48177bdf4d680673fa0b40623ebd67ac22c7e5f324bede8a0c7ef1360b3b280e0e719106d21f2d WHIRLPOOL 80bf07a3f0ae0aab276c0b42a4aff5b0df9dec416eb7e1bec9f2efba5038c89773211251f6d873ccb3d481989d64ffb37e7a0895265283f40598b06fe4d8505c -DIST calculate-console-3.2.0_alpha3.tar.bz2 25996 SHA256 7918c472b42aadfb0ef133fa6d56c45f9bb2a5706a4b86937cfea6342b7c084b SHA512 a6c673054458902a188a0053c2d36d609298ee878010bed5422e32c2a7ea4b60050d68485b39ab8ee10d4c8541c92ba557fd801bbe00e4edf09b0879ed568f21 WHIRLPOOL 5704f4f831510873a3eaa74d86f7f4262aef5989deeeee2d094b2bf91c26cd6fd90fa233d215072419a58dd198d0cddb5c377f9187958a1c668fa80e7680932f -DIST calculate-console-3.2.0_alpha4.tar.bz2 26040 SHA256 1ef37adee2c88a6808df171488fdb55e26bd3eea15e5841ba1a31c1a8053cdfb SHA512 802b71054bc24e2cad41f2f3ed86f8e3463076d0c33e0e64b9185d0b90bff1d81a2c5f791aaf19ac21ebbcc6efedc6a596e7bfe305921b416bbbfa661619dcd7 WHIRLPOOL 6c1b4fefc5afafcf7a332b5198c25e501d2332fa0b5cc5ffae5d66842262cb17781df782c6e6fea07f3fc608a3914c98e786a05567f7f343c03008f8bdda1264 -DIST calculate-console-3.2.0_alpha5.tar.bz2 25261 SHA256 b9be4c86130797749807beae6094c4983d3663150a8e1663ef7dbb12fc90ecf9 SHA512 c7799d15e4f4abe04114364c31e79ea988a98e125ddd7f6c0306ccfca67d393e4a2ea0ea565f4ab6750498d3f2ced754bd957e11b8d925733827e193e0f01b24 WHIRLPOOL 3b6cd4d238dba4c69487527b33e8aeee57040cc62a60ba6013473a9261a7432a959a8e53c3d5f93deea73216431b8d7fe46b6031940ffb2d27f89cc7c9b4b8cb DIST calculate-console-3.2.0_alpha6.tar.bz2 25239 SHA256 f39e10e8254f2afb861c39ff19dfb96a3146a0088169a09090043701b15753d3 SHA512 1ab4155d039ada9ad7833f9ef82399aa855a757a2fed952c1cb38700216378321fde36f1edf2a7e395cd6958a18eaf2bad9e0ac3f4d37b80b90ed9334da5cddc WHIRLPOOL 3f81ccb9a471f5ae13b08c572f8cc0e8e3d21b0a32b97d148d05e92fdc15634252825941600b86a15b2eaf676866f1b2be433e336f84fe0b0b9bc7bd08a73c72 DIST calculate-console-3.2.0_alpha7.tar.bz2 24609 SHA256 9887033436902299c4fce329c6d08ccf12a9f2d1c7d1f52ee52b16ae75490807 SHA512 2806e708959e137396a569f54eea1ec6652747c5f69aa4e716d7c74398f0a99d6ddd215e75a4fc4c08dba1de1890dcc32bf794e7a278e6106159a6d412b7dbfb WHIRLPOOL 39174ac180d80b8af9533b45b059f4f474d5349c7943afdf37f50db028535a2a0b73424d16cb86bcf2aa18a176c4fdc63cfe1c98a1d3d374a9c5584a2e9fc360 -EBUILD calculate-console-3.2.0_alpha1.ebuild 552 SHA256 29bf3331ba8217017f5575a34b1166b40c736d7cd354ef1a30b0df8338de6944 SHA512 eaed9de8ebfedcaf29ec1ea63a3650a4540abab5b4a10cf384f272b5ae1b8bba193c0dca5819094749eb7e0c36c1bd60e9322da7010ea1392fae9deb1c57a25d WHIRLPOOL 4b1998a3d117ec2fa46326840073fb95d3c81367bfd721de5e072c2e742335a25ea23f4d32afcab6db9f7c112aef6b552281eff162444aa22a1506d9ef25b0fb -EBUILD calculate-console-3.2.0_alpha2.ebuild 550 SHA256 9da1f0724e74c97e5fc5ceec8d0daff9de1dab2e102510f5d889ae970d893471 SHA512 37c384750b21b9d63235c1c008b12e28a45735ad1e2ea13f66ed45f410fde9916d150c57af3b8eccf40c7d3642c665f1bc7130bf43d62117e35de68c286a6280 WHIRLPOOL 27fa2e91ac42839a367e7de64b0413f94167d0bbd72bcb7e2708cd2eedcc03d8cd02306b60c65910d60f1b9296db9875ea7a8664f4efdb4339b10e26023b31e8 -EBUILD calculate-console-3.2.0_alpha3.ebuild 550 SHA256 23321b8858f599f1eb190e1a055e96f727517409903af9735b998261a12be013 SHA512 fd1cc9c82a8dfaf641edb4482f2728c14bc8a0d62bcaba0617b96b05f814035994551749613e501da27c8f998f0568de6ec93c64bc529c5df80a835442933591 WHIRLPOOL 7bf34019ac1d9a5202a088b8b01e904df67c59f144eb33ee46db1348b2349f47df5fe8aff89083d69c8b279ba1ecb619decc3dacd9b3ad4c80a54f186e23fe3b -EBUILD calculate-console-3.2.0_alpha4-r1.ebuild 695 SHA256 5a368747e46ffe05fb1d41021cecd4f9d469130e0ca5a11dca5d6f7d5e9b6b6f SHA512 362fc9190dbc36135549ff35095720157e26c1d8259a1b2d8817dc0a6bd24b53d7603f794064e67aa945a6dc3b4e97c9db2b6cb5571b7ff443ae4084886ad017 WHIRLPOOL a229306a0f5b0df519456d2dc886b63c1c0401d17f8097aeb9d0645165d70525f460971600df048f027bf0992770745a9af2a277a3200f451dd9c091caa92a00 -EBUILD calculate-console-3.2.0_alpha4.ebuild 550 SHA256 ed516e8802681282bb2267ecb4bd005cd4e1099892da0166d66b75605ddd02e0 SHA512 8b550b5018e4398eac1061b80bc106700f619b52eabed76fd2f3d3190e064f9965545bde7b6ccd46d340a5ce674751a59a8c0ec5bd0cac40d82d84e7fe2f0426 WHIRLPOOL 1a22ee90e0e53565e07cabad866666f91dc6251f1544ed266d627f3424526bde9c6e885d43e4e0b2bccd220219287e85806ab57103329ec3fd3c95183079d865 -EBUILD calculate-console-3.2.0_alpha5.ebuild 550 SHA256 4163fb17c600d30ecc263314b9a710011f6c71cd66902484236fad15d32365e0 SHA512 f26e2964b42b3a0eef44f2c19b430eb270b8808e4442bae08501bb4c8f3cf9e9b3ee98ce686402bb78142cfa417849db482b12598a0046d4eccd7272cdb317cb WHIRLPOOL 4cce4501e53ea2d8d121f15eddfc87109c7dcf125d253ddef0b3e690fde1b076af50096604e9f1506d76bc76140a2349dbf8a19152e05857e96099a1ab713bf3 EBUILD calculate-console-3.2.0_alpha6-r1.ebuild 695 SHA256 0c28ce93656f65efb3172f9ad395c481cb66c9245aabd7ee9425e818c187488a SHA512 e1600314dd36e9b94779bf773666e0819114ada2ce74243ce29e8471bdad349846857ebc275b0f4bb8e970cc2e272c7610c348fe46475a10fc61c2c2144ca79c WHIRLPOOL e62c390a048d647736fb4c8e18264fd145f4fe4120a839e5acb77ed2766334b6594ba5e37a23c7d2374f77bd7d1a89938bdefd09c3c8acf7f27795fb2688f0fe EBUILD calculate-console-3.2.0_alpha6.ebuild 550 SHA256 e62b9d67766463878f409f8ab9cd6495486eabdd22752681655bcde8927071a1 SHA512 2767740f1fb963c2e6b22f2ae3d29e814b7b362c5380ae4478aa28ca0606cd32ec13003ef4d2798d1ceaf5aefafc311db14a98b82340db7279d542c0a24ff9e0 WHIRLPOOL 2646477bbb6afed37a0a5b68cefa513ec7aaee90f644540ac3c418af072124dc0569ddf433262fadea0f28fafb9a914cbd2d5716ad346163a634d5376c698501 EBUILD calculate-console-3.2.0_alpha7.ebuild 550 SHA256 7d49e97861df6cd43327717af3fb5bb5aa513ec029ddc2bc2c67e78552609817 SHA512 d7078af1771e64480b71b5e3ef5215327558f6d6c77916070144ce6343c87bd1fd77908a0dcb8d84e3d90758ba16dc5ceee4a4b1ad06359b34d1c74508354b97 WHIRLPOOL 731ff2c73983e1139f13aee3b057bd74c66b9defe2e8c2a58aa496de31e7e58fc54ed70d4de3e66865b9eeb40f2a47852272acaa9aa1a4449c1a174c3bdb88ee diff --git a/sys-apps/calculate-console/calculate-console-3.2.0_alpha1.ebuild b/sys-apps/calculate-console/calculate-console-3.2.0_alpha1.ebuild deleted file mode 100644 index b510040..0000000 --- a/sys-apps/calculate-console/calculate-console-3.2.0_alpha1.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# 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="Console client for WSDL Calculate 3" -HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" -LICENSE="Apache-2.0" -SLOT="3" -KEYWORDS="~amd64 ~x86" - -DEPEND="~sys-apps/calculate-core-3.2.0_alpha1" -RDEPEND="${DEPEND}" diff --git a/sys-apps/calculate-console/calculate-console-3.2.0_alpha2.ebuild b/sys-apps/calculate-console/calculate-console-3.2.0_alpha2.ebuild deleted file mode 100644 index 9a8d141..0000000 --- a/sys-apps/calculate-console/calculate-console-3.2.0_alpha2.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# 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="Console client for WSDL Calculate 3" -HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" -LICENSE="Apache-2.0" -SLOT="3" -KEYWORDS="amd64 x86" - -DEPEND="~sys-apps/calculate-core-3.2.0_alpha2" -RDEPEND="${DEPEND}" diff --git a/sys-apps/calculate-console/calculate-console-3.2.0_alpha3.ebuild b/sys-apps/calculate-console/calculate-console-3.2.0_alpha3.ebuild deleted file mode 100644 index f6433b1..0000000 --- a/sys-apps/calculate-console/calculate-console-3.2.0_alpha3.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# 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="Console client for WSDL Calculate 3" -HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" -LICENSE="Apache-2.0" -SLOT="3" -KEYWORDS="amd64 x86" - -DEPEND="~sys-apps/calculate-core-3.2.0_alpha3" -RDEPEND="${DEPEND}" diff --git a/sys-apps/calculate-console/calculate-console-3.2.0_alpha4-r1.ebuild b/sys-apps/calculate-console/calculate-console-3.2.0_alpha4-r1.ebuild deleted file mode 100644 index 5cc053c..0000000 --- a/sys-apps/calculate-console/calculate-console-3.2.0_alpha4-r1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# 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="Console client for WSDL Calculate 3" -HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" -LICENSE="Apache-2.0" -SLOT="3" -KEYWORDS="amd64 x86" - -DEPEND="~sys-apps/calculate-core-3.2.0_alpha4" -RDEPEND="${DEPEND}" - -src_unpack() { - unpack "${A}" - cd "${S}" - - # apply revision changes - epatch "${FILESDIR}/calculate-console-3.2.0_alpha4-r1.patch" -} diff --git a/sys-apps/calculate-console/calculate-console-3.2.0_alpha4.ebuild b/sys-apps/calculate-console/calculate-console-3.2.0_alpha4.ebuild deleted file mode 100644 index 792669c..0000000 --- a/sys-apps/calculate-console/calculate-console-3.2.0_alpha4.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# 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="Console client for WSDL Calculate 3" -HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" -LICENSE="Apache-2.0" -SLOT="3" -KEYWORDS="amd64 x86" - -DEPEND="~sys-apps/calculate-core-3.2.0_alpha4" -RDEPEND="${DEPEND}" diff --git a/sys-apps/calculate-console/calculate-console-3.2.0_alpha5.ebuild b/sys-apps/calculate-console/calculate-console-3.2.0_alpha5.ebuild deleted file mode 100644 index c61474c..0000000 --- a/sys-apps/calculate-console/calculate-console-3.2.0_alpha5.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# 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="Console client for WSDL Calculate 3" -HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" -LICENSE="Apache-2.0" -SLOT="3" -KEYWORDS="amd64 x86" - -DEPEND="~sys-apps/calculate-core-3.2.0_alpha5" -RDEPEND="${DEPEND}" diff --git a/sys-apps/calculate-console/files/calculate-console-3.2.0_alpha4-r1.patch b/sys-apps/calculate-console/files/calculate-console-3.2.0_alpha4-r1.patch deleted file mode 100644 index f05b1f8..0000000 --- a/sys-apps/calculate-console/files/calculate-console-3.2.0_alpha4-r1.patch +++ /dev/null @@ -1,152 +0,0 @@ -diff --git console/application/function.py console/application/function.py -index 0e6f548..77968b5 100644 ---- console/application/function.py -+++ console/application/function.py -@@ -21,10 +21,12 @@ import termios - import subprocess - from OpenSSL import crypto - import shlex -+from calculate.core.server.func import shortTraceback - from calculate.lib.utils.colortext import get_terminal_print - from sudsds import MethodNotFound - from calculate.core.server.cert_cmd import getHwAddr, getIpLocal --from calculate.core.server.replace_class import printTable,Methods -+from calculate.core.server.replace_class import (printTable, Methods, -+ print_brief_group) - - from calculate.core.client.progressbar import Bar,Percentage,ETA,ProgressBar - from calculate.lib.cl_lang import setLocalTranslate -@@ -97,133 +99,6 @@ def get_ip_mac_type(client_type = None): - results.append ('console') - return results - --def print_brief_group(Fields, group_name): -- print_group_flag = False --# if group_name: --# _print ('\b'+group_name) -- uncompatible_count = 0 -- for field in Fields: -- if field.uncompatible: -- uncompatible_count += 1 -- continue -- if field.element in ['input', 'openfile']: -- value = field.value if field.value else '' -- if not print_group_flag: -- _print ('\b'+group_name) -- print_group_flag = True -- colorPrint._printSUCCESS('%s: %s' %(field.label, value)) -- -- elif field.element in ['combo', 'comboEdit', 'radio', 'file']: -- if hasattr (field.comments, 'string') and field.value in \ -- field.choice.string: -- value = map(lambda x: field.comments.string[x] \ -- if len(field.comments.string) > x \ -- else field.choice.string[x], -- map(lambda x: field.choice.string.index(x), \ -- [field.value])) -- value = ', '.join(value) -- else: -- value = field.value if field.value else '' -- if not print_group_flag: -- _print ('\b'+group_name) -- print_group_flag = True -- colorPrint._printSUCCESS('%s: %s' %(field.label, value)) -- -- elif field.element in ['multichoice', 'multichoice_add',\ -- 'selecttable', 'selecttable_add']: -- if hasattr (field.comments, 'string') and \ -- hasattr (field.listvalue, 'string'): -- value = map(lambda x: field.comments.string[x] \ -- if len(field.comments.string) > x \ -- else field.choice.string[x], -- map(lambda x: field.choice.string.index(x), \ -- field.listvalue.string)) -- value = ', '.join(value) -- elif hasattr (field.listvalue, 'string'): -- value = ', '.join(field.listvalue.string) -- else: -- value = field.value if field.value else '' -- if not print_group_flag: -- _print ('\b'+group_name) -- print_group_flag = True -- colorPrint._printSUCCESS('%s: %s' %(field.label, value)) -- --# elif field.element == 'label': --# print field.label -- -- elif field.element == 'error': -- if not print_group_flag: -- _print ('\b'+group_name) -- print_group_flag = True -- colorPrint.printERROR(field.label) -- -- elif field.element in ['check', 'check_tristate']: -- if field.value == 'on': -- value = _('yes') -- elif field.value == 'off': -- value = _('no') -- elif field.value == 'auto': -- value = _('auto') -- else: -- value = field.value -- if not print_group_flag: -- _print ('\b'+group_name) -- print_group_flag = True -- colorPrint._printSUCCESS('%s: %s' %(field.label, value)) -- -- elif field.element == 'table' and field.type != 'steps': -- if hasattr (field.tablevalue.head, 'string'): -- head = field.tablevalue.head.string -- else: head = None -- -- body = [] -- if hasattr (field.tablevalue.body, 'stringArray'): -- for row in field.tablevalue.body.stringArray: -- if hasattr(row, 'string'): -- body.append(row.string) -- else: body = [[]] -- -- # if empty table -- if not filter (None, map(lambda x: x, body)): -- body = [['']*len(head)] -- res = printTable(body, head) -- sys.stdout.flush() -- sys.stdout.write(res) -- continue -- -- ChoiceValue = field.tablevalue.values.ChoiceValue -- for row in xrange(len(ChoiceValue)): -- if ChoiceValue[row].typefield in ['check', 'check_tristate']: -- for i in xrange(len(body)): -- if body[i][row] == 'on': -- body[i][row] = _('yes') -- if body[i][row] == 'off': -- body[i][row] = _('no') -- if body[i][row] == 'auto': -- body[i][row] = _('auto') -- if ChoiceValue[row].typefield == 'password': -- for i in xrange(len(body)): -- if body[i][row]: -- body[i][row] = '***' -- -- data = [] -- for body_row in body: -- data.append(map(lambda x: x if x else '', body_row)) -- -- if not print_group_flag: -- _print ('\b'+group_name) -- print_group_flag = True -- colorPrint._printSUCCESS('%s: ' %(field.label)) -- res = printTable(data, head) -- sys.stdout.write(res+"\n") -- sys.stdout.flush() -- -- else: -- uncompatible_count += 1 -- --# if uncompatible_count == len (Fields) and group_name: --# colorPrint._printSUCCESS(_('Not used')) -- - def print_brief(view, brief_label): - for Group in view.groups.GroupField: - if Group.name: diff --git a/sys-apps/calculate-core/Manifest b/sys-apps/calculate-core/Manifest index 1e2b6d2..71ca104 100644 --- a/sys-apps/calculate-core/Manifest +++ b/sys-apps/calculate-core/Manifest @@ -1,32 +1,6 @@ -AUX calculate-core-3.2.0_alpha1-r1.patch 3909 SHA256 95338af9088ff7a8b535836c542c73aaaaeda2ae51c4fc070dee64ca015d65fe SHA512 743627d58a4c0c1ec0b57753fa5df320bbdec9102d4e6e3df63abe4e55323e4fac2de26ea22f69cb348f50070618eff5fb9b6848df0679bf73260a238507f4e0 WHIRLPOOL b186232ae83f4b40156bae4a0a66e1cde6b25768a329f7d7144cf4a4c6eee92e11319849cacb0ec2689a1f9801a96c1ae621505143c6bbc6979dd23c6fb4cade -AUX calculate-core-3.2.0_alpha4-r1.patch 16117 SHA256 cf06430288a9074388dfb92dcfc930691819a8233023b6560256a0da4086c52b SHA512 b6705837520166f21f3b920e110e1a653039a9e964fec333dc46fce36c4d1a55b6c2096f88c8a932f7105cfd2e517d482623217deeec12079f49eab16384b555 WHIRLPOOL 60ce776de8a1b3e8187e81c63b89551a3db3ab1baaac1394f9537f639ee01170be9d85b39a5f0b75df03ddb8c90bcdc244af23c9f4c1468b9322db06df0628f3 -AUX calculate-core-3.2.0_alpha4-r2.patch 16188 SHA256 cd2ea5c818f9fa80db9e2164c35f563bc5a53710c8773e8699872bc133637b98 SHA512 441f08285dbd2ef813645df5c71ff1bf9442aeff39b965436c63ac596e3ba551cb5e9dee6e040655b440a171a893716dc8689891d3a25757fd2cc34b7142a907 WHIRLPOOL bd3006df43f4505006bb3e7f2b5520fda45e18a1e0a580ca48a6b5296b09e02cb78557ce614ad826945dabe085195d84522a054a301c8d3220beede84474fd94 -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 -AUX calculate-core-3.2.0_alpha5-r2.patch 5506 SHA256 4c2ccc57ec1c8496b51c4a572e0a1d86982a75bb8c4e6ada329ff774de2af7eb SHA512 b2ee8ea8061c32cc0693c2124470db541544d98d2221f8b3606576bf039138d7fb3cff7bf15b0284cf1c1d7e3215d1e65ca3c027cffd47b65c99be76a3366a33 WHIRLPOOL 08722cd12ceed5646dfbddff70e80fd5fb4ce161e1284ddac206c40f43ac2a7176407ce0fa5acf8eadf91b5093a2d8e1cb034ffe5b536109015fa9fff311055f AUX calculate-core-3.2.0_alpha6-r1.patch 28016 SHA256 d99381bd316fba8256b5eb54945124c5f32d816b06ad3d32c7d972ff0d01e71e SHA512 a60106837082dd4e4f2794f71cf69a782fcb22f823a1f9f325e14145cbb195fd79e2b0bf5cfb1de486c0bb76b7b00c4694c33c1a9a639a7022f4b34c4f08f3b5 WHIRLPOOL d96a915b3755b061667e1ce8234c480e677429b6bae118774027a4d58930a9b2c13af635638d0c3a972e6ff64a7a19cbadf6abe1d048eb9c55e0e41ecfa522e3 -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 -DIST calculate-core-3.2.0_alpha4.tar.bz2 84863 SHA256 d2c7c59acfef1fe5c0fed1c458059aa7b74f57387d60edc6ed74e46cad740920 SHA512 d6c3b99b30e45a843f7b652e555212b6487f800dfc2cfcd4d916b90b080e377ba75e6371452bc12c33dee86d78ee30793d5dffd319119080f54eb9d540a969de WHIRLPOOL 7e4242cc553952a5640963e88c3321dc95093a267de769a98fa62d210979715bbd8b627d5352e2aae8f84717d268638800c48cf0d6306833eaa87503536c917d -DIST calculate-core-3.2.0_alpha5.tar.bz2 85593 SHA256 cc80d18d412839c0cfa5ff33273128df538a2363603f53ad31150887ff695e11 SHA512 951f829b590b2f73ca8cea31d085241488c1d4a4e8b3bfae55078a5c17966308aac939d48749c091773fdb7a235e1849e56f5f344e622c84d15d9f150b3a7ca2 WHIRLPOOL 190b6315499f09576ca080cf7584e2f09875968a58845a5de3760c6ef6508996d03669a9ab28a0d61f7dc5c94060aa9138f8eb395db8c8458a01968481ef2db1 DIST calculate-core-3.2.0_alpha6.tar.bz2 85602 SHA256 cd2bfdd419972f6be8c31e8d7ec853df1286948bc70ee381b2d9a3ea77ee7afe SHA512 c9229a2f0bd623cc5d40cd255688ceaa88122ab2d3ae67288ca3e53da4e6a6027af31e54be2dbfc9b95d47fce66f21ced92becd93f72a3d619e9dbbcb903af80 WHIRLPOOL ea5c0ec38595c30751d10797af28b946e254063f8de247bd9f75ed5800e1ac96844cd8dac2e4ad534675dbbb32472753fadd3b21e1fa245c975f7c196c828118 DIST calculate-core-3.2.0_alpha7.tar.bz2 86089 SHA256 427ce83eccbf25a559bf8345bf21524e62045339afba8a43dc03b282b22bea23 SHA512 3d232eb6dc92ff13932363ecdcd5b6dd1ce812b978a4dff04f57ab9b38971d3a60976f356ad63dbf92f3b7342ed0b5f834d10a47a1b44281e4f617e3d5a919b6 WHIRLPOOL bf96851963ac3c9ae75dc3e1cf83e1cfba3a30c87b8a06b2e05eeac1ba45e3363709bfd8404719ba14d11312654c9b3a4d236a6009fd7fb7ecf7886e077f3bb6 -EBUILD calculate-core-3.2.0_alpha1-r1.ebuild 1273 SHA256 63976ef94c626d3f910351467f2b3a82694948272883d00d4fba4903c3477ed6 SHA512 410c526fc951e3e3cc64d31a23a23528fd7dc34da410aeb26f0fa4522c151eef23ccca8786e8639ae254de73590501af12d893b85acd57dfcdc1fae7ac5c8111 WHIRLPOOL bf775eeee705c0883e36d01388463947e007ac4dcf82c3d2ca759f1546684a8c89e31c621f8d27662361e5785bc5f7070cfd279b06904a3274da51b6be6ebc81 -EBUILD calculate-core-3.2.0_alpha1.ebuild 1131 SHA256 08d7216cdc3618ae7a73f5cbce36a32d5e6aad3dbcbe4fd2eb94e5232dbe7d30 SHA512 dbe84720706bfda967d1c7758b476b83187c226894766b81c1e76012d20791d06bceefbccb5fcd92c884c7f6bd601f8e81d4af5caeb4f3adc58fab392bbd3108 WHIRLPOOL 415f3aab9b586620f68c4909d387267848053adc686fc675f9a666d8f19b93844af07d9402c2a27348f7c67b8e23f76485c5ed65b122129e064ff1bcc0c85030 -EBUILD calculate-core-3.2.0_alpha2.ebuild 1129 SHA256 0778b2b2cfa7d8a3b915d3db8ad6bfa3de60d3f268732e3488182818adc05983 SHA512 b6f6da14537a3fc3ebe12426b20080b5b19f884b387527bec8511bdabdcef4b2cac4fda48a3847dfbb2787b0ba8e19762b9b842cf1b779958467948ccf674c43 WHIRLPOOL 53158020860e2be6691e1aafb2f47fa74ae120d8408c728af305c4f50e47d24817581efa3b82bfd7e36c5a41166cfae3d677344a3f92b91b4e77fc902a118605 -EBUILD calculate-core-3.2.0_alpha3.ebuild 1129 SHA256 59a9203c3139b158fdfdd48d2d594048f8dacd8612e71c4ef26842c7d70edb53 SHA512 07ae01440c1f274145c876b20586db3fda50b4630a238521956239d887a9dcafc38ffa468821d9126bb4f8c3daae3b2f5d7092a8beefda44e1a715a8efd6413e WHIRLPOOL c13d3d6ca6642793ed2ac38a5b9cedd9535337ca1edfa18c941e92be26ddf4fde2fad9d6c143316dc08311415cc423b81a42e7b141c76aca4f73930a4994d7b5 -EBUILD calculate-core-3.2.0_alpha4-r1.ebuild 1271 SHA256 f8a79b4bec6d2549705ecddd0353e5ad83d375b3f836fefe48cff36a8fcbb75a SHA512 4614f7dfd4ab99bf2e38095bf02f7fcf5522b630423ab88e9e40ab95793590dd97e1cfb6bb0215cceebcf06c367bcb84b0457bab6c4a7f708dee3799ed22b220 WHIRLPOOL a6096d6e3289a22a20cd0f35ebeda9cc20820e80f39fa6c51a5711123973cb9f70bc720627561438f078c78c56129aac664ef8e9cf439ad22d53c302f4f79ed5 -EBUILD calculate-core-3.2.0_alpha4-r2.ebuild 1271 SHA256 527901c373e6bc466bb2651f42fe339871037046f4e1c9b91eddddfd17b97a2b SHA512 74d0638e7072cdf64f646696c313e563404fc1096cf24b71bf42d0d288c4da106b27c8ea4b0f84e6a1c0a97fd3fd9dae4ce69868608e894216f944bb1296b17c WHIRLPOOL 42f765c5f85388eb05ffa83d6f67c584e99ac6ab4426f53e50544f9560bdcbdd81bb1036df382ad29dda69240aed85a9bc83b328a95e34c0dd662e0f9c3b35a8 -EBUILD calculate-core-3.2.0_alpha4-r3.ebuild 1271 SHA256 0ce1729ff0a879ed40c4254d380f75239dbad7c5de4be59a4658cc7c58d2846e SHA512 d19f6f95c97604d46d69175ea0f0589270cde657b5f024bb80ed18f21e7ea271a8dd09566b7520a75345b125419f6efa2ca46f7ac3987cdb25d4f89a864e3a07 WHIRLPOOL 9398a93b877c21ed99ee94a5bf206d198a2720f28cfa6183a68b1cad4e60edf3cac4cd77fdf2456657be46699f76f03aba10ecc62fc4c848e6385cf9e1ed3d72 -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-r2.ebuild 1271 SHA256 0bf4b67c6d9a0dd9f182f8726d71cc97433a43b33dc179007836b0998248ce6a SHA512 031c14bdc101b6fc69057df83bfcf70c8aa1df5e27e93afcd96e07b0566dfde84790c1db9bbfe072b71fbef2abd94458da88e48dc95f1da9b367bed69c9e391b WHIRLPOOL 1c239566c0d8e515b76217d8397a180c2ee386596d28eadcf5e301298290798a5462fb39e29e73be38850612bc561f3ad83b1ccb955b7aab4d24caecedc8edf4 -EBUILD calculate-core-3.2.0_alpha5.ebuild 1129 SHA256 c7a2a90ddd2749bd33904e2f3cb96d63ae944b41f562d69e17fbd317af0bec16 SHA512 4a0d7f79a3472db765b0057e74186680bfc6a20e55589d5cec3947f6a52e79db361b3eea22d1e67bd4f981efa3316ac79fcf2b577df97e1b1abaa0d619fbbab9 WHIRLPOOL 70cef0293a36be5fe9d25a52f8b29b4aca288b0fc334c59d39ef4627fbdd4b9773f62719f8f61081e203385ae6709febf98faa0004d98867843abab1f9010299 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 EBUILD calculate-core-3.2.0_alpha7.ebuild 1129 SHA256 8f4d227566860928a01ed9e8225ae9f5ea7acba537798e28b717cc1b9ac1f820 SHA512 5c4b49360781ba90c047aba5f171be9d456490ea51975a47ba5d31de781cc2fb0d4cb875fb553e64a6eb83cb3a3fc8887be2a85a0181e6179316f79c6ea09e29 WHIRLPOOL 628c2137a0e490d80a34787defa3e474fbb29b8f9f02383e82e60c86e0a119d48d854c8e04086f0f797ff57eab299b96002c932937f899142d4ae213c7d9547f diff --git a/sys-apps/calculate-core/calculate-core-3.2.0_alpha1-r1.ebuild b/sys-apps/calculate-core/calculate-core-3.2.0_alpha1-r1.ebuild deleted file mode 100644 index 29a7c40..0000000 --- a/sys-apps/calculate-core/calculate-core-3.2.0_alpha1-r1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# 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_alpha1 - >=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_alpha1-r1.patch" -} diff --git a/sys-apps/calculate-core/calculate-core-3.2.0_alpha1.ebuild b/sys-apps/calculate-core/calculate-core-3.2.0_alpha1.ebuild deleted file mode 100644 index bd5e92b..0000000 --- a/sys-apps/calculate-core/calculate-core-3.2.0_alpha1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# 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_alpha1 - >=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" -} diff --git a/sys-apps/calculate-core/calculate-core-3.2.0_alpha2.ebuild b/sys-apps/calculate-core/calculate-core-3.2.0_alpha2.ebuild deleted file mode 100644 index e0dcb96..0000000 --- a/sys-apps/calculate-core/calculate-core-3.2.0_alpha2.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# 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_alpha2 - >=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" -} diff --git a/sys-apps/calculate-core/calculate-core-3.2.0_alpha3.ebuild b/sys-apps/calculate-core/calculate-core-3.2.0_alpha3.ebuild deleted file mode 100644 index 8befed9..0000000 --- a/sys-apps/calculate-core/calculate-core-3.2.0_alpha3.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# 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_alpha3 - >=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" -} diff --git a/sys-apps/calculate-core/calculate-core-3.2.0_alpha4-r1.ebuild b/sys-apps/calculate-core/calculate-core-3.2.0_alpha4-r1.ebuild deleted file mode 100644 index 3cca64c..0000000 --- a/sys-apps/calculate-core/calculate-core-3.2.0_alpha4-r1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# 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_alpha4 - >=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_alpha4-r1.patch" -} diff --git a/sys-apps/calculate-core/calculate-core-3.2.0_alpha4-r2.ebuild b/sys-apps/calculate-core/calculate-core-3.2.0_alpha4-r2.ebuild deleted file mode 100644 index 54d2060..0000000 --- a/sys-apps/calculate-core/calculate-core-3.2.0_alpha4-r2.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# 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_alpha4 - >=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_alpha4-r2.patch" -} diff --git a/sys-apps/calculate-core/calculate-core-3.2.0_alpha4-r3.ebuild b/sys-apps/calculate-core/calculate-core-3.2.0_alpha4-r3.ebuild deleted file mode 100644 index 9ca700c..0000000 --- a/sys-apps/calculate-core/calculate-core-3.2.0_alpha4-r3.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# 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_alpha4 - >=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_alpha4-r3.patch" -} diff --git a/sys-apps/calculate-core/calculate-core-3.2.0_alpha4-r4.ebuild b/sys-apps/calculate-core/calculate-core-3.2.0_alpha4-r4.ebuild deleted file mode 100644 index fea39f8..0000000 --- a/sys-apps/calculate-core/calculate-core-3.2.0_alpha4-r4.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# 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_alpha4 - >=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_alpha4-r4.patch" -} diff --git a/sys-apps/calculate-core/calculate-core-3.2.0_alpha4-r5.ebuild b/sys-apps/calculate-core/calculate-core-3.2.0_alpha4-r5.ebuild deleted file mode 100644 index 7eab25f..0000000 --- a/sys-apps/calculate-core/calculate-core-3.2.0_alpha4-r5.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# 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_alpha4 - >=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_alpha4-r5.patch" -} diff --git a/sys-apps/calculate-core/calculate-core-3.2.0_alpha4.ebuild b/sys-apps/calculate-core/calculate-core-3.2.0_alpha4.ebuild deleted file mode 100644 index ce14080..0000000 --- a/sys-apps/calculate-core/calculate-core-3.2.0_alpha4.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# 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_alpha4 - >=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" -} 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 deleted file mode 100644 index e8d0594..0000000 --- a/sys-apps/calculate-core/calculate-core-3.2.0_alpha5-r1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# 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/calculate-core-3.2.0_alpha5-r2.ebuild b/sys-apps/calculate-core/calculate-core-3.2.0_alpha5-r2.ebuild deleted file mode 100644 index 54c7dd2..0000000 --- a/sys-apps/calculate-core/calculate-core-3.2.0_alpha5-r2.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# 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-r2.patch" -} diff --git a/sys-apps/calculate-core/calculate-core-3.2.0_alpha5.ebuild b/sys-apps/calculate-core/calculate-core-3.2.0_alpha5.ebuild deleted file mode 100644 index a48a744..0000000 --- a/sys-apps/calculate-core/calculate-core-3.2.0_alpha5.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# 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" -} diff --git a/sys-apps/calculate-core/files/calculate-core-3.2.0_alpha1-r1.patch b/sys-apps/calculate-core/files/calculate-core-3.2.0_alpha1-r1.patch deleted file mode 100644 index aca697c..0000000 --- a/sys-apps/calculate-core/files/calculate-core-3.2.0_alpha1-r1.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff --git core/server/cl_server.py core/server/cl_server.py -index a62d8cd..abd555f 100644 ---- core/server/cl_server.py -+++ core/server/cl_server.py -@@ -75,12 +75,13 @@ def main(*args, **keywords): - cl_ver = ob.Get('cl_ver') - log_path_var = ob.Get('cl_log_path') - cl_core_port = ob.GetInteger('cl_core_port') -+ file_logger = None - - if args.version: - print cl_ver - return 0 - -- if ob.Get('cl_ebuild_phase') == '': -+ if ob.Get('cl_ebuild_phase') == '' and os.getuid() == 0: - import logging - import logging.handlers - -@@ -149,9 +150,10 @@ def main(*args, **keywords): - serv_certbase, certbase, data_path) - return 0 - except URLError, e: -- fd = open(LOG_FILENAME,'a') -- file_logger.debug(print_exc(file=fd)) -- fd.close() -+ if file_logger: -+ fd = open(LOG_FILENAME,'a') -+ file_logger.debug(print_exc(file=fd)) -+ fd.close() - print e - params_list = ["start", "create_symlink", "method", - "list_methods"] -@@ -262,9 +264,10 @@ def main(*args, **keywords): - print _("No socket could be created") - print _('Port %d already in use') %port - else: -- fd = open(LOG_FILENAME,'a') -- file_logger.debug(print_exc(file=fd)) -- fd.close() -+ if file_logger: -+ fd = open(LOG_FILENAME,'a') -+ file_logger.debug(print_exc(file=fd)) -+ fd.close() - print e - except SSLError, e: - print '\n',_('Server certificate not found')#, e -@@ -273,9 +276,10 @@ def main(*args, **keywords): - except KeyboardInterrupt: - pass - except Exception, e: -- fd = open(LOG_FILENAME,'a') -- file_logger.debug(print_exc(file=fd)) -- fd.close() -+ if file_logger: -+ fd = open(LOG_FILENAME,'a') -+ file_logger.debug(print_exc(file=fd)) -+ fd.close() - - server.stop() - if args.pidfile: -diff --git core/server/func.py core/server/func.py -index 190a066..ae0c88f 100644 ---- core/server/func.py -+++ core/server/func.py -@@ -815,8 +815,8 @@ def shortTraceback(e1,e2,e3): - Return short traceback - """ - frame = e3 -- #for i in apply(traceback.format_exception, (e1,e2,e3)): -- # print i, -+ for i in apply(traceback.format_exception, (e1,e2,e3)): -+ print i, - while(frame.tb_next): - frame = frame.tb_next - module,part = os.path.split(frame.tb_frame.f_code.co_filename) -diff --git core/server/server_class.py core/server/server_class.py -index 13157ec..43f9ffb 100644 ---- core/server/server_class.py -+++ core/server/server_class.py -@@ -360,7 +360,8 @@ class ClApplication(Application): - certobj = OpenSSL.crypto.load_certificate \ - (OpenSSL.SSL.FILETYPE_PEM, curThread.client_cert) - finger = certobj.digest('SHA1') -- self.log.debug('%s %s %s forbidden %s' \ -+ if self.log: -+ self.log.debug('%s %s %s forbidden %s' \ - %(datetime.datetime.now().__str__(), finger, ip, \ - method_name[5:])) - resp = "Permission denied: " + method_name -@@ -375,7 +376,8 @@ class ClApplication(Application): - finger = certobj.digest('SHA1') - if not method_name[5:] in not_log_list and \ - not method_name[5:].endswith('_view'): -- self.log.debug('%s %s %s allowed %s' \ -+ if self.log: -+ self.log.debug('%s %s %s allowed %s' \ - %(datetime.datetime.now().__str__(), finger, ip, \ - method_name[5:])) - diff --git a/sys-apps/calculate-core/files/calculate-core-3.2.0_alpha4-r1.patch b/sys-apps/calculate-core/files/calculate-core-3.2.0_alpha4-r1.patch deleted file mode 100644 index 5ac6d78..0000000 --- a/sys-apps/calculate-core/files/calculate-core-3.2.0_alpha4-r1.patch +++ /dev/null @@ -1,453 +0,0 @@ -diff --git core/server/api_types.py core/server/api_types.py -index 3863d53..eb205c1 100644 ---- core/server/api_types.py -+++ core/server/api_types.py -@@ -164,6 +164,97 @@ class Table(DataVarsSerializer): - self.onClick = onClick - self.addAction = addAction - -+class ChoiceValueAdapter(object): -+ def __init__(self, choicevalue): -+ self.choicevalue = choicevalue -+ -+ @property -+ def values(self): -+ return self.choicevalue.values.string -+ -+ @property -+ def comments(self): -+ return self.choicevalue.comments.string -+ -+ @property -+ def onChanged(self): -+ return self.choicevalue.onChanged.string -+ -+ def __getattr__(self, item): -+ return getattr(self.choicevalue, item) -+ -+ @classmethod -+ def from_detect(cls, choicevalue): -+ if isinstance(choicevalue, ChoiceValue): -+ return choicevalue -+ else: -+ return cls(choicevalue) -+ -+class TableAdapter(object): -+ def __init__(self, table): -+ self.table = table -+ -+ @property -+ def fields(self): -+ return self.table.fields.string -+ -+ @property -+ def head(self): -+ return self.table.head.string -+ -+ @property -+ def body(self): -+ if hasattr(self.table.body,'stringArray'): -+ return [row.string -+ for row in self.table.body.stringArray -+ if hasattr(row, "string")] -+ return [] -+ -+ @property -+ def values(self): -+ return [ChoiceValueAdapter(x) for x in self.table.values.ChoiceValue] -+ -+ def __getattr__(self, item): -+ return getattr(self.table, item) -+ -+ @classmethod -+ def from_detect(cls, table): -+ if isinstance(table, Table): -+ return table -+ else: -+ return cls(table) -+ -+class FieldAdapter(object): -+ def __init__(self, field): -+ self.field = field -+ -+ @property -+ def choice(self): -+ return self.field.choice.string -+ -+ @property -+ def listvalue(self): -+ return self.field.listvalue.string -+ -+ @property -+ def comments(self): -+ return self.field.comments.string -+ -+ @property -+ def tablevalue(self): -+ return TableAdapter(self.field.tablevalue) -+ -+ def __getattr__(self, item): -+ return getattr(self.field, item) -+ -+ @classmethod -+ def from_detect(cls, field): -+ if isinstance(field, Field): -+ return field -+ else: -+ return cls(field) -+ -+ - class Option(DataVarsSerializer): - shortopt = String - longopt = String -diff --git core/server/replace_class.py core/server/replace_class.py -index 23c5282..d01dd9b 100644 ---- core/server/replace_class.py -+++ core/server/replace_class.py -@@ -34,6 +34,7 @@ from calculate.lib.utils.colortext.output import BaseOutput - from calculate.lib.cl_print import color_print - from calculate.lib.datavars import VariableError - from calculate.lib.cl_lang import setLocalTranslate -+from calculate.core.server.api_types import FieldAdapter - - from methods_func import get_method_argparser, collect_object, \ - check_result_msg, get_param_pwd, _print -@@ -44,7 +45,7 @@ from func import shortTraceback, CommonMethods - - - setLocalTranslate('cl_core3', sys.modules[__name__]) --from itertools import cycle -+from itertools import cycle, izip, ifilter - import time - - -@@ -766,159 +767,176 @@ def print_brief(view, brief_label): - print_brief_group(Group.fields, Group.name) - - --def print_brief_group(Fields, group_name): -- print_group_flag = False -- # if group_name: -- # _print ('\b'+group_name) -- uncompatible_count = 0 -- colorPrint = color_print() -- _colorprint = get_terminal_print(_print) -- for field in Fields: -- if field.uncompatible: -- uncompatible_count += 1 -- continue -- if field.element in ['input', 'openfile']: -- value = field.value if field.value else '' -- if not print_group_flag: -- if group_name: -- print_group_flag = True -- _colorprint.bold.foreground( -- TextState.Colors.WHITE)(group_name) -- colorPrint.printSUCCESS('%s: %s' % (field.label, value)) -- -- elif field.element in ['combo', 'comboEdit', 'radio', 'file']: -- if field.choice: -- if not field.choice[0]: -- field.choice.pop(0) -- if field.comments: -- if not field.comments[0]: -- field.comments.pop(0) -- if field.comments and field.choice: -- if not field.value in field.choice: -- field.choice.append(field.value) -- value = map(lambda x: field.comments[x] \ -- if len(field.comments) > x else field.choice[x], -- map(lambda x: field.choice.index(x), -- filter(lambda x: x in field.choice, -- [field.value]))) -- value = ', '.join(value) -- else: -- value = field.value if field.value else '' -- if not print_group_flag: -- if group_name: -- print_group_flag = True -- #_print('\b' + group_name) -- _colorprint.bold.foreground( -- TextState.Colors.WHITE)(group_name) -- colorPrint.printSUCCESS('%s: %s' % (field.label, value)) -- -- elif field.element in ['multichoice', 'multichoice_add', \ -- 'selecttable', 'selecttable_add']: -- if field.choice: -- if not field.choice[0]: -- field.choice.pop(0) -- if field.comments: -- if not field.comments[0]: -- field.comments.pop(0) -- if field.listvalue: -- if not field.listvalue[0]: -- field.listvalue.pop(0) -- if field.choice: -- value = map(lambda x: field.comments[x] \ -- if len(field.comments) > x \ -- else field.choice[x], -- map(lambda x: field.choice.index(x), \ -- field.listvalue)) -+class Display(object): -+ def __init__(self): -+ self._print = get_terminal_print(color_print().defaultPrint) -+ -+ def print_info(self, label, value): -+ GREEN = TextState.Colors.GREEN -+ self.display_asterisk(GREEN) -+ self._print("%s: " % label) -+ WHITE = TextState.Colors.WHITE -+ self._print.foreground(WHITE)(value) -+ self._print("\n") -+ -+ def print_label(self, label): -+ GREEN = TextState.Colors.GREEN -+ self.display_asterisk(GREEN) -+ self._print("%s: " % label) -+ self._print("\n") -+ -+ def display_asterisk(self, color): -+ self._print(" ") -+ self._print.foreground(color).bold("*") -+ self._print(" ") -+ -+ def print_error(self, message): -+ RED = TextState.Colors.RED -+ self.display_asterisk(RED) -+ self._print(message) -+ self._print("\n") -+ -+ def print_table(self, data, head): -+ sys.stdout.write('%s\n' % printTable(data, head)) -+ -+ def print_group(self, label): -+ WHITE = TextState.Colors.WHITE -+ self._print.foreground(WHITE).bold(label) -+ self._print("\n") -+ -+ -+class InformationElement(object): -+ def __init__(self, field, display): -+ self.value = "" -+ self.label = "" -+ self.display = display -+ -+ @classmethod -+ def from_field(cls, field, display): -+ if field.type == 'steps': -+ return None -+ map_elements = {'input': ValueInfo, -+ 'openfile': ValueInfo, -+ 'combo': ChoiceInfo, -+ 'comboEdit': ChoiceInfo, -+ 'radio': ChoiceInfo, -+ 'file': ChoiceInfo, -+ 'multichoice': MultiChoiceInfo, -+ 'multichoice_add': MultiChoiceInfo, -+ 'selecttable': MultiChoiceInfo, -+ 'selecttable_add': MultiChoiceInfo, -+ 'error': ErrorInfo, -+ 'check': CheckInfo, -+ 'check_tristate': CheckInfo, -+ 'table': TableInfo -+ } -+ if field.element in map_elements: -+ return map_elements[field.element](field, display) -+ return None -+ -+ def show(self): -+ self.display.print_info(self.label, self.value) -+ -+ -+class ValueInfo(InformationElement): -+ def __init__(self, field, display): -+ super(ValueInfo, self).__init__(field, display) -+ self.value = field.value or '' -+ self.label = field.label -+ -+class CheckInfo(InformationElement): -+ def __init__(self, field, display): -+ super(CheckInfo, self).__init__(field, display) -+ self.label = field.label -+ map_answer = {'on':_('yes'), 'off': _("no"), 'auto': _('auto')} -+ self.value = map_answer.get(field.value, field.value) -+ -+class ChoiceInfo(InformationElement): -+ def __init__(self, field, display): -+ super(ChoiceInfo, self).__init__(field, display) -+ self.label = field.label or '' -+ if field.choice and field.comments: -+ map_comment = dict(zip(field.choice, field.comments)) -+ self.value = map_comment.get(field.value, field.value) or '' -+ else: -+ self.value = field.value if field.value else '' -+ -+ -+class MultiChoiceInfo(InformationElement): -+ def __init__(self, field, display): -+ super(MultiChoiceInfo, self).__init__(field, display) -+ self.label = field.label or '' -+ if field.listvalue: -+ value = field.listvalue -+ # удалить пустой первый элемент (особенности wsdl) -+ if value and not value[0]: -+ value.pop(0) -+ if field.choice and field.comments: -+ map_comment = dict(zip(field.choice, field.comments)) - else: -- value = [] -- value = ', '.join(value) -- if field.listvalue and not value: -- value = ', '.join(field.listvalue) -- elif not value: -- value = field.value if field.value else '' -- if not print_group_flag: -- if group_name: -- print_group_flag = True -- #_print('\b' + group_name) -- _colorprint.bold.foreground( -- TextState.Colors.WHITE)(group_name) -- colorPrint.printSUCCESS('%s: %s' % (field.label, value)) -- -- # elif field.element == 'label': -- # print field.label -- -- elif field.element == 'error': -- if not print_group_flag: -- if group_name: -- print_group_flag = True -- _colorprint.bold.foreground( -- TextState.Colors.WHITE)(group_name) -- colorPrint.printERROR(field.label) -- -- elif field.element in ['check', 'check_tristate']: -- if field.value == 'on': -- value = _('yes') -- elif field.value == 'off': -- value = _('no') -- elif field.value == 'auto': -- value = _('auto') -+ map_comment = {} -+ self.value = ", ".join([map_comment.get(x, x) or '' for x in value]) -+ else: -+ self.value = field.value or "" -+ -+ -+class ErrorInfo(InformationElement): -+ def __init__(self, field, display): -+ super(ErrorInfo, self).__init__(field, display) -+ self.label = field.label -+ -+ def show(self): -+ self.display.print_error(self.label) -+ -+ -+class TableInfo(InformationElement): -+ """ -+ Табличная информация -+ """ -+ -+ def map_row(self, row, typedata): -+ map_answer = {'on':_('yes'), 'off': _("no"), 'auto': _('auto')} -+ for cell, typefield in izip(row, typedata): -+ if typefield in ['check', 'check_tristate']: -+ yield map_answer.get(cell, cell) or "" -+ elif "password" in typefield: -+ yield "***" - else: -- value = field.value -- if not print_group_flag: -- if group_name: -- print_group_flag = True -- _colorprint.bold.foreground( -- TextState.Colors.WHITE)(group_name) -- colorPrint.printSUCCESS('%s: %s' % (field.label, value)) -- -- elif field.element == 'table' and field.type != 'steps': -- head = field.tablevalue.head -- -- body = [] -- for row in field.tablevalue.body: -- if not row[0]: -- row.pop(0) -- body.append(row) -- -- # if empty table -- if not filter(None, map(lambda x: x, body)): -- body = [[''] * len(head)] -- res = printTable(body, head) -- sys.stdout.flush() -- sys.stdout.write(res + "\n") -- continue -- ChoiceValue = field.tablevalue.values -- for row in xrange(len(ChoiceValue)): -- if ChoiceValue[row].typefield in ['check', 'check_tristate']: -- for i in xrange(len(body)): -- if body[i][row] == 'on': -- body[i][row] = _('yes') -- if body[i][row] == 'off': -- body[i][row] = _('no') -- if body[i][row] == 'auto': -- body[i][row] = _('auto') -- if "password" in ChoiceValue[row].typefield: -- for i in xrange(len(body)): -- if body[i][row]: -- body[i][row] = '***' -- data = [] -- for body_row in body: -- data.append(map(lambda x: x if x else '', body_row)) -- if not print_group_flag: -- if group_name: -- print_group_flag = True -- _colorprint.bold.foreground( -- TextState.Colors.WHITE)(group_name) -- colorPrint.printSUCCESS(field.label + ': ') -- res = printTable(data, head) -- sys.stdout.flush() -- sys.stdout.write(res + "\n") -+ yield cell or "" -+ -+ def __init__(self, field, display): -+ super(TableInfo, self).__init__(field, display) -+ self.label = field.label -+ self.head = field.tablevalue.head -+ -+ # удаление первого элемента строки (для wsdl) -+ body = [x[1:] if x and not x[0] else x for x in field.tablevalue.body] -+ -+ if not filter(None, map(lambda x: x, body)): -+ self.body = None - else: -- uncompatible_count += 1 -+ type_values = [x.typefield for x in field.tablevalue.values] -+ self.body = [list(self.map_row(x, type_values)) for x in body] -+ -+ def show(self): -+ if self.body: -+ self.display.print_label(self.label) -+ self.display.print_table(self.body, self.head) - - --# if uncompatible_count == len (Fields) and group_name: --# colorPrint.printSUCCESS(_('Not used')) -+def print_brief_group(Fields, group_name): -+ display = Display() -+ show_group = True -+ for element in ifilter(None, -+ (InformationElement.from_field( -+ FieldAdapter.from_detect(x), -+ display) -+ for x in Fields if not x.uncompatible)): -+ if show_group: -+ display.print_group(group_name) -+ show_group = False -+ element.show() -+ - - class Table(tableReport): - def __init__(self, *args, **kwargs): -@@ -953,4 +971,3 @@ def printTable(data, header=None): - except Exception as e: - print str(e) - raise -- diff --git a/sys-apps/calculate-core/files/calculate-core-3.2.0_alpha4-r2.patch b/sys-apps/calculate-core/files/calculate-core-3.2.0_alpha4-r2.patch deleted file mode 100644 index 509343a..0000000 --- a/sys-apps/calculate-core/files/calculate-core-3.2.0_alpha4-r2.patch +++ /dev/null @@ -1,456 +0,0 @@ -diff --git core/server/api_types.py core/server/api_types.py -index 3863d53..eb205c1 100644 ---- core/server/api_types.py -+++ core/server/api_types.py -@@ -164,6 +164,97 @@ class Table(DataVarsSerializer): - self.onClick = onClick - self.addAction = addAction - -+class ChoiceValueAdapter(object): -+ def __init__(self, choicevalue): -+ self.choicevalue = choicevalue -+ -+ @property -+ def values(self): -+ return self.choicevalue.values.string -+ -+ @property -+ def comments(self): -+ return self.choicevalue.comments.string -+ -+ @property -+ def onChanged(self): -+ return self.choicevalue.onChanged.string -+ -+ def __getattr__(self, item): -+ return getattr(self.choicevalue, item) -+ -+ @classmethod -+ def from_detect(cls, choicevalue): -+ if isinstance(choicevalue, ChoiceValue): -+ return choicevalue -+ else: -+ return cls(choicevalue) -+ -+class TableAdapter(object): -+ def __init__(self, table): -+ self.table = table -+ -+ @property -+ def fields(self): -+ return self.table.fields.string -+ -+ @property -+ def head(self): -+ return self.table.head.string -+ -+ @property -+ def body(self): -+ if hasattr(self.table.body,'stringArray'): -+ return [row.string -+ for row in self.table.body.stringArray -+ if hasattr(row, "string")] -+ return [] -+ -+ @property -+ def values(self): -+ return [ChoiceValueAdapter(x) for x in self.table.values.ChoiceValue] -+ -+ def __getattr__(self, item): -+ return getattr(self.table, item) -+ -+ @classmethod -+ def from_detect(cls, table): -+ if isinstance(table, Table): -+ return table -+ else: -+ return cls(table) -+ -+class FieldAdapter(object): -+ def __init__(self, field): -+ self.field = field -+ -+ @property -+ def choice(self): -+ return self.field.choice.string -+ -+ @property -+ def listvalue(self): -+ return self.field.listvalue.string -+ -+ @property -+ def comments(self): -+ return self.field.comments.string -+ -+ @property -+ def tablevalue(self): -+ return TableAdapter(self.field.tablevalue) -+ -+ def __getattr__(self, item): -+ return getattr(self.field, item) -+ -+ @classmethod -+ def from_detect(cls, field): -+ if isinstance(field, Field): -+ return field -+ else: -+ return cls(field) -+ -+ - class Option(DataVarsSerializer): - shortopt = String - longopt = String -diff --git core/server/replace_class.py core/server/replace_class.py -index 23c5282..6597928 100644 ---- core/server/replace_class.py -+++ core/server/replace_class.py -@@ -34,6 +34,7 @@ from calculate.lib.utils.colortext.output import BaseOutput - from calculate.lib.cl_print import color_print - from calculate.lib.datavars import VariableError - from calculate.lib.cl_lang import setLocalTranslate -+from calculate.core.server.api_types import FieldAdapter - - from methods_func import get_method_argparser, collect_object, \ - check_result_msg, get_param_pwd, _print -@@ -44,7 +45,7 @@ from func import shortTraceback, CommonMethods - - - setLocalTranslate('cl_core3', sys.modules[__name__]) --from itertools import cycle -+from itertools import cycle, izip, ifilter - import time - - -@@ -766,159 +767,179 @@ def print_brief(view, brief_label): - print_brief_group(Group.fields, Group.name) - - --def print_brief_group(Fields, group_name): -- print_group_flag = False -- # if group_name: -- # _print ('\b'+group_name) -- uncompatible_count = 0 -- colorPrint = color_print() -- _colorprint = get_terminal_print(_print) -- for field in Fields: -- if field.uncompatible: -- uncompatible_count += 1 -- continue -- if field.element in ['input', 'openfile']: -- value = field.value if field.value else '' -- if not print_group_flag: -- if group_name: -- print_group_flag = True -- _colorprint.bold.foreground( -- TextState.Colors.WHITE)(group_name) -- colorPrint.printSUCCESS('%s: %s' % (field.label, value)) -- -- elif field.element in ['combo', 'comboEdit', 'radio', 'file']: -- if field.choice: -- if not field.choice[0]: -- field.choice.pop(0) -- if field.comments: -- if not field.comments[0]: -- field.comments.pop(0) -- if field.comments and field.choice: -- if not field.value in field.choice: -- field.choice.append(field.value) -- value = map(lambda x: field.comments[x] \ -- if len(field.comments) > x else field.choice[x], -- map(lambda x: field.choice.index(x), -- filter(lambda x: x in field.choice, -- [field.value]))) -- value = ', '.join(value) -- else: -- value = field.value if field.value else '' -- if not print_group_flag: -- if group_name: -- print_group_flag = True -- #_print('\b' + group_name) -- _colorprint.bold.foreground( -- TextState.Colors.WHITE)(group_name) -- colorPrint.printSUCCESS('%s: %s' % (field.label, value)) -- -- elif field.element in ['multichoice', 'multichoice_add', \ -- 'selecttable', 'selecttable_add']: -- if field.choice: -- if not field.choice[0]: -- field.choice.pop(0) -- if field.comments: -- if not field.comments[0]: -- field.comments.pop(0) -- if field.listvalue: -- if not field.listvalue[0]: -- field.listvalue.pop(0) -- if field.choice: -- value = map(lambda x: field.comments[x] \ -- if len(field.comments) > x \ -- else field.choice[x], -- map(lambda x: field.choice.index(x), \ -- field.listvalue)) -+class Display(object): -+ def __init__(self): -+ self._print = get_terminal_print(color_print().defaultPrint) -+ -+ def print_info(self, label, value): -+ GREEN = TextState.Colors.GREEN -+ self.display_asterisk(GREEN) -+ self._print("%s: " % label) -+ WHITE = TextState.Colors.WHITE -+ self._print.foreground(WHITE)(value) -+ self._print("\n") -+ -+ def print_label(self, label): -+ GREEN = TextState.Colors.GREEN -+ self.display_asterisk(GREEN) -+ self._print("%s: " % label) -+ self._print("\n") -+ -+ def display_asterisk(self, color): -+ self._print(" ") -+ self._print.foreground(color).bold("*") -+ self._print(" ") -+ -+ def print_error(self, message): -+ RED = TextState.Colors.RED -+ self.display_asterisk(RED) -+ self._print(message) -+ self._print("\n") -+ -+ def print_table(self, data, head): -+ -+ sys.stdout.write('%s\n' % printTable(data, head)) -+ -+ def print_group(self, label): -+ #WHITE = TextState.Colors.WHITE -+ #self._print.foreground(WHITE).bold(label) -+ #self._print.underline(label) -+ self._print(label) -+ self._print("\n") -+ -+ -+class InformationElement(object): -+ def __init__(self, field, display): -+ self.value = "" -+ self.label = "" -+ self.display = display -+ -+ @classmethod -+ def from_field(cls, field, display): -+ if field.type == 'steps': -+ return None -+ map_elements = {'input': ValueInfo, -+ 'openfile': ValueInfo, -+ 'combo': ChoiceInfo, -+ 'comboEdit': ChoiceInfo, -+ 'radio': ChoiceInfo, -+ 'file': ChoiceInfo, -+ 'multichoice': MultiChoiceInfo, -+ 'multichoice_add': MultiChoiceInfo, -+ 'selecttable': MultiChoiceInfo, -+ 'selecttable_add': MultiChoiceInfo, -+ 'error': ErrorInfo, -+ 'check': CheckInfo, -+ 'check_tristate': CheckInfo, -+ 'table': TableInfo -+ } -+ if field.element in map_elements: -+ return map_elements[field.element](field, display) -+ return None -+ -+ def show(self): -+ self.display.print_info(self.label, self.value) -+ -+ -+class ValueInfo(InformationElement): -+ def __init__(self, field, display): -+ super(ValueInfo, self).__init__(field, display) -+ self.value = field.value or '' -+ self.label = field.label -+ -+class CheckInfo(InformationElement): -+ def __init__(self, field, display): -+ super(CheckInfo, self).__init__(field, display) -+ self.label = field.label -+ map_answer = {'on':_('yes'), 'off': _("no"), 'auto': _('auto')} -+ self.value = map_answer.get(field.value, field.value) -+ -+class ChoiceInfo(InformationElement): -+ def __init__(self, field, display): -+ super(ChoiceInfo, self).__init__(field, display) -+ self.label = field.label or '' -+ if field.choice and field.comments: -+ map_comment = dict(zip(field.choice, field.comments)) -+ self.value = map_comment.get(field.value, field.value) or '' -+ else: -+ self.value = field.value if field.value else '' -+ -+ -+class MultiChoiceInfo(InformationElement): -+ def __init__(self, field, display): -+ super(MultiChoiceInfo, self).__init__(field, display) -+ self.label = field.label or '' -+ if field.listvalue: -+ value = field.listvalue -+ # удалить пустой первый элемент (особенности wsdl) -+ if value and not value[0]: -+ value.pop(0) -+ if field.choice and field.comments: -+ map_comment = dict(zip(field.choice, field.comments)) - else: -- value = [] -- value = ', '.join(value) -- if field.listvalue and not value: -- value = ', '.join(field.listvalue) -- elif not value: -- value = field.value if field.value else '' -- if not print_group_flag: -- if group_name: -- print_group_flag = True -- #_print('\b' + group_name) -- _colorprint.bold.foreground( -- TextState.Colors.WHITE)(group_name) -- colorPrint.printSUCCESS('%s: %s' % (field.label, value)) -- -- # elif field.element == 'label': -- # print field.label -- -- elif field.element == 'error': -- if not print_group_flag: -- if group_name: -- print_group_flag = True -- _colorprint.bold.foreground( -- TextState.Colors.WHITE)(group_name) -- colorPrint.printERROR(field.label) -- -- elif field.element in ['check', 'check_tristate']: -- if field.value == 'on': -- value = _('yes') -- elif field.value == 'off': -- value = _('no') -- elif field.value == 'auto': -- value = _('auto') -+ map_comment = {} -+ self.value = ", ".join([map_comment.get(x, x) or '' for x in value]) -+ else: -+ self.value = field.value or "" -+ -+ -+class ErrorInfo(InformationElement): -+ def __init__(self, field, display): -+ super(ErrorInfo, self).__init__(field, display) -+ self.label = field.label -+ -+ def show(self): -+ self.display.print_error(self.label) -+ -+ -+class TableInfo(InformationElement): -+ """ -+ Табличная информация -+ """ -+ -+ def map_row(self, row, typedata): -+ map_answer = {'on':_('yes'), 'off': _("no"), 'auto': _('auto')} -+ for cell, typefield in izip(row, typedata): -+ if typefield in ['check', 'check_tristate']: -+ yield map_answer.get(cell, cell) or "" -+ elif "password" in typefield: -+ yield "***" - else: -- value = field.value -- if not print_group_flag: -- if group_name: -- print_group_flag = True -- _colorprint.bold.foreground( -- TextState.Colors.WHITE)(group_name) -- colorPrint.printSUCCESS('%s: %s' % (field.label, value)) -- -- elif field.element == 'table' and field.type != 'steps': -- head = field.tablevalue.head -- -- body = [] -- for row in field.tablevalue.body: -- if not row[0]: -- row.pop(0) -- body.append(row) -- -- # if empty table -- if not filter(None, map(lambda x: x, body)): -- body = [[''] * len(head)] -- res = printTable(body, head) -- sys.stdout.flush() -- sys.stdout.write(res + "\n") -- continue -- ChoiceValue = field.tablevalue.values -- for row in xrange(len(ChoiceValue)): -- if ChoiceValue[row].typefield in ['check', 'check_tristate']: -- for i in xrange(len(body)): -- if body[i][row] == 'on': -- body[i][row] = _('yes') -- if body[i][row] == 'off': -- body[i][row] = _('no') -- if body[i][row] == 'auto': -- body[i][row] = _('auto') -- if "password" in ChoiceValue[row].typefield: -- for i in xrange(len(body)): -- if body[i][row]: -- body[i][row] = '***' -- data = [] -- for body_row in body: -- data.append(map(lambda x: x if x else '', body_row)) -- if not print_group_flag: -- if group_name: -- print_group_flag = True -- _colorprint.bold.foreground( -- TextState.Colors.WHITE)(group_name) -- colorPrint.printSUCCESS(field.label + ': ') -- res = printTable(data, head) -- sys.stdout.flush() -- sys.stdout.write(res + "\n") -+ yield cell or "" -+ -+ def __init__(self, field, display): -+ super(TableInfo, self).__init__(field, display) -+ self.label = field.label -+ self.head = field.tablevalue.head -+ -+ # удаление первого элемента строки (для wsdl) -+ body = [x[1:] if x and not x[0] else x for x in field.tablevalue.body] -+ -+ if not filter(None, map(lambda x: x, body)): -+ self.body = None - else: -- uncompatible_count += 1 -+ type_values = [x.typefield for x in field.tablevalue.values] -+ self.body = [list(self.map_row(x, type_values)) for x in body] -+ -+ def show(self): -+ if self.body: -+ self.display.print_label(self.label) -+ self.display.print_table(self.body, self.head) - - --# if uncompatible_count == len (Fields) and group_name: --# colorPrint.printSUCCESS(_('Not used')) -+def print_brief_group(Fields, group_name): -+ display = Display() -+ show_group = True -+ for element in ifilter(None, -+ (InformationElement.from_field( -+ FieldAdapter.from_detect(x), -+ display) -+ for x in Fields if not x.uncompatible)): -+ if show_group: -+ display.print_group(group_name) -+ show_group = False -+ element.show() -+ - - class Table(tableReport): - def __init__(self, *args, **kwargs): -@@ -953,4 +974,3 @@ def printTable(data, header=None): - except Exception as e: - print str(e) - raise -- diff --git a/sys-apps/calculate-core/files/calculate-core-3.2.0_alpha4-r3.patch b/sys-apps/calculate-core/files/calculate-core-3.2.0_alpha4-r3.patch deleted file mode 100644 index 6090056..0000000 --- a/sys-apps/calculate-core/files/calculate-core-3.2.0_alpha4-r3.patch +++ /dev/null @@ -1,465 +0,0 @@ -diff --git core/server/api_types.py core/server/api_types.py -index 3863d53..eb205c1 100644 ---- core/server/api_types.py -+++ core/server/api_types.py -@@ -164,6 +164,97 @@ class Table(DataVarsSerializer): - self.onClick = onClick - self.addAction = addAction - -+class ChoiceValueAdapter(object): -+ def __init__(self, choicevalue): -+ self.choicevalue = choicevalue -+ -+ @property -+ def values(self): -+ return self.choicevalue.values.string -+ -+ @property -+ def comments(self): -+ return self.choicevalue.comments.string -+ -+ @property -+ def onChanged(self): -+ return self.choicevalue.onChanged.string -+ -+ def __getattr__(self, item): -+ return getattr(self.choicevalue, item) -+ -+ @classmethod -+ def from_detect(cls, choicevalue): -+ if isinstance(choicevalue, ChoiceValue): -+ return choicevalue -+ else: -+ return cls(choicevalue) -+ -+class TableAdapter(object): -+ def __init__(self, table): -+ self.table = table -+ -+ @property -+ def fields(self): -+ return self.table.fields.string -+ -+ @property -+ def head(self): -+ return self.table.head.string -+ -+ @property -+ def body(self): -+ if hasattr(self.table.body,'stringArray'): -+ return [row.string -+ for row in self.table.body.stringArray -+ if hasattr(row, "string")] -+ return [] -+ -+ @property -+ def values(self): -+ return [ChoiceValueAdapter(x) for x in self.table.values.ChoiceValue] -+ -+ def __getattr__(self, item): -+ return getattr(self.table, item) -+ -+ @classmethod -+ def from_detect(cls, table): -+ if isinstance(table, Table): -+ return table -+ else: -+ return cls(table) -+ -+class FieldAdapter(object): -+ def __init__(self, field): -+ self.field = field -+ -+ @property -+ def choice(self): -+ return self.field.choice.string -+ -+ @property -+ def listvalue(self): -+ return self.field.listvalue.string -+ -+ @property -+ def comments(self): -+ return self.field.comments.string -+ -+ @property -+ def tablevalue(self): -+ return TableAdapter(self.field.tablevalue) -+ -+ def __getattr__(self, item): -+ return getattr(self.field, item) -+ -+ @classmethod -+ def from_detect(cls, field): -+ if isinstance(field, Field): -+ return field -+ else: -+ return cls(field) -+ -+ - class Option(DataVarsSerializer): - shortopt = String - longopt = String -diff --git core/server/replace_class.py core/server/replace_class.py -index 23c5282..1318deb 100644 ---- core/server/replace_class.py -+++ core/server/replace_class.py -@@ -34,6 +34,7 @@ from calculate.lib.utils.colortext.output import BaseOutput - from calculate.lib.cl_print import color_print - from calculate.lib.datavars import VariableError - from calculate.lib.cl_lang import setLocalTranslate -+from calculate.core.server.api_types import FieldAdapter - - from methods_func import get_method_argparser, collect_object, \ - check_result_msg, get_param_pwd, _print -@@ -44,7 +45,7 @@ from func import shortTraceback, CommonMethods - - - setLocalTranslate('cl_core3', sys.modules[__name__]) --from itertools import cycle -+from itertools import cycle, izip, ifilter - import time - - -@@ -531,7 +532,7 @@ class replaceClass(): - def startGroup(self, message): - _print = get_terminal_print() - self.printDefault( -- _print.foreground(TextState.Colors.WHITE).bold(message)) -+ _print.foreground(TextState.Colors.WHITE)(message)) - #self.addMessage(type='startGroup', message=message) - - def endGroup(self): -@@ -766,159 +767,179 @@ def print_brief(view, brief_label): - print_brief_group(Group.fields, Group.name) - - --def print_brief_group(Fields, group_name): -- print_group_flag = False -- # if group_name: -- # _print ('\b'+group_name) -- uncompatible_count = 0 -- colorPrint = color_print() -- _colorprint = get_terminal_print(_print) -- for field in Fields: -- if field.uncompatible: -- uncompatible_count += 1 -- continue -- if field.element in ['input', 'openfile']: -- value = field.value if field.value else '' -- if not print_group_flag: -- if group_name: -- print_group_flag = True -- _colorprint.bold.foreground( -- TextState.Colors.WHITE)(group_name) -- colorPrint.printSUCCESS('%s: %s' % (field.label, value)) -- -- elif field.element in ['combo', 'comboEdit', 'radio', 'file']: -- if field.choice: -- if not field.choice[0]: -- field.choice.pop(0) -- if field.comments: -- if not field.comments[0]: -- field.comments.pop(0) -- if field.comments and field.choice: -- if not field.value in field.choice: -- field.choice.append(field.value) -- value = map(lambda x: field.comments[x] \ -- if len(field.comments) > x else field.choice[x], -- map(lambda x: field.choice.index(x), -- filter(lambda x: x in field.choice, -- [field.value]))) -- value = ', '.join(value) -- else: -- value = field.value if field.value else '' -- if not print_group_flag: -- if group_name: -- print_group_flag = True -- #_print('\b' + group_name) -- _colorprint.bold.foreground( -- TextState.Colors.WHITE)(group_name) -- colorPrint.printSUCCESS('%s: %s' % (field.label, value)) -- -- elif field.element in ['multichoice', 'multichoice_add', \ -- 'selecttable', 'selecttable_add']: -- if field.choice: -- if not field.choice[0]: -- field.choice.pop(0) -- if field.comments: -- if not field.comments[0]: -- field.comments.pop(0) -- if field.listvalue: -- if not field.listvalue[0]: -- field.listvalue.pop(0) -- if field.choice: -- value = map(lambda x: field.comments[x] \ -- if len(field.comments) > x \ -- else field.choice[x], -- map(lambda x: field.choice.index(x), \ -- field.listvalue)) -+class Display(object): -+ def __init__(self): -+ self._print = get_terminal_print(color_print().defaultPrint) -+ -+ def print_info(self, label, value): -+ GREEN = TextState.Colors.GREEN -+ self.display_asterisk(GREEN) -+ self._print("%s: " % label) -+ WHITE = TextState.Colors.WHITE -+ self._print.foreground(WHITE)(value) -+ self._print("\n") -+ -+ def print_label(self, label): -+ GREEN = TextState.Colors.GREEN -+ self.display_asterisk(GREEN) -+ self._print("%s: " % label) -+ self._print("\n") -+ -+ def display_asterisk(self, color): -+ self._print(" ") -+ self._print.foreground(color).bold("*") -+ self._print(" ") -+ -+ def print_error(self, message): -+ RED = TextState.Colors.RED -+ self.display_asterisk(RED) -+ self._print(message) -+ self._print("\n") -+ -+ def print_table(self, data, head): -+ -+ sys.stdout.write('%s\n' % printTable(data, head)) -+ -+ def print_group(self, label): -+ #WHITE = TextState.Colors.WHITE -+ #self._print.foreground(WHITE).bold(label) -+ #self._print.underline(label) -+ self._print(label) -+ self._print("\n") -+ -+ -+class InformationElement(object): -+ def __init__(self, field, display): -+ self.value = "" -+ self.label = "" -+ self.display = display -+ -+ @classmethod -+ def from_field(cls, field, display): -+ if field.type == 'steps': -+ return None -+ map_elements = {'input': ValueInfo, -+ 'openfile': ValueInfo, -+ 'combo': ChoiceInfo, -+ 'comboEdit': ChoiceInfo, -+ 'radio': ChoiceInfo, -+ 'file': ChoiceInfo, -+ 'multichoice': MultiChoiceInfo, -+ 'multichoice_add': MultiChoiceInfo, -+ 'selecttable': MultiChoiceInfo, -+ 'selecttable_add': MultiChoiceInfo, -+ 'error': ErrorInfo, -+ 'check': CheckInfo, -+ 'check_tristate': CheckInfo, -+ 'table': TableInfo -+ } -+ if field.element in map_elements: -+ return map_elements[field.element](field, display) -+ return None -+ -+ def show(self): -+ self.display.print_info(self.label, self.value) -+ -+ -+class ValueInfo(InformationElement): -+ def __init__(self, field, display): -+ super(ValueInfo, self).__init__(field, display) -+ self.value = field.value or '' -+ self.label = field.label -+ -+class CheckInfo(InformationElement): -+ def __init__(self, field, display): -+ super(CheckInfo, self).__init__(field, display) -+ self.label = field.label -+ map_answer = {'on':_('yes'), 'off': _("no"), 'auto': _('auto')} -+ self.value = map_answer.get(field.value, field.value) -+ -+class ChoiceInfo(InformationElement): -+ def __init__(self, field, display): -+ super(ChoiceInfo, self).__init__(field, display) -+ self.label = field.label or '' -+ if field.choice and field.comments: -+ map_comment = dict(zip(field.choice, field.comments)) -+ self.value = map_comment.get(field.value, field.value) or '' -+ else: -+ self.value = field.value if field.value else '' -+ -+ -+class MultiChoiceInfo(InformationElement): -+ def __init__(self, field, display): -+ super(MultiChoiceInfo, self).__init__(field, display) -+ self.label = field.label or '' -+ if field.listvalue: -+ value = field.listvalue -+ # удалить пустой первый элемент (особенности wsdl) -+ if value and not value[0]: -+ value.pop(0) -+ if field.choice and field.comments: -+ map_comment = dict(zip(field.choice, field.comments)) - else: -- value = [] -- value = ', '.join(value) -- if field.listvalue and not value: -- value = ', '.join(field.listvalue) -- elif not value: -- value = field.value if field.value else '' -- if not print_group_flag: -- if group_name: -- print_group_flag = True -- #_print('\b' + group_name) -- _colorprint.bold.foreground( -- TextState.Colors.WHITE)(group_name) -- colorPrint.printSUCCESS('%s: %s' % (field.label, value)) -- -- # elif field.element == 'label': -- # print field.label -- -- elif field.element == 'error': -- if not print_group_flag: -- if group_name: -- print_group_flag = True -- _colorprint.bold.foreground( -- TextState.Colors.WHITE)(group_name) -- colorPrint.printERROR(field.label) -- -- elif field.element in ['check', 'check_tristate']: -- if field.value == 'on': -- value = _('yes') -- elif field.value == 'off': -- value = _('no') -- elif field.value == 'auto': -- value = _('auto') -+ map_comment = {} -+ self.value = ", ".join([map_comment.get(x, x) or '' for x in value]) -+ else: -+ self.value = field.value or "" -+ -+ -+class ErrorInfo(InformationElement): -+ def __init__(self, field, display): -+ super(ErrorInfo, self).__init__(field, display) -+ self.label = field.label -+ -+ def show(self): -+ self.display.print_error(self.label) -+ -+ -+class TableInfo(InformationElement): -+ """ -+ Табличная информация -+ """ -+ -+ def map_row(self, row, typedata): -+ map_answer = {'on':_('yes'), 'off': _("no"), 'auto': _('auto')} -+ for cell, typefield in izip(row, typedata): -+ if typefield in ['check', 'check_tristate']: -+ yield map_answer.get(cell, cell) or "" -+ elif "password" in typefield: -+ yield "***" - else: -- value = field.value -- if not print_group_flag: -- if group_name: -- print_group_flag = True -- _colorprint.bold.foreground( -- TextState.Colors.WHITE)(group_name) -- colorPrint.printSUCCESS('%s: %s' % (field.label, value)) -- -- elif field.element == 'table' and field.type != 'steps': -- head = field.tablevalue.head -- -- body = [] -- for row in field.tablevalue.body: -- if not row[0]: -- row.pop(0) -- body.append(row) -- -- # if empty table -- if not filter(None, map(lambda x: x, body)): -- body = [[''] * len(head)] -- res = printTable(body, head) -- sys.stdout.flush() -- sys.stdout.write(res + "\n") -- continue -- ChoiceValue = field.tablevalue.values -- for row in xrange(len(ChoiceValue)): -- if ChoiceValue[row].typefield in ['check', 'check_tristate']: -- for i in xrange(len(body)): -- if body[i][row] == 'on': -- body[i][row] = _('yes') -- if body[i][row] == 'off': -- body[i][row] = _('no') -- if body[i][row] == 'auto': -- body[i][row] = _('auto') -- if "password" in ChoiceValue[row].typefield: -- for i in xrange(len(body)): -- if body[i][row]: -- body[i][row] = '***' -- data = [] -- for body_row in body: -- data.append(map(lambda x: x if x else '', body_row)) -- if not print_group_flag: -- if group_name: -- print_group_flag = True -- _colorprint.bold.foreground( -- TextState.Colors.WHITE)(group_name) -- colorPrint.printSUCCESS(field.label + ': ') -- res = printTable(data, head) -- sys.stdout.flush() -- sys.stdout.write(res + "\n") -+ yield cell or "" -+ -+ def __init__(self, field, display): -+ super(TableInfo, self).__init__(field, display) -+ self.label = field.label -+ self.head = field.tablevalue.head -+ -+ # удаление первого элемента строки (для wsdl) -+ body = [x[1:] if x and not x[0] else x for x in field.tablevalue.body] -+ -+ if not filter(None, map(lambda x: x, body)): -+ self.body = None - else: -- uncompatible_count += 1 -+ type_values = [x.typefield for x in field.tablevalue.values] -+ self.body = [list(self.map_row(x, type_values)) for x in body] -+ -+ def show(self): -+ if self.body: -+ self.display.print_label(self.label) -+ self.display.print_table(self.body, self.head) - - --# if uncompatible_count == len (Fields) and group_name: --# colorPrint.printSUCCESS(_('Not used')) -+def print_brief_group(Fields, group_name): -+ display = Display() -+ show_group = True -+ for element in ifilter(None, -+ (InformationElement.from_field( -+ FieldAdapter.from_detect(x), -+ display) -+ for x in Fields if not x.uncompatible)): -+ if show_group: -+ display.print_group(group_name) -+ show_group = False -+ element.show() -+ - - class Table(tableReport): - def __init__(self, *args, **kwargs): -@@ -953,4 +974,3 @@ def printTable(data, header=None): - except Exception as e: - print str(e) - raise -- diff --git a/sys-apps/calculate-core/files/calculate-core-3.2.0_alpha4-r4.patch b/sys-apps/calculate-core/files/calculate-core-3.2.0_alpha4-r4.patch deleted file mode 100644 index 55b6c05..0000000 --- a/sys-apps/calculate-core/files/calculate-core-3.2.0_alpha4-r4.patch +++ /dev/null @@ -1,500 +0,0 @@ -diff --git core/server/api_types.py core/server/api_types.py -index 3863d53..eb205c1 100644 ---- core/server/api_types.py -+++ core/server/api_types.py -@@ -164,6 +164,97 @@ class Table(DataVarsSerializer): - self.onClick = onClick - self.addAction = addAction - -+class ChoiceValueAdapter(object): -+ def __init__(self, choicevalue): -+ self.choicevalue = choicevalue -+ -+ @property -+ def values(self): -+ return self.choicevalue.values.string -+ -+ @property -+ def comments(self): -+ return self.choicevalue.comments.string -+ -+ @property -+ def onChanged(self): -+ return self.choicevalue.onChanged.string -+ -+ def __getattr__(self, item): -+ return getattr(self.choicevalue, item) -+ -+ @classmethod -+ def from_detect(cls, choicevalue): -+ if isinstance(choicevalue, ChoiceValue): -+ return choicevalue -+ else: -+ return cls(choicevalue) -+ -+class TableAdapter(object): -+ def __init__(self, table): -+ self.table = table -+ -+ @property -+ def fields(self): -+ return self.table.fields.string -+ -+ @property -+ def head(self): -+ return self.table.head.string -+ -+ @property -+ def body(self): -+ if hasattr(self.table.body,'stringArray'): -+ return [row.string -+ for row in self.table.body.stringArray -+ if hasattr(row, "string")] -+ return [] -+ -+ @property -+ def values(self): -+ return [ChoiceValueAdapter(x) for x in self.table.values.ChoiceValue] -+ -+ def __getattr__(self, item): -+ return getattr(self.table, item) -+ -+ @classmethod -+ def from_detect(cls, table): -+ if isinstance(table, Table): -+ return table -+ else: -+ return cls(table) -+ -+class FieldAdapter(object): -+ def __init__(self, field): -+ self.field = field -+ -+ @property -+ def choice(self): -+ return self.field.choice.string -+ -+ @property -+ def listvalue(self): -+ return self.field.listvalue.string -+ -+ @property -+ def comments(self): -+ return self.field.comments.string -+ -+ @property -+ def tablevalue(self): -+ return TableAdapter(self.field.tablevalue) -+ -+ def __getattr__(self, item): -+ return getattr(self.field, item) -+ -+ @classmethod -+ def from_detect(cls, field): -+ if isinstance(field, Field): -+ return field -+ else: -+ return cls(field) -+ -+ - class Option(DataVarsSerializer): - shortopt = String - longopt = String -diff --git core/server/replace_class.py core/server/replace_class.py -index 23c5282..6901ef6 100644 ---- core/server/replace_class.py -+++ core/server/replace_class.py -@@ -34,6 +34,7 @@ from calculate.lib.utils.colortext.output import BaseOutput - from calculate.lib.cl_print import color_print - from calculate.lib.datavars import VariableError - from calculate.lib.cl_lang import setLocalTranslate -+from calculate.core.server.api_types import FieldAdapter - - from methods_func import get_method_argparser, collect_object, \ - check_result_msg, get_param_pwd, _print -@@ -44,7 +45,7 @@ from func import shortTraceback, CommonMethods - - - setLocalTranslate('cl_core3', sys.modules[__name__]) --from itertools import cycle -+from itertools import cycle, izip, ifilter - import time - - -@@ -411,9 +412,9 @@ class replaceClass(): - yes_color, no_color = Colors.GREEN, Colors.LIGHT_RED - else: - yes_color, no_color = Colors.LIGHT_RED, Colors.GREEN -- yes = _print.foreground(yes_color).bold("Yes") -- no = _print.foreground(no_color).bold("No") -- white_message = _print.foreground(Colors.WHITE).bold( -+ yes = _print.foreground(yes_color)("Yes") -+ no = _print.foreground(no_color)("No") -+ white_message = _print.foreground(Colors.WHITE)( - message) - ask = raw_input(white_message + ' (%s/%s): ' % (yes, no)) - except KeyboardInterrupt: -@@ -445,7 +446,7 @@ class replaceClass(): - useGetChar = False - else: - useGetChar = True -- message = _print.foreground(Colors.WHITE).bold(message) -+ message = _print.foreground(Colors.WHITE)(message) - - while True: - outMessage = message + ' (%s): ' % \ -@@ -531,7 +532,7 @@ class replaceClass(): - def startGroup(self, message): - _print = get_terminal_print() - self.printDefault( -- _print.foreground(TextState.Colors.WHITE).bold(message)) -+ _print.foreground(TextState.Colors.WHITE)(message)) - #self.addMessage(type='startGroup', message=message) - - def endGroup(self): -@@ -766,159 +767,179 @@ def print_brief(view, brief_label): - print_brief_group(Group.fields, Group.name) - - --def print_brief_group(Fields, group_name): -- print_group_flag = False -- # if group_name: -- # _print ('\b'+group_name) -- uncompatible_count = 0 -- colorPrint = color_print() -- _colorprint = get_terminal_print(_print) -- for field in Fields: -- if field.uncompatible: -- uncompatible_count += 1 -- continue -- if field.element in ['input', 'openfile']: -- value = field.value if field.value else '' -- if not print_group_flag: -- if group_name: -- print_group_flag = True -- _colorprint.bold.foreground( -- TextState.Colors.WHITE)(group_name) -- colorPrint.printSUCCESS('%s: %s' % (field.label, value)) -- -- elif field.element in ['combo', 'comboEdit', 'radio', 'file']: -- if field.choice: -- if not field.choice[0]: -- field.choice.pop(0) -- if field.comments: -- if not field.comments[0]: -- field.comments.pop(0) -- if field.comments and field.choice: -- if not field.value in field.choice: -- field.choice.append(field.value) -- value = map(lambda x: field.comments[x] \ -- if len(field.comments) > x else field.choice[x], -- map(lambda x: field.choice.index(x), -- filter(lambda x: x in field.choice, -- [field.value]))) -- value = ', '.join(value) -- else: -- value = field.value if field.value else '' -- if not print_group_flag: -- if group_name: -- print_group_flag = True -- #_print('\b' + group_name) -- _colorprint.bold.foreground( -- TextState.Colors.WHITE)(group_name) -- colorPrint.printSUCCESS('%s: %s' % (field.label, value)) -- -- elif field.element in ['multichoice', 'multichoice_add', \ -- 'selecttable', 'selecttable_add']: -- if field.choice: -- if not field.choice[0]: -- field.choice.pop(0) -- if field.comments: -- if not field.comments[0]: -- field.comments.pop(0) -- if field.listvalue: -- if not field.listvalue[0]: -- field.listvalue.pop(0) -- if field.choice: -- value = map(lambda x: field.comments[x] \ -- if len(field.comments) > x \ -- else field.choice[x], -- map(lambda x: field.choice.index(x), \ -- field.listvalue)) -+class Display(object): -+ def __init__(self): -+ self._print = get_terminal_print(color_print().defaultPrint) -+ -+ def print_info(self, label, value): -+ GREEN = TextState.Colors.GREEN -+ self.display_asterisk(GREEN) -+ self._print("%s: " % label) -+ WHITE = TextState.Colors.WHITE -+ self._print.foreground(WHITE)(value) -+ self._print("\n") -+ -+ def print_label(self, label): -+ GREEN = TextState.Colors.GREEN -+ self.display_asterisk(GREEN) -+ self._print("%s: " % label) -+ self._print("\n") -+ -+ def display_asterisk(self, color): -+ self._print(" ") -+ self._print.foreground(color).bold("*") -+ self._print(" ") -+ -+ def print_error(self, message): -+ RED = TextState.Colors.RED -+ self.display_asterisk(RED) -+ self._print(message) -+ self._print("\n") -+ -+ def print_table(self, data, head): -+ -+ sys.stdout.write('%s\n' % printTable(data, head)) -+ -+ def print_group(self, label): -+ #WHITE = TextState.Colors.WHITE -+ #self._print.foreground(WHITE).bold(label) -+ #self._print.underline(label) -+ self._print(label) -+ self._print("\n") -+ -+ -+class InformationElement(object): -+ def __init__(self, field, display): -+ self.value = "" -+ self.label = "" -+ self.display = display -+ -+ @classmethod -+ def from_field(cls, field, display): -+ if field.type == 'steps': -+ return None -+ map_elements = {'input': ValueInfo, -+ 'openfile': ValueInfo, -+ 'combo': ChoiceInfo, -+ 'comboEdit': ChoiceInfo, -+ 'radio': ChoiceInfo, -+ 'file': ChoiceInfo, -+ 'multichoice': MultiChoiceInfo, -+ 'multichoice_add': MultiChoiceInfo, -+ 'selecttable': MultiChoiceInfo, -+ 'selecttable_add': MultiChoiceInfo, -+ 'error': ErrorInfo, -+ 'check': CheckInfo, -+ 'check_tristate': CheckInfo, -+ 'table': TableInfo -+ } -+ if field.element in map_elements: -+ return map_elements[field.element](field, display) -+ return None -+ -+ def show(self): -+ self.display.print_info(self.label, self.value) -+ -+ -+class ValueInfo(InformationElement): -+ def __init__(self, field, display): -+ super(ValueInfo, self).__init__(field, display) -+ self.value = field.value or '' -+ self.label = field.label -+ -+class CheckInfo(InformationElement): -+ def __init__(self, field, display): -+ super(CheckInfo, self).__init__(field, display) -+ self.label = field.label -+ map_answer = {'on':_('yes'), 'off': _("no"), 'auto': _('auto')} -+ self.value = map_answer.get(field.value, field.value) -+ -+class ChoiceInfo(InformationElement): -+ def __init__(self, field, display): -+ super(ChoiceInfo, self).__init__(field, display) -+ self.label = field.label or '' -+ if field.choice and field.comments: -+ map_comment = dict(zip(field.choice, field.comments)) -+ self.value = map_comment.get(field.value, field.value) or '' -+ else: -+ self.value = field.value if field.value else '' -+ -+ -+class MultiChoiceInfo(InformationElement): -+ def __init__(self, field, display): -+ super(MultiChoiceInfo, self).__init__(field, display) -+ self.label = field.label or '' -+ if field.listvalue: -+ value = field.listvalue -+ # удалить пустой первый элемент (особенности wsdl) -+ if value and not value[0]: -+ value.pop(0) -+ if field.choice and field.comments: -+ map_comment = dict(zip(field.choice, field.comments)) - else: -- value = [] -- value = ', '.join(value) -- if field.listvalue and not value: -- value = ', '.join(field.listvalue) -- elif not value: -- value = field.value if field.value else '' -- if not print_group_flag: -- if group_name: -- print_group_flag = True -- #_print('\b' + group_name) -- _colorprint.bold.foreground( -- TextState.Colors.WHITE)(group_name) -- colorPrint.printSUCCESS('%s: %s' % (field.label, value)) -- -- # elif field.element == 'label': -- # print field.label -- -- elif field.element == 'error': -- if not print_group_flag: -- if group_name: -- print_group_flag = True -- _colorprint.bold.foreground( -- TextState.Colors.WHITE)(group_name) -- colorPrint.printERROR(field.label) -- -- elif field.element in ['check', 'check_tristate']: -- if field.value == 'on': -- value = _('yes') -- elif field.value == 'off': -- value = _('no') -- elif field.value == 'auto': -- value = _('auto') -+ map_comment = {} -+ self.value = ", ".join([map_comment.get(x, x) or '' for x in value]) -+ else: -+ self.value = field.value or "" -+ -+ -+class ErrorInfo(InformationElement): -+ def __init__(self, field, display): -+ super(ErrorInfo, self).__init__(field, display) -+ self.label = field.label -+ -+ def show(self): -+ self.display.print_error(self.label) -+ -+ -+class TableInfo(InformationElement): -+ """ -+ Табличная информация -+ """ -+ -+ def map_row(self, row, typedata): -+ map_answer = {'on':_('yes'), 'off': _("no"), 'auto': _('auto')} -+ for cell, typefield in izip(row, typedata): -+ if typefield in ['check', 'check_tristate']: -+ yield map_answer.get(cell, cell) or "" -+ elif "password" in typefield: -+ yield "***" - else: -- value = field.value -- if not print_group_flag: -- if group_name: -- print_group_flag = True -- _colorprint.bold.foreground( -- TextState.Colors.WHITE)(group_name) -- colorPrint.printSUCCESS('%s: %s' % (field.label, value)) -- -- elif field.element == 'table' and field.type != 'steps': -- head = field.tablevalue.head -- -- body = [] -- for row in field.tablevalue.body: -- if not row[0]: -- row.pop(0) -- body.append(row) -- -- # if empty table -- if not filter(None, map(lambda x: x, body)): -- body = [[''] * len(head)] -- res = printTable(body, head) -- sys.stdout.flush() -- sys.stdout.write(res + "\n") -- continue -- ChoiceValue = field.tablevalue.values -- for row in xrange(len(ChoiceValue)): -- if ChoiceValue[row].typefield in ['check', 'check_tristate']: -- for i in xrange(len(body)): -- if body[i][row] == 'on': -- body[i][row] = _('yes') -- if body[i][row] == 'off': -- body[i][row] = _('no') -- if body[i][row] == 'auto': -- body[i][row] = _('auto') -- if "password" in ChoiceValue[row].typefield: -- for i in xrange(len(body)): -- if body[i][row]: -- body[i][row] = '***' -- data = [] -- for body_row in body: -- data.append(map(lambda x: x if x else '', body_row)) -- if not print_group_flag: -- if group_name: -- print_group_flag = True -- _colorprint.bold.foreground( -- TextState.Colors.WHITE)(group_name) -- colorPrint.printSUCCESS(field.label + ': ') -- res = printTable(data, head) -- sys.stdout.flush() -- sys.stdout.write(res + "\n") -+ yield cell or "" -+ -+ def __init__(self, field, display): -+ super(TableInfo, self).__init__(field, display) -+ self.label = field.label -+ self.head = field.tablevalue.head -+ -+ # удаление первого элемента строки (для wsdl) -+ body = [x[1:] if x and not x[0] else x for x in field.tablevalue.body] -+ -+ if not filter(None, map(lambda x: x, body)): -+ self.body = None - else: -- uncompatible_count += 1 -+ type_values = [x.typefield for x in field.tablevalue.values] -+ self.body = [list(self.map_row(x, type_values)) for x in body] -+ -+ def show(self): -+ if self.body: -+ self.display.print_label(self.label) -+ self.display.print_table(self.body, self.head) - - --# if uncompatible_count == len (Fields) and group_name: --# colorPrint.printSUCCESS(_('Not used')) -+def print_brief_group(Fields, group_name): -+ display = Display() -+ show_group = True -+ for element in ifilter(None, -+ (InformationElement.from_field( -+ FieldAdapter.from_detect(x), -+ display) -+ for x in Fields if not x.uncompatible)): -+ if show_group: -+ display.print_group(group_name) -+ show_group = False -+ element.show() -+ - - class Table(tableReport): - def __init__(self, *args, **kwargs): -@@ -953,4 +974,3 @@ def printTable(data, header=None): - except Exception as e: - print str(e) - raise -- -diff --git core/variables/certificate.py core/variables/certificate.py -index 7cbf9fe..8b1c0cf 100644 ---- core/variables/certificate.py -+++ core/variables/certificate.py -@@ -204,7 +204,7 @@ class VariableClCertGroups(Variable): - (OpenSSL.SSL.FILETYPE_PEM, cert) - com = certobj.get_extension(certobj.get_extension_count()-1). \ - get_data() -- groups = com.split(':')[1] -+ groups = com.rpartition(':')[2] - groups_list = groups.split(',') - return groups_list - except (OpenSSL.crypto.Error,IOError) as e: diff --git a/sys-apps/calculate-core/files/calculate-core-3.2.0_alpha4-r5.patch b/sys-apps/calculate-core/files/calculate-core-3.2.0_alpha4-r5.patch deleted file mode 100644 index 7ff64d8..0000000 --- a/sys-apps/calculate-core/files/calculate-core-3.2.0_alpha4-r5.patch +++ /dev/null @@ -1,522 +0,0 @@ -diff --git core/server/api_types.py core/server/api_types.py -index 3863d53..eb205c1 100644 ---- core/server/api_types.py -+++ core/server/api_types.py -@@ -164,6 +164,97 @@ class Table(DataVarsSerializer): - self.onClick = onClick - self.addAction = addAction - -+class ChoiceValueAdapter(object): -+ def __init__(self, choicevalue): -+ self.choicevalue = choicevalue -+ -+ @property -+ def values(self): -+ return self.choicevalue.values.string -+ -+ @property -+ def comments(self): -+ return self.choicevalue.comments.string -+ -+ @property -+ def onChanged(self): -+ return self.choicevalue.onChanged.string -+ -+ def __getattr__(self, item): -+ return getattr(self.choicevalue, item) -+ -+ @classmethod -+ def from_detect(cls, choicevalue): -+ if isinstance(choicevalue, ChoiceValue): -+ return choicevalue -+ else: -+ return cls(choicevalue) -+ -+class TableAdapter(object): -+ def __init__(self, table): -+ self.table = table -+ -+ @property -+ def fields(self): -+ return self.table.fields.string -+ -+ @property -+ def head(self): -+ return self.table.head.string -+ -+ @property -+ def body(self): -+ if hasattr(self.table.body,'stringArray'): -+ return [row.string -+ for row in self.table.body.stringArray -+ if hasattr(row, "string")] -+ return [] -+ -+ @property -+ def values(self): -+ return [ChoiceValueAdapter(x) for x in self.table.values.ChoiceValue] -+ -+ def __getattr__(self, item): -+ return getattr(self.table, item) -+ -+ @classmethod -+ def from_detect(cls, table): -+ if isinstance(table, Table): -+ return table -+ else: -+ return cls(table) -+ -+class FieldAdapter(object): -+ def __init__(self, field): -+ self.field = field -+ -+ @property -+ def choice(self): -+ return self.field.choice.string -+ -+ @property -+ def listvalue(self): -+ return self.field.listvalue.string -+ -+ @property -+ def comments(self): -+ return self.field.comments.string -+ -+ @property -+ def tablevalue(self): -+ return TableAdapter(self.field.tablevalue) -+ -+ def __getattr__(self, item): -+ return getattr(self.field, item) -+ -+ @classmethod -+ def from_detect(cls, field): -+ if isinstance(field, Field): -+ return field -+ else: -+ return cls(field) -+ -+ - class Option(DataVarsSerializer): - shortopt = String - longopt = String -diff --git core/server/replace_class.py core/server/replace_class.py -index 23c5282..6901ef6 100644 ---- core/server/replace_class.py -+++ core/server/replace_class.py -@@ -34,6 +34,7 @@ from calculate.lib.utils.colortext.output import BaseOutput - from calculate.lib.cl_print import color_print - from calculate.lib.datavars import VariableError - from calculate.lib.cl_lang import setLocalTranslate -+from calculate.core.server.api_types import FieldAdapter - - from methods_func import get_method_argparser, collect_object, \ - check_result_msg, get_param_pwd, _print -@@ -44,7 +45,7 @@ from func import shortTraceback, CommonMethods - - - setLocalTranslate('cl_core3', sys.modules[__name__]) --from itertools import cycle -+from itertools import cycle, izip, ifilter - import time - - -@@ -411,9 +412,9 @@ class replaceClass(): - yes_color, no_color = Colors.GREEN, Colors.LIGHT_RED - else: - yes_color, no_color = Colors.LIGHT_RED, Colors.GREEN -- yes = _print.foreground(yes_color).bold("Yes") -- no = _print.foreground(no_color).bold("No") -- white_message = _print.foreground(Colors.WHITE).bold( -+ yes = _print.foreground(yes_color)("Yes") -+ no = _print.foreground(no_color)("No") -+ white_message = _print.foreground(Colors.WHITE)( - message) - ask = raw_input(white_message + ' (%s/%s): ' % (yes, no)) - except KeyboardInterrupt: -@@ -445,7 +446,7 @@ class replaceClass(): - useGetChar = False - else: - useGetChar = True -- message = _print.foreground(Colors.WHITE).bold(message) -+ message = _print.foreground(Colors.WHITE)(message) - - while True: - outMessage = message + ' (%s): ' % \ -@@ -531,7 +532,7 @@ class replaceClass(): - def startGroup(self, message): - _print = get_terminal_print() - self.printDefault( -- _print.foreground(TextState.Colors.WHITE).bold(message)) -+ _print.foreground(TextState.Colors.WHITE)(message)) - #self.addMessage(type='startGroup', message=message) - - def endGroup(self): -@@ -766,159 +767,179 @@ def print_brief(view, brief_label): - print_brief_group(Group.fields, Group.name) - - --def print_brief_group(Fields, group_name): -- print_group_flag = False -- # if group_name: -- # _print ('\b'+group_name) -- uncompatible_count = 0 -- colorPrint = color_print() -- _colorprint = get_terminal_print(_print) -- for field in Fields: -- if field.uncompatible: -- uncompatible_count += 1 -- continue -- if field.element in ['input', 'openfile']: -- value = field.value if field.value else '' -- if not print_group_flag: -- if group_name: -- print_group_flag = True -- _colorprint.bold.foreground( -- TextState.Colors.WHITE)(group_name) -- colorPrint.printSUCCESS('%s: %s' % (field.label, value)) -- -- elif field.element in ['combo', 'comboEdit', 'radio', 'file']: -- if field.choice: -- if not field.choice[0]: -- field.choice.pop(0) -- if field.comments: -- if not field.comments[0]: -- field.comments.pop(0) -- if field.comments and field.choice: -- if not field.value in field.choice: -- field.choice.append(field.value) -- value = map(lambda x: field.comments[x] \ -- if len(field.comments) > x else field.choice[x], -- map(lambda x: field.choice.index(x), -- filter(lambda x: x in field.choice, -- [field.value]))) -- value = ', '.join(value) -- else: -- value = field.value if field.value else '' -- if not print_group_flag: -- if group_name: -- print_group_flag = True -- #_print('\b' + group_name) -- _colorprint.bold.foreground( -- TextState.Colors.WHITE)(group_name) -- colorPrint.printSUCCESS('%s: %s' % (field.label, value)) -- -- elif field.element in ['multichoice', 'multichoice_add', \ -- 'selecttable', 'selecttable_add']: -- if field.choice: -- if not field.choice[0]: -- field.choice.pop(0) -- if field.comments: -- if not field.comments[0]: -- field.comments.pop(0) -- if field.listvalue: -- if not field.listvalue[0]: -- field.listvalue.pop(0) -- if field.choice: -- value = map(lambda x: field.comments[x] \ -- if len(field.comments) > x \ -- else field.choice[x], -- map(lambda x: field.choice.index(x), \ -- field.listvalue)) -+class Display(object): -+ def __init__(self): -+ self._print = get_terminal_print(color_print().defaultPrint) -+ -+ def print_info(self, label, value): -+ GREEN = TextState.Colors.GREEN -+ self.display_asterisk(GREEN) -+ self._print("%s: " % label) -+ WHITE = TextState.Colors.WHITE -+ self._print.foreground(WHITE)(value) -+ self._print("\n") -+ -+ def print_label(self, label): -+ GREEN = TextState.Colors.GREEN -+ self.display_asterisk(GREEN) -+ self._print("%s: " % label) -+ self._print("\n") -+ -+ def display_asterisk(self, color): -+ self._print(" ") -+ self._print.foreground(color).bold("*") -+ self._print(" ") -+ -+ def print_error(self, message): -+ RED = TextState.Colors.RED -+ self.display_asterisk(RED) -+ self._print(message) -+ self._print("\n") -+ -+ def print_table(self, data, head): -+ -+ sys.stdout.write('%s\n' % printTable(data, head)) -+ -+ def print_group(self, label): -+ #WHITE = TextState.Colors.WHITE -+ #self._print.foreground(WHITE).bold(label) -+ #self._print.underline(label) -+ self._print(label) -+ self._print("\n") -+ -+ -+class InformationElement(object): -+ def __init__(self, field, display): -+ self.value = "" -+ self.label = "" -+ self.display = display -+ -+ @classmethod -+ def from_field(cls, field, display): -+ if field.type == 'steps': -+ return None -+ map_elements = {'input': ValueInfo, -+ 'openfile': ValueInfo, -+ 'combo': ChoiceInfo, -+ 'comboEdit': ChoiceInfo, -+ 'radio': ChoiceInfo, -+ 'file': ChoiceInfo, -+ 'multichoice': MultiChoiceInfo, -+ 'multichoice_add': MultiChoiceInfo, -+ 'selecttable': MultiChoiceInfo, -+ 'selecttable_add': MultiChoiceInfo, -+ 'error': ErrorInfo, -+ 'check': CheckInfo, -+ 'check_tristate': CheckInfo, -+ 'table': TableInfo -+ } -+ if field.element in map_elements: -+ return map_elements[field.element](field, display) -+ return None -+ -+ def show(self): -+ self.display.print_info(self.label, self.value) -+ -+ -+class ValueInfo(InformationElement): -+ def __init__(self, field, display): -+ super(ValueInfo, self).__init__(field, display) -+ self.value = field.value or '' -+ self.label = field.label -+ -+class CheckInfo(InformationElement): -+ def __init__(self, field, display): -+ super(CheckInfo, self).__init__(field, display) -+ self.label = field.label -+ map_answer = {'on':_('yes'), 'off': _("no"), 'auto': _('auto')} -+ self.value = map_answer.get(field.value, field.value) -+ -+class ChoiceInfo(InformationElement): -+ def __init__(self, field, display): -+ super(ChoiceInfo, self).__init__(field, display) -+ self.label = field.label or '' -+ if field.choice and field.comments: -+ map_comment = dict(zip(field.choice, field.comments)) -+ self.value = map_comment.get(field.value, field.value) or '' -+ else: -+ self.value = field.value if field.value else '' -+ -+ -+class MultiChoiceInfo(InformationElement): -+ def __init__(self, field, display): -+ super(MultiChoiceInfo, self).__init__(field, display) -+ self.label = field.label or '' -+ if field.listvalue: -+ value = field.listvalue -+ # удалить пустой первый элемент (особенности wsdl) -+ if value and not value[0]: -+ value.pop(0) -+ if field.choice and field.comments: -+ map_comment = dict(zip(field.choice, field.comments)) - else: -- value = [] -- value = ', '.join(value) -- if field.listvalue and not value: -- value = ', '.join(field.listvalue) -- elif not value: -- value = field.value if field.value else '' -- if not print_group_flag: -- if group_name: -- print_group_flag = True -- #_print('\b' + group_name) -- _colorprint.bold.foreground( -- TextState.Colors.WHITE)(group_name) -- colorPrint.printSUCCESS('%s: %s' % (field.label, value)) -- -- # elif field.element == 'label': -- # print field.label -- -- elif field.element == 'error': -- if not print_group_flag: -- if group_name: -- print_group_flag = True -- _colorprint.bold.foreground( -- TextState.Colors.WHITE)(group_name) -- colorPrint.printERROR(field.label) -- -- elif field.element in ['check', 'check_tristate']: -- if field.value == 'on': -- value = _('yes') -- elif field.value == 'off': -- value = _('no') -- elif field.value == 'auto': -- value = _('auto') -+ map_comment = {} -+ self.value = ", ".join([map_comment.get(x, x) or '' for x in value]) -+ else: -+ self.value = field.value or "" -+ -+ -+class ErrorInfo(InformationElement): -+ def __init__(self, field, display): -+ super(ErrorInfo, self).__init__(field, display) -+ self.label = field.label -+ -+ def show(self): -+ self.display.print_error(self.label) -+ -+ -+class TableInfo(InformationElement): -+ """ -+ Табличная информация -+ """ -+ -+ def map_row(self, row, typedata): -+ map_answer = {'on':_('yes'), 'off': _("no"), 'auto': _('auto')} -+ for cell, typefield in izip(row, typedata): -+ if typefield in ['check', 'check_tristate']: -+ yield map_answer.get(cell, cell) or "" -+ elif "password" in typefield: -+ yield "***" - else: -- value = field.value -- if not print_group_flag: -- if group_name: -- print_group_flag = True -- _colorprint.bold.foreground( -- TextState.Colors.WHITE)(group_name) -- colorPrint.printSUCCESS('%s: %s' % (field.label, value)) -- -- elif field.element == 'table' and field.type != 'steps': -- head = field.tablevalue.head -- -- body = [] -- for row in field.tablevalue.body: -- if not row[0]: -- row.pop(0) -- body.append(row) -- -- # if empty table -- if not filter(None, map(lambda x: x, body)): -- body = [[''] * len(head)] -- res = printTable(body, head) -- sys.stdout.flush() -- sys.stdout.write(res + "\n") -- continue -- ChoiceValue = field.tablevalue.values -- for row in xrange(len(ChoiceValue)): -- if ChoiceValue[row].typefield in ['check', 'check_tristate']: -- for i in xrange(len(body)): -- if body[i][row] == 'on': -- body[i][row] = _('yes') -- if body[i][row] == 'off': -- body[i][row] = _('no') -- if body[i][row] == 'auto': -- body[i][row] = _('auto') -- if "password" in ChoiceValue[row].typefield: -- for i in xrange(len(body)): -- if body[i][row]: -- body[i][row] = '***' -- data = [] -- for body_row in body: -- data.append(map(lambda x: x if x else '', body_row)) -- if not print_group_flag: -- if group_name: -- print_group_flag = True -- _colorprint.bold.foreground( -- TextState.Colors.WHITE)(group_name) -- colorPrint.printSUCCESS(field.label + ': ') -- res = printTable(data, head) -- sys.stdout.flush() -- sys.stdout.write(res + "\n") -+ yield cell or "" -+ -+ def __init__(self, field, display): -+ super(TableInfo, self).__init__(field, display) -+ self.label = field.label -+ self.head = field.tablevalue.head -+ -+ # удаление первого элемента строки (для wsdl) -+ body = [x[1:] if x and not x[0] else x for x in field.tablevalue.body] -+ -+ if not filter(None, map(lambda x: x, body)): -+ self.body = None - else: -- uncompatible_count += 1 -+ type_values = [x.typefield for x in field.tablevalue.values] -+ self.body = [list(self.map_row(x, type_values)) for x in body] -+ -+ def show(self): -+ if self.body: -+ self.display.print_label(self.label) -+ self.display.print_table(self.body, self.head) - - --# if uncompatible_count == len (Fields) and group_name: --# colorPrint.printSUCCESS(_('Not used')) -+def print_brief_group(Fields, group_name): -+ display = Display() -+ show_group = True -+ for element in ifilter(None, -+ (InformationElement.from_field( -+ FieldAdapter.from_detect(x), -+ display) -+ for x in Fields if not x.uncompatible)): -+ if show_group: -+ display.print_group(group_name) -+ show_group = False -+ element.show() -+ - - class Table(tableReport): - def __init__(self, *args, **kwargs): -@@ -953,4 +974,3 @@ def printTable(data, header=None): - except Exception as e: - print str(e) - raise -- -diff --git core/variables/certificate.py core/variables/certificate.py -index 7cbf9fe..8b1c0cf 100644 ---- core/variables/certificate.py -+++ core/variables/certificate.py -@@ -204,7 +204,7 @@ class VariableClCertGroups(Variable): - (OpenSSL.SSL.FILETYPE_PEM, cert) - com = certobj.get_extension(certobj.get_extension_count()-1). \ - get_data() -- groups = com.split(':')[1] -+ groups = com.rpartition(':')[2] - groups_list = groups.split(',') - return groups_list - except (OpenSSL.crypto.Error,IOError) as e: -diff --git scripts/cl-core scripts/cl-core -index 02baeff..c923e34 100644 ---- scripts/cl-core -+++ scripts/cl-core -@@ -18,6 +18,7 @@ - from calculate.core.server.cl_server import main - import sys, os - reload(sys) -+from calculate.lib.datavars import CriticalError - sys.setdefaultencoding("utf-8") - from calculate.lib.cl_lang import setLocalTranslate - setLocalTranslate('cl_core',sys.modules[__name__]) -@@ -26,6 +27,9 @@ from traceback import print_exc - if __name__=='__main__': - try: - sys.exit(main()) -+ except CriticalError as e: -+ sys.stderr.write("%s\n" % str(e)) -+ sys.exit(1) - except ImportError, e: - print_exc() - cannot_import = 'cannot import name ' 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 deleted file mode 100644 index 0bbb8a6..0000000 --- a/sys-apps/calculate-core/files/calculate-core-3.2.0_alpha5-r1.patch +++ /dev/null @@ -1,102 +0,0 @@ -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-core/files/calculate-core-3.2.0_alpha5-r2.patch b/sys-apps/calculate-core/files/calculate-core-3.2.0_alpha5-r2.patch deleted file mode 100644 index f2d84cc..0000000 --- a/sys-apps/calculate-core/files/calculate-core-3.2.0_alpha5-r2.patch +++ /dev/null @@ -1,133 +0,0 @@ -diff --git core/depricated.py core/depricated.py -new file mode 100644 -index 0000000..f5d7b4e ---- /dev/null -+++ core/depricated.py -@@ -0,0 +1,17 @@ -+#-*- coding: utf-8 -*- -+ -+# Copyright 2011-2013 Calculate Ltd. http://www.calculate-linux.org -+# -+# Licensed under the Apache License, Version 2.0 (the "License"); -+# you may not use this file except in compliance with the License. -+# You may obtain a copy of the License at -+# -+# http://www.apache.org/licenses/LICENSE-2.0 -+# -+# Unless required by applicable law or agreed to in writing, software -+# distributed under the License is distributed on an "AS IS" BASIS, -+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+# See the License for the specific language governing permissions and -+# limitations under the License. -+ -+safetyWrapper = lambda *args, **kw: lambda f:f -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..3bde6e4 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 -@@ -38,6 +39,7 @@ from calculate.core.server.api_types import ChoiceValue, Table, Option, Field, \ - GroupField, ViewInfo, ViewParams - from calculate.lib.datavars import DataVars - from decorators import Dec -+from calculate.core.depricated import safetyWrapper - - class CommonMethods: - def dispatchConf(self,filesApply=None): -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-desktop/Manifest b/sys-apps/calculate-desktop/Manifest index 335ec7d..cedb306 100644 --- a/sys-apps/calculate-desktop/Manifest +++ b/sys-apps/calculate-desktop/Manifest @@ -1,15 +1,5 @@ -DIST calculate-desktop-3.2.0_alpha1.tar.bz2 16991 SHA256 ae11cc15034f6c635056d2e093138cd0ff721c16ecce0f7a964b993c531cf55f SHA512 acb9bf90d706072201a3c1c63512e6f218964e89856a704c44f0545124ab96c2e7b1871239e9527ab87579adb812acb4541bb58eebdb53b80442524b5b5cf7e4 WHIRLPOOL 53c36dbad0473a1ba6977de5488975a87e7d35d9975399bdf715a48268dce5eb1b4d0c5026acf65fd6003388d42095d5264396cca5e9c06c98b1711e51f83f65 -DIST calculate-desktop-3.2.0_alpha2.tar.bz2 16992 SHA256 a15f663b4cbdf3e5c76a3016c7bd7271eb7c5d2192a914c3e8daf0fa80d7ab6e SHA512 91dc8011d55e6680625d6b9ba101983155c45c01c4286605284521de5c13c8203c1c8c6424bb7b68f041f51863166958a634c18ba18b9e9c82d4ecde51c56c75 WHIRLPOOL 3a2c3282e9d0092e3cea8647cd906987d9ef5966c63f62f24eeeff50face26bc134615c82bb885207209623705940092b46f765dda8e0091afdd27eec8827523 -DIST calculate-desktop-3.2.0_alpha3.tar.bz2 16966 SHA256 cec3be379d400c030aba3858555ed30cfd5455dacea5b372c34dcc840bafce4f SHA512 2e2f1b2b90eb1bc4e1617099a83f828f91df3656e6c79e33895c928690bcb155fa5f0af3ad0a15b923121015bf79c0b34a90c8d609d1414e7c242a90372c8a4d WHIRLPOOL 7a4d9c8e709e01cc030ddf89ff529fb733726fcfe91c4b1d8a1b2a011cffc935e2c61c9c6259deea22529279546372a63902e67f773a28e9ec830d6856c2194c -DIST calculate-desktop-3.2.0_alpha4.tar.bz2 16993 SHA256 341af3512fd6f03873d4ba8fb9ae6619e58b3645714e5865528232dfe87bd391 SHA512 e372f6efb53ce25adec3eb537b1fdb9e3aa9ba55675a1d3f27f8b424638a454a9aae9f3dcb89d425b11b3d126d0055c5e382048a0396ca071251ac5afcc057f3 WHIRLPOOL 4c00ec00fb17937ac324d2ad14268c08a200f0e982450e49e9a48f5e887e2f6a69ccba2ec4929715c7fcd5c21c3d96c78b95f7037d2f6ffdde699955134a454c -DIST calculate-desktop-3.2.0_alpha5.tar.bz2 16960 SHA256 5ac8f0f92bd5e71256a78a5715348f627e05e48fbc1e79e6c6a91cd22d1dda8d SHA512 fe655e03a4ff8f115ebcadebd68e0cf439dc10f35b5526b82c7e5df95966c451379a58b7cc3872d6b44f8dad9a2824bb116c4a119a7c3811459b09cddceeb10b WHIRLPOOL c3ee1926c8402d9411983cf53fbf0bee8f972ce7d7bbe53082df2a46b1c3769c96a475884b3e4d7d2ae62f6c9a6af3345c18344a1e7814356856063edb039358 DIST calculate-desktop-3.2.0_alpha6.tar.bz2 16994 SHA256 26c068a2b009a4d3dccf3164d541fcdeb27854717880eddbbba1daecd64998cc SHA512 6ac9f982a5abfd32d36669404de1936b66d57d5e3590778fa6f128464d75fd6a5a3d062fe7a4ad400439929d5d6e3ed2ccbb51c27f5d83ed4b398e463f7c1642 WHIRLPOOL 64e4e53085fd8f7458665471a43816a425e56281d62c3579d68285647057f9ac1e3d761e0d11cd1dd86f80046d1d2525162d4b107e726d6c405a09e5203e8864 DIST calculate-desktop-3.2.0_alpha7.tar.bz2 16986 SHA256 03d279545655fbc44ea0848575f6ffe8c9bbda31b31a8301e88c8c880dd80869 SHA512 1c4de51161b6ac2cbd9c6470fcafd40dfc45b47133c123d518b8cfd32564b6d0e7b55eb10ce5a9330f765219d4adb63c1e7d99792a9021369ae3984b70d5184a WHIRLPOOL 847c81a4ebb390f62efcef7bb4e21e6ce624a5ec52f4f5132f3f7f805bc854ff145c384e5c939b1eadbebe5c17c8023e55a45b3bd36012571e2a7e78073c095f -EBUILD calculate-desktop-3.2.0_alpha1.ebuild 772 SHA256 4cc1a40a4bc4ccce2b878d979ef1dfb84acadad570cebabefc9a34d5f32b774c SHA512 279af8a1c6e5d017d46c2436466e0697f4be35b6975e0f1d44c0f59e8020b3130c5788e4841116a021ab6b16fed1f21052886197342eb0987d72e549f5b17ba2 WHIRLPOOL 8f512d33d5364be9ee9cce997fea18826d77ca85287c7ef146c0729e4cfbeba09e5175fd889325b793322c4feee83633177793204bc63aa773639f27fe845914 -EBUILD calculate-desktop-3.2.0_alpha2.ebuild 770 SHA256 894ed9f241cd42c1477ed119b950e22f714ff591309ba0fdb438ffc95c7b9fcb SHA512 ceacdc067a91b9669382490d038702de7c79911aa834250ed03ba87f15ca6c23bde33fb58fa42f65b8ccb4971bfbb41f0c5104f8c6141d264d1187274201e4ce WHIRLPOOL afeee7bcbbd8e945977b17d5d9b06dd6ec1ada2b9471639ea0bf978e7b22c74b36e5b4d45347a031fdda15dec9f112a372afff5447d7428add0fd0d02e45d971 -EBUILD calculate-desktop-3.2.0_alpha3.ebuild 770 SHA256 4aa669171d82a0b3f1d17dca57d651c5001e632ed0a00ac19f4eee84fae8f0a5 SHA512 8d9887a764ec8d146943368363e57cb74e1b88709a2faed3e61f027144d347b8508d9a1e52763890c3b4724d27db7249ac5e18aaa5f34c92ba386a2441dfee35 WHIRLPOOL 5947b680727f55a9ada7ffedb13a417f18c1a7ee30d8c624076c57ea2f7327de5977bee1667dfcb5ceea938a576c99199789b1c941fdfbbd9451d0b6278605ef -EBUILD calculate-desktop-3.2.0_alpha4.ebuild 770 SHA256 66a44885c720810ac3f4bedc83d16a1af6947268ef02b5446b52e95873aa9bd8 SHA512 cbe7266189af6b1c43f6c9e7857919a291f46257fe35b2c8c3a6629b63218f566b3069cb0abf03ac3c37a4bbaef0d913e7d6110351252cc059a481fcbd7a1a99 WHIRLPOOL f7804d0a06c5619fd1498443e95769c4c434203f832c180441d19e8fed84bf7ca2ca11804112775467a464c445a7582371690b431ef311f10f6ff2db58b0bc42 -EBUILD calculate-desktop-3.2.0_alpha5.ebuild 770 SHA256 a64221d60d2d2793a044b39b6485cb3324b51588529919810da93862850bc47f SHA512 fa31be471f02916f04757fb767f0bb1eaab290827cfb505ae6114e51b04b9c8b61bdb19d9536a05177f89404425d37ae509b32ff025ba6274b81010e62404580 WHIRLPOOL e086e031907c7e35e7c2111d1473c8a3af85b79ccbd6297f08a66fc6d362c45543475e25fa7b1905b3b3544c1e3d0e2d74d0582a56455baf3284f4f209a322e6 EBUILD calculate-desktop-3.2.0_alpha6.ebuild 770 SHA256 b61657898f8754fa2154607e053af2bd11317a9a574daad21028d04db8ed0eba SHA512 11aea4b613fff9ce31b19d3f22bef3d888c8bd3bbacc712b8a8450642bcb19300fe3ff9dc74583e1e8032be3630080609c07e8c86b5aaf99836a50cecbe38f86 WHIRLPOOL 440ec050982e230a337e98f13242016a0edae9764a93660699a0c38ffc6c61d5fa139482ae97fc4e31ebfcc586688e1ab458254dddb4e9fc8e259837fe1fd5b4 EBUILD calculate-desktop-3.2.0_alpha7.ebuild 770 SHA256 dc0c14fdd8a3de6cf5aaeccd504d5938577d9c08977aae82ffbc28e7e364e317 SHA512 9c6770bc981724fae2cfcbb840d7e7451b6af1fa6c1b575efd70e0221495114429e234876c4af26916bbaf7a9c57c9fdf2ecb754a36bc479c77c84a6ec4f7f28 WHIRLPOOL dd3bb9155590e7b5758191670df1f167a656e29f70925d80ab9d72d8bfbc533c677d01c2a33b2cf4e218bdcbfbfe24dc8c3b91bee85bda40c8f1e8a9fff026f5 EBUILD calculate-desktop-3.2.9999.ebuild 976 SHA256 bd8a14acad129ab9d31540ed84b0ac43db93672c8b8503fc8a67fa9806ddf33c SHA512 8369a58929caad3c2b2017589e260c17eb17e55a3f7cd257836c7c9922a6880c991f70ab3e267c21a1cc416261e091aa3e1619e06cdc8c850096a39c63968a28 WHIRLPOOL 837661bf9ab451689c25290793a92286e9bed8eb02761bd3f7757b606f7ef16f18de4a8653c6e0902e3b23fafd1f3f7b3215e7e4d1713ed9e6f70ef12ded196e diff --git a/sys-apps/calculate-desktop/calculate-desktop-3.2.0_alpha1.ebuild b/sys-apps/calculate-desktop/calculate-desktop-3.2.0_alpha1.ebuild deleted file mode 100644 index 92fb60f..0000000 --- a/sys-apps/calculate-desktop/calculate-desktop-3.2.0_alpha1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# 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 the desktop configuration 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_alpha1 - >=dev-python/python-ldap-2.0[ssl] - media-gfx/feh - x11-apps/xmessage - ! 1: -@@ -256,6 +260,9 @@ class Update: - self.startTask(_("Emerging%s %s") % (part, _print(str(pkg)))) - - def _printInstallPackage(self, pkg, binary=False): -+ """ -+ Вывод сообщения установки пакета -+ """ - self.endTask() - _print = self.color_print - if self.is_binary_pkg(pkg,binary): -@@ -266,6 +273,9 @@ class Update: - _print(str(pkg))) - - def _printUninstallPackage(self, pkg, num=1, max_num=1): -+ """ -+ Вывод сообщения удаления пакета -+ """ - self.endTask() - _print = self.color_print - if max_num > 1: -@@ -279,23 +289,33 @@ class Update: - self.startTask(_("Unmerging%s %s") % (part, _print.bold(str(pkg)))) - - def emergelike(self, cmd, *params): -+ """ -+ Запуск команды, которая подразумевает выполнение emerge -+ """ - cmd_path = getProgPath(cmd) - if not cmd_path: - raise UpdateError(_("Failed to find %s command") % cmd) - with EmergeParser( - emerge_parser.CommandExecutor(cmd_path, params)) as emerge: -- emerge.emerging.add_observer(self._printEmergePackage) -- emerge.installing.add_observer(self._printInstallPackage) -- emerge.uninstalling.add_observer(self._printUninstallPackage) -- try: -- emerge.run() -- except EmergeError: -- if emerge.emerging_error: -- self.printPre( -- self._emerge_translate(emerge.emerging_error.log)) -- else: -- self.printPre(self._emerge_translate(emerge.prepare_error)) -- raise -+ self._startEmerging(emerge) -+ return True -+ -+ def revdep_rebuild(self, cmd, *params): -+ """ -+ Запуск revdep-rebulid -+ """ -+ cmd_path = getProgPath(cmd) -+ if not cmd_path: -+ raise UpdateError(_("Failed to find %s command") % cmd) -+ with EmergeParser( -+ emerge_parser.CommandExecutor(cmd_path, params)) as emerge: -+ revdep = RevdepPercentBlock(emerge) -+ self.addProgress() -+ revdep.add_observer(self.setProgress) -+ revdep.action = lambda x: ( -+ self.endTask(), self.startTask(_("Assigning files to packages")) -+ if "Assign" in revdep else None) -+ self._startEmerging(emerge) - return True - - def _display_pretty_package_list(self, pkglist, remove_list=False): -@@ -323,7 +343,7 @@ class Update: - else: - size = "" - mult = _print.bold("*") -- self.printDefault(" {mult} {fullname} {shortname}{size}".format( -+ self.printDefault(" {mult} {fullname} {shortname}{size}".format( - mult=mult, fullname=fullname, shortname=shortname, size=size)) - - def _display_install_package(self, emerge): -@@ -332,6 +352,7 @@ class Update: - """ - # подробный список пакетов - _print = self.color_print -+ highlight = TextState.Colors.WHITE - if self.clVars.Get('cl_verbose_set') == 'on': - self.printPre(str(emerge.install_packages)) - else: -@@ -345,9 +366,9 @@ class Update: - self._display_pretty_package_list( - emerge.install_packages.remove_list, remove_list=True) - if str(emerge.download_size) != "0 kB": -- self.printSUCCESS(_print( -- _("{size} will be downloaded").format( -- size=emerge.download_size))) -+ self.printSUCCESS(_("{size} will be downloaded").format( -+ size=_print.foreground(highlight)( -+ str(emerge.download_size)))) - - def _display_remove_list(self, emerge): - """ -@@ -364,6 +385,9 @@ class Update: - self._display_pretty_package_list(pkglist, remove_list=True) - - def getCacheOnWorld(self, params, packages, check=False): -+ """ -+ Получить список обновляемых пакетов @world из кэша -+ """ - if "@world" in packages: - from calculate.update.utils.cl_update import ClUpdateAction - elog = EmergeLog( -@@ -379,6 +403,10 @@ class Update: - return params, packages - - def updateCache(self, pkg_list): -+ """ -+ Обновить кэш. Оставить отметку в emerge.log о том, выполнено действие -+ premerge -+ """ - self.emerge_cache.set_cache(pkg_list) - from calculate.update.utils.cl_update import ClUpdateAction - elog = EmergeLog( -@@ -393,7 +421,7 @@ class Update: - param = [param, "-pv"] - - if not packages: -- self.printSUCCESS(_("The system is up to date")) -+ self.printSUCCESS(_("Installed packages are up to date")) - return True - with EmergeParser(EmergeCommand(list(packages), - extra_params=param)) as emerge: -@@ -422,6 +450,9 @@ class Update: - return True - - def _emerge_translate(self, s): -+ """ -+ Перевести текст из emerge -+ """ - return RegexpLocalization('cl_emerge').translate(str(s)) - - def setUpToDateCache(self): -@@ -431,6 +462,25 @@ class Update: - self.updateCache(PackageList([])) - return True - -+ def _startEmerging(self, emerge): -+ """ -+ Настроить и выполнить emerge -+ """ -+ emerge.command.send("yes\n") -+ emerge.emerging.add_observer(self._printEmergePackage) -+ emerge.installing.add_observer(self._printInstallPackage) -+ emerge.uninstalling.add_observer(self._printUninstallPackage) -+ try: -+ emerge.run() -+ except EmergeError: -+ self.emerge_cache.drop_cache() -+ if emerge.emerging_error: -+ self.printPre( -+ self._emerge_translate(emerge.emerging_error.log)) -+ else: -+ self.printPre(self._emerge_translate(emerge.prepare_error)) -+ raise -+ - def emerge(self, param, *packages): - """ - Выполнить сборку пакета -@@ -449,32 +499,12 @@ class Update: - emerge.question.action = lambda x: False - emerge.run() - if not emerge.install_packages.list: -- #self.printSUCCESS(_("Nothing to merge")) - return True -- #if ask_emerge: -- # self.printPre(str(emerge.install_packages)) - except EmergeError: - self.emerge_cache.drop_cache() - self.printPre(self._emerge_translate(emerge.prepare_error)) - raise -- #if (ask_emerge and self.askConfirm( -- # _("Would you like to merge these packages?")) == 'no'): -- # raise KeyboardInterrupt -- emerge.command.send("yes\n") -- -- emerge.emerging.add_observer(self._printEmergePackage) -- emerge.installing.add_observer(self._printInstallPackage) -- emerge.uninstalling.add_observer(self._printUninstallPackage) -- try: -- emerge.run() -- except EmergeError as e: -- self.emerge_cache.drop_cache() -- if emerge.emerging_error: -- self.printPre( -- self._emerge_translate(emerge.emerging_error.log)) -- else: -- self.printPre(self._emerge_translate(emerge.prepare_error)) -- raise -+ self._startEmerging(emerge) - return True - - def depclean(self): -@@ -494,14 +524,7 @@ class Update: - if (self.askConfirm( - _("Would you like to unmerge these packages?")) == 'no'): - return False -- emerge.command.send("yes\n") -- -- emerge.uninstalling.add_observer(self._printUninstallPackage) -- try: -- emerge.run() -- except EmergeError: -- self.printPre(self._emerge_translate(emerge.emerging_error.log)) -- raise -+ self._startEmerging(emerge) - return True - - def update_task(self, task_name): -@@ -510,10 +533,10 @@ class Update: - """ - - def decor(f): -- def wrapper(self, *args, **kwargs): -+ def wrapper(*args, **kwargs): - logger = EmergeLog(EmergeLogNamedTask(task_name)) - logger.mark_begin_task() -- ret = f(self, *args, **kwargs) -+ ret = f(*args, **kwargs) - if ret: - logger.mark_end_task() - return ret -diff --git update/utils/cl_update.py update/utils/cl_update.py -index 111b369..033a3bd 100644 ---- update/utils/cl_update.py -+++ update/utils/cl_update.py -@@ -58,6 +58,7 @@ class ClUpdateAction(Action): - 'python_updater': "update python modules", - 'perl_cleaner': "update perl modules", - 'kernel_modules': "update kernel modules", -+ 'depclean': "depclean", - 'xorg_modules': "update xorg modules", - 'preserved_libs': "update preserved libs", - 'revdep': "revdep rebuild"} -@@ -76,8 +77,12 @@ class ClUpdateAction(Action): - 'condition': lambda Get:Get('cl_update_pretend_set') == 'off', - 'depend': Tasks.result("premerge", eq='yes') - }, -+ {'name': 'update_other', -+ 'condition': lambda Get: ( Get('cl_update_pretend_set') == 'off' and -+ Get('cl_update_sync_only_set') == 'off') -+ }, - {'name': 'update:update_portage', -- 'group': __("Updating portage"), -+ 'group': __("Updating Portage"), - 'tasks': [ - {'name': 'update:update_portage_pkg', - 'message': __("Updating {0}").format( -@@ -88,7 +93,7 @@ class ClUpdateAction(Action): - ] - }, - {'name': 'update:update_python', -- 'group': __("Updating python"), -+ 'group': __("Updating Python"), - 'tasks': [ - {'name': 'update:update_python_pkg', - 'message': __('Updating {0}').format( -@@ -97,7 +102,7 @@ class ClUpdateAction(Action): - 'condition': need_upgrade('dev-lang/python$') - }, - {'name': 'update:python_updater', -- 'message': __('Updating python modules'), -+ 'message': __('Updating Python modules'), - 'method': 'Update.emergelike("python-updater")', - 'condition': was_installed('dev-lang/python$', - log_names['python_updater']), -@@ -115,7 +120,7 @@ class ClUpdateAction(Action): - 'condition': need_upgrade('dev-lang/perl$') - }, - {'name': 'update:perl_cleaner', -- 'message': __('Updating perl modules'), -+ 'message': __('Updating Perl modules'), - 'method': 'Update.emergelike("perl-cleaner", "all")', - 'condition': was_installed('dev-lang/perl$', - log_names['perl_cleaner']), -@@ -136,7 +141,7 @@ class ClUpdateAction(Action): - ] - }, - {'name': 'update:update_world', -- 'group': __("Updating all packages"), -+ 'group': __("Updating packages"), - 'tasks': [ - {'name': 'update:update_world', - 'message': __("Calculating dependencies"), -@@ -144,52 +149,54 @@ class ClUpdateAction(Action): - } - ] - }, -- {'name': 'update:depclean', -+ {'name': 'update_other:depclean', - 'group': __("Cleaning system from needless packages"), - 'tasks': [ -- {'name': 'update:update_depclean', -+ {'name': 'update_other:update_depclean', - 'message': __("Emerge depclean"), - 'method': 'Update.depclean()', -+ 'condition': was_installed('.*', log_names['depclean']), -+ 'decoration': 'Update.update_task("%s")' % log_names['depclean'] - }, - ] - }, -- {'name': 'update:update_modules', -+ {'name': 'update_other:update_modules', - 'group': __("Rebuilding dependent modules"), - 'tasks': [ -- {'name': 'update:module_rebuild', -- 'message': __('Updating kernel modules'), -+ {'name': 'update_other:module_rebuild', -+ 'message': __('Updating Kernel modules'), - 'method': 'Update.emerge("@module-rebuild")', - 'condition': was_installed('sys-kernel/.*source', - log_names['kernel_modules']), - 'decoration': 'Update.update_task("%s")' % log_names[ - 'kernel_modules'] - }, -- {'name': 'update:x11_module_rebuild', -- 'message': __('Updating xorg-server modules'), -+ {'name': 'update_other:x11_module_rebuild', -+ 'message': __('Updating X.Org server modules'), - 'method': 'Update.emerge("@x11-module-rebuild")', - 'condition': was_installed('x11-base/xorg-server', - log_names['xorg_modules']), - 'decoration': 'Update.update_task("%s")' % log_names[ - 'xorg_modules'] - }, -- {'name': 'update:preserved_rebuild', -+ {'name': 'update_other:preserved_rebuild', - 'message': __('Updating preserved libraries'), - 'method': 'Update.emerge("@preserved-rebuild")', - 'condition': was_installed('.*', log_names['preserved_libs']), - 'decoration': 'Update.update_task("%s")' % log_names[ - 'preserved_libs'] - }, -- {'name': 'update:revdev_rebuild', -- 'message': __('Executing {0}').format("revdep-rebuild"), -- 'method': 'Update.emergelike("revdep-rebuild")', -+ {'name': 'update_other:revdev_rebuild', -+ 'message': __('Checking reverse dependencies'), -+ 'method': 'Update.revdep_rebuild("revdep-rebuild")', - 'condition': was_installed('.*', log_names['revdep']), - 'decoration': 'Update.update_task("%s")' % log_names['revdep'] - }, -- {'name': 'update:set_upto_date_cache', -- 'method': 'Update.setUpToDateCache()' -- } - ] - }, -+ {'name': 'update:set_upto_date_cache', -+ 'method': 'Update.setUpToDateCache()' -+ } - ] - - # список задач для дейсвия -diff --git update/variables/update.py update/variables/update.py -index 0f79468..a000e45 100644 ---- update/variables/update.py -+++ update/variables/update.py -@@ -117,8 +117,10 @@ class VariableClUpdateSystemProfile(ReadonlyVariable): - """ - def get(self): - try: -+ make_profile = self.Get('cl_make_profile') - return path.normpath( -- path.join('/etc',os.readlink('/etc/make.profile'))) -+ path.join(path.dirname(make_profile), -+ os.readlink(make_profile))) - except: - raise VariableError(_("Failed to determine system profile")) - diff --git a/sys-apps/calculate-update/files/calculate-update-3.2.0_alpha5-r1.patch b/sys-apps/calculate-update/files/calculate-update-3.2.0_alpha5-r1.patch deleted file mode 100644 index b959a8c..0000000 --- a/sys-apps/calculate-update/files/calculate-update-3.2.0_alpha5-r1.patch +++ /dev/null @@ -1,14 +0,0 @@ -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 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 deleted file mode 100644 index 6b768a8..0000000 --- a/sys-apps/calculate-update/files/calculate-update-3.2.0_alpha5-r2.patch +++ /dev/null @@ -1,66 +0,0 @@ -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-update/files/calculate-update-3.2.0_alpha5-r3.patch b/sys-apps/calculate-update/files/calculate-update-3.2.0_alpha5-r3.patch deleted file mode 100644 index ca234ad..0000000 --- a/sys-apps/calculate-update/files/calculate-update-3.2.0_alpha5-r3.patch +++ /dev/null @@ -1,153 +0,0 @@ -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..8e082fa 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 -@@ -96,10 +97,6 @@ class Update: - needMeta = True - if needMeta: - dv.Set('cl_update_outdate_set', 'on', force=True) -- layman = Layman(dv.Get('cl_update_layman_installed'), -- dv.Get('cl_update_layman_make')) -- if name != "portage": -- layman.add(name, url, rpath) - return True - - def syncRepositories(self, repname, clean_on_error=True): -@@ -124,15 +121,26 @@ 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" -+ -+ layman = Layman(dv.Get('cl_update_layman_installed'), -+ dv.Get('cl_update_layman_make')) -+ if repname != "portage": -+ layman.add(repname, url, rpath) - return True - - def syncLaymanRepository(self, repname): -@@ -352,13 +360,12 @@ class Update: - """ - # подробный список пакетов - _print = self.color_print -- highlight = TextState.Colors.WHITE - if self.clVars.Get('cl_verbose_set') == 'on': - self.printPre(str(emerge.install_packages)) - else: - pkglist = emerge.install_packages.list - self.printSUCCESS(_print( -- _("List packages for installation"))) -+ _("Listing packages for installation"))) - self._display_pretty_package_list(pkglist) - if emerge.install_packages.remove_list: - self.printSUCCESS(_print( -@@ -367,8 +374,7 @@ class Update: - emerge.install_packages.remove_list, remove_list=True) - if str(emerge.download_size) != "0 kB": - self.printSUCCESS(_("{size} will be downloaded").format( -- size=_print.foreground(highlight)( -- str(emerge.download_size)))) -+ size=str(emerge.download_size))) - - def _display_remove_list(self, emerge): - """ -diff --git update/utils/cl_update.py update/utils/cl_update.py -index 033a3bd..533d1c1 100644 ---- update/utils/cl_update.py -+++ update/utils/cl_update.py -@@ -102,7 +102,8 @@ class ClUpdateAction(Action): - 'condition': need_upgrade('dev-lang/python$') - }, - {'name': 'update:python_updater', -- 'message': __('Updating Python modules'), -+ 'message': __('Find & rebuild packages broken due ' -+ 'to a Python upgrade'), - 'method': 'Update.emergelike("python-updater")', - 'condition': was_installed('dev-lang/python$', - log_names['python_updater']), -@@ -112,7 +113,7 @@ class ClUpdateAction(Action): - ] - }, - {'name': 'update:update_perl', -- 'group': __("Updating perl"), -+ 'group': __("Updating Perl"), - 'tasks': [ - {'name': 'update:update_perl_pkg', - 'message': __('Updating {0}').format(pkg_color('dev-lang/perl')), -@@ -120,7 +121,8 @@ class ClUpdateAction(Action): - 'condition': need_upgrade('dev-lang/perl$') - }, - {'name': 'update:perl_cleaner', -- 'message': __('Updating Perl modules'), -+ 'message': __('Find & rebuild packages and Perl header files ' -+ 'broken due to a perl upgrade'), - 'method': 'Update.emergelike("perl-cleaner", "all")', - 'condition': was_installed('dev-lang/perl$', - log_names['perl_cleaner']), -@@ -133,15 +135,14 @@ 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$') - }, - ] - }, - {'name': 'update:update_world', -- 'group': __("Updating packages"), -+ 'group': __("Updating the list packages"), - 'tasks': [ - {'name': 'update:update_world', - 'message': __("Calculating dependencies"), -@@ -153,7 +154,7 @@ class ClUpdateAction(Action): - 'group': __("Cleaning system from needless packages"), - 'tasks': [ - {'name': 'update_other:update_depclean', -- 'message': __("Emerge depclean"), -+ 'message': __("Calculating dependencies"), - 'method': 'Update.depclean()', - 'condition': was_installed('.*', log_names['depclean']), - 'decoration': 'Update.update_task("%s")' % log_names['depclean'] diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest index c0a4b8d..19b0dc1 100644 --- a/sys-apps/calculate-utilities/Manifest +++ b/sys-apps/calculate-utilities/Manifest @@ -1,23 +1,3 @@ -EBUILD calculate-utilities-3.2.0_alpha1-r1.ebuild 823 SHA256 2b50e40a1ffe5e903a7a6f5593afa525d40e4c9779b1d251369762d696a0f2c4 SHA512 ed74da8b3492170fd565cf175495c3e2ed4f33e81cc3b96aca45713551ad2058264e7b58a9bc03f6573f2d1fe89de14b7de6f878dccf689e7944a8bf4a65bb8e WHIRLPOOL 818629c905836836820df45db67df657be07610a40c7ab034003eba5ce373c45b98e1ddf9256ac59ff2a2672485da0b62793c7dd43323306063bd8dedc83048e -EBUILD calculate-utilities-3.2.0_alpha1.ebuild 814 SHA256 8bfda4f720daefebbdb87be5d078e7fe4e03042e0e1ddf30c907925f48c10c50 SHA512 0948e70dc1cff058f2523aab3e43ff74704128face7db74381dc014c05f628b57c2baa5531b19bb9a335198ed47904e649b724d46214bad0e069b1283256fbbf WHIRLPOOL 0d3d84b220e813e0b979d70513e75ba10605d289b65df41eb4f73b5449b271cd4f3343088e8e1696615aca5244b23e09013e89a26c6624925288edc47fd1368e -EBUILD calculate-utilities-3.2.0_alpha2.ebuild 812 SHA256 ecaf29e49f955fe030e4926548a88218c90c4eb19dcec9dd8dfe2be2d7484628 SHA512 f4c637c64742e0b02bb311a4a1cb176832f41142d086bd2327d6cafcba35881661a950cb7880aaf7870b48650aaa9166652652a1c366e7ad72cf848dc8d625b4 WHIRLPOOL 4b6f3ed657610e5995556fbb7482a63443bd0df51ad6cdbde795cc577f73bcea91a890268d3637205e56fed0500508737763dc69cff5cbf420deaf34de4e946c -EBUILD calculate-utilities-3.2.0_alpha3-r1.ebuild 815 SHA256 d979d77520dc609ec65f9474d4bc59d983af0e8e22ea786818c85b0b78e9c51b SHA512 8ef15428e292abf22ec2ad210b20e94aa38e485270437eb0ffdd19ed8e047647fdfa1c365b068853e147e9f5eee2b966efcf9a38dc1840aa4846134a512c27fe WHIRLPOOL 04f2fff91652552075617ccf1ad82fcb3b1cb8796649c55a2a0058043a16dc75dafde3bdd394869da3772976bf4398801bb15c19c3ea50c4e5d5d39301e92f2b -EBUILD calculate-utilities-3.2.0_alpha3-r2.ebuild 815 SHA256 4d3859770e84dcb76f2cb800c9b198acd7336cdad0f293ec50035c3b00aa3839 SHA512 df293f106eea06c0b8a5cbf533a71cc149aa83647d49df811bb0db8ead9598a22106c005fa3b6d4172bdb94c6440dbcf545aa573842f7607e9fb6b7990e378ad WHIRLPOOL 6d0da416b53f1a04b35b17048d9ad4c25d377a2c7da26ad7d2e3ee55da53b72d0e3d87b480138d798426b38557d1a882804af5a2be4680692eb9725eb38e3706 -EBUILD calculate-utilities-3.2.0_alpha3.ebuild 812 SHA256 7aa150fabd4171e2dd45f6892b0596ad7bf3394c629b6f3f383b8c5fd8bf86b7 SHA512 34f08c147d7b3d3f8164ab3d21fdc5ca1e2f82c2a6880a3b93f7ab0771d8b874ed388b311148e69bb9cf4d716542f3d98dbbed7c38422a5b4739299fad5897b0 WHIRLPOOL 20deaa70b41be90e1e1b3d6e54117e6ca26fa394b155d3f3ab4d2d5c617467ce58b76762e31b71f73a969bab361924127832ec2b790c397bedd5045baf20cd1c -EBUILD calculate-utilities-3.2.0_alpha4-r1.ebuild 821 SHA256 5dce13bb317b2ae448edb8f61db57a442f21e7a15cdeb90f550ea1cf98d00f9d SHA512 dc8c2c4a3651a0d4b928acc4b47e1a2cd817ec5145207c9eb8ffd9765691ad1fc8bdbe0e44d977bdf1e2c3663a2762ecb6b65cb9e05e5c5793e22293a6add303 WHIRLPOOL 107d63d512a784e296bccd0fbac94904f26df2e4d9a867c8e1cbe347eec183922d7c5addfebc2f896456b866ff59eee93f4951d6c12c7bbb809ab75c007c574e -EBUILD calculate-utilities-3.2.0_alpha4-r2.ebuild 827 SHA256 5bc052d0127a8d9eb83fb309730f11d54f0381e57926c42907d74f3fe60c5433 SHA512 19d5e3c07ee79359ec10c3bb724e104aea05acdbf6f615dad442177c0885b1a4927e3342149221e0dc044ba0e09ab371912790040321e151b1feac18d9c7068f WHIRLPOOL 2a5bb42ece1c8966601916b347916e5bad524704ab06f45d66aa082452abfe3e1ae60592f7331ca306bfde3923447fbb3e231d3d48f0bc144e4fd35be0056494 -EBUILD calculate-utilities-3.2.0_alpha4-r3.ebuild 827 SHA256 55e3c689f7b9f63d44d5ee4463f2a9ca5e935961b47b999d6936244a2f3cca07 SHA512 7ad917b33b415a442c5022f81df4f81fb83c0a68ce5ab68bc2709fc3b051f693aa6a9768640759a7aaa70dcabe6870f4a43dea4943d526e9e52c54ea9d7f595c WHIRLPOOL 5062f3f2e6523c59e2bf48298a789024af5c81a969f1b182d481fb3b830a811ae9cf4aeefea49025c3baa33970b2d11deb56b547f6838c70597c80489ef3cefb -EBUILD calculate-utilities-3.2.0_alpha4-r4.ebuild 827 SHA256 af1f37610602ad63affaabdb89a4fc86176712346021b82dfae9cbed3c525dc0 SHA512 83569e0abda57714131f63e0bd6188e9f26fe76d0246de6ed4e9e72dcd6568e1f35bf6da5680a283fc4c57caf64d0eca8bd59cef33d9643dcf828948a0746037 WHIRLPOOL 1636428c5177413bd18d461d5724d5e75dd60edf1fe573c53e0f0a3ba6147167ceddf4b3b86b38745b5fb51b1a6d1ec4ca9ef90e33a698c936480ce61c5d6f60 -EBUILD calculate-utilities-3.2.0_alpha4-r5.ebuild 827 SHA256 788046721074b571d1da3ddcebdff9b512c7f4e53535a38ad7271b41a7bc60e2 SHA512 ce858fa8da3fa4bff0ce56b22b4a09f0d323cf755da48b957622e4268c67f4382beab9160f4416050885838fe3d43dc54e9275526e695e9042f11728bf34fa55 WHIRLPOOL 814f7cbb331444df618d1a5a8b106612118616f172fa7462c5070021cf7832daf385482e23d281eb745938045f6ef0bd8ee0a87483d627568fd17729695f12c1 -EBUILD calculate-utilities-3.2.0_alpha4-r6.ebuild 827 SHA256 567baddea480a7bc2f14796ec1751b525d79d844dc6c231708d28052bcbd635d SHA512 9fbc4bf9103efba1dfd62cdcfd0eb8f1d2f7ba77be7c8daa4a4014929efe38f7627309b19fdfd5e90a2d5bc55b964096d5a16a56488e060ae1843850c453fb34 WHIRLPOOL b99b8964c5d565846ef88f7fce6a85611383efa9b2fd799f44d0894a707fff69956d0e7a2e95f544be3e0feb642845b5846d4468d5cc01804483c115fd0f6518 -EBUILD calculate-utilities-3.2.0_alpha4-r7.ebuild 827 SHA256 a7a927dc84f6373b8c2f9745d1c825f850692e71f7c712cbe1b6fc23d6ebabfa SHA512 e97694376075af4086931f3530f86ef6975ba43e96e66fc7ec869b349e4055e5ed8763fc80e580f46c726df70cf2fd444326a1a00cdd671f83f2cd0f4faac8b1 WHIRLPOOL 765774a2696c65bde9f90b1fdd551308a4a2e43bde865fa63d909217faea6bda7aaa7d3ddf2fd1c69d31726d04336db77808e4ff008affc18b2476dd152be706 -EBUILD calculate-utilities-3.2.0_alpha4.ebuild 812 SHA256 c3528f2fcb9980d90b8948fe672a64c0a899364a4a8f7a8290990536f7f31631 SHA512 ffad0effd883749802e6dc12779054010949aa2eccf68ee3560f5239c2b45f683cc5ae00d7582fec7d1d0382a35fc6a73411abf1aa58e43417e26b52130885a8 WHIRLPOOL 56d339c417b70eb53d942d533e56bc530e85fdc4f3bf6c8c30ff07af69e0bd98d373d6dbb27b944af4c8e9d596cd1b75424699391cd49b21a48a3ae8bc014fa1 -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-r5.ebuild 824 SHA256 8e5e3fe8b0d4fc0036663d6f7c502509cfbf77ce456b4288ca8f7de6232f66e9 SHA512 27bb630f3c93a00838f01402a7c36cb2e126bc79a0e91b7c38116915f70388fc5aa8cf37dcfedd0142aeff3beb74929b3f010e4d0c0b49bf494ad9ca42bb8963 WHIRLPOOL f339925adc1067f7fd68898dbf9a9c356192140ce24d2497c347714e0d9fdf1dbf5cc536b26377b65e07dd2a5c7bc53d88aa69ce35d896b0be703d2a6c8344a2 -EBUILD calculate-utilities-3.2.0_alpha5.ebuild 812 SHA256 63daca77ef430fde9004129bc823f23db03d55d1da05f06a6956d5492658cefa SHA512 0dd86877552a553982a5693f5bc47606b66f15974693cb6525dd8d61a4d6e4f8d27cb7dfda19b567329deec1515095f79c7ef55dfa0d4eef87d90c9d5b9b1db3 WHIRLPOOL 2cf662e15e5a0be84ccf5f3a32ccd87e56bd07bdff938bb188c0097a7fd1a88252799e5974019c0175bb1d04b374d5b78e444d69371dc8b5655e85e858bb5690 EBUILD calculate-utilities-3.2.0_alpha6-r1.ebuild 827 SHA256 943e1949dec30c2f0ffd5a7cd065c8101ee6e999acc09d2ebd256f67b44b13bb SHA512 a9fede957dd87532feac22f631935b2ee6933541e8b589abe892ec45960a09063b9b0009298fccb346ab74dbfd6d5889d13f9fbfe4a42b56ec086e7140d12bad WHIRLPOOL c75eea5fc5d82a42615346dbc72664dfec75dbf87ab61b2ff3cb2bbf15ae78634befa815aed95f09ae00e268b618e966815a87e309128777b3455ac08e793e0c EBUILD calculate-utilities-3.2.0_alpha6.ebuild 812 SHA256 21f5c205fbb62622da8c262be1be8f3e5d7da7b64e3c93c7b33ca04693452490 SHA512 025b503372989e498fc6b50609d3ebbf13f3376b8e66c5123e3dcebeb0722ff586212c08cf085ee9bd02e215c7ac03d9876b00f73ff1f636a14a1f5d146c3869 WHIRLPOOL 259a86930a618b530515322cf73a4cb0ab8f16a44f8531ae478f30173e1f376272afbdd3b80c6e195e65cbdf10ec19544eae990e262726a51097f01650b5d1cb EBUILD calculate-utilities-3.2.0_alpha7.ebuild 812 SHA256 2e1a475c177becfdef6b09c791b5368c8a53a9f1d6435dc03942946849e2d8bd SHA512 79fb92473c9d4895e51974bd5a8b0e0c0731aed43e43d7816c4c3e76e9d91e6b1ee920582184ebbf15f1424a07ca62c35cdf4d4fe98faaf182e31c5cdeb15ffd WHIRLPOOL beb4ed8df392536651e562da8b3c87fad9f30165828bbba835f9c62181e0fd5f240a70fac47af45fce24462d3cc75d891b384d257bc5639cae5fdc939dee4cd0 diff --git a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha1-r1.ebuild b/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha1-r1.ebuild deleted file mode 100644 index 549f1af..0000000 --- a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha1-r1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# 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_alpha1 - =sys-apps/calculate-i18n-3.2.0_alpha1 - =sys-apps/calculate-lib-3.2.0_alpha1-r1 - =sys-apps/calculate-core-3.2.0_alpha1-r1 - =sys-apps/calculate-update-3.2.0_alpha1-r1 - cl_client? ( =sys-apps/calculate-client-3.2.0_alpha1 ) - cl_desktop? ( =sys-apps/calculate-desktop-3.2.0_alpha1 ) - cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.0_alpha1 ) - cl_console? ( =sys-apps/calculate-console-3.2.0_alpha1 ) -" diff --git a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha1.ebuild b/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha1.ebuild deleted file mode 100644 index 3cec1e8..0000000 --- a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# 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_alpha1 - =sys-apps/calculate-i18n-3.2.0_alpha1 - =sys-apps/calculate-lib-3.2.0_alpha1 - =sys-apps/calculate-core-3.2.0_alpha1 - =sys-apps/calculate-update-3.2.0_alpha1 - cl_client? ( =sys-apps/calculate-client-3.2.0_alpha1 ) - cl_desktop? ( =sys-apps/calculate-desktop-3.2.0_alpha1 ) - cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.0_alpha1 ) - cl_console? ( =sys-apps/calculate-console-3.2.0_alpha1 ) -" diff --git a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha2.ebuild b/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha2.ebuild deleted file mode 100644 index 0e61800..0000000 --- a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha2.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# 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_alpha2 - =sys-apps/calculate-i18n-3.2.0_alpha2 - =sys-apps/calculate-lib-3.2.0_alpha2 - =sys-apps/calculate-core-3.2.0_alpha2 - =sys-apps/calculate-update-3.2.0_alpha2 - cl_client? ( =sys-apps/calculate-client-3.2.0_alpha2 ) - cl_desktop? ( =sys-apps/calculate-desktop-3.2.0_alpha2 ) - cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.0_alpha2 ) - cl_console? ( =sys-apps/calculate-console-3.2.0_alpha2 ) -" diff --git a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha3-r1.ebuild b/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha3-r1.ebuild deleted file mode 100644 index 188a2de..0000000 --- a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha3-r1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# 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_alpha3 - =sys-apps/calculate-i18n-3.2.0_alpha3 - =sys-apps/calculate-lib-3.2.0_alpha3 - =sys-apps/calculate-core-3.2.0_alpha3 - =sys-apps/calculate-update-3.2.0_alpha3-r1 - cl_client? ( =sys-apps/calculate-client-3.2.0_alpha3 ) - cl_desktop? ( =sys-apps/calculate-desktop-3.2.0_alpha3 ) - cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.0_alpha3 ) - cl_console? ( =sys-apps/calculate-console-3.2.0_alpha3 ) -" diff --git a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha3-r2.ebuild b/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha3-r2.ebuild deleted file mode 100644 index 9fd8be6..0000000 --- a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha3-r2.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# 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_alpha3 - =sys-apps/calculate-i18n-3.2.0_alpha3 - =sys-apps/calculate-lib-3.2.0_alpha3 - =sys-apps/calculate-core-3.2.0_alpha3 - =sys-apps/calculate-update-3.2.0_alpha3-r2 - cl_client? ( =sys-apps/calculate-client-3.2.0_alpha3 ) - cl_desktop? ( =sys-apps/calculate-desktop-3.2.0_alpha3 ) - cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.0_alpha3 ) - cl_console? ( =sys-apps/calculate-console-3.2.0_alpha3 ) -" diff --git a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha3.ebuild b/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha3.ebuild deleted file mode 100644 index d1c6fe2..0000000 --- a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha3.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# 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_alpha3 - =sys-apps/calculate-i18n-3.2.0_alpha3 - =sys-apps/calculate-lib-3.2.0_alpha3 - =sys-apps/calculate-core-3.2.0_alpha3 - =sys-apps/calculate-update-3.2.0_alpha3 - cl_client? ( =sys-apps/calculate-client-3.2.0_alpha3 ) - cl_desktop? ( =sys-apps/calculate-desktop-3.2.0_alpha3 ) - cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.0_alpha3 ) - cl_console? ( =sys-apps/calculate-console-3.2.0_alpha3 ) -" diff --git a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha4-r1.ebuild b/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha4-r1.ebuild deleted file mode 100644 index 946d771..0000000 --- a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha4-r1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# 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_alpha4 - =sys-apps/calculate-i18n-3.2.0_alpha4 - =sys-apps/calculate-lib-3.2.0_alpha4-r1 - =sys-apps/calculate-core-3.2.0_alpha4-r1 - =sys-apps/calculate-update-3.2.0_alpha4-r1 - cl_client? ( =sys-apps/calculate-client-3.2.0_alpha4 ) - cl_desktop? ( =sys-apps/calculate-desktop-3.2.0_alpha4 ) - cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.0_alpha4 ) - cl_console? ( =sys-apps/calculate-console-3.2.0_alpha4 ) -" diff --git a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha4-r2.ebuild b/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha4-r2.ebuild deleted file mode 100644 index 4574bb3..0000000 --- a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha4-r2.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# 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_alpha4-r1 - =sys-apps/calculate-i18n-3.2.0_alpha4 - =sys-apps/calculate-lib-3.2.0_alpha4-r1 - =sys-apps/calculate-core-3.2.0_alpha4-r1 - =sys-apps/calculate-update-3.2.0_alpha4-r1 - cl_client? ( =sys-apps/calculate-client-3.2.0_alpha4 ) - cl_desktop? ( =sys-apps/calculate-desktop-3.2.0_alpha4 ) - cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.0_alpha4 ) - cl_console? ( =sys-apps/calculate-console-3.2.0_alpha4-r1 ) -" diff --git a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha4-r3.ebuild b/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha4-r3.ebuild deleted file mode 100644 index cc09750..0000000 --- a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha4-r3.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# 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_alpha4-r1 - =sys-apps/calculate-i18n-3.2.0_alpha4 - =sys-apps/calculate-lib-3.2.0_alpha4-r2 - =sys-apps/calculate-core-3.2.0_alpha4-r1 - =sys-apps/calculate-update-3.2.0_alpha4-r1 - cl_client? ( =sys-apps/calculate-client-3.2.0_alpha4 ) - cl_desktop? ( =sys-apps/calculate-desktop-3.2.0_alpha4 ) - cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.0_alpha4 ) - cl_console? ( =sys-apps/calculate-console-3.2.0_alpha4-r1 ) -" diff --git a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha4-r4.ebuild b/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha4-r4.ebuild deleted file mode 100644 index c6934b7..0000000 --- a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha4-r4.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# 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_alpha4-r1 - =sys-apps/calculate-i18n-3.2.0_alpha4 - =sys-apps/calculate-lib-3.2.0_alpha4-r3 - =sys-apps/calculate-core-3.2.0_alpha4-r2 - =sys-apps/calculate-update-3.2.0_alpha4-r2 - cl_client? ( =sys-apps/calculate-client-3.2.0_alpha4 ) - cl_desktop? ( =sys-apps/calculate-desktop-3.2.0_alpha4 ) - cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.0_alpha4 ) - cl_console? ( =sys-apps/calculate-console-3.2.0_alpha4-r1 ) -" diff --git a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha4-r5.ebuild b/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha4-r5.ebuild deleted file mode 100644 index d21d0e9..0000000 --- a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha4-r5.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# 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_alpha4-r1 - =sys-apps/calculate-i18n-3.2.0_alpha4 - =sys-apps/calculate-lib-3.2.0_alpha4-r3 - =sys-apps/calculate-core-3.2.0_alpha4-r3 - =sys-apps/calculate-update-3.2.0_alpha4-r3 - cl_client? ( =sys-apps/calculate-client-3.2.0_alpha4 ) - cl_desktop? ( =sys-apps/calculate-desktop-3.2.0_alpha4 ) - cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.0_alpha4 ) - cl_console? ( =sys-apps/calculate-console-3.2.0_alpha4-r1 ) -" diff --git a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha4-r6.ebuild b/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha4-r6.ebuild deleted file mode 100644 index 9dcdb5e..0000000 --- a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha4-r6.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# 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_alpha4-r1 - =sys-apps/calculate-i18n-3.2.0_alpha4 - =sys-apps/calculate-lib-3.2.0_alpha4-r3 - =sys-apps/calculate-core-3.2.0_alpha4-r4 - =sys-apps/calculate-update-3.2.0_alpha4-r4 - cl_client? ( =sys-apps/calculate-client-3.2.0_alpha4 ) - cl_desktop? ( =sys-apps/calculate-desktop-3.2.0_alpha4 ) - cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.0_alpha4 ) - cl_console? ( =sys-apps/calculate-console-3.2.0_alpha4-r1 ) -" diff --git a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha4-r7.ebuild b/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha4-r7.ebuild deleted file mode 100644 index 1764bd1..0000000 --- a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha4-r7.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# 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_alpha4-r1 - =sys-apps/calculate-i18n-3.2.0_alpha4 - =sys-apps/calculate-lib-3.2.0_alpha4-r4 - =sys-apps/calculate-core-3.2.0_alpha4-r5 - =sys-apps/calculate-update-3.2.0_alpha4-r4 - cl_client? ( =sys-apps/calculate-client-3.2.0_alpha4 ) - cl_desktop? ( =sys-apps/calculate-desktop-3.2.0_alpha4 ) - cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.0_alpha4 ) - cl_console? ( =sys-apps/calculate-console-3.2.0_alpha4-r1 ) -" diff --git a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha4.ebuild b/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha4.ebuild deleted file mode 100644 index 9d23e9b..0000000 --- a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha4.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# 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_alpha4 - =sys-apps/calculate-i18n-3.2.0_alpha4 - =sys-apps/calculate-lib-3.2.0_alpha4 - =sys-apps/calculate-core-3.2.0_alpha4 - =sys-apps/calculate-update-3.2.0_alpha4 - cl_client? ( =sys-apps/calculate-client-3.2.0_alpha4 ) - cl_desktop? ( =sys-apps/calculate-desktop-3.2.0_alpha4 ) - cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.0_alpha4 ) - cl_console? ( =sys-apps/calculate-console-3.2.0_alpha4 ) -" diff --git a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha5-r1.ebuild b/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha5-r1.ebuild deleted file mode 100644 index 64ecf66..0000000 --- a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha5-r1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# 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 - =sys-apps/calculate-update-3.2.0_alpha5-r1 - cl_client? ( =sys-apps/calculate-client-3.2.0_alpha5 ) - 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 ) -" diff --git a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha5-r2.ebuild b/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha5-r2.ebuild deleted file mode 100644 index d340ad2..0000000 --- a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha5-r2.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# 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 - =sys-apps/calculate-update-3.2.0_alpha5-r1 - cl_client? ( =sys-apps/calculate-client-3.2.0_alpha5-r1 ) - 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 ) -" diff --git a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha5-r3.ebuild b/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha5-r3.ebuild deleted file mode 100644 index 65cd16d..0000000 --- a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha5-r3.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# 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 - =sys-apps/calculate-update-3.2.0_alpha5-r1 - 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 ) -" 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 deleted file mode 100644 index ed86e50..0000000 --- a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha5-r4.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# 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 ) -" diff --git a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha5-r5.ebuild b/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha5-r5.ebuild deleted file mode 100644 index 9db77fe..0000000 --- a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha5-r5.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# 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-r2 - =sys-apps/calculate-update-3.2.0_alpha5-r3 - 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-r2 ) - cl_console? ( =sys-apps/calculate-console-3.2.0_alpha5 ) -" diff --git a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha5.ebuild b/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha5.ebuild deleted file mode 100644 index 64ffe59..0000000 --- a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha5.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# 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 - =sys-apps/calculate-update-3.2.0_alpha5 - cl_client? ( =sys-apps/calculate-client-3.2.0_alpha5 ) - cl_desktop? ( =sys-apps/calculate-desktop-3.2.0_alpha5 ) - cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.0_alpha5 ) - cl_console? ( =sys-apps/calculate-console-3.2.0_alpha5 ) -"