diff --git a/sys-apps/calculate-lib/ChangeLog b/sys-apps/calculate-lib/ChangeLog index 188bac3e9..c1b305321 100644 --- a/sys-apps/calculate-lib/ChangeLog +++ b/sys-apps/calculate-lib/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*calculate-lib-2.2.20-r1 (28 Jul 2011) + + 28 Jul 2011; Mike Hiretsky (mhiretskiy) + +calculate-lib-2.2.20-r1.ebuild, + +files/calculate-lib-2.2.20-fix_getsize.patch: + Update for bugfix + *calculate-lib-2.2.20 (27 Jul 2011) 27 Jul 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-lib/Manifest b/sys-apps/calculate-lib/Manifest index 070dac487..81c751caa 100644 --- a/sys-apps/calculate-lib/Manifest +++ b/sys-apps/calculate-lib/Manifest @@ -5,6 +5,7 @@ AUX calculate-lib-2.2.19_fix_detect_video.patch 1265 RMD160 7080753d4f7937cb4ff1 AUX calculate-lib-2.2.19_lvmraid_rc1.patch 29023 RMD160 3f2778691e38b151a3677a545e906e290e083f28 SHA1 e2f1a74247016ddecbb88572e4c2f0707b1edeaa SHA256 b24055f0d670b778505fe52559529651dc612597648a6a7cc035b60acefb07f6 AUX calculate-lib-2.2.19_lvmraid_rc2.patch 29724 RMD160 aac416459d263c52db23e67bc0388d2944338e68 SHA1 2b298afaa57a239600a491adf402fa3c0f98b868 SHA256 50523f213ffced8eff86e95911ce58bd8db1ce36e04f8fa8f1e0e823f5ba03b5 AUX calculate-lib-2.2.19_lvmraid_rc3.patch 29716 RMD160 d9ee062987526ad7a038716692bc3d31cdbe7af8 SHA1 fc9468ea090a415b8d3c49b0794b36ed6da030b9 SHA256 426b521bde2034457f2c5699f2f059611f63ea13e0fe09aeafd5459251a36949 +AUX calculate-lib-2.2.20-fix_getsize.patch 666 RMD160 6234c06190001330eaeebd05ca94d386dcc66300 SHA1 e3bd8ea3573fc05b2693f7abf24b98e70c5641c5 SHA256 e96742e70defb712975e5d7385ccef6031bb6e37133cbb9feb0911e2fb4bef18 DIST calculate-lib-2.1.11.tar.bz2 61687 RMD160 93ca4f84ff2cd7018addfd4de162959d78e51f78 SHA1 53149951c346fea7709cb43b4d8ebefe63acb0fd SHA256 62976c08d4fb4810389ace6f5a99abb5a962f6c8d9053ff943d0669480fb5599 DIST calculate-lib-2.1.8.tar.bz2 61178 RMD160 4a4ed063a9b4d3b82723f5f6eb046c97ad9fcda1 SHA1 93eb20057afff6e98c409388e1259a3ad078bb7a SHA256 ef8e315001663da7a45e69b82dc7c158fb0e10bd567efa95bf8a654ed441144a DIST calculate-lib-2.2.18.tar.bz2 111559 RMD160 294326d180c3de46ef1f5c56d4da10313e123d87 SHA1 e6340c81573421eca1f8b882f4a4929830df8bdd SHA256 8e8c0124ab9e2efa270fba9529c36a4dd12aa6d616d005e35945bbd999b6a3a5 @@ -23,8 +24,9 @@ EBUILD calculate-lib-2.2.19-r4.ebuild 766 RMD160 3ecf0c49ba379ccc98493549b8c226f EBUILD calculate-lib-2.2.19-r5.ebuild 793 RMD160 5784660046ff341b4ae1bda6bb88049fae05de08 SHA1 e662dad4e80f281e80cb5c399c1ede0c505cf16a SHA256 ccaf03b638bb894192782b1ec1067e8fa989dd41909c59b3ecf8bb650ec0d1f9 EBUILD calculate-lib-2.2.19-r6.ebuild 793 RMD160 2b95b3ca1bb55a9efed1b112963d5fce0dcfab1e SHA1 a5fecb9a64efa92a2794b7a6162be04e4b3b1634 SHA256 09fafd8aa57e3aee6209c6473443630c1713fd8ba037a8c93f2b8ea2dd566213 EBUILD calculate-lib-2.2.19.ebuild 639 RMD160 d2dda2492b257947c88e37acdfdcffd30266ef29 SHA1 c0fee75613aa560848d32f7314737bc094d0dceb SHA256 bafff10516a4b7557c379e20592026a684be9b34dd38b381e136bd457c2c1dc0 +EBUILD calculate-lib-2.2.20-r1.ebuild 804 RMD160 2f4e7dfe51d1854c424b6e4c35dc310b7d0e8dee SHA1 7fc66547ff144bbe56cf1e8c0db129cbca424379 SHA256 9b80040d235d8ed429c7417e0e42eb0494f8c7b841f94ef956248eee1bf788d9 EBUILD calculate-lib-2.2.20.ebuild 666 RMD160 890df4d0d047196b4afa183a28f828835eb32447 SHA1 faaaeeae26b5a1f5f790ff118f5d8bea7899a778 SHA256 899c8c4267cdd8044002777b1d63c7b6d36a03f7cb792f82e4e7299b7352de1e EBUILD calculate-lib-2.2.9999.ebuild 726 RMD160 6dce718f317825c712f7c9595a3e712ef6222cf9 SHA1 42e1607a36e826310ef5ed317d717c5aa8acc2bf SHA256 dce73aafa346ea1fd88b6e99d8f6184a562de56e3eb871c1b5849890b13c34c2 EBUILD calculate-lib-9999.ebuild 476 RMD160 3df165f011b324fa8dc37d0443e941263943dd61 SHA1 069ab864dc83f32c69c4349d807d25e1196756ee SHA256 07a628ede4f47849908dd543f879ab8b40a5ca887b892fa0f5cf6c1ef2a24cab -MISC ChangeLog 23899 RMD160 bfce1d532e625c0d0d6c0c17bc6f9dbf9dd120e0 SHA1 f5bcdaee38ccc2e3275df7f62f97e4d6e17f75d0 SHA256 8f662b3c2dd38bd18805d7ca63bf00e9109cfc62dce1db57e5f62b7be13c298b +MISC ChangeLog 24104 RMD160 1823db3be89065ab373b53af52b1df82627dd997 SHA1 7f7232bc67732c8d4bbde2c1ae4720b60c9c563e SHA256 97865c84ea0940e2b846e1394127b67f3945e9d93ae51e407dcb16179fd6d98c MISC metadata.xml 303 RMD160 774b65ed76939d6878496ad6ef6451849bdced05 SHA1 7d08569697a290ede98c88ab59db3cdc3037bd15 SHA256 181519d9679fd9aee9a7a9806733a50728d3da0b1e0ad54f31499200f7f5c6ec diff --git a/sys-apps/calculate-lib/calculate-lib-2.2.20-r1.ebuild b/sys-apps/calculate-lib/calculate-lib-2.2.20-r1.ebuild new file mode 100644 index 000000000..e3d190261 --- /dev/null +++ b/sys-apps/calculate-lib/calculate-lib-2.2.20-r1.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="3" + +inherit distutils eutils + +SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2" + +DESCRIPTION="The library for Calculate 2" +HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" +LICENSE="Apache-2.0" +SLOT="2.2" +KEYWORDS="amd64 x86" +IUSE="minimal" +DEPEND="!=dev-python/pyxml-0.8 + sys-apps/iproute2 + sys-fs/lvm2 + sys-fs/mdadm + sys-apps/file[python]" +RDEPEND="${DEPEND}" + +src_unpack() { + unpack "${A}" + cd "${S}" + + # fix determining partition size + epatch "${FILESDIR}/calculate-lib-2.2.18-part_size.patch" +} diff --git a/sys-apps/calculate-lib/files/calculate-lib-2.2.20-fix_getsize.patch b/sys-apps/calculate-lib/files/calculate-lib-2.2.20-fix_getsize.patch new file mode 100644 index 000000000..2a1b58c8d --- /dev/null +++ b/sys-apps/calculate-lib/files/calculate-lib-2.2.20-fix_getsize.patch @@ -0,0 +1,19 @@ +commit 714b61d18dd9dd98522946e867cff243dad220e7 +Author: Mike Hiretsky +Date: Thu Jul 28 09:16:09 2011 +0400 + + Fix getPartitionSize. + +diff --git a/pym/cl_utils.py b/pym/cl_utils.py +index f477aea..23616bc 100644 +--- a/pym/cl_utils.py ++++ b/pym/cl_utils.py +@@ -1164,7 +1164,7 @@ def getPartitionSize(dev): + suffix = filter(lambda x:size >x[0],suffix) + if suffix: + suffix = suffix[-1] +- printSize = size / (suffix[0]/10) ++ printSize = int(size / (float(suffix[0])/10)) + printSizeTail = printSize % 10 + printSize = printSize / 10 + if suffix[2] and printSizeTail: diff --git a/sys-apps/calculate-utilities/ChangeLog b/sys-apps/calculate-utilities/ChangeLog index 56c3ed2a8..2a5adb205 100644 --- a/sys-apps/calculate-utilities/ChangeLog +++ b/sys-apps/calculate-utilities/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*calculate-utilities-2.2.20-r1 (28 Jul 2011) + + 28 Jul 2011; Mike Hiretsky (mhiretskiy) + +calculate-utilities-2.2.20-r1.ebuild: + Update for lib + *calculate-utilities-2.2.20 (27 Jul 2011) 27 Jul 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest index 77eeb00a1..3feb44186 100644 --- a/sys-apps/calculate-utilities/Manifest +++ b/sys-apps/calculate-utilities/Manifest @@ -14,6 +14,7 @@ EBUILD calculate-utilities-2.2.19-r7.ebuild 880 RMD160 be5b601ad2b663467d9b5076d EBUILD calculate-utilities-2.2.19-r8.ebuild 880 RMD160 0fb0262878a1b06674ea4867269188af56a9c387 SHA1 f954f3afa94cd18299aa4be9bdd0f5cc6a6f29a0 SHA256 b2fbb951e027a8db6dbae989c1f37ec069c4e719e0ac14b6313894af7bdc1c78 EBUILD calculate-utilities-2.2.19-r9.ebuild 880 RMD160 c50ba8a3cf6f4bc299c557d70b779b374a9b4a9a SHA1 c07a7906ba0f41b37e2292a096eb18b00f423905 SHA256 bd92057db3262afe79f3907cd41e64cdeaa61f52f48c633fe36c819123e76a3f EBUILD calculate-utilities-2.2.19.ebuild 862 RMD160 3c63622728c5486252332890f946fb29bc5af5ca SHA1 1d923fbbb9959dbfed1fbe3f08e530e2e365d940 SHA256 881356df9ab4e47bff03ca9eed44656b38702b1f60055c4b1c446ba49e7f4040 +EBUILD calculate-utilities-2.2.20-r1.ebuild 865 RMD160 0de1b2cada7ae4ac1ce911cef051afbcdca60f26 SHA1 4f8a0fb80b1bad7486cffa5b8c9433eb7cef1e7d SHA256 0c6e2f78c53db45e92bf588380356583a45ffae14a00264c1e550bc5d647ad5a EBUILD calculate-utilities-2.2.20.ebuild 862 RMD160 192cb774b0a4c7dc0ce9f12a7736ad2f62febe14 SHA1 709c0aeb568224264988e15c4f914187eb6c00c2 SHA256 33618ea225c693f3a532f146e0ebcd7ac5d86c121dedb0f8cc7cfda8e938569d EBUILD calculate-utilities-2.2.9999.ebuild 840 RMD160 0c7324a9ed480118ac19f62b162c9ee62c25f964 SHA1 7dadab1430ed147334ed7e9b4fcc86dc99e25d56 SHA256 f3ee28f9f765e7302c83eb4a15a09bdf066f09e6b40e34f6d52157a946df5e66 -MISC ChangeLog 17406 RMD160 ddf822543a17ea76d66dc908b6162835a920ee80 SHA1 781404728c363bcd606f0717949ae906a290e737 SHA256 a2fa1f179d40afcff45795b41428b016fe44971a8f70ff6fd790d2a88bcd8a2d +MISC ChangeLog 17571 RMD160 001b7335ba8b2c9169a2bce2d807b0c0d91aee4a SHA1 3f9d4c1723e816d7e35e0fea2f7af0e5aab6352e SHA256 a2aa6a165e9bee987dc39f7f33f04868d2ab6430dc092f8e23c1be416276851a diff --git a/sys-apps/calculate-utilities/calculate-utilities-2.2.20-r1.ebuild b/sys-apps/calculate-utilities/calculate-utilities-2.2.20-r1.ebuild new file mode 100644 index 000000000..eb621ec6c --- /dev/null +++ b/sys-apps/calculate-utilities/calculate-utilities-2.2.20-r1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=3 + +DESCRIPTION="Calculate Utilities meta package" +HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" +SRC_URI="" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE=" +cl_assemble +cl_builder +cl_client +cl_desktop +cl_installgui +cl_server +" + +RDEPEND="${RDEPEND} + =sys-apps/calculate-install-2.2.20 + =sys-apps/calculate-templates-2.2.20 + =sys-apps/calculate-lib-2.2.20-r1 + =sys-apps/calculate-i18n-2.2.20 + + cl_assemble? ( =sys-apps/calculate-assemble-2.2.20 ) + cl_builder? ( =sys-apps/calculate-builder-2.2.20 ) + cl_client? ( =sys-apps/calculate-client-2.2.20 ) + cl_desktop? ( =sys-apps/calculate-desktop-2.2.20 ) + cl_installgui? ( =app-misc/calculate-install-gui-2.2.20 ) + + cl_server? ( =sys-apps/calculate-server-2.1.14-r6 ) +" +