parent
ae30cd62d4
commit
ffbaeef4c6
@ -0,0 +1,54 @@
|
||||
# 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-lib-3.0.0
|
||||
!<sys-apps/calculate-install-2.2.29
|
||||
app-portage/layman
|
||||
!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}"
|
||||
|
||||
# changes
|
||||
epatch "${FILESDIR}/calculate-install-3.0.0-r3.patch"
|
||||
epatch "${FILESDIR}/calculate-install-3.0.0-fix_install_grub.patch"
|
||||
epatch "${FILESDIR}/calculate-install-3.0.0-fix_using_lvm.patch"
|
||||
epatch "${FILESDIR}/calculate-install-3.0.0-fix_lvm_and_setup_system.patch"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "For install wsdl for calculate-install perform:"
|
||||
einfo " cl-core --append-variable cl_wsdl=calculate-install"
|
||||
einfo " cl-core --append-variable cl_merges=calculate-install"
|
||||
}
|
||||
@ -0,0 +1,310 @@
|
||||
commit e2b72b54c06f698ed98d5cff42c7824711f14e76
|
||||
Author: Mike Hiretsky <mh@calculate.ru>
|
||||
Date: Wed Aug 8 13:37:22 2012 +0400
|
||||
|
||||
Fix lvm installation, close variables, display errors
|
||||
|
||||
diff --git install/cl_install.py install/cl_install.py
|
||||
index 3656e5e..762758b 100644
|
||||
--- install/cl_install.py
|
||||
+++ install/cl_install.py
|
||||
@@ -186,67 +186,26 @@ class Install(color_print):
|
||||
|
||||
# cltObj = True if 'clt' in templates_locate else False
|
||||
dirs_list, files_list = ([],[])
|
||||
- listTemplatePaths = ["/var/lib/layman/calculate/profiles/templates",
|
||||
- "/var/calculate/templates",
|
||||
- "/var/calculate/remote/templates"]
|
||||
- for location in templates_locate:
|
||||
- if location in ("overlay", "local", "remote", "clt"):
|
||||
- if len(listTemplatePaths) != 3:
|
||||
- self.printERROR(\
|
||||
- _("Error in template variable 'cl_template_path=%s'")\
|
||||
- %str(listTemplatePaths))
|
||||
- return False
|
||||
- elif location == "local":
|
||||
- if not os.path.isdir(listTemplatePaths[1]):
|
||||
- continue
|
||||
- self.clVars.Set("cl_template_path",
|
||||
- [listTemplatePaths[1]], True)
|
||||
- elif location == "remote":
|
||||
- if not os.path.isdir(listTemplatePaths[2]):
|
||||
- continue
|
||||
- self.clVars.Set("cl_template_path",
|
||||
- [listTemplatePaths[2]], True)
|
||||
- elif location == "overlay":
|
||||
- if not os.path.isdir(listTemplatePaths[0]):
|
||||
- continue
|
||||
- self.clVars.Set("cl_template_path",
|
||||
- [listTemplatePaths[0]], True)
|
||||
- elif location == "clt":
|
||||
-# list_paths = ['/etc'] + \
|
||||
-# os.environ.get('CONFIG_PROTECT').split()
|
||||
-# for template_path in list_paths:
|
||||
-# if not os.path.isdir(template_path):
|
||||
-# continue
|
||||
-# print template_path
|
||||
-# self.clVars.Set("cl_template_path",
|
||||
-# [template_path], True)
|
||||
-# self.clTempl = ProgressTemplate(self.setProgress,
|
||||
-# self.clVars,cltObj=True,
|
||||
-# cltFilter=True)
|
||||
-#
|
||||
-# dirsFiles = self.clTempl.applyTemplates()
|
||||
-# # cltObj = False
|
||||
-# print dirsFiles
|
||||
-# dirs_list += (dirsFiles[0])
|
||||
-# files_list += (dirsFiles[1])
|
||||
- continue
|
||||
-
|
||||
- self.clTempl = ProgressTemplate(self.setProgress, self.clVars,
|
||||
- cltFilter=False)
|
||||
-
|
||||
- dirsFiles = self.clTempl.applyTemplates()
|
||||
- if type(dirsFiles) in [list, tuple]:
|
||||
- if len (dirsFiles) > 1:
|
||||
- dirs_list += (dirsFiles[0])
|
||||
- files_list += (dirsFiles[1])
|
||||
- self.clVars.Set("cl_template_path", listTemplatePaths, True)
|
||||
+ useClt = "clt" in templates_locate
|
||||
+ self.clVars.Set("cl_template_path",
|
||||
+ map(lambda x:x[1],
|
||||
+ filter(lambda x:x[0] in templates_locate,
|
||||
+ zip(self.clVars.Get('cl_template_location'),
|
||||
+ self.clVars.Get('cl_template_path')))),
|
||||
+ True)
|
||||
+
|
||||
+ self.clTempl = ProgressTemplate(self.setProgress, self.clVars,
|
||||
+ cltObj=useClt,
|
||||
+ cltFilter=False)
|
||||
+
|
||||
+ dirsFiles = self.clTempl.applyTemplates()
|
||||
try:
|
||||
if self.clTempl.getError():
|
||||
self.printERROR(self.clTempl.getError())
|
||||
return False
|
||||
except AttributeError:
|
||||
pass
|
||||
- return (dirs_list, files_list)
|
||||
+ return dirsFiles
|
||||
|
||||
def applyTemplatesFlash(self,directory):
|
||||
"""Apply templates for root of system."""
|
||||
diff --git install/cl_wsdl_install.py install/cl_wsdl_install.py
|
||||
index a40c561..ae5a639 100644
|
||||
--- install/cl_wsdl_install.py
|
||||
+++ install/cl_wsdl_install.py
|
||||
@@ -23,7 +23,7 @@ from soaplib.service import rpc, DefinitionBase
|
||||
from calculate.core.server.api_types import ReturnedMessage
|
||||
from calculate.core.server.api_types import ChoiceValue, Table, Option, Field, \
|
||||
GroupField, ViewInfo, ViewParams
|
||||
-from calculate.lib.datavars import VariableError
|
||||
+from calculate.lib.datavars import VariableError,DataVarsError
|
||||
|
||||
#from cl_install import Install,DataVarsInstall
|
||||
import cl_install
|
||||
@@ -107,8 +107,10 @@ class catchExcept:
|
||||
default = 'color:red;',
|
||||
element = "error"))
|
||||
view.groups.append(group)
|
||||
- #for i in apply(traceback.format_exception, sys.exc_info()):
|
||||
- # print i
|
||||
+ if not isinstance(VariableError,DataVarsError,InstallError):
|
||||
+ for i in apply(traceback.format_exception, sys.exc_info()):
|
||||
+ print i,
|
||||
+
|
||||
return view
|
||||
|
||||
class Wsdl:
|
||||
@@ -232,13 +234,13 @@ class Wsdl:
|
||||
lang = dv.Get('os_install_locale_lang')
|
||||
self.set_cache(sid,"install","lang",lang,smart=False)
|
||||
dv.processRefresh()
|
||||
+ self.set_cache(sid, 'install', "vars",dv,smart=False)
|
||||
view = ViewInfo(dv,step=params.step,
|
||||
expert=params.expert,
|
||||
brief=params.brief,
|
||||
has_brief=True,
|
||||
allsteps=langChanged,
|
||||
brief_label=_("Start installing"))
|
||||
- self.set_cache(sid, 'install', "vars",dv,smart=False)
|
||||
return view
|
||||
|
||||
def install_flash_vars(self):
|
||||
@@ -272,10 +274,10 @@ class Wsdl:
|
||||
dv = self.install_flash_vars()
|
||||
else:
|
||||
dv.processRefresh()
|
||||
+ self.set_cache(sid, 'install_flash', "vars",dv,smart=False)
|
||||
view = ViewInfo(dv,step=params.step,
|
||||
expert=params.expert,
|
||||
brief=params.brief)
|
||||
- self.set_cache(sid, 'install_flash', "vars",dv,smart=False)
|
||||
return view
|
||||
|
||||
def install_pxe_vars(self):
|
||||
@@ -309,10 +311,10 @@ class Wsdl:
|
||||
dv = self.install_pxe_vars()
|
||||
else:
|
||||
dv.processRefresh()
|
||||
+ self.set_cache(sid, 'install_pxe', "vars",dv,smart=False)
|
||||
view = ViewInfo(dv,step=params.step,
|
||||
expert=params.expert,
|
||||
brief=params.brief)
|
||||
- self.set_cache(sid, 'install_pxe', "vars",dv,smart=False)
|
||||
return view
|
||||
|
||||
def setup_network_vars(self):
|
||||
@@ -351,10 +353,10 @@ class Wsdl:
|
||||
dv = self.setup_network_vars()
|
||||
else:
|
||||
dv.processRefresh()
|
||||
+ self.set_cache(sid, 'setup_network', "vars",dv,smart=False)
|
||||
view = ViewInfo(dv,step=params.step,
|
||||
expert=params.expert,
|
||||
brief=params.brief)
|
||||
- self.set_cache(sid, 'setup_network', "vars",dv,smart=False)
|
||||
return view
|
||||
|
||||
def setup_video_vars(self):
|
||||
@@ -391,10 +393,10 @@ class Wsdl:
|
||||
dv = self.setup_video_vars()
|
||||
else:
|
||||
dv.processRefresh()
|
||||
+ self.set_cache(sid, 'setup_video', "vars",dv,smart=False)
|
||||
view = ViewInfo(dv,step=params.step,
|
||||
expert=params.expert,
|
||||
brief=params.brief)
|
||||
- self.set_cache(sid, 'setup_video', "vars",dv,smart=False)
|
||||
return view
|
||||
|
||||
def setup_locale_vars(self):
|
||||
@@ -431,10 +433,10 @@ class Wsdl:
|
||||
dv = self.setup_locale_vars()
|
||||
else:
|
||||
dv.processRefresh()
|
||||
+ self.set_cache(sid, 'setup_locale', "vars",dv,smart=False)
|
||||
view = ViewInfo(dv,step=params.step,
|
||||
expert=params.expert,
|
||||
brief=params.brief)
|
||||
- self.set_cache(sid, 'setup_locale', "vars",dv,smart=False)
|
||||
return view
|
||||
|
||||
def setup_boot_vars(self):
|
||||
@@ -470,10 +472,10 @@ class Wsdl:
|
||||
dv = self.setup_boot_vars()
|
||||
else:
|
||||
dv.processRefresh()
|
||||
+ self.set_cache(sid, 'setup_boot', "vars",dv,smart=False)
|
||||
view = ViewInfo(dv,step=params.step,
|
||||
expert=params.expert,
|
||||
brief=params.brief)
|
||||
- self.set_cache(sid, 'setup_boot', "vars",dv,smart=False)
|
||||
return view
|
||||
|
||||
def setup_system_vars(self):
|
||||
@@ -507,8 +509,8 @@ class Wsdl:
|
||||
dv = self.setup_system_vars()
|
||||
else:
|
||||
dv.processRefresh()
|
||||
+ self.set_cache(sid, 'setup_system', "vars",dv,smart=False)
|
||||
view = ViewInfo(dv,step=params.step,
|
||||
expert=params.expert,
|
||||
brief=params.brief)
|
||||
- self.set_cache(sid, 'setup_system', "vars",dv,smart=False)
|
||||
return view
|
||||
diff --git install/variables/autopartition.py install/variables/autopartition.py
|
||||
index 1be3e82..f1935c5 100644
|
||||
--- install/variables/autopartition.py
|
||||
+++ install/variables/autopartition.py
|
||||
@@ -337,7 +337,7 @@ class VariableHrMemorySize(ReadonlyVariable):
|
||||
return "0"
|
||||
|
||||
def humanReadable(self):
|
||||
- return map(humanreadableSize,self.Get())
|
||||
+ return humanreadableSize(self.Get())
|
||||
|
||||
class VariableClAutopartitionSwapSize(Variable):
|
||||
"""
|
||||
diff --git install/variables/disk.py install/variables/disk.py
|
||||
index 018fe70..d0d8fee 100644
|
||||
--- install/variables/disk.py
|
||||
+++ install/variables/disk.py
|
||||
@@ -28,7 +28,7 @@ from calculate.lib.datavars import (TableVariable,Variable,VariableError,
|
||||
from calculate.lib.utils.device import (getUdevDeviceInfo,getDeviceType,
|
||||
getPartitionType,getPartitionDevice,getRaidPartitions,
|
||||
getLvmPartitions,getPartitionSize, humanreadableSize,
|
||||
- getUUIDDict)
|
||||
+ getUUIDDict,getCommonDeviceName)
|
||||
from calculate.lib.utils.files import (listDirectory,pathJoin,readFile,FStab,
|
||||
isMount)
|
||||
from calculate.install.cl_distr import PartitionDistributive
|
||||
@@ -769,10 +769,7 @@ class VariableOsLocationDest(LocationHelper,Variable):
|
||||
return path.normpath(val)
|
||||
return val
|
||||
value = map(normpath,value)
|
||||
- if len(value) == 1 and value[0] == "":
|
||||
- return ["/"]
|
||||
- else:
|
||||
- return value
|
||||
+ return map(lambda x:x or "/",value)
|
||||
|
||||
def choice(self):
|
||||
if self.Get('cl_install_type') == 'flash': return ["/",""]
|
||||
@@ -1102,6 +1099,12 @@ class VariableOsLocationSize(LocationHelper,SourceReadonlyVariable):
|
||||
self.Get('cl_autopartition_disk_size')))
|
||||
return mapDevSize
|
||||
|
||||
+ def get(self):
|
||||
+ return map(lambda x:x or "",
|
||||
+ map(self.getMap().get,
|
||||
+ map(getCommonDeviceName,
|
||||
+ self.Get(self.indexField))))
|
||||
+
|
||||
def getMapHumanReadable(self):
|
||||
#return map(lambda x:humanreadableSize(x) if x else "",
|
||||
# self.Get())
|
||||
@@ -1112,6 +1115,13 @@ class VariableOsLocationSize(LocationHelper,SourceReadonlyVariable):
|
||||
self.Get('cl_autopartition_disk_size',humanreadable=True)))
|
||||
return mapDevSize
|
||||
|
||||
+ def humanReadable(self):
|
||||
+ return map(lambda x:x or "",
|
||||
+ map(self.getMapHumanReadable().get,
|
||||
+ map(getCommonDeviceName,
|
||||
+ self.Get(self.indexField))))
|
||||
+
|
||||
+
|
||||
class VariableClUuidSet(Variable):
|
||||
"""
|
||||
Use or not UUID for /etc/fstab
|
||||
@@ -1153,10 +1163,11 @@ class VariableOsInstallDiskDev(ReadonlyVariable):
|
||||
type = "list"
|
||||
|
||||
def get(self):
|
||||
- return map(lambda x:x[0],
|
||||
+ return map(getCommonDeviceName,
|
||||
+ map(lambda x:x[0],
|
||||
filter(lambda x:x[0].startswith('/dev/') and x[1],
|
||||
zip(self.Get('os_location_source'),
|
||||
- self.Get('os_location_dest'))))
|
||||
+ self.Get('os_location_dest')))))
|
||||
|
||||
class VariableOsInstallDiskUuid(ReadonlyVariable):
|
||||
"""
|
||||
@@ -1547,9 +1558,12 @@ class VariableOsInstallRootType(LocationHelper,Variable):
|
||||
class VariableOsInstallRootDev(ReadonlyVariable):
|
||||
def get(self):
|
||||
"""Get install root device"""
|
||||
- return self.Select('os_install_disk_dev',
|
||||
- where='os_install_disk_mount',
|
||||
- eq="/",limit=1) or ''
|
||||
+ if self.Get('cl_action') == 'system':
|
||||
+ return self.Select('os_install_disk_dev',
|
||||
+ where='os_install_disk_mount',
|
||||
+ eq="/",limit=1) or ''
|
||||
+ else:
|
||||
+ return self.Get('os_root_dev')
|
||||
|
||||
class VariableOsInstallFstabMountConf(ReadonlyVariable,DeviceHelper):
|
||||
"""
|
||||
@ -0,0 +1,38 @@
|
||||
# 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="amd64 x86"
|
||||
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}"
|
||||
|
||||
# changes
|
||||
epatch "${FILESDIR}/calculate-lib-3.0.0-r1.patch"
|
||||
# fix variables
|
||||
epatch "${FILESDIR}/calculate-lib-3.0.0-fix_variables.patch"
|
||||
}
|
||||
@ -0,0 +1,94 @@
|
||||
commit f26ea6f4ca72377fb020d7308a7926dfd5b6ae07
|
||||
Author: Mike Hiretsky <mh@calculate.ru>
|
||||
Date: Wed Aug 8 13:41:59 2012 +0400
|
||||
|
||||
Add function for install,fix fill variables
|
||||
|
||||
diff --git calculate/lib/cl_template.py calculate/lib/cl_template.py
|
||||
index 831705d..5547101 100644
|
||||
--- calculate/lib/cl_template.py
|
||||
+++ calculate/lib/cl_template.py
|
||||
@@ -3931,7 +3931,7 @@ re.M|re.S)
|
||||
self.dictTemplates)
|
||||
# Считаем количество шаблонов
|
||||
dirsTemplatesExists = filter(lambda x: os.path.exists(x), dirsTemplates)
|
||||
- if not dirsTemplatesExists:
|
||||
+ if not dirsTemplatesExists and not self.cltObj:
|
||||
self.setError(_("No such template directories") +\
|
||||
": %s"%", ".join(map(lambda x: "'%s'"%x ,dirsTemplates)))
|
||||
return (self.createdDirs, self.filesApply)
|
||||
diff --git calculate/lib/utils/device.py calculate/lib/utils/device.py
|
||||
index cf3aea3..50351bc 100644
|
||||
--- calculate/lib/utils/device.py
|
||||
+++ calculate/lib/utils/device.py
|
||||
@@ -401,3 +401,9 @@ def refreshUdev():
|
||||
except:
|
||||
pass
|
||||
process(udevadm,"trigger","--subsystem-match","block").success()
|
||||
+
|
||||
+def getCommonDeviceName(dev):
|
||||
+ """
|
||||
+ Get common device name (example: LVM -> /dev/dm- and etc)
|
||||
+ """
|
||||
+ return getUdevDeviceInfo(name=dev).get('DEVNAME',dev)
|
||||
diff --git calculate/lib/variables/X11.py calculate/lib/variables/X11.py
|
||||
index 78f1df6..ed5c49e 100644
|
||||
--- calculate/lib/variables/X11.py
|
||||
+++ calculate/lib/variables/X11.py
|
||||
@@ -38,7 +38,7 @@ class VariableOsX11Resolution(Variable):
|
||||
return ""
|
||||
except OSError:
|
||||
return ""
|
||||
- lines = processXDpy.readLines()
|
||||
+ lines = processXDpy.readlines()
|
||||
reRes = re.compile("dimensions:\s+(\d+)x(\d+)\s+pixels")
|
||||
searchRes=False
|
||||
for line in lines:
|
||||
diff --git calculate/lib/variables/__init__.py calculate/lib/variables/__init__.py
|
||||
index 37e0cd5..a79d5ea 100644
|
||||
--- calculate/lib/variables/__init__.py
|
||||
+++ calculate/lib/variables/__init__.py
|
||||
@@ -1,3 +1,5 @@
|
||||
+from calculate.lib.datavars import ReadonlyVariable
|
||||
+
|
||||
import X11
|
||||
import locale
|
||||
import env
|
||||
diff --git calculate/lib/variables/env.py calculate/lib/variables/env.py
|
||||
index 849563f..e948553 100644
|
||||
--- calculate/lib/variables/env.py
|
||||
+++ calculate/lib/variables/env.py
|
||||
@@ -50,6 +50,20 @@ class VariableClEnvPath(Variable):
|
||||
type = 'list'
|
||||
value = list(zip(*_envData)[1])
|
||||
|
||||
+class VariableClTemplateData(TableVariable):
|
||||
+ """
|
||||
+ Aliases to templates path
|
||||
+ """
|
||||
+ source = ["cl_template_location","cl_template_path"]
|
||||
+
|
||||
+class VariableClTemplateLocation(Variable):
|
||||
+ """
|
||||
+ Name to templates
|
||||
+ """
|
||||
+ type = 'list'
|
||||
+ value = ["overlay","local","remote"]
|
||||
+
|
||||
+
|
||||
class VariableClTemplatePath(Variable):
|
||||
"""
|
||||
Path to information file on server
|
||||
diff --git calculate/lib/variables/system.py calculate/lib/variables/system.py
|
||||
index 3135816..5f6dc4d 100644
|
||||
--- calculate/lib/variables/system.py
|
||||
+++ calculate/lib/variables/system.py
|
||||
@@ -68,7 +68,7 @@ class VariableOsRootDev(ReadonlyVariable):
|
||||
dfProcess = process('df','/',envdict={'LANG':'C'})
|
||||
if dfProcess.failed():
|
||||
return ""
|
||||
- dfLines = dfProcess.readLines()
|
||||
+ dfLines = dfProcess.readlines()
|
||||
if len(dfLines)>1:
|
||||
root_dev = dfLines[1].split(" ")[0].strip()
|
||||
if root_dev:
|
||||
@ -0,0 +1,24 @@
|
||||
# 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_console"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
=sys-apps/calculate-install-3.0.0-r6
|
||||
=sys-apps/calculate-i18n-3.0.0
|
||||
=sys-apps/calculate-lib-3.0.0-r2
|
||||
=sys-apps/calculate-core-3.0.0-r2
|
||||
cl_consolegui? ( =sys-apps/calculate-console-gui-3.0.0-r2 )
|
||||
cl_console? ( =sys-apps/calculate-console-3.0.0-r1 )
|
||||
"
|
||||
|
||||
Loading…
Reference in new issue