parent
113074b6d7
commit
308f856535
@ -0,0 +1,42 @@
|
||||
# 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 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-templates-2.2.21
|
||||
~sys-apps/calculate-lib-2.2.21
|
||||
app-portage/layman
|
||||
!app-misc/livecd-tools
|
||||
!minimal? ( sys-boot/grub
|
||||
sys-apps/gptfdisk
|
||||
>=sys-apps/util-linux-2.19.1
|
||||
sys-fs/dosfstools
|
||||
sys-fs/squashfs-tools
|
||||
sys-block/parted )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# fix bug of caching detected images and installed os
|
||||
epatch "${FILESDIR}/calculate-install-2.2.21-r1.patch"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "For configure calculate-install perform:"
|
||||
einfo " cl-install --install"
|
||||
}
|
@ -0,0 +1,28 @@
|
||||
commit 71456c2c67431006fdf49cd7e9cc17103a387d40
|
||||
Author: Mike Hiretsky <mh@calculate.ru>
|
||||
Date: Fri Aug 19 10:54:23 2011 +0400
|
||||
|
||||
Bugfix caching of param detected images and installed system.
|
||||
|
||||
diff --git a/pym/cl_distr.py b/pym/cl_distr.py
|
||||
index 057e50d..b622e6d 100644
|
||||
--- a/pym/cl_distr.py
|
||||
+++ b/pym/cl_distr.py
|
||||
@@ -136,7 +136,7 @@ class DistributiveRepository:
|
||||
"""Get info from content"""
|
||||
origfilename = filename
|
||||
if filename in DistributiveRepository.contentCache:
|
||||
- return DistributiveRepository.contentCache[filename]
|
||||
+ return DistributiveRepository.contentCache[filename].copy()
|
||||
varsShare = self.varsShare
|
||||
distr = None
|
||||
# may be directory is isodir (directory which contains iso image)
|
||||
@@ -184,7 +184,7 @@ class DistributiveRepository:
|
||||
if distr:
|
||||
distr.close()
|
||||
DistributiveRepository.contentCache[origfilename] = d
|
||||
- return d
|
||||
+ return d.copy()
|
||||
|
||||
def _getdistrinfo(self,filename):
|
||||
"""Get information by distributive"""
|
@ -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.21-r1
|
||||
=sys-apps/calculate-templates-2.2.21
|
||||
=sys-apps/calculate-lib-2.2.21
|
||||
=sys-apps/calculate-i18n-2.2.21
|
||||
|
||||
cl_assemble? ( =sys-apps/calculate-assemble-2.2.21 )
|
||||
cl_builder? ( =sys-apps/calculate-builder-2.2.21 )
|
||||
cl_client? ( =sys-apps/calculate-client-2.2.21 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-2.2.21 )
|
||||
cl_installgui? ( =app-misc/calculate-install-gui-2.2.21 )
|
||||
|
||||
cl_server? ( =sys-apps/calculate-server-2.1.14-r6 )
|
||||
"
|
||||
|
Loading…
Reference in new issue