parent
d77cb750af
commit
6e923ae5f7
@ -0,0 +1,39 @@
|
||||
# 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 program of installation Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="minimal"
|
||||
|
||||
DEPEND="~sys-apps/calculate-templates-2.2.17
|
||||
app-portage/layman
|
||||
!minimal? ( sys-boot/grub
|
||||
sys-apps/gptfdisk
|
||||
sys-fs/dosfstools
|
||||
sys-fs/squashfs-tools
|
||||
sys-block/parted )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# update to 2.2.18_rc1
|
||||
epatch "${FILESDIR}/calculate-install-2.2.17_2.2.18_rc1.patch"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "For configure calculate-install perform:"
|
||||
einfo " cl-install --install"
|
||||
}
|
||||
@ -0,0 +1,152 @@
|
||||
diff --git i18n/cl_install_ru.mo i18n/cl_install_ru.mo
|
||||
index f65db0b..e8ea763 100644
|
||||
Binary files i18n/cl_install_ru.mo and i18n/cl_install_ru.mo differ
|
||||
diff --git pym/cl_fill_install.py pym/cl_fill_install.py
|
||||
index 80ca597..fb9434e 100644
|
||||
--- pym/cl_fill_install.py
|
||||
+++ pym/cl_fill_install.py
|
||||
@@ -1104,13 +1104,21 @@ class fillVars(object, glob_attr):
|
||||
else:
|
||||
return ""
|
||||
|
||||
+ def isDNSByDHCP(self):
|
||||
+ """If first interface get ip by DHCP dns must be DHCP"""
|
||||
+ dhcps = self.Get('os_install_net_dhcp_set')
|
||||
+ if dhcps:
|
||||
+ if dhcps[0] == "on":
|
||||
+ return True
|
||||
+ return False
|
||||
+
|
||||
def get_os_install_net_dns(self):
|
||||
"""Get current name servers"""
|
||||
dnsIps = filter(ip.checkIp,
|
||||
map(lambda x:x.strip().partition("nameserver")[2].strip(),
|
||||
filter(lambda x:x.lstrip().startswith("nameserver"),
|
||||
readLinesFile('/etc/resolv.conf'))))
|
||||
- return " ".join(dnsIps)
|
||||
+ return "" if self.isDNSByDHCP() else " ".join(dnsIps)
|
||||
|
||||
def get_os_install_net_dns_search(self):
|
||||
"""Get current name servers"""
|
||||
@@ -1118,7 +1126,7 @@ class fillVars(object, glob_attr):
|
||||
map(lambda x:x.strip().partition("search")[2].strip(),
|
||||
filter(lambda x:x.lstrip().startswith("search"),
|
||||
readLinesFile('/etc/resolv.conf'))))
|
||||
- return dnsSearch
|
||||
+ return "" if self.isDNSByDHCP() else dnsSearch
|
||||
|
||||
def get_os_install_net_conf(self):
|
||||
"""Net setup (networkmanager or openrc)"""
|
||||
diff --git pym/cl_install.py pym/cl_install.py
|
||||
index 966b881..e1bf83e 100644
|
||||
--- pym/cl_install.py
|
||||
+++ pym/cl_install.py
|
||||
@@ -864,6 +864,12 @@ class cl_install(color_print, SignalInterrupt):
|
||||
else:
|
||||
musers = _("none")
|
||||
|
||||
+ dnsNoValue = _("none")
|
||||
+ dhcps = self.clVars.Get('os_install_net_dhcp_set')
|
||||
+ if dhcps:
|
||||
+ if dhcps[0] == "on":
|
||||
+ dnsNoValue = _("DHCP")
|
||||
+
|
||||
self.printSUCCESS(_("Installation") + " Calculate Linux")
|
||||
printData = [
|
||||
[(_("System"),True),
|
||||
@@ -883,13 +889,13 @@ class cl_install(color_print, SignalInterrupt):
|
||||
(_("PROXY"),
|
||||
clGet('os_install_proxy') or _("none"),True),
|
||||
(_("NTP"),clGet('os_install_ntp') or _("none"),True),
|
||||
- (_("DNS"),clGet('os_install_net_dns') or _("none"),True)
|
||||
+ (_("DNS"),clGet('os_install_net_dns') or dnsNoValue,True)
|
||||
],
|
||||
[(_("Hardware"),True),
|
||||
(_("Machine hardware name"),
|
||||
clGet('os_install_arch_machine'),True),
|
||||
(_("Quantity processors"),clGet('hr_cpu_num'),hdd),
|
||||
- (_("Videocard vendor"),clGet('hr_video'),hdd),
|
||||
+ (_("Videocard"),clGet('hr_video_name'),hdd),
|
||||
(_("{0} video driver").format("Xorg"),
|
||||
clGet('os_install_x11_video_drv'),hdd),
|
||||
(_("Screen resolution"),clGet('os_install_x11_resolution'),hdd)
|
||||
@@ -1153,7 +1159,8 @@ class cl_install(color_print, SignalInterrupt):
|
||||
map(lambda x:x[NET],routes)+map(lambda x:x[NET],routedata))
|
||||
routes = filter(lambda x:x[GW] or x[SRC],routes)
|
||||
wrongGws = map(lambda x:x[GW],
|
||||
- filter(lambda x:not ip.isIpInNet(x[GW],*nets),
|
||||
+ filter(lambda x:not ip.isIpInNet(x[GW],
|
||||
+ *(set(nets)-set([x[NET]]))),
|
||||
filter(lambda x:x[GW],
|
||||
routes)))
|
||||
if wrongGws:
|
||||
@@ -1170,7 +1177,12 @@ class cl_install(color_print, SignalInterrupt):
|
||||
if not dev:
|
||||
gwnetwork = ip.isIpInNet(gw,*nets)[0]
|
||||
dev = filter(lambda x:x[NET]==gwnetwork,
|
||||
- routedata+newroutes)[0][DEV]
|
||||
+ routedata+newroutes)
|
||||
+ if not dev:
|
||||
+ raise InstallError(
|
||||
+ _("Can not determine device for network %s")%
|
||||
+ network)
|
||||
+ dev = dev[0][DEV]
|
||||
if not gw and not src:
|
||||
continue
|
||||
newroutes.append((network,gw,dev,src))
|
||||
@@ -1820,7 +1832,7 @@ class cl_install(color_print, SignalInterrupt):
|
||||
clGet('os_install_net_route_network'),
|
||||
clGet('os_install_net_route_gw'),
|
||||
clGet('os_install_net_route_src')) + \
|
||||
- map(lambda x:(x[0],_("DHCP")),
|
||||
+ map(lambda x:(x[0],_("DHCP"),_("DHCP"),_("DHCP")),
|
||||
filter(lambda x:x[1]=='on',zip(clGet('os_install_net_interfaces'),
|
||||
clGet('os_install_net_dhcp_set'))))
|
||||
|
||||
diff --git pym/cl_install_cmd.py pym/cl_install_cmd.py
|
||||
index 67a049a..d1424d3 100644
|
||||
--- pym/cl_install_cmd.py
|
||||
+++ pym/cl_install_cmd.py
|
||||
@@ -228,8 +228,8 @@ class install_cmd(share_cmd):
|
||||
" " + _("ip specifing error: '{ip}' "
|
||||
"(example: '{example}')").format(\
|
||||
ip=ipaddr,example="eth0:192.168.0.21/16"))
|
||||
- if values.dns:
|
||||
- if not re.match("^{0}(,{0})*$".format(iputils.IP_ADDR),values.dns):
|
||||
+ if not values.dns is None:
|
||||
+ if not re.match("(^{0}(,{0})*|)$".format(iputils.IP_ADDR),values.dns):
|
||||
self.optobj.error(_("option %s:") %"--dns" +\
|
||||
" " + _("dns specifing error: '%s'") %\
|
||||
values.dns)
|
||||
@@ -319,7 +319,7 @@ class install_cmd(share_cmd):
|
||||
|
||||
def setNetworkParams(self,ipaddrs,routes,dns,setup,dhcps):
|
||||
"""Set nework params"""
|
||||
- if dns:
|
||||
+ if not dns is None:
|
||||
self.logicObj.clVars.Set("os_install_net_dns",dns,True)
|
||||
ipaddrs = map(lambda x:x.split(":"),ipaddrs or [])
|
||||
routes = map(lambda x:x+[""]*(4-len(x)),
|
||||
diff --git pym/cl_vars_install.py pym/cl_vars_install.py
|
||||
index 77ae323..5238f7b 100644
|
||||
--- pym/cl_vars_install.py
|
||||
+++ pym/cl_vars_install.py
|
||||
@@ -299,6 +299,10 @@ class Data:
|
||||
# net setup (networkmanager or openrc)
|
||||
os_install_net_conf = {}
|
||||
|
||||
+ # net service configured
|
||||
+ os_install_net_settings = {'mode':'w',
|
||||
+ 'value':''}
|
||||
+
|
||||
# dhcp or not
|
||||
os_install_net_dhcp_set = {}
|
||||
|
||||
@@ -376,6 +380,7 @@ class Data:
|
||||
# lib vars
|
||||
os_locale_xkb = {}
|
||||
hr_video = {}
|
||||
+ hr_video_name = {}
|
||||
os_linux_name = {}
|
||||
os_scratch = {}
|
||||
os_x11_video_drv = {}
|
||||
@ -0,0 +1,31 @@
|
||||
# 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 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
|
||||
!minimal? ( dev-python/py-smbpasswd )
|
||||
>=dev-python/pyxml-0.8
|
||||
sys-apps/file[python]"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# patch for update to 2.2.18_rc1
|
||||
epatch "${FILESDIR}/calculate-lib-2.2.17_2.2.18_rc1.patch"
|
||||
}
|
||||
@ -0,0 +1,118 @@
|
||||
diff --git pym/cl_fill.py pym/cl_fill.py
|
||||
index 639e100..a846970 100644
|
||||
--- pym/cl_fill.py
|
||||
+++ pym/cl_fill.py
|
||||
@@ -24,7 +24,7 @@ from cl_vars_share import varsShare, clLocale
|
||||
from os.path import exists as pathexists
|
||||
from os import path
|
||||
from cl_utils import isMount, genpassword, getAvailableX11Drivers, \
|
||||
- listDirectory,isPkgInstalled
|
||||
+ listDirectory,isPkgInstalled,lspci
|
||||
from utils import ip
|
||||
from encrypt import getHash
|
||||
|
||||
@@ -529,19 +529,21 @@ class fillVars(varsShare):
|
||||
return valBoardName or "unknown"
|
||||
return ""
|
||||
|
||||
+ def get_hr_video_name(self):
|
||||
+ """Get video name"""
|
||||
+ pciVideo = list(sorted(lspci("VGA compatible").items()))
|
||||
+ if pciVideo:
|
||||
+ pciVideo = pciVideo[0][1]
|
||||
+ vendor=pciVideo.get("vendor","").split(" ")[0]
|
||||
+ name=pciVideo.get("name","")
|
||||
+ if "[" in name and "]" in name:
|
||||
+ name = name.partition("[")[2].partition("]")[0]
|
||||
+ return "{vendor} {name}".format(vendor=vendor,name=name)
|
||||
+ return ""
|
||||
+
|
||||
def get_hr_video(self):
|
||||
"""Videocard vendor"""
|
||||
- lines=self._runos("lspci")
|
||||
- if not lines:
|
||||
- return ""
|
||||
- reVGA = re.compile("vga",re.I)
|
||||
- foundVGA = False
|
||||
- for line in lines:
|
||||
- if reVGA.search(line):
|
||||
- foundVGA = True
|
||||
- break
|
||||
- if not foundVGA:
|
||||
- return "vesa"
|
||||
+ line = self.Get('hr_video_name')
|
||||
if "nVidia" in line or "GeForce" in line:
|
||||
return "nvidia"
|
||||
elif "ATI" in line:
|
||||
diff --git pym/cl_utils.py pym/cl_utils.py
|
||||
index 24760c9..025b051 100644
|
||||
--- pym/cl_utils.py
|
||||
+++ pym/cl_utils.py
|
||||
@@ -967,16 +967,10 @@ def getSquashList():
|
||||
|
||||
def getAvailableX11Drivers(prefix="/"):
|
||||
"""Get available x11 drivers"""
|
||||
- distfiles = path.join(prefix,'usr/portage/distfiles')
|
||||
xorg_modules_dir = path.join(prefix,'usr/lib/xorg/modules/drivers')
|
||||
- return list(set(
|
||||
- map(lambda x:'fglrx' if x.startswith('ati-driver') else "nvidia",
|
||||
- filter(lambda x:x.startswith('ati-driver-installer') or
|
||||
- x.startswith('NVIDIA-Linux'),
|
||||
- listDirectory(distfiles))) + \
|
||||
- map(lambda x: x[:-7],
|
||||
+ return map(lambda x: x[:-7],
|
||||
filter(lambda x:x.endswith('_drv.so'),
|
||||
- listDirectory(xorg_modules_dir)))))
|
||||
+ listDirectory(xorg_modules_dir)))
|
||||
|
||||
def lspci(filtername=None,shortInfo=False):
|
||||
"""Get hash of lspci, filtred by filtername. If shortInfo, then
|
||||
diff --git pym/cl_vars.py pym/cl_vars.py
|
||||
index 3ffa1db..4d7f9f2 100644
|
||||
--- pym/cl_vars.py
|
||||
+++ pym/cl_vars.py
|
||||
@@ -185,6 +185,9 @@ class Data:
|
||||
# video verdor name
|
||||
hr_video = {'hide':True}
|
||||
|
||||
+ # videocard name
|
||||
+ hr_video_name = {'hide':True}
|
||||
+
|
||||
# Video driver used by xorg
|
||||
os_x11_video_drv = {'hide':True}
|
||||
|
||||
diff --git pym/cl_vars_share.py pym/cl_vars_share.py
|
||||
index 66e1567..755ae89 100644
|
||||
--- pym/cl_vars_share.py
|
||||
+++ pym/cl_vars_share.py
|
||||
@@ -144,6 +144,15 @@ class clLocale:
|
||||
'xkblayout':'pt,us',
|
||||
'language':'pt',
|
||||
},
|
||||
+ #Romanian
|
||||
+ 'ro_RO' : {
|
||||
+ 'locale':'ro_RO.UTF-8',
|
||||
+ 'keymap':'ro_win',
|
||||
+ 'dumpkeys_charset':'',
|
||||
+ 'consolefont':'lat2-16',
|
||||
+ 'xkblayout':'ro,us',
|
||||
+ 'language':'ro',
|
||||
+ },
|
||||
#Russian
|
||||
'ru_RU' : {
|
||||
'locale':'ru_RU.UTF-8',
|
||||
diff --git pym/utils/ip.py pym/utils/ip.py
|
||||
index bec371d..a1ec1be 100644
|
||||
--- pym/utils/ip.py
|
||||
+++ pym/utils/ip.py
|
||||
@@ -179,6 +179,7 @@ def getRouteTable(onlyIface=[]):
|
||||
yield (network,dict(zip(routeParams[0::2],routeParams[1::2])))
|
||||
|
||||
def getInterfaces():
|
||||
- """Get available interfaces"""
|
||||
- return filter(lambda x:x != "lo",
|
||||
- listDirectory('/sys/class/net'))
|
||||
+ """Get available interfaces (discard which hasn't device)"""
|
||||
+ sysNet = "/sys/class/net"
|
||||
+ return filter(lambda x:path.exists(path.join(sysNet,x,"device")),
|
||||
+ listDirectory(sysNet))
|
||||
@ -0,0 +1,37 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
|
||||
inherit eutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="Templates for calculate utilities 2.2"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
DEPEND="~sys-apps/calculate-lib-2.2.17"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# patch to 2.2.18_rc1
|
||||
epatch "${FILESDIR}/calculate-templates-2.2.17_2.2.18_rc1.patch"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
:
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dodir /usr/share/calculate/templates
|
||||
insinto /usr/share/calculate/templates
|
||||
doins -r *
|
||||
}
|
||||
@ -0,0 +1,290 @@
|
||||
diff --git builder/iso/calcboot/isolinux/keymap.cfg builder/iso/calcboot/isolinux/keymap.cfg
|
||||
index d4abb5e..9da49d6 100644
|
||||
--- builder/iso/calcboot/isolinux/keymap.cfg
|
||||
+++ builder/iso/calcboot/isolinux/keymap.cfg
|
||||
@@ -80,6 +80,11 @@ LABEL keymap:pt_PT
|
||||
KERNEL calcmenu.c32
|
||||
APPEND isolinux.cfg calculate=,keymap:pt_PT
|
||||
|
||||
+LABEL keymap:ro_RO
|
||||
+ MENU LABEL Romanian
|
||||
+ KERNEL calcmenu.c32
|
||||
+ APPEND isolinux.cfg calculate=,keymap:ro_RO
|
||||
+
|
||||
LABEL keymap:ru_RU
|
||||
MENU LABEL Russian
|
||||
KERNEL calcmenu.c32
|
||||
diff --git builder/iso/calcboot/isolinux/lang.cfg builder/iso/calcboot/isolinux/lang.cfg
|
||||
index aefb539..180dafb 100644
|
||||
--- builder/iso/calcboot/isolinux/lang.cfg
|
||||
+++ builder/iso/calcboot/isolinux/lang.cfg
|
||||
@@ -50,6 +50,11 @@ LABEL lang:ru_RU
|
||||
KERNEL calcmenu.c32
|
||||
APPEND isolinux.cfg calculate=lang:ru_RU,keymap:ru_RU,timezone:Europe/Moscow
|
||||
|
||||
+LABEL lang:ro_RO
|
||||
+ MENU LABEL Romanian
|
||||
+ KERNEL calcmenu.c32
|
||||
+ APPEND isolinux.cfg calculate=lang:ro_RO,keymap:ro_RO,timezone:Europe/Bucharest
|
||||
+
|
||||
LABEL lang:es_ES
|
||||
MENU LABEL Espanol
|
||||
KERNEL calcmenu.c32
|
||||
diff --git desktop/00-desktop-init/empty_dir/2ini_res.env desktop/00-desktop-init/empty_dir/2ini_res.env
|
||||
index ba4c0a6..13bac65 100644
|
||||
--- desktop/00-desktop-init/empty_dir/2ini_res.env
|
||||
+++ desktop/00-desktop-init/empty_dir/2ini_res.env
|
||||
@@ -118,6 +118,19 @@ videos = #-ini(resource.path)-#/Видео
|
||||
desktop = /home/#-ur_login-#/Рабочий стол
|
||||
#os_locale_lang#
|
||||
|
||||
+#?os_locale_lang==ro_RO#
|
||||
+documents = #-ini(resource.path)-#/Documente
|
||||
+downloads = #-ini(resource.path)-#/Descărcări
|
||||
+music = #-ini(resource.path)-#/Muzică
|
||||
+pictures = #-ini(resource.path)-#/Poze
|
||||
+public = #-ini(resource.path)-#/Public
|
||||
+templates = #-ini(resource.path)-#/Templates
|
||||
+videos = #-ini(resource.path)-#/Video
|
||||
+#os_locale_lang#
|
||||
+#?os_locale_lang==ro_RO&&ur_domain_set==off#
|
||||
+desktop = /home/#-ur_login-#/Desktop
|
||||
+#os_locale_lang#
|
||||
+
|
||||
#?os_locale_lang==uk_UA#
|
||||
documents = #-ini(resource.path)-#/Документи
|
||||
downloads = #-ini(resource.path)-#/Завантаження
|
||||
diff --git desktop/desktop/00-patch-2.2.0.16/2ini_res.env desktop/desktop/00-patch-2.2.0.16/2ini_res.env
|
||||
index ba4c0a6..ec7ae86 100644
|
||||
--- desktop/desktop/00-patch-2.2.0.16/2ini_res.env
|
||||
+++ desktop/desktop/00-patch-2.2.0.16/2ini_res.env
|
||||
@@ -105,6 +105,19 @@ videos = #-ini(resource.path)-#/Vídeos
|
||||
desktop = /home/#-ur_login-#/Desktop
|
||||
#os_locale_lang#
|
||||
|
||||
+#?os_locale_lang==ro_RO#
|
||||
+documents = #-ini(resource.path)-#/Documente
|
||||
+downloads = #-ini(resource.path)-#/Descărcări
|
||||
+music = #-ini(resource.path)-#/Muzică
|
||||
+pictures = #-ini(resource.path)-#/Poze
|
||||
+public = #-ini(resource.path)-#/Public
|
||||
+templates = #-ini(resource.path)-#/Templates
|
||||
+videos = #-ini(resource.path)-#/Video
|
||||
+#os_locale_lang#
|
||||
+#?os_locale_lang==ro_RO&&ur_domain_set==off#
|
||||
+desktop = /home/#-ur_login-#/Desktop
|
||||
+#os_locale_lang#
|
||||
+
|
||||
#?os_locale_lang==ru_RU#
|
||||
documents = #-ini(resource.path)-#/Документы
|
||||
downloads = #-ini(resource.path)-#/Загрузки
|
||||
diff --git desktop/desktop/30-gnome-2.26/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ro desktop/desktop/30-gnome-2.26/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ro
|
||||
new file mode 100644
|
||||
index 0000000..a40c1af
|
||||
--- /dev/null
|
||||
+++ desktop/desktop/30-gnome-2.26/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ro
|
||||
@@ -0,0 +1,12 @@
|
||||
+# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==ro_RO
|
||||
+<?xml version="1.0"?>
|
||||
+<gconf>
|
||||
+ <entry name="layouts" type="list" ltype="string">
|
||||
+ <li type="string">
|
||||
+ <stringvalue>ro</stringvalue>
|
||||
+ </li>
|
||||
+ <li type="string">
|
||||
+ <stringvalue>us</stringvalue>
|
||||
+ </li>
|
||||
+ </entry>
|
||||
+</gconf>
|
||||
diff --git desktop/desktop/30-gnome-2.30/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ro desktop/desktop/30-gnome-2.30/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ro
|
||||
new file mode 100644
|
||||
index 0000000..a40c1af
|
||||
--- /dev/null
|
||||
+++ desktop/desktop/30-gnome-2.30/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ro
|
||||
@@ -0,0 +1,12 @@
|
||||
+# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==ro_RO
|
||||
+<?xml version="1.0"?>
|
||||
+<gconf>
|
||||
+ <entry name="layouts" type="list" ltype="string">
|
||||
+ <li type="string">
|
||||
+ <stringvalue>ro</stringvalue>
|
||||
+ </li>
|
||||
+ <li type="string">
|
||||
+ <stringvalue>us</stringvalue>
|
||||
+ </li>
|
||||
+ </entry>
|
||||
+</gconf>
|
||||
diff --git desktop/desktop/60-firefox-3.5/.mozilla/firefox/calculate.default/prefs.js desktop/desktop/60-firefox-3.5/.mozilla/firefox/calculate.default/prefs.js
|
||||
index 846e584..3d9432e 100644
|
||||
--- desktop/desktop/60-firefox-3.5/.mozilla/firefox/calculate.default/prefs.js
|
||||
+++ desktop/desktop/60-firefox-3.5/.mozilla/firefox/calculate.default/prefs.js
|
||||
@@ -71,6 +71,9 @@ user_pref("spellchecker.dictionary", "pt");
|
||||
#?pkg(www-plugins/spell-mozilla-plugin)!=&&os_locale_language==ru#
|
||||
user_pref("spellchecker.dictionary", "ru");
|
||||
#pkg#
|
||||
+#?pkg(www-plugins/spell-mozilla-plugin)!=&&os_locale_language==ro#
|
||||
+user_pref("spellchecker.dictionary", "ro");
|
||||
+#pkg#
|
||||
#?pkg(www-plugins/spell-mozilla-plugin)!=&&os_locale_language==uk#
|
||||
user_pref("spellchecker.dictionary", "uk-UA");
|
||||
#pkg#
|
||||
diff --git install/1merge/00-calculate-install/calculate2.env install/1merge/00-calculate-install/calculate2.env
|
||||
new file mode 100644
|
||||
index 0000000..cead32f
|
||||
--- /dev/null
|
||||
+++ install/1merge/00-calculate-install/calculate2.env
|
||||
@@ -0,0 +1,4 @@
|
||||
+# Calculate format=samba path=/etc/calculate
|
||||
+
|
||||
+[install]
|
||||
+os_install_net_settings = #-os_install_net_conf-#
|
||||
diff --git install/1merge/glibc/locale.gen install/1merge/glibc/locale.gen
|
||||
index 15cff6b..c087558 100644
|
||||
--- install/1merge/glibc/locale.gen
|
||||
+++ install/1merge/glibc/locale.gen
|
||||
@@ -26,6 +26,8 @@ nn_NO.UTF-8 UTF-8
|
||||
pl_PL.UTF-8 UTF-8
|
||||
#Portuguese
|
||||
pt_PT.UTF-8 UTF-8
|
||||
+#Romanian
|
||||
+ro_RO.UTF-8 UTF-8
|
||||
#Russian
|
||||
ru_RU.UTF-8 UTF-8
|
||||
#Spanish
|
||||
diff --git install/1merge/grub2/default.grub install/1merge/grub2/default.grub
|
||||
index 67ddb16..b9a91cc 100644
|
||||
--- install/1merge/grub2/default.grub
|
||||
+++ install/1merge/grub2/default.grub
|
||||
@@ -8,7 +8,7 @@ GRUB_CMDLINE_LINUX="video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,spla
|
||||
#?pkg(media-gfx/cld-themes)==&&pkg(media-gfx/cldx-themes)==&&pkg(media-gfx/cldg-themes)==&&pkg(media-gfx/cls-themes)==&&pkg(media-gfx/cds-themes)==&&pkg(media-gfx/cmc-themes)==#
|
||||
GRUB_CMDLINE_LINUX="video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=off,theme:tty1 #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-# console=tty1 udev quiet"
|
||||
#pkg#
|
||||
-GRUB_TERMINAL="gfxterm"
|
||||
+!GRUB_TERMINAL=del
|
||||
GRUB_GFXMODE="auto"
|
||||
GRUB_BACKGROUND="/boot/grub/grub-calculate.png"
|
||||
GRUB_COLOR_NORMAL="white/black"
|
||||
diff --git install/1merge/networkmanager/plasma-applet-networkmanagement.desktop install/1merge/networkmanager/plasma-applet-networkmanagement.desktop
|
||||
new file mode 100644
|
||||
index 0000000..2b3b677
|
||||
--- /dev/null
|
||||
+++ install/1merge/networkmanager/plasma-applet-networkmanagement.desktop
|
||||
@@ -0,0 +1,8 @@
|
||||
+# Calculate path=/usr/share/kde4/services pkg(kde-base/kdelibs)!= format=kde
|
||||
+[Desktop Entry]
|
||||
+#?os_install_net_conf==networkmanager#
|
||||
+X-KDE-Library=plasma_applet_networkmanagement
|
||||
+#os_install_net_conf#
|
||||
+#?os_install_net_conf!=networkmanager#
|
||||
+X-KDE-Library=
|
||||
+#os_install_net_conf#
|
||||
diff --git install/1merge/networkmanager/system-connections/.calculate_directory install/1merge/networkmanager/system-connections/.calculate_directory
|
||||
index 4401bf6..b3a2ea7 100644
|
||||
--- install/1merge/networkmanager/system-connections/.calculate_directory
|
||||
+++ install/1merge/networkmanager/system-connections/.calculate_directory
|
||||
@@ -1 +1 @@
|
||||
-# Calculate path=/etc/NetworkManager exists(/etc/NetworkManager/system-connections,root)==&&cl_chroot_status==off&&os_install_root_type!=livecd||ac_install_system==up
|
||||
+# Calculate path=/etc/NetworkManager os_install_net_settings!=networkmanager&&cl_chroot_status==off&&os_install_root_type!=livecd||ac_install_system==up
|
||||
diff --git install/1merge/nm-applet/.calculate_directory install/1merge/nm-applet/.calculate_directory
|
||||
new file mode 100644
|
||||
index 0000000..6f79f0c
|
||||
--- /dev/null
|
||||
+++ install/1merge/nm-applet/.calculate_directory
|
||||
@@ -0,0 +1,2 @@
|
||||
+# Calculate belong()!=&&cl_chroot_status==off&&pkg(gnome-extra/nm-applet)!= path=/etc/xdg name=autostart
|
||||
+
|
||||
diff --git install/1merge/nm-applet/nm-applet.desktop install/1merge/nm-applet/nm-applet.desktop
|
||||
new file mode 100644
|
||||
index 0000000..d32af0f
|
||||
--- /dev/null
|
||||
+++ install/1merge/nm-applet/nm-applet.desktop
|
||||
@@ -0,0 +1,8 @@
|
||||
+# Calculate format=kde
|
||||
+[Desktop Entry]
|
||||
+#?os_install_net_conf==networkmanager#
|
||||
+X-GNOME-Autostart-enabled=true
|
||||
+#os_install_net_conf#
|
||||
+#?os_install_net_conf!=networkmanager#
|
||||
+X-GNOME-Autostart-enabled=false
|
||||
+#os_install_net_conf#
|
||||
diff --git install/1merge/openrc/conf.d/net install/1merge/openrc/conf.d/net
|
||||
index a40ea98..4d39ad5 100644
|
||||
--- install/1merge/openrc/conf.d/net
|
||||
+++ install/1merge/openrc/conf.d/net
|
||||
@@ -1,22 +1,30 @@
|
||||
-# Calculate comment=# exists(/etc/conf.d/net,root)==&&cl_chroot_status==off&&os_install_root_type!=livecd&&os_install_net_conf==openrc||ac_install_system==up&&os_install_net_conf==openrc
|
||||
+# Calculate comment=# os_install_net_settings!=openrc&&cl_chroot_status==off&&os_install_root_type!=livecd&&os_install_net_conf==openrc||ac_install_system==up&&os_install_net_conf==openrc
|
||||
|
||||
#?os_install_linux_system==server#
|
||||
modules="!plug"
|
||||
#os_install_linux_system#
|
||||
#?list(os_install_net_interfaces,0)!=&&list(os_install_net_dhcp_set,0)!=on&&list(os_install_net_ip,0)!=#
|
||||
config_#-list(os_install_net_interfaces,0)-#=( "#-list(os_install_net_ip,0)-#/#-list(os_install_net_cidr,0)-#" )
|
||||
+#list#
|
||||
+#?list(os_install_net_interfaces,0)!=&&list(os_install_net_dhcp_set,0)!=on&&list(os_install_net_ip,0)!=&&list(os_install_net_route,0)!=#
|
||||
routes_#-list(os_install_net_interfaces,0)-#="#-list(os_install_net_route,0)-#"
|
||||
#list#
|
||||
#?list(os_install_net_interfaces,1)!=&&list(os_install_net_dhcp_set,1)!=on&&list(os_install_net_ip,1)!=#
|
||||
config_#-list(os_install_net_interfaces,1)-#=( "#-list(os_install_net_ip,1)-#/#-list(os_install_net_cidr,1)-#" )
|
||||
+#list#
|
||||
+#?list(os_install_net_interfaces,1)!=&&list(os_install_net_dhcp_set,1)!=on&&list(os_install_net_ip,1)!=&&list(os_install_net_route,1)!=#
|
||||
routes_#-list(os_install_net_interfaces,1)-#="#-list(os_install_net_route,1)-#"
|
||||
#list#
|
||||
#?list(os_install_net_interfaces,2)!=&&list(os_install_net_dhcp_set,2)!=on&&list(os_install_net_ip,2)!=#
|
||||
config_#-list(os_install_net_interfaces,2)-#=( "#-list(os_install_net_ip,2)-#/#-list(os_install_net_cidr,2)-#" )
|
||||
+#list#
|
||||
+#?list(os_install_net_interfaces,2)!=&&list(os_install_net_dhcp_set,2)!=on&&list(os_install_net_ip,2)!=&&list(os_install_net_route,2)!=#
|
||||
routes_#-list(os_install_net_interfaces,2)-#="#-list(os_install_net_route,2)-#"
|
||||
#list#
|
||||
#?list(os_install_net_interfaces,3)!=&&list(os_install_net_dhcp_set,3)!=on&&list(os_install_net_ip,3)!=#
|
||||
config_#-list(os_install_net_interfaces,3)-#=( "#-list(os_install_net_ip,3)-#/#-list(os_install_net_cidr,3)-#" )
|
||||
+#list#
|
||||
+#?list(os_install_net_interfaces,3)!=&&list(os_install_net_dhcp_set,3)!=on&&list(os_install_net_ip,3)!=&&list(os_install_net_route,3)!=#
|
||||
routes_#-list(os_install_net_interfaces,3)-#="#-list(os_install_net_route,3)-#"
|
||||
#list#
|
||||
#?os_install_net_dns!=#
|
||||
diff --git install/1merge/sudo/sudoers install/1merge/sudo/sudoers
|
||||
index 961a5bf..25c4cde 100644
|
||||
--- install/1merge/sudo/sudoers
|
||||
+++ install/1merge/sudo/sudoers
|
||||
@@ -1,4 +1,4 @@
|
||||
-# Calculate comment=#
|
||||
+# Calculate comment=# chmod=0400
|
||||
|
||||
Defaults env_reset
|
||||
#?os_install_root_type==livecd#
|
||||
diff --git install/1system/calculate-install/calculate2.env install/1system/calculate-install/calculate2.env
|
||||
index d83a0f6..27df9f5 100644
|
||||
--- install/1system/calculate-install/calculate2.env
|
||||
+++ install/1system/calculate-install/calculate2.env
|
||||
@@ -6,6 +6,10 @@ os_install_dev_from = #-os_root_dev-#
|
||||
# NTP is a protocol designed to synchronize the clocks of computers over a network.
|
||||
os_install_ntp = #-os_install_ntp-#
|
||||
#os_root_type#
|
||||
+#pkg(sys-apps/calculate-install)>2.2.17-r1&&os_root_type=hdd#
|
||||
+# name of net manager which is used
|
||||
+os_install_net_settings = #-os_install_net_conf-#
|
||||
+#pkg#
|
||||
|
||||
#?os_install_linux_ver>10.8.81#
|
||||
[main]
|
||||
diff --git install/2laptop/lenovo/sudo/sudoers install/2laptop/lenovo/sudo/sudoers
|
||||
index dc81e5e..f252dae 100644
|
||||
--- install/2laptop/lenovo/sudo/sudoers
|
||||
+++ install/2laptop/lenovo/sudo/sudoers
|
||||
@@ -1,4 +1,4 @@
|
||||
-# Calculate format=patch path=/etc
|
||||
+# Calculate format=patch path=/etc chmod=0400
|
||||
<reg>(# BEGIN laptop configuration)
|
||||
.*(# END laptop configuration)</reg>
|
||||
<text>\1
|
||||
diff --git install/2laptop/samsung/sudo/sudoers install/2laptop/samsung/sudo/sudoers
|
||||
index ee88674..4b5b0f7 100644
|
||||
--- install/2laptop/samsung/sudo/sudoers
|
||||
+++ install/2laptop/samsung/sudo/sudoers
|
||||
@@ -1,4 +1,4 @@
|
||||
-# Calculate format=patch path=/etc
|
||||
+# Calculate format=patch path=/etc chmod=0400
|
||||
<reg>(# BEGIN laptop configuration)
|
||||
.*(# END laptop configuration)</reg>
|
||||
<text>\1
|
||||
@ -0,0 +1,36 @@
|
||||
# Copyright 1999-2011 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_installgui
|
||||
cl_server
|
||||
"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
=sys-apps/calculate-install-2.2.17-r2
|
||||
=sys-apps/calculate-templates-2.2.17-r5
|
||||
=sys-apps/calculate-lib-2.2.17-r3
|
||||
|
||||
cl_assemble? ( =sys-apps/calculate-assemble-2.2.17-r1 )
|
||||
cl_builder? ( =sys-apps/calculate-builder-2.2.17 )
|
||||
cl_client? ( =sys-apps/calculate-client-2.2.17 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-2.2.17 )
|
||||
cl_installgui? ( =app-misc/calculate-install-gui-2.2.17 )
|
||||
|
||||
cl_server? ( =sys-apps/calculate-server-2.1.14-r3 )
|
||||
"
|
||||
|
||||
Loading…
Reference in new issue