parent
776b889715
commit
fcf0aa5eda
@ -0,0 +1,35 @@
|
||||
# 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 utilities for builder tasks of Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
DEPEND=">=sys-kernel/calckernel-3.4.18
|
||||
!<sys-apps/calculate-install-3
|
||||
!<sys-apps/calculate-1.4.0_p20100921
|
||||
app-cdr/cdrkit
|
||||
sys-fs/squashfs-tools"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# fix get value from variable
|
||||
epatch "${FILESDIR}/calculate-builder-2.2.29-fix_init.d.patch"
|
||||
|
||||
# fix urandom remove func
|
||||
epatch "${FILESDIR}/calculate-builder-2.2.29-fix_urandom.patch"
|
||||
epatch "${FILESDIR}/calculate-builder-2.2.29-fix_urandom2.patch"
|
||||
}
|
||||
@ -0,0 +1,19 @@
|
||||
commit 66d71469ba6f4e007190fe5ff29247f81b8076e2
|
||||
Author: Mike Hiretsky <mh@calculate.ru>
|
||||
Date: Fri Jun 22 14:41:12 2012 +0400
|
||||
|
||||
Fix create urandom device
|
||||
|
||||
diff --git a/pym/cl_builder.py b/pym/cl_builder.py
|
||||
index de9fbf5..fd3d922 100644
|
||||
--- a/pym/cl_builder.py
|
||||
+++ b/pym/cl_builder.py
|
||||
@@ -287,7 +287,7 @@ class cl_builder(color_print):
|
||||
createdDev = []
|
||||
for node,mode,dmode,major,minor in [("urandom",0666,stat.S_IFCHR,1,9)]:
|
||||
try:
|
||||
- nodePath = path.join(devPath,node)
|
||||
+ nodePath = path.join(devPath,"dev",node)
|
||||
if not path.exists(nodePath):
|
||||
os.mknod(nodePath,mode|dmode,os.makedev(major,minor))
|
||||
os.chmod(nodePath,mode)
|
||||
@ -0,0 +1,36 @@
|
||||
# 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
|
||||
!<sys-apps/calculate-install-3
|
||||
!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.29-fix_funcPkg.patch"
|
||||
}
|
||||
@ -0,0 +1,38 @@
|
||||
commit d4b9968ecc9de15549c00386b2726cdee166ce06
|
||||
Author: Mike Hiretsky <mh@calculate.ru>
|
||||
Date: Fri Jun 22 14:28:59 2012 +0400
|
||||
|
||||
Fix pkg function
|
||||
|
||||
diff --git a/pym/cl_template.py b/pym/cl_template.py
|
||||
index dae7872..734ab92 100644
|
||||
--- a/pym/cl_template.py
|
||||
+++ b/pym/cl_template.py
|
||||
@@ -2782,20 +2782,18 @@ class templateFunction(_error, _shareTemplate, _shareTermsFunction):
|
||||
if os.path.exists(pathCategory):
|
||||
pkgs = os.listdir(pathCategory)
|
||||
pkgs = map(lambda x: os.path.join(category,x),
|
||||
- pkgs)
|
||||
+ pkgs)
|
||||
installProg = self.sharePkg(pkgs)
|
||||
replace = self.pkg(nameProg, installProg)
|
||||
- oldInstallProg = self.installProg
|
||||
- self.installProg = {}
|
||||
- self.installProg.update(installProg)
|
||||
- self.installProg.update(oldInstallProg)
|
||||
+ self.installProg.update(
|
||||
+ filter(lambda x:not x[0] in self.installProg,
|
||||
+ installProg.items()))
|
||||
else:
|
||||
if not self.flagAllPkgScan:
|
||||
installProg = self.getInstallPkgGentoo()
|
||||
- oldInstallProg = self.installProg
|
||||
- self.installProg = {}
|
||||
- self.installProg.update(installProg)
|
||||
- self.installProg.update(oldInstallProg)
|
||||
+ self.installProg.update(
|
||||
+ filter(lambda x:not x[0] in self.installProg,
|
||||
+ installProg.items()))
|
||||
templateFunction.flagAllPkgScan = True
|
||||
replace = self.pkg(nameProg, self.installProg)
|
||||
textTemplateTmp = textTemplateTmp[:resS.start()] + replace +\
|
||||
@ -0,0 +1,34 @@
|
||||
# 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_server
|
||||
"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
!sys-apps/calculate-templates
|
||||
!<sys-apps/calculate-install-3
|
||||
=sys-apps/calculate-lib-2.2.29-r1
|
||||
=sys-apps/calculate-i18n-2.2.29
|
||||
|
||||
cl_assemble? ( =sys-apps/calculate-assemble-2.2.29-r1 )
|
||||
cl_builder? ( =sys-apps/calculate-builder-2.2.29-r3 )
|
||||
cl_client? ( =sys-apps/calculate-client-2.2.29 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-2.2.29 )
|
||||
|
||||
cl_server? ( =sys-apps/calculate-server-2.1.15-r6 )
|
||||
"
|
||||
Loading…
Reference in new issue