parent
6fbf3e3c86
commit
663331085f
@ -0,0 +1,27 @@
|
||||
# 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 assembling tasks of Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
DEPEND="~sys-apps/calculate-builder-2.2.22"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# add support use directory for assembling
|
||||
epatch "${FILESDIR}/calculate-assemble-2.2.22-r1.patch"
|
||||
}
|
||||
@ -0,0 +1,47 @@
|
||||
diff --git pym/cl_assemble.py pym/cl_assemble.py
|
||||
index 98daa34..f1e77f1 100644
|
||||
--- pym/cl_assemble.py
|
||||
+++ pym/cl_assemble.py
|
||||
@@ -320,9 +320,13 @@ class cl_assemble(color_print):
|
||||
self.clVars.Get('os_assemble_linux_ver'))
|
||||
self.printSUCCESS(_("Machine hardware name")+": %s"%
|
||||
self.clVars.Get('os_assemble_arch_machine'))
|
||||
- self.printSUCCESS(_("Partition for assembling: %s")%
|
||||
+ if path.isdir(self.clVars.Get('os_assemble_root_dev')):
|
||||
+ self.printSUCCESS(_("Directory for assembling: %s")%
|
||||
+ self.clVars.Get('os_assemble_root_dev'))
|
||||
+ else:
|
||||
+ self.printSUCCESS(_("Partition for assembling: %s")%
|
||||
self.clVars.Get('os_assemble_root_dev'))
|
||||
- self.printSUCCESS(_("File system: %s")%
|
||||
+ self.printSUCCESS(_("File system: %s")%
|
||||
self.clVars.Get('os_assemble_root_format'))
|
||||
if self.clVars.Get('cl_assemble_sync'):
|
||||
self.printSUCCESS(_("Portage rsync mirror: %s")%
|
||||
@@ -466,14 +470,18 @@ class cl_assemble(color_print):
|
||||
rootPartdev = self.clVars.Get('os_assemble_root_dev')
|
||||
formatId = PartitionDistributive.formatId
|
||||
fileSystem = self.clVars.Get('os_assemble_root_format')
|
||||
- return PartitionDistributive(rootPartdev,
|
||||
- mdirectory=self.clVars.Get('cl_assemble_path'),
|
||||
- check=True, fileSystem=fileSystem, isFormat=True,
|
||||
- systemId=formatId.get(fileSystem,"83"),
|
||||
- flagRemoveDir=False,
|
||||
- rootLabel="%s-%s"%
|
||||
- (self.clVars.Get('os_assemble_linux_shortname'),
|
||||
- self.clVars.Get('os_assemble_linux_ver')))
|
||||
+ if rootPartdev.startswith('/dev'):
|
||||
+ return PartitionDistributive(rootPartdev,
|
||||
+ mdirectory=self.clVars.Get('cl_assemble_path'),
|
||||
+ check=True, fileSystem=fileSystem, isFormat=True,
|
||||
+ systemId=formatId.get(fileSystem,"83"),
|
||||
+ flagRemoveDir=False,
|
||||
+ rootLabel="%s-%s"%
|
||||
+ (self.clVars.Get('os_assemble_linux_shortname'),
|
||||
+ self.clVars.Get('os_assemble_linux_ver')))
|
||||
+ else:
|
||||
+ return DirectoryDistributive(rootPartdev,
|
||||
+ mdirectory=self.clVars.Get('cl_assemble_path'))
|
||||
|
||||
def _prepareMount(self):
|
||||
"""Mount /proc,/sys, remote, /dev to chroot"""
|
||||
@ -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 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-2.2.22
|
||||
!<sys-apps/calculate-1.4.0_p20100921
|
||||
app-cdr/cdrkit
|
||||
sys-fs/squashfs-tools"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# support kernel 3 and dispatch conf
|
||||
epatch "${FILESDIR}/calculate-builder-2.2.22-r3.patch"
|
||||
}
|
||||
@ -0,0 +1,112 @@
|
||||
diff --git pym/cl_builder.py pym/cl_builder.py
|
||||
index 572e6c7..b6e3582 100644
|
||||
--- pym/cl_builder.py
|
||||
+++ pym/cl_builder.py
|
||||
@@ -231,6 +231,13 @@ class cl_builder(color_print):
|
||||
removeKernelSources)
|
||||
self.printByResult(True)
|
||||
|
||||
+ def dispatchConf(self, distrPath):
|
||||
+ """Execute dispatch conf for """
|
||||
+ self.printMessageForTest(_("Execute '%s'")%"dispatch-conf")
|
||||
+ # run dispatch conf interactive
|
||||
+ os.system("chroot %s /bin/bash -c '/usr/sbin/dispatch-conf'"%
|
||||
+ distrPath)
|
||||
+
|
||||
def prepareSourceDistributive(self,distr):
|
||||
"""Unmount all bind,proc mount points from source distribute"""
|
||||
mp = self.clVars.Get('cl_builder_path')
|
||||
@@ -243,6 +250,7 @@ class cl_builder(color_print):
|
||||
self.printByResult(True)
|
||||
distrPath = distr.convertToDirectory().getDirectory()
|
||||
self.cleanNeedlessKernelData(distrPath)
|
||||
+ self.dispatchConf(distrPath)
|
||||
|
||||
if self.assembleIso and \
|
||||
self.clVars.Get('os_builder_profile').endswith('binary'):
|
||||
@@ -580,13 +588,6 @@ class cl_builder(color_print):
|
||||
dialogRes = dialogYesNo(dialogMessage)
|
||||
if dialogRes in (None,False):
|
||||
return True
|
||||
- self.printMessageForTest(_("Prepare data for live image"))
|
||||
- self.prepareSourceDistributive(self.sourceDistr)
|
||||
- self.printByResult(True)
|
||||
- self.targetDistr.prepareIso = self.flashPrepacking
|
||||
- self.printMessageForTest(_("Creating squash image"))
|
||||
- self.targetDistr.installFrom(self.sourceDistr)
|
||||
- self.printByResult(True)
|
||||
|
||||
self.printMessageForTest(_("Removing old images"))
|
||||
oldImages = map(lambda x:pathJoin(buildDirectory,x),
|
||||
@@ -597,6 +598,14 @@ class cl_builder(color_print):
|
||||
raise BuilderError(_("Can not remove old files")+":\n%s"%str(e))
|
||||
self.printByResult(True)
|
||||
|
||||
+ self.printMessageForTest(_("Prepare data for live image"))
|
||||
+ self.prepareSourceDistributive(self.sourceDistr)
|
||||
+ self.printByResult(True)
|
||||
+ self.targetDistr.prepareIso = self.flashPrepacking
|
||||
+ self.printMessageForTest(_("Creating squash image"))
|
||||
+ self.targetDistr.installFrom(self.sourceDistr)
|
||||
+ self.printByResult(True)
|
||||
+
|
||||
self.printMessageForTest(_("Performing syncronization"))
|
||||
processSync = process("/bin/sync")
|
||||
self.printByResult(processSync.success())
|
||||
diff --git pym/cl_fill_builder.py pym/cl_fill_builder.py
|
||||
index 2b4d512..6f20032 100644
|
||||
--- pym/cl_fill_builder.py
|
||||
+++ pym/cl_fill_builder.py
|
||||
@@ -23,7 +23,7 @@ from os import access, R_OK,W_OK
|
||||
from os import path
|
||||
from cl_distr import Distributive
|
||||
from cl_utils import getTupleVersion,genpassword,pathJoin,_toUNICODE, \
|
||||
- getFilesCount
|
||||
+ getFilesCount,getCmdLineParam
|
||||
from operator import itemgetter
|
||||
from types import ListType
|
||||
from cl_datavars import iniParser
|
||||
@@ -110,7 +110,13 @@ class fillVars(object, varsShare):
|
||||
kernelDirs = self.Get('cl_kernel_config_path')
|
||||
if not access(kernelDirs,R_OK):
|
||||
return ""
|
||||
- shortVerSearch = re.search("^\d+\.\d+.\d+",self.Get('cl_kernel_ver'),re.I)
|
||||
+ # check first number (3 or other kernel)
|
||||
+ tupleKernelVer = self.Get('cl_kernel_ver').split('.')
|
||||
+ if tupleKernelVer and tupleKernelVer[0] == '3':
|
||||
+ shortVerSearch = re.search("^\d+\.\d+",
|
||||
+ self.Get('cl_kernel_ver'),re.I)
|
||||
+ else:
|
||||
+ shortVerSearch = re.search("^\d+\.\d+.\d+",self.Get('cl_kernel_ver'),re.I)
|
||||
if shortVerSearch:
|
||||
shortVer = shortVerSearch.group()
|
||||
else:
|
||||
@@ -309,21 +315,18 @@ class fillVars(object, varsShare):
|
||||
squashfiles = filter(lambda x:x,
|
||||
map(Distributive.reLive.search,
|
||||
os.listdir(directory)))
|
||||
+ curName = self.Get('cl_builder_current_squash')
|
||||
if squashfiles:
|
||||
- return map(lambda x:x.group(),
|
||||
- sorted(squashfiles, key=self.getSquashNum))[:-1]
|
||||
+ return filter(lambda x:x != curName,
|
||||
+ map(lambda x:x.group(),
|
||||
+ sorted(squashfiles, key=self.getSquashNum)))
|
||||
return ""
|
||||
|
||||
def get_cl_builder_current_squash(self):
|
||||
"""Livecd.squashfs name (may be livecd.squashfs.2 and etc)"""
|
||||
- directory = self.Get('cl_builder_iso_path')
|
||||
- if not os.access(directory,R_OK):
|
||||
- return ""
|
||||
- squashfiles = filter(lambda x:x,
|
||||
- map(Distributive.reLive.search,
|
||||
- os.listdir(directory)))
|
||||
- if squashfiles:
|
||||
- return max(squashfiles, key=self.getSquashNum).group()
|
||||
+ loopValue = getCmdLineParam('loop')
|
||||
+ if loopValue:
|
||||
+ return path.basename(loopValue)
|
||||
return ""
|
||||
|
||||
def get_cl_builder_iso_path(self):
|
||||
@ -0,0 +1,33 @@
|
||||
# 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 assembling tasks of Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
RDEPEND=">=sys-apps/calculate-lib-2.2.19
|
||||
!<sys-apps/calculate-install-2.2.19
|
||||
!<sys-apps/calculate-client-2.2.19
|
||||
!<sys-apps/calculate-desktop-2.2.19
|
||||
!<sys-apps/calculate-builder-2.2.19
|
||||
!<sys-apps/calculate-assemble-2.2.19"
|
||||
|
||||
DEPEND="sys-devel/gettext
|
||||
${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# update for install,assemble,builder
|
||||
epatch "${FILESDIR}/calculate-i18n-2.2.22-r1.patch"
|
||||
}
|
||||
@ -0,0 +1,75 @@
|
||||
diff --git ru/cl_assemble_ru.po ru/cl_assemble_ru.po
|
||||
index a2bb9e5..a2b6e0c 100644
|
||||
--- ru/cl_assemble_ru.po
|
||||
+++ ru/cl_assemble_ru.po
|
||||
@@ -519,3 +519,6 @@ msgstr "настроить шаблонами %s"
|
||||
|
||||
msgid "For installation '%s' will be installed follow packages"
|
||||
msgstr "При установке '%s' будут устанавливаться следующие пакеты"
|
||||
+
|
||||
+msgid "Directory for assembling: %s"
|
||||
+msgstr "Директория для сборки: %s"
|
||||
diff --git ru/cl_builder_ru.po ru/cl_builder_ru.po
|
||||
index 1d6e66a..aec0ca7 100644
|
||||
--- ru/cl_builder_ru.po
|
||||
+++ ru/cl_builder_ru.po
|
||||
@@ -435,3 +435,6 @@ msgid ""
|
||||
msgstr ""
|
||||
"Если вы хотите вручную устанавливать пакеты в собираемой системе, пожалуйста "
|
||||
"выполните:"
|
||||
+
|
||||
+msgid "Execute '%s'"
|
||||
+msgstr "Выполнение '%s'"
|
||||
diff --git ru/cl_install_ru.po ru/cl_install_ru.po
|
||||
index cc1688b..8a02369 100644
|
||||
--- ru/cl_install_ru.po
|
||||
+++ ru/cl_install_ru.po
|
||||
@@ -966,3 +966,48 @@ msgstr ""
|
||||
|
||||
msgid "option is depricated, use '--startup' option"
|
||||
msgstr "параметр устарел, используйте параметр '--startup'"
|
||||
+
|
||||
+msgid "set video driver"
|
||||
+msgstr "установить видео драйвер"
|
||||
+
|
||||
+msgid "set Xorg resolution"
|
||||
+msgstr "установить Xorg разрешение"
|
||||
+
|
||||
+msgid "set frame buffer resolution"
|
||||
+msgstr "установить разрешение для фрейм буффера"
|
||||
+
|
||||
+msgid "set timezone"
|
||||
+msgstr "установить часовой пояс"
|
||||
+
|
||||
+msgid "option {optname}: {errormess}: '{value}' (example: '{example}')"
|
||||
+msgstr "опция {optname}: {errormess}: '{value}' (пример: '{example}')"
|
||||
+
|
||||
+msgid "%s specifing error"
|
||||
+msgstr "ошибка указания %s"
|
||||
+
|
||||
+msgid "X resolution"
|
||||
+msgstr "Xorg разрешения"
|
||||
+
|
||||
+msgid "route"
|
||||
+msgstr "маршрута"
|
||||
+
|
||||
+msgid "disk"
|
||||
+msgstr "диска"
|
||||
+
|
||||
+msgid "frame buffer resolution"
|
||||
+msgstr "разрешения фрейм буффера"
|
||||
+
|
||||
+msgid "%s videodriver is unavailable"
|
||||
+msgstr "%s видеодрайвер недоступен"
|
||||
+
|
||||
+msgid "Install %s driver by command:"
|
||||
+msgstr "Установите %s драйвер командой:"
|
||||
+
|
||||
+msgid "To apply changes you must reboot the system"
|
||||
+msgstr "Для применения изменений необходимо перезагрузить систему"
|
||||
+
|
||||
+msgid "To apply changes you must restart the X server"
|
||||
+msgstr "Для применения изменений необходимо перезагрузить X сервер"
|
||||
+
|
||||
+msgid "%s timezone is wrong"
|
||||
+msgstr "Неправильный часовой пояс %s"
|
||||
@ -0,0 +1,42 @@
|
||||
# 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.22
|
||||
~sys-apps/calculate-lib-2.2.22
|
||||
app-portage/layman
|
||||
!app-misc/livecd-tools
|
||||
!minimal? ( sys-boot/grub
|
||||
sys-apps/gptfdisk
|
||||
>=sys-apps/util-linux-2.19.1
|
||||
sys-fs/dosfstools
|
||||
sys-fs/squashfs-tools
|
||||
sys-block/parted )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# add four options, add perform format for directory distr,fix dns opt
|
||||
epatch "${FILESDIR}/calculate-install-2.2.22-r2.patch"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "For configure calculate-install perform:"
|
||||
einfo " cl-install --install"
|
||||
}
|
||||
@ -0,0 +1,36 @@
|
||||
# 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/iproute2
|
||||
sys-apps/pciutils
|
||||
sys-fs/lvm2
|
||||
sys-fs/mdadm
|
||||
sys-apps/file[python]"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# add timezone variable, getcmdlineopt
|
||||
# hide target symlink template output
|
||||
epatch "${FILESDIR}/calculate-lib-2.2.22-r2.patch"
|
||||
}
|
||||
@ -0,0 +1,75 @@
|
||||
diff --git pym/cl_fill.py pym/cl_fill.py
|
||||
index c2300b7..31bbc61 100644
|
||||
--- pym/cl_fill.py
|
||||
+++ pym/cl_fill.py
|
||||
@@ -715,3 +715,18 @@ class fillVars(varsShare):
|
||||
def get_cl_ca_path(self):
|
||||
"""CA path"""
|
||||
return '/var/calculate/ssl/main'
|
||||
+
|
||||
+ def get_os_clock_timezone(self):
|
||||
+ """Current clock timezone"""
|
||||
+ zoneinfodir = "/usr/share/zoneinfo/"
|
||||
+ localtimefile = "/etc/localtime"
|
||||
+ timezonefile = "/etc/timezone"
|
||||
+ # try get timezone from kernel calculate param
|
||||
+ timezone = self.getValueFromCmdLine("calculate",2)
|
||||
+ if timezone and \
|
||||
+ path.exists(path.join(zoneinfodir,timezone)):
|
||||
+ return timezone
|
||||
+ # get timezone from /etc/timezone
|
||||
+ if path.exists(timezonefile):
|
||||
+ return open(timezonefile,"r").read().strip()
|
||||
+ return "UTC"
|
||||
diff --git pym/cl_template.py pym/cl_template.py
|
||||
index b06ddee..dbf39cd 100644
|
||||
--- pym/cl_template.py
|
||||
+++ pym/cl_template.py
|
||||
@@ -4773,9 +4773,9 @@ variable 'cl_name'"))
|
||||
preReturn(pathProg)
|
||||
return ([], False)
|
||||
if not "/" == pathOldFile[0]:
|
||||
- applyFiles = [prevOldFile,os.path.join(pathLink,pathOldFile)]
|
||||
+ applyFiles = [prevOldFile]#,os.path.join(pathLink,pathOldFile)]
|
||||
else:
|
||||
- applyFiles = [prevOldFile,pathOldFile]
|
||||
+ applyFiles = [prevOldFile]#,pathOldFile]
|
||||
try:
|
||||
os.symlink(pathOldFile, prevOldFile)
|
||||
except:
|
||||
diff --git pym/cl_utils.py pym/cl_utils.py
|
||||
index 5fea955..6da750d 100644
|
||||
--- pym/cl_utils.py
|
||||
+++ pym/cl_utils.py
|
||||
@@ -1339,3 +1339,17 @@ def getPasswdUsers(minId=1000,maxId=65000):
|
||||
sortUsers.sort()
|
||||
retList = ["root"] + sortUsers
|
||||
return retList
|
||||
+
|
||||
+def getCmdLineParam(paramName):
|
||||
+ """Get value of param /proc/cmdline. If param not found then empty.
|
||||
+ """
|
||||
+ cmdLine = '/proc/cmdline'
|
||||
+ paramName = "%s="%paramName
|
||||
+ params = \
|
||||
+ map(lambda x:x.partition('=')[2],
|
||||
+ filter(lambda x:x.startswith(paramName),
|
||||
+ readFile(cmdLine).split(' ')))
|
||||
+ if params:
|
||||
+ return params[-1]
|
||||
+ else:
|
||||
+ return ""
|
||||
diff --git pym/cl_vars.py pym/cl_vars.py
|
||||
index 3194ff8..0466cc5 100644
|
||||
--- pym/cl_vars.py
|
||||
+++ pym/cl_vars.py
|
||||
@@ -103,6 +103,9 @@ class Data:
|
||||
# system (desktop or server)
|
||||
os_linux_system = {'hide':True}
|
||||
|
||||
+ # current timezone
|
||||
+ os_clock_timezone = {'hide':True}
|
||||
+
|
||||
# motherboard model
|
||||
hr_board_model = {'hide':True}
|
||||
|
||||
@ -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.22"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# fix xorg.conf template, improve xfce panel templates
|
||||
epatch "${FILESDIR}/calculate-templates-2.2.22-r2.patch"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
:
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dodir /usr/share/calculate/templates
|
||||
insinto /usr/share/calculate/templates
|
||||
doins -r *
|
||||
}
|
||||
@ -0,0 +1,420 @@
|
||||
diff --git desktop/desktop/00-patch-2.2.23/.calculate_directory desktop/desktop/00-patch-2.2.23/.calculate_directory
|
||||
new file mode 100644
|
||||
index 0000000..dd6d923
|
||||
--- /dev/null
|
||||
+++ desktop/desktop/00-patch-2.2.23/.calculate_directory
|
||||
@@ -0,0 +1 @@
|
||||
+# Calculate append=skip belong(calculate-templates)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.23
|
||||
diff --git desktop/desktop/00-patch-2.2.23/audioplayer.desktop desktop/desktop/00-patch-2.2.23/audioplayer.desktop
|
||||
new file mode 100644
|
||||
index 0000000..c39d33d
|
||||
--- /dev/null
|
||||
+++ desktop/desktop/00-patch-2.2.23/audioplayer.desktop
|
||||
@@ -0,0 +1 @@
|
||||
+# Calculate exists(~/.config/xfce4/panel/launcher-39/10000000039.desktop)!=&&exists(/usr/share/applications/calculate-audioplayer.desktop)!= link=/usr/share/applications/calculate-audioplayer.desktop path=~/.config/xfce4/panel/launcher-39 name=10000000039.desktop symbolic force
|
||||
diff --git desktop/desktop/00-patch-2.2.23/browser.desktop desktop/desktop/00-patch-2.2.23/browser.desktop
|
||||
new file mode 100644
|
||||
index 0000000..6783f06
|
||||
--- /dev/null
|
||||
+++ desktop/desktop/00-patch-2.2.23/browser.desktop
|
||||
@@ -0,0 +1 @@
|
||||
+# Calculate exists(~/.config/xfce4/panel/launcher-30/10000000030.desktop)!=&&exists(/usr/share/applications/calculate-browser.desktop)!= link=/usr/share/applications/calculate-browser.desktop path=~/.config/xfce4/panel/launcher-30 name=10000000030.desktop symbolic force
|
||||
diff --git desktop/desktop/00-patch-2.2.23/calc.desktop desktop/desktop/00-patch-2.2.23/calc.desktop
|
||||
new file mode 100644
|
||||
index 0000000..dea0ce6
|
||||
--- /dev/null
|
||||
+++ desktop/desktop/00-patch-2.2.23/calc.desktop
|
||||
@@ -0,0 +1 @@
|
||||
+# Calculate exists(~/.config/xfce4/panel/launcher-35/10000000035.desktop)!=&&exists(/usr/share/applications/calculate-calc.desktop)!= link=/usr/share/applications/calculate-calc.desktop path=~/.config/xfce4/panel/launcher-35 name=10000000035.desktop symbolic force
|
||||
diff --git desktop/desktop/00-patch-2.2.23/calculator.desktop desktop/desktop/00-patch-2.2.23/calculator.desktop
|
||||
new file mode 100644
|
||||
index 0000000..d9de472
|
||||
--- /dev/null
|
||||
+++ desktop/desktop/00-patch-2.2.23/calculator.desktop
|
||||
@@ -0,0 +1 @@
|
||||
+# Calculate exists(~/.config/xfce4/panel/launcher-36/10000000036.desktop)!=&&exists(/usr/share/applications/calculate-calculator.desktop)!= link=/usr/share/applications/calculate-calculator.desktop path=~/.config/xfce4/panel/launcher-36 name=10000000036.desktop symbolic force
|
||||
diff --git desktop/desktop/00-patch-2.2.23/chat.desktop desktop/desktop/00-patch-2.2.23/chat.desktop
|
||||
new file mode 100644
|
||||
index 0000000..7aca1c7
|
||||
--- /dev/null
|
||||
+++ desktop/desktop/00-patch-2.2.23/chat.desktop
|
||||
@@ -0,0 +1 @@
|
||||
+# Calculate exists(~/.config/xfce4/panel/launcher-32/10000000032.desktop)!=&&exists(/usr/share/applications/calculate-chat.desktop)!= link=/usr/share/applications/calculate-chat.desktop path=~/.config/xfce4/panel/launcher-32 name=10000000032.desktop symbolic force
|
||||
diff --git desktop/desktop/00-patch-2.2.23/dict.desktop desktop/desktop/00-patch-2.2.23/dict.desktop
|
||||
new file mode 100644
|
||||
index 0000000..bd030d7
|
||||
--- /dev/null
|
||||
+++ desktop/desktop/00-patch-2.2.23/dict.desktop
|
||||
@@ -0,0 +1 @@
|
||||
+# Calculate exists(~/.config/xfce4/panel/launcher-42/10000000042.desktop)!=&&exists(/usr/share/applications/calculate-dict.desktop)!= link=/usr/share/applications/calculate-dict.desktop path=~/.config/xfce4/panel/launcher-42 name=10000000042.desktop symbolic force
|
||||
diff --git desktop/desktop/00-patch-2.2.23/im.desktop desktop/desktop/00-patch-2.2.23/im.desktop
|
||||
new file mode 100644
|
||||
index 0000000..cecf261
|
||||
--- /dev/null
|
||||
+++ desktop/desktop/00-patch-2.2.23/im.desktop
|
||||
@@ -0,0 +1 @@
|
||||
+# Calculate exists(~/.config/xfce4/panel/launcher-33/10000000033.desktop)!=&&exists(/usr/share/applications/calculate-im.desktop)!= link=/usr/share/applications/calculate-im.desktop path=~/.config/xfce4/panel/launcher-33 name=10000000033.desktop symbolic force
|
||||
diff --git desktop/desktop/00-patch-2.2.23/imageburn.desktop desktop/desktop/00-patch-2.2.23/imageburn.desktop
|
||||
new file mode 100644
|
||||
index 0000000..d1fead5
|
||||
--- /dev/null
|
||||
+++ desktop/desktop/00-patch-2.2.23/imageburn.desktop
|
||||
@@ -0,0 +1 @@
|
||||
+# Calculate exists(~/.config/xfce4/panel/launcher-41/10000000041.desktop)!=&&exists(/usr/share/applications/calculate-imageburn.desktop)!= link=/usr/share/applications/calculate-imageburn.desktop path=~/.config/xfce4/panel/launcher-41 name=10000000041.desktop symbolic force
|
||||
diff --git desktop/desktop/00-patch-2.2.23/imageedit.desktop desktop/desktop/00-patch-2.2.23/imageedit.desktop
|
||||
new file mode 100644
|
||||
index 0000000..3d8cf83
|
||||
--- /dev/null
|
||||
+++ desktop/desktop/00-patch-2.2.23/imageedit.desktop
|
||||
@@ -0,0 +1 @@
|
||||
+# Calculate exists(~/.config/xfce4/panel/launcher-37/10000000037.desktop)!=&&exists(/usr/share/applications/calculate-imageedit.desktop)!= link=/usr/share/applications/calculate-imageedit.desktop path=~/.config/xfce4/panel/launcher-37 name=10000000037.desktop symbolic force
|
||||
diff --git desktop/desktop/00-patch-2.2.23/imageview.desktop desktop/desktop/00-patch-2.2.23/imageview.desktop
|
||||
new file mode 100644
|
||||
index 0000000..915366a
|
||||
--- /dev/null
|
||||
+++ desktop/desktop/00-patch-2.2.23/imageview.desktop
|
||||
@@ -0,0 +1 @@
|
||||
+# Calculate exists(~/.config/xfce4/panel/launcher-38/10000000038.desktop)!=&&exists(/usr/share/applications/calculate-imageview.desktop)!= link=/usr/share/applications/calculate-imageview.desktop path=~/.config/xfce4/panel/launcher-38 name=10000000038.desktop symbolic force
|
||||
diff --git desktop/desktop/00-patch-2.2.23/ini.env desktop/desktop/00-patch-2.2.23/ini.env
|
||||
new file mode 100644
|
||||
index 0000000..b93a55a
|
||||
--- /dev/null
|
||||
+++ desktop/desktop/00-patch-2.2.23/ini.env
|
||||
@@ -0,0 +1,7 @@
|
||||
+# Calculate format=samba path=~/.calculate
|
||||
+
|
||||
+[ver]
|
||||
+patch = 2.2.23
|
||||
+
|
||||
+[update]
|
||||
+patch = on
|
||||
diff --git desktop/desktop/00-patch-2.2.23/mail.desktop desktop/desktop/00-patch-2.2.23/mail.desktop
|
||||
new file mode 100644
|
||||
index 0000000..2bea389
|
||||
--- /dev/null
|
||||
+++ desktop/desktop/00-patch-2.2.23/mail.desktop
|
||||
@@ -0,0 +1 @@
|
||||
+# Calculate exists(~/.config/xfce4/panel/launcher-31/10000000031.desktop)!=&&exists(/usr/share/applications/calculate-mail.desktop)!= link=/usr/share/applications/calculate-mail.desktop path=~/.config/xfce4/panel/launcher-31 name=10000000031.desktop symbolic force
|
||||
diff --git desktop/desktop/00-patch-2.2.23/terminal.desktop desktop/desktop/00-patch-2.2.23/terminal.desktop
|
||||
new file mode 100644
|
||||
index 0000000..53b9741
|
||||
--- /dev/null
|
||||
+++ desktop/desktop/00-patch-2.2.23/terminal.desktop
|
||||
@@ -0,0 +1 @@
|
||||
+# Calculate exists(~/.config/xfce4/panel/launcher-44/10000000044.desktop)!=&&exists(/usr/share/applications/calculate-terminal.desktop)!= link=/usr/share/applications/calculate-terminal.desktop path=~/.config/xfce4/panel/launcher-44 name=10000000044.desktop symbolic force
|
||||
diff --git desktop/desktop/00-patch-2.2.23/textedit.desktop desktop/desktop/00-patch-2.2.23/textedit.desktop
|
||||
new file mode 100644
|
||||
index 0000000..a86d325
|
||||
--- /dev/null
|
||||
+++ desktop/desktop/00-patch-2.2.23/textedit.desktop
|
||||
@@ -0,0 +1 @@
|
||||
+# Calculate exists(~/.config/xfce4/panel/launcher-43/10000000043.desktop)!=&&exists(/usr/share/applications/calculate-textedit.desktop)!= link=/usr/share/applications/calculate-textedit.desktop path=~/.config/xfce4/panel/launcher-43 name=10000000043.desktop symbolic force
|
||||
diff --git desktop/desktop/00-patch-2.2.23/videoplayer.desktop desktop/desktop/00-patch-2.2.23/videoplayer.desktop
|
||||
new file mode 100644
|
||||
index 0000000..2fc2577
|
||||
--- /dev/null
|
||||
+++ desktop/desktop/00-patch-2.2.23/videoplayer.desktop
|
||||
@@ -0,0 +1 @@
|
||||
+# Calculate exists(~/.config/xfce4/panel/launcher-40/10000000040.desktop)!=&&exists(/usr/share/applications/calculate-videoplayer.desktop)!= link=/usr/share/applications/calculate-videoplayer.desktop path=~/.config/xfce4/panel/launcher-40 name=10000000040.desktop symbolic force
|
||||
diff --git desktop/desktop/00-patch-2.2.23/writer.desktop desktop/desktop/00-patch-2.2.23/writer.desktop
|
||||
new file mode 100644
|
||||
index 0000000..eb9b8cc
|
||||
--- /dev/null
|
||||
+++ desktop/desktop/00-patch-2.2.23/writer.desktop
|
||||
@@ -0,0 +1 @@
|
||||
+# Calculate exists(~/.config/xfce4/panel/launcher-34/10000000034.desktop)!=&&exists(/usr/share/applications/calculate-writer.desktop)!= link=/usr/share/applications/calculate-writer.desktop path=~/.config/xfce4/panel/launcher-34 name=10000000034.desktop symbolic force
|
||||
diff --git desktop/desktop/20-kde-4.6/.kde4/share/config/kxkbrc desktop/desktop/20-kde-4.6/.kde4/share/config/kxkbrc
|
||||
index c0d7733..20105e8 100644
|
||||
--- desktop/desktop/20-kde-4.6/.kde4/share/config/kxkbrc
|
||||
+++ desktop/desktop/20-kde-4.6/.kde4/share/config/kxkbrc
|
||||
@@ -12,7 +12,7 @@ Options=terminate:ctrl_alt_bksp
|
||||
Options=grp:caps_toggle,grp_led:scroll,terminate:ctrl_alt_bksp
|
||||
#os_locale_xkb#
|
||||
ResetOldOptions=true
|
||||
-ShowFlag=true
|
||||
+ShowFlag=false
|
||||
ShowSingle=false
|
||||
SwitchMode=WinClass
|
||||
Use=true
|
||||
diff --git desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-30/browser.desktop desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-30/browser.desktop
|
||||
index 71080ee..cbd7725 100644
|
||||
--- desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-30/browser.desktop
|
||||
+++ desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-30/browser.desktop
|
||||
@@ -1,3 +1 @@
|
||||
-# Calculate format=kde exists(/usr/share/applications/calculate-browser.desktop)!= link=/usr/share/applications/calculate-browser.desktop name=10000000030.desktop
|
||||
-[Desktop Entry]
|
||||
-X-XFCE-Source=file:///usr/share/applications/calculate-browser.desktop
|
||||
+# Calculate exists(/usr/share/applications/calculate-browser.desktop)!= link=/usr/share/applications/calculate-browser.desktop name=10000000030.desktop symbolic force
|
||||
diff --git desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-31/mail.desktop desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-31/mail.desktop
|
||||
index 4bddcb2..26fcecd 100644
|
||||
--- desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-31/mail.desktop
|
||||
+++ desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-31/mail.desktop
|
||||
@@ -1,3 +1 @@
|
||||
-# Calculate format=kde exists(/usr/share/applications/calculate-mail.desktop)!= link=/usr/share/applications/calculate-mail.desktop name=10000000031.desktop
|
||||
-[Desktop Entry]
|
||||
-X-XFCE-Source=file:///usr/share/applications/calculate-mail.desktop
|
||||
+# Calculate exists(/usr/share/applications/calculate-mail.desktop)!= link=/usr/share/applications/calculate-mail.desktop name=10000000031.desktop symbolic force
|
||||
diff --git desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-32/chat.desktop desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-32/chat.desktop
|
||||
index 84da5ad..94e8002 100644
|
||||
--- desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-32/chat.desktop
|
||||
+++ desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-32/chat.desktop
|
||||
@@ -1,3 +1 @@
|
||||
-# Calculate format=kde exists(/usr/share/applications/calculate-chat.desktop)!= link=/usr/share/applications/calculate-chat.desktop name=10000000032.desktop
|
||||
-[Desktop Entry]
|
||||
-X-XFCE-Source=file:///usr/share/applications/calculate-chat.desktop
|
||||
+# Calculate exists(/usr/share/applications/calculate-chat.desktop)!= link=/usr/share/applications/calculate-chat.desktop name=10000000032.desktop symbolic force
|
||||
diff --git desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-33/im.desktop desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-33/im.desktop
|
||||
index 792351f..babdad5 100644
|
||||
--- desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-33/im.desktop
|
||||
+++ desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-33/im.desktop
|
||||
@@ -1,3 +1 @@
|
||||
-# Calculate format=kde exists(/usr/share/applications/calculate-im.desktop)!= link=/usr/share/applications/calculate-im.desktop name=10000000033.desktop
|
||||
-[Desktop Entry]
|
||||
-X-XFCE-Source=file:///usr/share/applications/calculate-im.desktop
|
||||
+# Calculate exists(/usr/share/applications/calculate-im.desktop)!= link=/usr/share/applications/calculate-im.desktop name=10000000033.desktop symbolic force
|
||||
diff --git desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-34/writer.desktop desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-34/writer.desktop
|
||||
index 3844f4c..0f8ee73 100644
|
||||
--- desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-34/writer.desktop
|
||||
+++ desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-34/writer.desktop
|
||||
@@ -1,3 +1 @@
|
||||
-# Calculate format=kde exists(/usr/share/applications/calculate-writer.desktop)!= link=/usr/share/applications/calculate-writer.desktop name=10000000034.desktop
|
||||
-[Desktop Entry]
|
||||
-X-XFCE-Source=file:///usr/share/applications/calculate-writer.desktop
|
||||
+# Calculate exists(/usr/share/applications/calculate-writer.desktop)!= link=/usr/share/applications/calculate-writer.desktop name=10000000034.desktop symbolic force
|
||||
diff --git desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-35/calc.desktop desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-35/calc.desktop
|
||||
index c8b098f..2eaf1dd 100644
|
||||
--- desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-35/calc.desktop
|
||||
+++ desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-35/calc.desktop
|
||||
@@ -1,3 +1 @@
|
||||
-# Calculate format=kde exists(/usr/share/applications/calculate-calc.desktop)!= link=/usr/share/applications/calculate-calc.desktop name=10000000035.desktop
|
||||
-[Desktop Entry]
|
||||
-X-XFCE-Source=file:///usr/share/applications/calculate-calc.desktop
|
||||
+# Calculate exists(/usr/share/applications/calculate-calc.desktop)!= link=/usr/share/applications/calculate-calc.desktop name=10000000035.desktop symbolic force
|
||||
diff --git desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-36/calculator.desktop desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-36/calculator.desktop
|
||||
index e3db59c..306f0d8 100644
|
||||
--- desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-36/calculator.desktop
|
||||
+++ desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-36/calculator.desktop
|
||||
@@ -1,3 +1 @@
|
||||
-# Calculate format=kde exists(/usr/share/applications/calculate-calculator.desktop)!= link=/usr/share/applications/calculate-calculator.desktop name=10000000036.desktop
|
||||
-[Desktop Entry]
|
||||
-X-XFCE-Source=file:///usr/share/applications/calculate-calculator.desktop
|
||||
+# Calculate exists(/usr/share/applications/calculate-calculator.desktop)!= link=/usr/share/applications/calculate-calculator.desktop name=10000000036.desktop symbolic force
|
||||
diff --git desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-37/imageedit.desktop desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-37/imageedit.desktop
|
||||
index 088648c..a42cc67 100644
|
||||
--- desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-37/imageedit.desktop
|
||||
+++ desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-37/imageedit.desktop
|
||||
@@ -1,3 +1 @@
|
||||
-# Calculate format=kde exists(/usr/share/applications/calculate-imageedit.desktop)!= link=/usr/share/applications/calculate-imageedit.desktop name=10000000037.desktop
|
||||
-[Desktop Entry]
|
||||
-X-XFCE-Source=file:///usr/share/applications/calculate-imageedit.desktop
|
||||
+# Calculate exists(/usr/share/applications/calculate-imageedit.desktop)!= link=/usr/share/applications/calculate-imageedit.desktop name=10000000037.desktop symbolic force
|
||||
diff --git desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-38/imageview.desktop desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-38/imageview.desktop
|
||||
index cb488a8..6a8f5e7 100644
|
||||
--- desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-38/imageview.desktop
|
||||
+++ desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-38/imageview.desktop
|
||||
@@ -1,3 +1 @@
|
||||
-# Calculate format=kde exists(/usr/share/applications/calculate-imageview.desktop)!= link=/usr/share/applications/calculate-imageview.desktop name=10000000038.desktop
|
||||
-[Desktop Entry]
|
||||
-X-XFCE-Source=file:///usr/share/applications/calculate-imageview.desktop
|
||||
+# Calculate exists(/usr/share/applications/calculate-imageview.desktop)!= link=/usr/share/applications/calculate-imageview.desktop name=10000000038.desktop symbolic force
|
||||
diff --git desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-39/audioplayer.desktop desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-39/audioplayer.desktop
|
||||
index db61067..1e65abb 100644
|
||||
--- desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-39/audioplayer.desktop
|
||||
+++ desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-39/audioplayer.desktop
|
||||
@@ -1,3 +1 @@
|
||||
-# Calculate format=kde exists(/usr/share/applications/calculate-audioplayer.desktop)!= link=/usr/share/applications/calculate-audioplayer.desktop name=10000000039.desktop
|
||||
-[Desktop Entry]
|
||||
-X-XFCE-Source=file:///usr/share/applications/calculate-audioplayer.desktop
|
||||
+# Calculate exists(/usr/share/applications/calculate-audioplayer.desktop)!= link=/usr/share/applications/calculate-audioplayer.desktop name=10000000039.desktop symbolic force
|
||||
diff --git desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-40/videoplayer.desktop desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-40/videoplayer.desktop
|
||||
index 00614a7..c5e5084 100644
|
||||
--- desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-40/videoplayer.desktop
|
||||
+++ desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-40/videoplayer.desktop
|
||||
@@ -1,3 +1 @@
|
||||
-# Calculate format=kde exists(/usr/share/applications/calculate-videoplayer.desktop)!= link=/usr/share/applications/calculate-videoplayer.desktop name=10000000040.desktop
|
||||
-[Desktop Entry]
|
||||
-X-XFCE-Source=file:///usr/share/applications/calculate-videoplayer.desktop
|
||||
+# Calculate exists(/usr/share/applications/calculate-videoplayer.desktop)!= link=/usr/share/applications/calculate-videoplayer.desktop name=10000000040.desktop symbolic force
|
||||
diff --git desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-41/imageburn.desktop desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-41/imageburn.desktop
|
||||
index 16fac96..5f386c4 100644
|
||||
--- desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-41/imageburn.desktop
|
||||
+++ desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-41/imageburn.desktop
|
||||
@@ -1,3 +1 @@
|
||||
-# Calculate format=kde exists(/usr/share/applications/calculate-imageburn.desktop)!= link=/usr/share/applications/calculate-imageburn.desktop name=10000000041.desktop
|
||||
-[Desktop Entry]
|
||||
-X-XFCE-Source=file:///usr/share/applications/calculate-imageburn.desktop
|
||||
+# Calculate exists(/usr/share/applications/calculate-imageburn.desktop)!= link=/usr/share/applications/calculate-imageburn.desktop name=10000000041.desktop symbolic force
|
||||
diff --git desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-42/dict.desktop desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-42/dict.desktop
|
||||
index 07fe94c..c983499 100644
|
||||
--- desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-42/dict.desktop
|
||||
+++ desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-42/dict.desktop
|
||||
@@ -1,3 +1 @@
|
||||
-# Calculate format=kde exists(/usr/share/applications/calculate-dict.desktop)!= link=/usr/share/applications/calculate-dict.desktop name=10000000042.desktop
|
||||
-[Desktop Entry]
|
||||
-X-XFCE-Source=file:///usr/share/applications/calculate-dict.desktop
|
||||
+# Calculate exists(/usr/share/applications/calculate-dict.desktop)!= link=/usr/share/applications/calculate-dict.desktop name=10000000042.desktop symbolic force
|
||||
diff --git desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-43/textedit.desktop desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-43/textedit.desktop
|
||||
index e8fa798..26ae5c1 100644
|
||||
--- desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-43/textedit.desktop
|
||||
+++ desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-43/textedit.desktop
|
||||
@@ -1,3 +1 @@
|
||||
-# Calculate format=kde exists(/usr/share/applications/calculate-textedit.desktop)!= link=/usr/share/applications/calculate-textedit.desktop name=10000000043.desktop
|
||||
-[Desktop Entry]
|
||||
-X-XFCE-Source=file:///usr/share/applications/calculate-textedit.desktop
|
||||
+# Calculate exists(/usr/share/applications/calculate-textedit.desktop)!= link=/usr/share/applications/calculate-textedit.desktop name=10000000043.desktop symbolic force
|
||||
diff --git desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-44/terminal.desktop desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-44/terminal.desktop
|
||||
index 132307d..422b1a1 100644
|
||||
--- desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-44/terminal.desktop
|
||||
+++ desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-44/terminal.desktop
|
||||
@@ -1,3 +1 @@
|
||||
-# Calculate format=kde exists(/usr/share/applications/calculate-terminal.desktop)!= link=/usr/share/applications/calculate-terminal.desktop name=10000000044.desktop
|
||||
-[Desktop Entry]
|
||||
-X-XFCE-Source=file:///usr/share/applications/calculate-terminal.desktop
|
||||
+# Calculate exists(/usr/share/applications/calculate-terminal.desktop)!= link=/usr/share/applications/calculate-terminal.desktop name=10000000044.desktop symbolic force
|
||||
diff --git desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
|
||||
index 6cda23a..a1311f2 100644
|
||||
--- desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
|
||||
+++ desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
|
||||
@@ -202,5 +202,10 @@
|
||||
<value type="string" value="10000000044.desktop"/>
|
||||
</property>
|
||||
</property>
|
||||
+ <property name="clipman" type="empty">
|
||||
+ <property name="settings" type="empty">
|
||||
+ <property name="add-primary-clipboard" type="bool" value="true"/>
|
||||
+ </property>
|
||||
+ </property>
|
||||
</property>
|
||||
</channel>
|
||||
diff --git desktop/desktop/60-xbmc-10.0/.calculate/ini.env desktop/desktop/60-xbmc-10.0/.calculate/ini.env
|
||||
new file mode 100644
|
||||
index 0000000..764e4ad
|
||||
--- /dev/null
|
||||
+++ desktop/desktop/60-xbmc-10.0/.calculate/ini.env
|
||||
@@ -0,0 +1,7 @@
|
||||
+# Calculate format=samba
|
||||
+
|
||||
+[ver]
|
||||
+xbmc = 10.1
|
||||
+
|
||||
+[update]
|
||||
+xbmc = on
|
||||
diff --git desktop/desktop/60-xbmc-10.0/.calculate_directory desktop/desktop/60-xbmc-10.0/.calculate_directory
|
||||
new file mode 100644
|
||||
index 0000000..dcb6016
|
||||
--- /dev/null
|
||||
+++ desktop/desktop/60-xbmc-10.0/.calculate_directory
|
||||
@@ -0,0 +1 @@
|
||||
+# Calculate append=skip belong(xbmc)!=&&ini(update.xbmc)!=off&&ini(ver.xbmc)==&&pkg(media-tv/xbmc)>=10.0
|
||||
diff --git desktop/desktop/60-xbmc-10.0/guisettings.xml desktop/desktop/60-xbmc-10.0/guisettings.xml
|
||||
new file mode 100644
|
||||
index 0000000..094edba
|
||||
--- /dev/null
|
||||
+++ desktop/desktop/60-xbmc-10.0/guisettings.xml
|
||||
@@ -0,0 +1,10 @@
|
||||
+# Calculate path=~/.xbmc/userdata
|
||||
+<settings>
|
||||
+ <locale>
|
||||
+ <charset>CP1251</charset>
|
||||
+ <country>USA</country>
|
||||
+ <language>Russian</language>
|
||||
+ <timezone>Europe/Moscow</timezone>
|
||||
+ <timezonecountry>Russia</timezonecountry>
|
||||
+ </locale>
|
||||
+</settings>
|
||||
diff --git desktop/desktop/60-xbmc-10.0/sources.xml desktop/desktop/60-xbmc-10.0/sources.xml
|
||||
new file mode 100644
|
||||
index 0000000..ca2bedf
|
||||
--- /dev/null
|
||||
+++ desktop/desktop/60-xbmc-10.0/sources.xml
|
||||
@@ -0,0 +1,30 @@
|
||||
+# Calculate path=~/.xbmc/userdata
|
||||
+<sources>
|
||||
+ <programs>
|
||||
+ <default pathversion="1"></default>
|
||||
+ </programs>
|
||||
+ <video>
|
||||
+ <default pathversion="1"></default>
|
||||
+ <source>
|
||||
+ <name>My Video</name>
|
||||
+ <path pathversion="1">#-ini(resource.videos)-#</path>
|
||||
+ </source>
|
||||
+ </video>
|
||||
+ <music>
|
||||
+ <default pathversion="1"></default>
|
||||
+ <source>
|
||||
+ <name>My Music</name>
|
||||
+ <path pathversion="1">#-ini(resource.music)-#</path>
|
||||
+ </source>
|
||||
+ </music>
|
||||
+ <pictures>
|
||||
+ <default pathversion="1"></default>
|
||||
+ <source>
|
||||
+ <name>My Pictures</name>
|
||||
+ <path pathversion="1">#-ini(resource.pictures)-#</path>
|
||||
+ </source>
|
||||
+ </pictures>
|
||||
+ <files>
|
||||
+ <default pathversion="1"></default>
|
||||
+ </files>
|
||||
+</sources>
|
||||
diff --git install/1merge/Desktop/400-AudioPlayer/audacious/calculate/audacious-2.4.desktop install/1merge/Desktop/400-AudioPlayer/audacious/calculate/audacious-2.4.desktop
|
||||
index a0bc2a5..ff49e6f 100644
|
||||
--- install/1merge/Desktop/400-AudioPlayer/audacious/calculate/audacious-2.4.desktop
|
||||
+++ install/1merge/Desktop/400-AudioPlayer/audacious/calculate/audacious-2.4.desktop
|
||||
@@ -1,4 +1,4 @@
|
||||
-# Calculate format=kde link=/usr/share/applications/audacious2.desktop name=calculate-audioplayer.desktop mirror pkg(media-sound/audacious)>=2.4&&pkg(media-sound/audacious)<3.0
|
||||
+# Calculate format=kde link=/usr/share/applications/audacious2.desktop name=calculate-audioplayer.desktop mirror pkg(media-sound/audacious)>=2.4&&pkg(media-sound/audacious)<2.5
|
||||
|
||||
# Update info
|
||||
#-ini(desktop.audioplayer, audacious)-#
|
||||
diff --git install/1merge/Desktop/400-AudioPlayer/audacious/calculate/audacious-2.5.desktop install/1merge/Desktop/400-AudioPlayer/audacious/calculate/audacious-2.5.desktop
|
||||
new file mode 100644
|
||||
index 0000000..d24772b
|
||||
--- /dev/null
|
||||
+++ install/1merge/Desktop/400-AudioPlayer/audacious/calculate/audacious-2.5.desktop
|
||||
@@ -0,0 +1,9 @@
|
||||
+# Calculate format=kde link=/usr/share/applications/audacious.desktop name=calculate-audioplayer.desktop mirror pkg(media-sound/audacious)>=2.5
|
||||
+
|
||||
+# Update info
|
||||
+#-ini(desktop.audioplayer, audacious)-#
|
||||
+
|
||||
+# Hide icon
|
||||
+[Desktop Entry]
|
||||
+OnlyShowIn=X-NeverShowThis;
|
||||
+
|
||||
diff --git install/1merge/Desktop/400-AudioPlayer/audacious/calculate/audacious-3.0.desktop install/1merge/Desktop/400-AudioPlayer/audacious/calculate/audacious-3.0.desktop
|
||||
deleted file mode 100644
|
||||
index 6387c9e..0000000
|
||||
--- install/1merge/Desktop/400-AudioPlayer/audacious/calculate/audacious-3.0.desktop
|
||||
+++ /dev/null
|
||||
@@ -1,9 +0,0 @@
|
||||
-# Calculate format=kde link=/usr/share/applications/audacious.desktop name=calculate-audioplayer.desktop mirror pkg(media-sound/audacious)>=3.0
|
||||
-
|
||||
-# Update info
|
||||
-#-ini(desktop.audioplayer, audacious)-#
|
||||
-
|
||||
-# Hide icon
|
||||
-[Desktop Entry]
|
||||
-OnlyShowIn=X-NeverShowThis;
|
||||
-
|
||||
diff --git install/1merge/xorg-server/X11/xorg.conf install/1merge/xorg-server/X11/xorg.conf
|
||||
index 210d3a1..204c197 100644
|
||||
--- install/1merge/xorg-server/X11/xorg.conf
|
||||
+++ install/1merge/xorg-server/X11/xorg.conf
|
||||
@@ -1,4 +1,4 @@
|
||||
-# Calculate comment=# os_install_video_drv!=other
|
||||
+# Calculate comment=# os_install_x11_video_drv!=other
|
||||
|
||||
Section "ServerLayout"
|
||||
Identifier "Xorg Configured"
|
||||
diff --git install/1merge/xorg-server/X11/xorg.conf.other install/1merge/xorg-server/X11/xorg.conf.other
|
||||
index 9342c02..72ce36b 100644
|
||||
--- install/1merge/xorg-server/X11/xorg.conf.other
|
||||
+++ install/1merge/xorg-server/X11/xorg.conf.other
|
||||
@@ -1,4 +1,4 @@
|
||||
-# Calculate comment=# os_install_video_drv==other name=xorg.conf
|
||||
+# Calculate comment=# os_install_x11_video_drv==other name=xorg.conf
|
||||
|
||||
Section "ServerLayout"
|
||||
Identifier "Xorg Configured"
|
||||
@ -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.22-r2
|
||||
=sys-apps/calculate-templates-2.2.22-r2
|
||||
=sys-apps/calculate-lib-2.2.22-r2
|
||||
=sys-apps/calculate-i18n-2.2.22-r1
|
||||
|
||||
cl_assemble? ( =sys-apps/calculate-assemble-2.2.22-r1 )
|
||||
cl_builder? ( =sys-apps/calculate-builder-2.2.22-r3 )
|
||||
cl_client? ( =sys-apps/calculate-client-2.2.22 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-2.2.22 )
|
||||
cl_installgui? ( =app-misc/calculate-install-gui-2.2.22 )
|
||||
|
||||
cl_server? ( =sys-apps/calculate-server-2.1.14-r6 )
|
||||
"
|
||||
Loading…
Reference in new issue