parent
ccd89aa614
commit
ebcbdfa523
@ -0,0 +1,45 @@
|
||||
# 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.4_beta1
|
||||
!<sys-apps/calculate-install-2.2.29
|
||||
app-portage/layman
|
||||
>=sys-fs/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 )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-install-3.1.4_beta1-r2.patch"
|
||||
}
|
@ -0,0 +1,34 @@
|
||||
diff --git install/cl_install.py install/cl_install.py
|
||||
index a225a7a..1b7af1b 100644
|
||||
--- install/cl_install.py
|
||||
+++ install/cl_install.py
|
||||
@@ -154,7 +154,8 @@ class Install(color_print):
|
||||
"""Check that system has grub2 in current and installed system"""
|
||||
if self.clVars.Get('os_grub2_path'):
|
||||
return bool(
|
||||
- filter(lambda x:x.startswith('grub-1.99'),
|
||||
+ filter(lambda x:x.startswith('grub-1.99') or \
|
||||
+ x.startswith('grub-2'),
|
||||
listDirectory('/var/db/pkg/sys-boot')))
|
||||
return False
|
||||
|
||||
diff --git install/variables/system.py install/variables/system.py
|
||||
index 04d6455..088169b 100644
|
||||
--- install/variables/system.py
|
||||
+++ install/variables/system.py
|
||||
@@ -490,12 +490,12 @@ class VariableOsGrub2Path(Variable):
|
||||
"""
|
||||
def get(self):
|
||||
# find grub2-install
|
||||
- grubInstall = getProgPath('/sbin/grub2-install')
|
||||
+ grubInstall = getProgPath('/usr/sbin/grub2-install')
|
||||
if grubInstall:
|
||||
return grubInstall
|
||||
# find grub-install and check, that this is grub2-install (ver 1.99)
|
||||
- grubInstall = self.getProgPath('/sbin/grub-install')
|
||||
- if grubInstall and filter(lambda x:"1.99" in x,
|
||||
+ grubInstall = getProgPath('/usr/sbin/grub-install')
|
||||
+ if grubInstall and filter(lambda x:"1.99" in x or "2.00" in x,
|
||||
process(grubInstall,'-v')):
|
||||
return grubInstall
|
||||
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.4_beta1-r2
|
||||
=sys-apps/calculate-i18n-3.1.4_beta1
|
||||
=sys-apps/calculate-lib-3.1.4_beta1-r2
|
||||
=sys-apps/calculate-core-3.1.4_beta1-r3
|
||||
=sys-apps/calculate-update-3.1.4_beta1
|
||||
cl_client? ( =sys-apps/calculate-client-3.1.4_beta1 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-3.1.4_beta1-r1 )
|
||||
cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.4_beta1 )
|
||||
cl_console? ( =sys-apps/calculate-console-3.1.4_beta1 )
|
||||
"
|
Loading…
Reference in new issue