Update lib for fix gzip comression.

atratsevskiy
parent 9a7035034f
commit 2e2aac4242

@ -5,6 +5,7 @@ AUX calculate-lib-2.2.27-r1.patch 1938 RMD160 5ed5fdfe10f1b43488d3b39f56638d65d3
AUX calculate-lib-2.2.27-r2.patch 2012 RMD160 a8a17de239ab029c0197f70e19b2eff3975ca519 SHA1 15e60277f59ae6af7e6fa3ac6e26f2f10c686342 SHA256 57fc372bb70ff0ab23cfafd4517f7d3215e3f631a7e017ce451c4b7eaa3480ab
AUX calculate-lib-2.2.27-r3.patch 3587 RMD160 b0d05efe7aae95caea6235226d6e98840b9c04a6 SHA1 b5a673e665dd5c26a04d18e7d758828384db8034 SHA256 c7679af68d24f75c8519b31311fad1dbd3768f9c87fcdeb53d80e02019234f91
AUX calculate-lib-2.2.28-fix_ati_name.patch 805 RMD160 7364279eb1658dc4f169a0011c4882457d50161a SHA1 bb46ab934109a475dd266c5c8b8a4469f0d85d8d SHA256 349ad24afbe96025a37b9d6e11896c7cf9223822cbae003e2ff7b58c21a1bc11
AUX calculate-lib-2.2.28-fix_detect_compress.patch 798 RMD160 90ad3d33b0c6bc8490c43d128989f0d59e1359d5 SHA1 dc6345b91b4902dc3e548a88c9987e72f766d3f8 SHA256 5e86ecd310af0de60d86598b6b2ddfe16591f785c4bf643b355a92c9ca7d41ce
AUX calculate-lib-2.2.28-fix_detect_video.patch 889 RMD160 1608727a200a0988dbab8313a4239eebe632de40 SHA1 8bb38bd85e430533efe5d85aa97a677e3780488e SHA256 33712cbd680548d22a79f0e4c3f1aa407d2e77fbcc68b5a4a8828c0e82068840
AUX calculate-lib-2.2.28-fix_update.patch 1070 RMD160 95a469e9597db6ffdeda77f63faf559eed34f9b5 SHA1 c312cb14376806e378ef7f0b034ba72141423ee4 SHA256 97956b3af799478fa18d3a5025b25ac176188aa0c3325744d519910ad0fc7c8d
DIST calculate-lib-2.1.11.tar.bz2 61687 RMD160 93ca4f84ff2cd7018addfd4de162959d78e51f78 SHA1 53149951c346fea7709cb43b4d8ebefe63acb0fd SHA256 62976c08d4fb4810389ace6f5a99abb5a962f6c8d9053ff943d0669480fb5599
@ -29,6 +30,7 @@ EBUILD calculate-lib-2.2.27.ebuild 685 RMD160 43e6ab9361d04ac60f06819ac4f6a31ab4
EBUILD calculate-lib-2.2.28-r1.ebuild 821 RMD160 68c2af2bbfa2389657e2c34406815fec9353a412 SHA1 d08f2e836feeceab97b65e4449001609ab9a3e93 SHA256 f7af837a535e048fafbc50e39ac6cf5ff299947c49a29ad54caa6c034ad6c453
EBUILD calculate-lib-2.2.28-r2.ebuild 899 RMD160 59ddd5a374fc178452c3d193ab4b391c4150720a SHA1 6f2e63f610984e8f251d15e4753d47feb3552054 SHA256 173bc2b0e14a856d2815e7a6148104e35e7349c488efc55558c204b39b5d3061
EBUILD calculate-lib-2.2.28-r3.ebuild 1007 RMD160 e19ff3db7527e1d4c97bac896b01943c4c54cf55 SHA1 6cc0038c2952a0db41614d6e0c586a200649e4b8 SHA256 f42ea32f748c7a11af8324d5a90680ce3440dc3ceebeb91b1c27f12eb4378ae1
EBUILD calculate-lib-2.2.28-r4.ebuild 1122 RMD160 dd50ad24abc33d0a4303e86e5f901d33c97e3a9b SHA1 141c0a2a72d8459b8ee576537313d3ad3630ed84 SHA256 25297105d4ca32d6f904baefe20107f3550be8246da49aff303fea01dcc479a3
EBUILD calculate-lib-2.2.28.ebuild 685 RMD160 0c4c469e376277d75d07b418c412890bf0e80a19 SHA1 fa6e65383835bec5c9bcc75a7b53edbc800123fe SHA256 92ef43bc11ccb1d7501d2b58621ed91a01420c1bfc979638b10a8d832b6d7132
EBUILD calculate-lib-2.2.9999.ebuild 656 RMD160 85058ff3964a829330b506998b134bd0993e92e8 SHA1 6d6f0e7c00e2f467ee4a8fe0a587bfd45e488b79 SHA256 35451656788914b0890f8d5238f2cab70d858718eb43e38b162cd975eb89e8ca
EBUILD calculate-lib-3.0.9999.ebuild 612 RMD160 db02703fc606ec42386d1857d24b257502dc7142 SHA1 9c417c67357be794f535cd5570bf630b40dda2e6 SHA256 cc7c5c15e3f2bac5e5e251a11860110f62cdabfcd231965e5fe849a560782ea9

@ -0,0 +1,41 @@
# Copyright 1999-2012 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="!<sys-apps/calculate-lib-2.1.8-r1
!=sys-apps/calculate-lib-2.1.9
!=sys-apps/calculate-lib-2.1.10
!minimal? ( dev-python/py-smbpasswd )
>=dev-python/pyxml-0.8
sys-apps/iproute2
sys-apps/pciutils
sys-fs/lvm2
sys-fs/mdadm
sys-apps/file[python]"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# fix autoupdate user profile
epatch "${FILESDIR}/calculate-lib-2.2.28-fix_update.patch"
# fix ati name
epatch "${FILESDIR}/calculate-lib-2.2.28-fix_ati_name.patch"
# fix detect video by /etc/X11/xorg.conf
epatch "${FILESDIR}/calculate-lib-2.2.28-fix_detect_video.patch"
# fix detect ability gzip for squashfs-tools
epatch "${FILESDIR}/calculate-lib-2.2.28-fix_detect_compress.patch"
}

@ -0,0 +1,23 @@
commit cd60886fd866e4fc44516cc9af1f1609ef7eea17
Author: Mike Hiretsky <mh@calculate.ru>
Date: Thu Mar 15 11:21:45 2012 +0400
Fix detect gzip compress for squashfs-tools.
diff --git a/pym/cl_utils.py b/pym/cl_utils.py
index 063d5a2..7ae5015 100644
--- a/pym/cl_utils.py
+++ b/pym/cl_utils.py
@@ -1047,6 +1047,12 @@ def getSquashList():
if not usesSquashFs:
return ["gzip"]
else:
+ pkgInfo = getPkgInstalled('sys-fs/squashfs-tools')
+ if pkgInfo and pkgInfo[0]['PV']:
+ pkgVer = getTupleVersion(pkgInfo[0]['PV'])
+ gzipVer = getTupleVersion('4.2')
+ if pkgVer >= gzipVer:
+ usesSquashFs.append('gzip')
return map(lambda x:{"lzma":"xz"}.get(x,x),
list(set(usesSquashFs) & wantMethod))

@ -64,6 +64,7 @@ EBUILD calculate-utilities-2.2.28-r3.ebuild 863 RMD160 c13c0edb76be7060853cf425c
EBUILD calculate-utilities-2.2.28-r4.ebuild 863 RMD160 0810acb8c13bf278c23824d543bbd3b2b9762087 SHA1 2cdf83114749a71b8ccebbdafedf86bf08671436 SHA256 6e0137409a878b8d7b771c7b0ae379c017ba0411d06b89f49a3ee94f292c33ba
EBUILD calculate-utilities-2.2.28-r5.ebuild 863 RMD160 2022ed0df09f1718cb2ad43f8dd7d0b6d96fabea SHA1 fc3305fb8cfb0a1d3c4895dfe927cd765e1926af SHA256 f050dc1c8d93b03917443e6f64ad3336bb73ebd88fd809ad7f932cf88fd5a574
EBUILD calculate-utilities-2.2.28-r6.ebuild 866 RMD160 be47823324a2b30f1de03d7ec776f9523056603a SHA1 bcbc9fde4aced76bb81b6390a3629a40a739a307 SHA256 f75d9357e3e0c02bce685a23d8b939ddd23c4ba02290179636b5bdb55ae51ba7
EBUILD calculate-utilities-2.2.28-r7.ebuild 866 RMD160 48a1042dfca36442702652e267b0dbd8056fe9f2 SHA1 25dc12ff793e62af8bf92473c5c9150aae4bf9cc SHA256 f55a8e90fd9fb20c9ab2be4a786f689e71fb68e667a0f4fc7d252acbe99b79d4
EBUILD calculate-utilities-2.2.28.ebuild 854 RMD160 4a1efb9b471b17cf02f033887b544a5c4e792aae SHA1 e51eed091e5928ffec22f66271fce95128ca34b8 SHA256 dfc566dcecc232a52add5528e20a814690d0080bdb1eff405bf774ce08770f59
EBUILD calculate-utilities-2.2.9999.ebuild 842 RMD160 f2c0fdc1068614b71a37f2226dcde4883ebd2876 SHA1 99f673a52934f552589baf6d12ed9bffc03b8ebd SHA256 56d97b7d2ce11d23b25d9036b4e2ee196b547ce1d11b0cc349a8205515b66bf1
EBUILD calculate-utilities-3.0.9999.ebuild 441 RMD160 ec17f871ec70a322cff866048e50c150931e0e95 SHA1 d0e036ba01e6a71ad14e6f3e6735bbd0f325df99 SHA256 30c6cd4ce478016cb75458314ea4e745ccb1501be33f14c3a2593d9d0e670c9c

@ -0,0 +1,36 @@
# Copyright 1999-2012 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-templates
=sys-apps/calculate-install-2.2.28-r1
=sys-apps/calculate-lib-2.2.28-r4
=sys-apps/calculate-i18n-2.2.28
cl_assemble? ( =sys-apps/calculate-assemble-2.2.28-r1 )
cl_builder? ( =sys-apps/calculate-builder-2.2.28 )
cl_client? ( =sys-apps/calculate-client-2.2.28-r1 )
cl_desktop? ( =sys-apps/calculate-desktop-2.2.28 )
cl_installgui? ( =app-misc/calculate-install-gui-2.2.28 )
cl_server? ( =sys-apps/calculate-server-2.1.15-r4 )
"
Loading…
Cancel
Save