parent
3d9c46a939
commit
8510640b4c
@ -0,0 +1,35 @@
|
||||
# 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 library for Calculate 3"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS=""
|
||||
IUSE="minimal"
|
||||
DEPEND="!minimal? ( dev-python/py-smbpasswd )
|
||||
>=dev-python/pyxml-0.8
|
||||
sys-apps/iproute2
|
||||
sys-apps/pciutils
|
||||
sys-fs/lvm2
|
||||
sys-fs/mdadm
|
||||
dev-python/pyinotify
|
||||
sys-apps/file[python]"
|
||||
RDEPEND="${DEPEND}"
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-lib-3.1.5_alpha2-r2.patch"
|
||||
}
|
||||
@ -0,0 +1,53 @@
|
||||
diff --git calculate/lib/cl_template.py calculate/lib/cl_template.py
|
||||
index e94ce8a..130ef48 100644
|
||||
--- calculate/lib/cl_template.py
|
||||
+++ calculate/lib/cl_template.py
|
||||
@@ -4303,19 +4303,19 @@ gettext -d cl_template "$*"
|
||||
if os.path.isfile(skipTempl):
|
||||
skipDirTemplates.append(skipTempl)
|
||||
if skipTemplates or skipDirTemplates:
|
||||
- setWARNING(_("Skipped templates:"))
|
||||
+ self.printWARNING(_("Skipped templates:"))
|
||||
for skipTemplate in skipTemplates + skipDirTemplates:
|
||||
- setWARNING(" "*6 + skipTemplate)
|
||||
+ self.printWARNING(" "*6 + skipTemplate)
|
||||
if skipDirs:
|
||||
- setWARNING(_("Skipped directories:"))
|
||||
+ self.printWARNING(_("Skipped directories:"))
|
||||
for skipDir in skipDirs:
|
||||
- setWARNING(" "*6 + skipDir)
|
||||
- setWARNING("")
|
||||
- setWARNING(_("Headers of directory templates and headers "
|
||||
+ self.printWARNING(" "*6 + skipDir)
|
||||
+ self.printWARNING("")
|
||||
+ self.printWARNING(_("Headers of directory templates and headers "
|
||||
"of files on the first level should include "
|
||||
"an action variable."))
|
||||
- setWARNING(_("Example:"))
|
||||
- setWARNING("# Calculate ac_install_merge==on")
|
||||
+ self.printWARNING(_("Example:"))
|
||||
+ self.printWARNING("# Calculate ac_install_merge==on")
|
||||
return skipDirs + skipTemplates
|
||||
|
||||
def applyTemplates(self,progress=True,rerun=True):
|
||||
diff --git calculate/lib/utils/device.py calculate/lib/utils/device.py
|
||||
index 4f89891..d9eeee6 100644
|
||||
--- calculate/lib/utils/device.py
|
||||
+++ calculate/lib/utils/device.py
|
||||
@@ -405,7 +405,7 @@ def refreshUdev(onlyTrigger=False):
|
||||
"""Run command which refresh information about device in udev"""
|
||||
if not onlyTrigger:
|
||||
getUdevDeviceInfo.clearCache()
|
||||
- udevadm = getProgPath('/sbin/udevadm')
|
||||
+ udevadm = getProgPath('/bin/udevadm')
|
||||
if udevadm:
|
||||
blkidFile = '/etc/blkid.tab'
|
||||
try:
|
||||
@@ -414,6 +414,7 @@ def refreshUdev(onlyTrigger=False):
|
||||
except:
|
||||
pass
|
||||
process(udevadm,"trigger","--subsystem-match","block").success()
|
||||
+ process(udevadm,"settle","--timeout=15").success()
|
||||
|
||||
def getCommonDeviceName(dev):
|
||||
"""
|
||||
@ -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=""
|
||||
IUSE="cl_consolegui cl_client cl_desktop cl_console"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
=sys-apps/calculate-install-3.1.5_alpha2-r3
|
||||
=sys-apps/calculate-i18n-3.1.5_alpha2
|
||||
=sys-apps/calculate-lib-3.1.5_alpha2-r2
|
||||
=sys-apps/calculate-core-3.1.5_alpha2
|
||||
=sys-apps/calculate-update-3.1.5_alpha2
|
||||
cl_client? ( =sys-apps/calculate-client-3.1.5_alpha2 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-3.1.5_alpha2 )
|
||||
cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.5_alpha2 )
|
||||
cl_console? ( =sys-apps/calculate-console-3.1.5_alpha2 )
|
||||
"
|
||||
Loading…
Reference in new issue