Fix work utilities with python2.7.3

atratsevskiy
parent 5be1b3361f
commit bbdc24204c

@ -10,6 +10,7 @@ AUX calculate-lib-2.2.28-fix_detect_compress.patch 798 RMD160 90ad3d33b0c6bc8490
AUX calculate-lib-2.2.28-fix_detect_video.patch 889 RMD160 1608727a200a0988dbab8313a4239eebe632de40 SHA1 8bb38bd85e430533efe5d85aa97a677e3780488e SHA256 33712cbd680548d22a79f0e4c3f1aa407d2e77fbcc68b5a4a8828c0e82068840
AUX calculate-lib-2.2.28-fix_ifconfig.patch 2152 RMD160 b98f69e18417bf24af922bf0372943b5fc871f97 SHA1 3c3f955430969625914fd464d8f1331922966f9a SHA256 0c40e749e111493b5d55e9c316baef4ca29df945dd5357ef3f5da5a380be50c4
AUX calculate-lib-2.2.28-fix_update.patch 1070 RMD160 95a469e9597db6ffdeda77f63faf559eed34f9b5 SHA1 c312cb14376806e378ef7f0b034ba72141423ee4 SHA256 97956b3af799478fa18d3a5025b25ac176188aa0c3325744d519910ad0fc7c8d
AUX calculate-lib-2.2.28-fix_work_with_python2_7_3.patch 494 RMD160 cfe3092da1c824bcafcbb2e46cadeffe81ce9eab SHA1 2d4c4bd3d8b4148cd34edefd3a5558acfceb70e9 SHA256 3eb6c49760d0bebfd7c92d949ebae756f7bc7fa8a286957af98ac3daa066aad3
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.24.tar.bz2 109443 RMD160 6e67f4adf69cd611a822cb2ab05084b85d4c32e3 SHA1 db96a8844e5beae0f27e22d646613c79b0682881 SHA256 172fd33fe0d8985d73eacbff882286827f0f15960ef37b641c687bd455ec7857
@ -35,6 +36,7 @@ EBUILD calculate-lib-2.2.28-r2.ebuild 899 RMD160 59ddd5a374fc178452c3d193ab4b391
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-r5.ebuild 1221 RMD160 a44ec102aee807864edf4348666a50b656dc3ec7 SHA1 291748a76268956ec17b951d81e64fa17104f2ba SHA256 113ed5ddc9789fb3f3826d3fdc5ae1165ca1ebfe219635832cd81665479c3702
EBUILD calculate-lib-2.2.28-r6.ebuild 1336 RMD160 b79c8da518cc5ea292b7514c71e8415bf874e1fe SHA1 4773a87b33ffde465777b0c9ecc121ec1e28384e SHA256 19f5302ddb989912b65713291d92897fc0c138e9f537c9cce133d904871a8311
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 634 RMD160 114268a839d17dfccdf12a6be3ab434de99b0fa5 SHA1 5d9330211622f89362bb47db285bb83018468cf9 SHA256 7197d2184d77097c1353ba2536d6590c1054feb188cf3c5f251e52be94bb25a3

@ -0,0 +1,45 @@
# 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"
# fix detect util path and ifconfig
epatch "${FILESDIR}/calculate-lib-2.2.28-fix_ifconfig.patch"
# fix work with python 2.7.3 and pyxml
epatch "${FILESDIR}/calculate-lib-2.2.28-fix_work_with_python2_7_3.patch"
}

@ -0,0 +1,20 @@
commit 80ca6c052625f937b2ef50441ea1452f939fa00c
Author: Mike Hiretsky <mh@calculate.ru>
Date: Thu May 3 11:03:22 2012 +0400
Fix work with python 2.7.3 pyxml.
diff --git a/pym/cl_template.py b/pym/cl_template.py
index f8127ec..8c6f7b9 100644
--- a/pym/cl_template.py
+++ b/pym/cl_template.py
@@ -19,6 +19,9 @@ import os
import stat
import re
import xml.dom.minidom
+import xml
+if hasattr(xml,"use_pyxml"):
+ xml.use_pyxml()
from xml import xpath
import subprocess
import types

@ -61,6 +61,7 @@ EBUILD calculate-utilities-2.2.27.ebuild 861 RMD160 d840018012b50f856de0042966fa
EBUILD calculate-utilities-2.2.28-r1.ebuild 857 RMD160 04995d8aa9f65a078877c173262b54fb8400ed71 SHA1 ad08c121ad5be596a261afc96464f7d550c28267 SHA256 49f1d150a1378ca49238fb6d004282d08a1aae36b50f2e7964ad73394ff2a71e
EBUILD calculate-utilities-2.2.28-r10.ebuild 866 RMD160 2dc1d3d9af8136e7f9e54e887284959eb80adb21 SHA1 5b0a050782eca6a79f61c28fddb6201ad385a0ef SHA256 2f2756e9a48b5f8b76b16b50ce2fb8230d7838c9af0158b77a92bfbfe39fcd93
EBUILD calculate-utilities-2.2.28-r11.ebuild 866 RMD160 803523f972d942f75bbb484312e9558cea596ad2 SHA1 1280143fca032fce18cb9fff55c51ac744910cda SHA256 f68798dde7cb0d210bba27ab9753c227fb107af3a0649fee780be0d463d03cdc
EBUILD calculate-utilities-2.2.28-r12.ebuild 866 RMD160 4e6df148dfd85f59d846c895888b230909e369d6 SHA1 2b8c0de16e87f42b962befd4a46ac27af7f6b574 SHA256 4502714b1de2962733f2acdc960d09b5b52fc34c7d169863452f1c12207ad00c
EBUILD calculate-utilities-2.2.28-r2.ebuild 860 RMD160 b56c73b3c4a4154889f7d77b2e953357d23c842d SHA1 5ca3456fe37e9324985f47ca095ae19bdc2c0bc1 SHA256 a585335e343c470cd91c8f1ec3814d3e64343f022e66215be86064e65e858e25
EBUILD calculate-utilities-2.2.28-r3.ebuild 863 RMD160 c13c0edb76be7060853cf425c4204a056df9d7d1 SHA1 98d05c7deb5868b6a0f0cf9776009670dc00bb0f SHA256 4d47839f2c7513cf4e5a0ea0c49168ba72e83e9b5f7a9f49a8270308fe9e5b11
EBUILD calculate-utilities-2.2.28-r4.ebuild 863 RMD160 0810acb8c13bf278c23824d543bbd3b2b9762087 SHA1 2cdf83114749a71b8ccebbdafedf86bf08671436 SHA256 6e0137409a878b8d7b771c7b0ae379c017ba0411d06b89f49a3ee94f292c33ba

@ -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-r6
=sys-apps/calculate-i18n-2.2.28
cl_assemble? ( =sys-apps/calculate-assemble-2.2.28-r3 )
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-r5 )
"
Loading…
Cancel
Save