diff --git a/sys-apps/calculate-install/ChangeLog b/sys-apps/calculate-install/ChangeLog index ce51585fc..09bce88aa 100644 --- a/sys-apps/calculate-install/ChangeLog +++ b/sys-apps/calculate-install/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*calculate-install-2.2.8-r1 (21 Jan 2011) + + 21 Jan 2011; Mike Hiretsky (mhiretskiy) + +calculate-install-2.2.8-r1.ebuild, + +files/calculate-install-2.2.8-fix_bind_mounts.patch: + Add patch for bind mount point installation. + *calculate-install-2.2.8 (20 Jan 2011) 20 Jan 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-install/Manifest b/sys-apps/calculate-install/Manifest index 11a6ca1b0..2626e5b39 100644 --- a/sys-apps/calculate-install/Manifest +++ b/sys-apps/calculate-install/Manifest @@ -4,6 +4,7 @@ AUX calculate-install-2.2.4-fix_linux_ver.patch 817 RMD160 696ee5b33ba921572e5a7 AUX calculate-install-2.2.4-fix_uuid_fstab.patch 2855 RMD160 a7ca8c3a974ec0fcd22bf6eb17dd31215b103b43 SHA1 5e085ba66fbde593e7382131d10eb3f9b05251db SHA256 d71e8c0a78fc66c518e9d720f64fd72de11ffe813eb06c45f895321fa48104fa AUX calculate-install-2.2.5-fix-uuid.patch 1378 RMD160 71736880f0393c7e6d1f959b60b8a211c1fe3538 SHA1 fc43a89388fcbd7c8ddb3e37f40b44ad6504d19c SHA256 7cfb4c6354fa05f1f902b766a040fe6b7fbc7d64e9c8a71d4e358fbab3e02186 AUX calculate-install-2.2.5-update-handbook.patch 19299 RMD160 09e802f2f0da4148d05960519e9f22fcaf3815dd SHA1 bff856dbba21db607e158b1ccac725657bdf27ed SHA256 a62728c9be1dc9b081f590f56d41a0ba59a9ad686b7394d30ef409f36a060bb0 +AUX calculate-install-2.2.8-fix_bind_mounts.patch 763 RMD160 e774d09d128c2e82d3cc735379b39ba0649d947d SHA1 d0a117214bec14e2ae30919f4d6ea1ccb5154131 SHA256 8d1cd59b0287fdaa7525ce7dccccb347a4042bb9432e63395b554e9508f7e20b DIST calculate-install-2.2.3.tar.bz2 61306 RMD160 21022f3b0afdeea728940164c25f0b028b446ad2 SHA1 6515b31a3c1a130c3d8a097cb0fa099b966b93bc SHA256 70b75fd42bb54bbdffd01ef677f784da5febfd269e6d255dc5c4240420de4b7f DIST calculate-install-2.2.4.tar.bz2 62718 RMD160 6949c3d43568b26f871abef2cafba5d94116868d SHA1 b5181c9037fe007f8984517da9c601f0b704bab3 SHA256 8ca05ef67b4ea1b1a25d12a810aaebdbfa91fb93d507f44e43394b5eb6c33836 DIST calculate-install-2.2.5.tar.bz2 62830 RMD160 0c03090ef66c055b54e6ac819dbea0f47af9a2c5 SHA1 5e215c4ec146abad8081fc1e3e57088fd8cacac5 SHA256 8df2d45ad730496eef9f5bd2ec6951486215bf8bb5677eb86d81f5350b7a2442 @@ -20,7 +21,8 @@ EBUILD calculate-install-2.2.5-r1.ebuild 901 RMD160 60b58b076d58aa4a7c60738c917f EBUILD calculate-install-2.2.5.ebuild 692 RMD160 b8f66c47f4b10dedb9ccc3970236c5a6eedd60d9 SHA1 728dd4df27cb7fe39295dfbdf83bce70f7d1437c SHA256 bea864852221ffb9da330673440ec43ecd219a3973bf13fd55fb506a669eda92 EBUILD calculate-install-2.2.6.ebuild 692 RMD160 69a4f91c19fc7e4b443004b6fe2fb05fe90022e7 SHA1 e8ddd787706f784ce513cf5d28cc50bb4f176da8 SHA256 3e4f28ccc63d9ed2094a2560d7201f191780bbdd96dad61de6011c2f6d763546 EBUILD calculate-install-2.2.7.ebuild 692 RMD160 1b0e22f31b7c815f623ebfffe82e6ea2253485c8 SHA1 6633b00dc457daa7e44661db9547483558a8f721 SHA256 5dba09f572793a92fc47db8837e4f9d15577db5cb7cbf0ac4fe57d2557592734 +EBUILD calculate-install-2.2.8-r1.ebuild 888 RMD160 7746cbf0286306d918ca45160b7c0bc1e3fc3ac7 SHA1 e25fd104edc700bc8762517221ac19371fda4025 SHA256 52ceb3d5fb9b5020c21ce5e4a46c10f5598cdd1590e8e3e6478ebf641c3a8b46 EBUILD calculate-install-2.2.8.ebuild 708 RMD160 a8f5e930862aa2f606ae03aaff3f94fd58677068 SHA1 03870f8d07b3c9f8a81861dce7567e947431969a SHA256 5d427db1983a94439defca075857a2a0a031e2507f15c89bfe8e287776c61a05 EBUILD calculate-install-2.2.9999.ebuild 540 RMD160 038eb80ed7ab1120e6305cbfe2eca480a48aa1c0 SHA1 0cc13d21f94d71f0e6bb6dce3e8abfa1f2f66a4f SHA256 7f9bd4b0b6c2fa260f2e93c78fdee24b32545dc2a98e19363f4933dcc32d3557 -MISC ChangeLog 16270 RMD160 1bec7d387614320b3e4e3632eb27c3adc0d741f2 SHA1 42793e65575c18ad8bded7b9a6570369858d76ba SHA256 6af5985f852eea7af9c7ca61c9fb2656a9411d0d1d61b5857d40522249f6dde0 +MISC ChangeLog 16515 RMD160 78d8b55860989b2045334ca762a47998026d58a4 SHA1 aae22f358001d1dc47aa564146f9ca3fcb489367 SHA256 6a513814d95654b95ada35ca316f14fa2619f798996eadf6e5b409d075dd3123 MISC metadata.xml 310 RMD160 769e4f17a9354da6b168b72a5d65d978f65bf6dd SHA1 83aaae376052d69c7327e880cf028ebc0dea608b SHA256 c29d3efc676d8308872920db5223c78469db86ac236b5d45c3ee98ceb8fca846 diff --git a/sys-apps/calculate-install/calculate-install-2.2.8-r1.ebuild b/sys-apps/calculate-install/calculate-install-2.2.8-r1.ebuild new file mode 100644 index 000000000..198204ba9 --- /dev/null +++ b/sys-apps/calculate-install/calculate-install-2.2.8-r1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +inherit distutils eutils + +SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2" + +DESCRIPTION="The program of installation Calculate Linux" +HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="minimal" + +DEPEND=">=sys-apps/calculate-lib-2.2.8-r1 + + +calculate-lib-2.2.8-r1.ebuild, +files/calculate-lib-2.2.8-file.patch: + Add patch for work with sys-apps/file-2.05 + *calculate-lib-2.2.8 (20 Jan 2011) 20 Jan 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-lib/Manifest b/sys-apps/calculate-lib/Manifest index bcc2a5916..422c02382 100644 --- a/sys-apps/calculate-lib/Manifest +++ b/sys-apps/calculate-lib/Manifest @@ -1,6 +1,7 @@ AUX calculate-lib-2.2.4-fixfilter.patch 864 RMD160 48cb2d054eb0f0cac58baf79308efc69d2b1b7b3 SHA1 583f85b66c2f4eb166f99253ca8c8b42c5c215f6 SHA256 2f76b337aa172671abb19352149a7ded6240527012b4b931bcb1820a486c2203 AUX calculate-lib-2.2.5-encoding-fix.patch 715 RMD160 85e76051711d1a8eb83b73e3dc35240b26c55342 SHA1 5f40bd93a3d721424a1900475f419a92bb1589a1 SHA256 b9c1f65c1921af96ba6343ac630a23d3ccf6ff6c0e06e73c4d0a91dd944d5459 AUX calculate-lib-2.2.5-uuid-fix.patch 1306 RMD160 0d21739271926d408f0e71d23fa6e9a570af0714 SHA1 482195b61dda5fbdce5bfffd7757184b9f51b2f7 SHA256 99c1a83cedb36567c96287f9a08221ff38dbfe1992692ed6182d6f12fea494fc +AUX calculate-lib-2.2.8-file.patch 747 RMD160 8a1f90c822eaefac69b67aa6999a1dc8c2b51b9f SHA1 aeded1b0587785145f4e62f3e81a2726e7c4312d SHA256 45ce03a248d8bec22bbdf006ce607809761304d255467e687242f9423c8413a4 AUX lib_i18n_path.patch 1114 RMD160 6e561c46e91105f4e7686678771da21e8f3685a2 SHA1 b58e8906104b4b9d1a1bd8ecb6959767cad2d329 SHA256 2913821d3c069612485e6dd7fb0e71bc06e5061054309ad9ed6bac29eee732f2 DIST calculate-lib-2.1.8.tar.bz2 61178 RMD160 4a4ed063a9b4d3b82723f5f6eb046c97ad9fcda1 SHA1 93eb20057afff6e98c409388e1259a3ad078bb7a SHA256 ef8e315001663da7a45e69b82dc7c158fb0e10bd567efa95bf8a654ed441144a DIST calculate-lib-2.2.3.tar.bz2 106198 RMD160 1899e8cec1dcb448fe77656bf68abd262659b33e SHA1 9b48e3fa0d4be4ac13793cd7b94e5f0e1e9a2f49 SHA256 3f854c0eab7fc16926e5204dd7fef3ee89c123a39581739646231ff96f0cb61a @@ -16,8 +17,9 @@ EBUILD calculate-lib-2.2.5-r1.ebuild 849 RMD160 27bfb3c2099e7a53fed3fdf778705cc9 EBUILD calculate-lib-2.2.5.ebuild 658 RMD160 c0be7250b363931d729086d0e41e546029d76068 SHA1 cec2c3063069614f4efb37bdd99a838aa329b7eb SHA256 8a0d79a17ef75f8a0ae2e80b113408c8decc9be0f575044794cdcef68103a0eb EBUILD calculate-lib-2.2.6.ebuild 658 RMD160 4e21c5fb9b31f2dae22a254e8537d65465e6e34b SHA1 783b4b6ba2fff11f988e5b83c3954528a3e3ce30 SHA256 a1d2febc01c8f572846e7052597ad2769f00b29f80bd6d19236b57195ebb35a9 EBUILD calculate-lib-2.2.7.ebuild 658 RMD160 8e8ffef149ce5aaf57e07da32d21ba095c1c98a2 SHA1 2e91b9f7fe669d915972e6311f058b8dc94f7c00 SHA256 15a7cc4095d3fa40910240052fb34a89278d8eb2a9f099ff7792c534941bd98d +EBUILD calculate-lib-2.2.8-r1.ebuild 791 RMD160 6da62f71058eb75f572cad1689930f2c4d41a6b0 SHA1 c10a3216c348b68875840b32ebf5643c4290ab2b SHA256 ea1e44f5741fe037e6f5f200fb933fe680ca0f27f8b6e9a7a093a787e754a3c9 EBUILD calculate-lib-2.2.8.ebuild 658 RMD160 1e08d25d084eb8a60bb45b80f3f98fb2063f47db SHA1 02d3e988e9bce9ae3b0b7b69d1428f7eb667ab88 SHA256 c3b23f9dd4113dab95eeffc16dbf78fbb44b65e73da7c735536a78de76169467 EBUILD calculate-lib-2.2.9999.ebuild 592 RMD160 e559e7ccafdb150093a055b4f90bf33666ab796c SHA1 752fe9e05ce1380af9a44bf5e81a56dc00f36506 SHA256 f4cf5511cca3007b735cf98871ee72442c6bf677be63349058d1bb029a4b1abf EBUILD calculate-lib-9999.ebuild 476 RMD160 e510e0aa98b7f6da9acc37197073cac0d5d6a47f SHA1 393c416fcfd77d6c05aea8932a7a1e3805aa926d SHA256 a9eee592ec352db7852e93ad33249072307051d3bda6cfdcd034ea9b96747578 -MISC ChangeLog 15172 RMD160 337fa94c712cb39b6cafabc94ca977385f288c56 SHA1 2edd10de87c5d5491295ad57b91aacca593eed19 SHA256 035332a7e8883683ada97e756fdbaba96e3732caf7d186ebec4451ad341687fe +MISC ChangeLog 15391 RMD160 f2ba41e6e5d51e341d1f5eae42d98b01a4146109 SHA1 782c3345b3ad0d7cff74ec19a9d4fbcdd2aa6170 SHA256 efb8209e3dfc7e74c51cf19104cbaa0cd6c08949260bc4ce0c6a7c7b518e5ed1 MISC metadata.xml 303 RMD160 774b65ed76939d6878496ad6ef6451849bdced05 SHA1 7d08569697a290ede98c88ab59db3cdc3037bd15 SHA256 181519d9679fd9aee9a7a9806733a50728d3da0b1e0ad54f31499200f7f5c6ec diff --git a/sys-apps/calculate-lib/calculate-lib-2.2.8-r1.ebuild b/sys-apps/calculate-lib/calculate-lib-2.2.8-r1.ebuild new file mode 100644 index 000000000..859501f83 --- /dev/null +++ b/sys-apps/calculate-lib/calculate-lib-2.2.8-r1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +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="~sys-apps/calculate-templates-2.2.8 + !=dev-python/pyxml-0.8 + sys-apps/file[python]" +RDEPEND="${DEPEND}" + +src_unpack() { + unpack "${A}" + cd "${S}" + + # fix work with sys-apps/file-5.05 + epatch "${FILESDIR}/calculate-lib-2.2.8-file.patch" +} diff --git a/sys-apps/calculate-lib/files/calculate-lib-2.2.8-file.patch b/sys-apps/calculate-lib/files/calculate-lib-2.2.8-file.patch new file mode 100644 index 000000000..caf64ae6d --- /dev/null +++ b/sys-apps/calculate-lib/files/calculate-lib-2.2.8-file.patch @@ -0,0 +1,26 @@ +diff --git a/pym/cl_utils.py b/pym/cl_utils.py +index b84d6e6..d6fa979 100644 +--- a/pym/cl_utils.py ++++ b/pym/cl_utils.py +@@ -28,7 +28,11 @@ import re + import sys + import getpass + from types import StringType +-import magic as type_file ++ ++try: ++ from magic import open as type_file, MAGIC_NONE as MAGIC_NONE ++except ImportError: ++ from magic import open as type_file, NONE as MAGIC_NONE + + import cl_lang + tr = cl_lang.lang() +@@ -73,7 +77,7 @@ class typeFile: + """Получение типа файла""" + + def __init__(self, magic=0x410): +- self.magicObject = type_file.open(type_file.MAGIC_NONE) ++ self.magicObject = type_file(MAGIC_NONE) + self.magicObject.load() + self.magicObject.setflags(magic) +