Update calculate-assemble for bugfix.

atratsevskiy
Mike Hiretsky 14 years ago
parent 132181324e
commit 883db74b53

@ -2,6 +2,13 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-assemble-2.2.12-r2 (24 Mar 2011)
24 Mar 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+calculate-assemble-2.2.12-r2.ebuild,
+files/calculate-assemble-2.2.12-fix_unlink.patch:
Add for bug fix.
*calculate-assemble-2.2.12-r1 (24 Mar 2011)
24 Mar 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

@ -1,13 +1,15 @@
AUX calculate-assemble-2.2.11-fix_listdir.patch 1117 RMD160 2be19ad672eba81510b12e890c8bb73e6d0b178e SHA1 de443b4d122e9db0884682f941ff6357e4046e26 SHA256 6b72819a5e28968a899d71c22eb31ac1f1aecc14dfc33a554726707545cebcc8
AUX calculate-assemble-2.2.11-fix_nvidia_assembling.patch 2652 RMD160 d76c71382b024416f0ac0433144f9b5766afd20c SHA1 b3100af6f975744ec4937867e927189d71d8d473 SHA256 f7653bf48f491f80ad10d80918f9699d3b220557236c8f350683725d2bca33bb
AUX calculate-assemble-2.2.11-uselist.patch 3967 RMD160 5e6d2c2f11f81e60d0d911a5775989aa9a7ec60e SHA1 954f0b17c2bb91d838d137c00d346095670cf122 SHA256 fdd347b3d195660702a24188f86d092b25d953cedd9ade54d024bbb5090cf4e2
AUX calculate-assemble-2.2.12-fix_unlink.patch 724 RMD160 f6885b700a1b048c48162b28ade789d21d22bc53 SHA1 c3f396e239fc0ce4a9decb6313edc4db96b21b15 SHA256 c1559139b1b95f9ef7b129d517f4c4c557420499c96c3a30d33f345967ce7dc4
AUX calculate-assemble-2.2.12-withvideo.patch 8764 RMD160 5a60d4ddb68d3f3a4de7ba14d30453faeb6604be SHA1 a46b18ed2d63f25842e05138aa730dc26fe422ce SHA256 6c382c806c1d96973389f67f56bcc3d42c5afb864d9bfba290c85df102aaa8c7
DIST calculate-assemble-2.2.11.tar.bz2 28918 RMD160 aa2b567ff1d86159ae95857f65a3d94786f78007 SHA1 7099a6e8f4c689c341d0567091c56a7037ec58bf SHA256 7047d1a4dad511bedbccf3960f1be6f1f38cdba446bd3ade148c35af0902d27c
DIST calculate-assemble-2.2.12.tar.bz2 29410 RMD160 68da0d49140931a9a6b3e2b860583abb2ed61601 SHA1 bf29a8619d608f1f0975adce72a36791ff05b6ca SHA256 90ad1926cb1d74f6977967c764926e1f808b442e782a98f828c719a19aee6c29
EBUILD calculate-assemble-2.2.11-r2.ebuild 763 RMD160 527e3f9456d3646b349255b381b47f56f291b425 SHA1 4df33f2bf2ba18ad3959d096968f90b34522268d SHA256 c799d24450d920970b51aee1fbb0bf9f9b989e3da119d4fe269d4e9c1c7d4113
EBUILD calculate-assemble-2.2.11-r3.ebuild 851 RMD160 91ee6f9dad37fca35c2e7227ef5abba5e3c55484 SHA1 0eaf9c6b47d53bfd3fa5e3d9868de94a7a8c080a SHA256 4b9bdc56c190db29cba68e181d72671b2f2c4f45e7e23a55e65528db84b4939b
EBUILD calculate-assemble-2.2.12-r1.ebuild 655 RMD160 cf37c12e4e2b1f046cb2a321ef906bb5f470c263 SHA1 1233c0b2b08ec7c77dfafe9d4bad2f52f80664b8 SHA256 f0d18cc7ed590c99388fb520aa213c445d5a687912b238d80f96dae1d3b711d4
EBUILD calculate-assemble-2.2.12-r2.ebuild 770 RMD160 d9952075553c704041ca62fb85af7036265643cb SHA1 7e4df9928f48643762b02a25d4396e27916f5bcf SHA256 d226810d1c38bdc9a3e668e994fc9862971d9d691921f6269fc4b9767fbe794c
EBUILD calculate-assemble-2.2.12.ebuild 519 RMD160 93567202ef7dab1c88daf4308d27b31b3e38d1af SHA1 041ec6e2868a9dcb06e51ec43c0b1e82913cd0f2 SHA256 c1306acc6271f16ad9977b2667c2d5006250d25bc3f9e819eda575ef840476fc
EBUILD calculate-assemble-2.2.9999.ebuild 482 RMD160 e9830fc17fec7062761321a7c79d5c9f1a7dd147 SHA1 8b8ace9d0c6c34bd9fe12cd9e507ba7cc32ee9af SHA256 467968b55696273c3576f10f9845a100fd4aba2c90eaaefb9ae97d478e04e11a
MISC ChangeLog 8230 RMD160 6c47146de2eab0cec67bdc7633528da394eb70f2 SHA1 46566550b432892d9d23d173ddfc9b37e440c16e SHA256 ace628be724744d94ab1f0595bf4c2285cd3acb4ba5005e9e8df326aefdd7bab
MISC ChangeLog 8448 RMD160 c8535511eec40416cbe3fc53c70f438c05b70ead SHA1 2aa6690f8084224643486498651028bbc3cc69d7 SHA256 eac647613cdde93d0e35eaccd3ac5ce7a750f8e48e65116c3964cd9e51af8ecc
MISC metadata.xml 273 RMD160 7d99331acd3ba20fc7ae361cb845f33f73d994ee SHA1 92e19e1e4c24527654168ac0cf9fe58ba78aeb4d SHA256 4e25d45ba43b2ab7f7ae8ab4cfc05c406566cfb143a87166de77fbd8d9f8a943

@ -0,0 +1,30 @@
# 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 utilities for assembling tasks of Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-builder-2.2.12
~sys-apps/calculate-templates-2.2.12"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# fix bug in call listdir
epatch "${FILESDIR}/calculate-assemble-2.2.12-withvideo.patch"
# fix unlink directory in /usr/portage/distfiles
epatch "${FILESDIR}/calculate-assemble-2.2.12-fix_unlink.patch"
}

@ -0,0 +1,19 @@
commit 95ebf418d5cb098f70d35b4319a76dc8a353a5ab
Author: Mike Hiretsky <mh@calculate.ru>
Date: Thu Mar 24 16:09:11 2011 +0300
Fix removing directory in /usr/portage/distfiles.
diff --git a/pym/cl_assemble.py b/pym/cl_assemble.py
index 803fd08..ae9ec2b 100644
--- a/pym/cl_assemble.py
+++ b/pym/cl_assemble.py
@@ -1452,7 +1452,7 @@ class cl_assemble(color_print):
removedList = fetchedList - needFiles
self.printMessageForTest(" " +
_("Cleaning %s")%distDir)
- map(lambda x:os.unlink(x),
+ map(lambda x:os.rmdir(x) if path.isdir(x) else os.unlink(x),
filter(lambda x:path.exists(x),
map(lambda x:pathJoin(chrootPath,distDir,x),
removedList)))

@ -2,6 +2,12 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-utilities-2.2.12-r3 (24 Mar 2011)
24 Mar 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+calculate-utilities-2.2.12-r3.ebuild:
Update for assemble.
*calculate-utilities-2.2.12-r2 (24 Mar 2011)
24 Mar 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

@ -1,5 +1,6 @@
EBUILD calculate-utilities-2.2.11-r12.ebuild 838 RMD160 d5c72a8b4ec2d1471f7d911ff917d5698cbac1f0 SHA1 171b8aa3bbfdacb02e73506e377f9d1d66989872 SHA256 6624f4d903bfef433f25b52ed82119a8f970e3b67f2f55496bc7c8cb72a3a2a1
EBUILD calculate-utilities-2.2.12-r1.ebuild 832 RMD160 5882f622681fd9ecbbde1bba49a4204114ef8c8f SHA1 3dd06830aa9849d25f9cc2308e093d5e4921ae2e SHA256 303e0f23064db2a13e0e05a286dd2731c0ccb5d488fe725a330f2b8325c08d00
EBUILD calculate-utilities-2.2.12-r2.ebuild 835 RMD160 3286a38d46db2bfa4eca99cfbed396fdd90a6ff9 SHA1 3e297c5c65e1c2cc9db7eeb9b5322aa74ceab8b5 SHA256 53e1e723ae085567d94f5c15aa42169b1663aa3f1b3f5578861404f3b0129dfd
EBUILD calculate-utilities-2.2.12-r3.ebuild 835 RMD160 02850d5eb1e7d4bb869dfca540dd6de2e8d63a69 SHA1 51a48154482a6f7086c8b978e8d8380e577c865e SHA256 50bed12155018e21ebf9b180a623a9259a0c7c03c90d511faa6c5f4e6330b94b
EBUILD calculate-utilities-2.2.12.ebuild 826 RMD160 2e3f045d37568bcfb15248163b4c04800fefeeac SHA1 2cf9f0cc76002be25ac85c4303f06b6a2506eefc SHA256 aa38dccd206fea10ded4f3d8daf39e4c68e17a4c4420cbc524d043a4c0ddc60b
MISC ChangeLog 4366 RMD160 a73542da8eb1526394703df3d36e9b5413fb031d SHA1 23030fcb24694eed7a11dd86f17cb89fc968a8d4 SHA256 7b04f41b2c001f34f6b56b78b2012383065e2e806d790a1d7c57ec78feb9c3d1
MISC ChangeLog 4537 RMD160 c8a4b1b5e6b26546517378d11e00fd5d4823af7a SHA1 5127f23ff18ab4ad2d37882125533898435f4363 SHA256 a03d5da57e0198f939f6ac72e44aeac946901ae991cce27665796320825d953a

@ -0,0 +1,36 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=2
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.12-r1
=sys-apps/calculate-templates-2.2.12-r1
=sys-apps/calculate-lib-2.2.12
cl_assemble? ( =sys-apps/calculate-assemble-2.2.12-r2 )
cl_builder? ( =sys-apps/calculate-builder-2.2.12 )
cl_client? ( =sys-apps/calculate-client-2.2.12 )
cl_desktop? ( =sys-apps/calculate-desktop-2.2.12 )
cl_installgui? ( =app-misc/calculate-install-gui-2.2.12 )
cl_server? ( =sys-apps/calculate-server-2.1.13 )
"
Loading…
Cancel
Save