parent
be2755b3c8
commit
dbf8bd1251
@ -0,0 +1,44 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
SUPPORT_PYTHON_ABIS="1"
|
||||
PYTHON_DEPEND="2:2.7"
|
||||
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
|
||||
|
||||
inherit distutils eutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${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="3"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="pxe minimal"
|
||||
|
||||
DEPEND="~sys-apps/calculate-core-3.1.7
|
||||
!<sys-apps/calculate-install-2.2.29
|
||||
app-portage/layman
|
||||
>=virtual/udev-197
|
||||
!app-misc/livecd-tools
|
||||
sys-apps/iproute2[-minimal]
|
||||
!minimal? ( sys-boot/grub
|
||||
sys-apps/gptfdisk
|
||||
>=sys-apps/util-linux-2.19.1
|
||||
sys-fs/dosfstools
|
||||
sys-fs/squashfs-tools
|
||||
sys-block/parted )
|
||||
pxe? ( sys-apps/calculate-server
|
||||
net-ftp/tftp-hpa
|
||||
net-misc/dhcp
|
||||
net-fs/nfs-utils )"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-install-3.1.7-r2.patch"
|
||||
}
|
||||
@ -0,0 +1,25 @@
|
||||
diff --git install/install.py install/install.py
|
||||
index 9456d36..3ae3eb9 100644
|
||||
--- install/install.py
|
||||
+++ install/install.py
|
||||
@@ -400,7 +400,7 @@ class Install:
|
||||
'lvm_vgname' название группы томов LVM, bios_grub - создавать
|
||||
bios_grub раздел
|
||||
"""
|
||||
- ap = Autopartition()
|
||||
+ ap = AutoPartition()
|
||||
ap.clearLvm(devices,self.clVars)
|
||||
ap.clearRaid(devices,self.clVars)
|
||||
ap.recreateSpace(table,devices,data,lvm,lvm_vgname,bios_grub)
|
||||
diff --git install/variables/system.py install/variables/system.py
|
||||
index dd5a974..b54aaf8 100644
|
||||
--- install/variables/system.py
|
||||
+++ install/variables/system.py
|
||||
@@ -766,6 +766,6 @@ class VariableOsAudioDefault(Variable):
|
||||
"""
|
||||
Audio setting up unavailable for flash installation
|
||||
"""
|
||||
- if self.Get('os_install_root_type') != 'flash':
|
||||
+ if self.Get('os_install_root_type') == 'flash':
|
||||
return _("Audio configuration unavailable for Flash install")
|
||||
return ""
|
||||
@ -0,0 +1,26 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=4
|
||||
|
||||
DESCRIPTION="Calculate Utilities meta package"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
SRC_URI=""
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="cl_consolegui cl_client cl_desktop cl_console"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
=sys-apps/calculate-install-3.1.7-r2
|
||||
=sys-apps/calculate-i18n-3.1.7
|
||||
=sys-apps/calculate-lib-3.1.7-r1
|
||||
=sys-apps/calculate-core-3.1.7-r2
|
||||
=sys-apps/calculate-update-3.1.7
|
||||
cl_client? ( =sys-apps/calculate-client-3.1.7-r2 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-3.1.7-r1 )
|
||||
cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.7-r1 )
|
||||
cl_console? ( =sys-apps/calculate-console-3.1.7 )
|
||||
"
|
||||
Loading…
Reference in new issue