From a7202c245535edca3c9eca29ac45525c3ac62bbf Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Tue, 23 Aug 2011 18:05:50 +0400 Subject: [PATCH] Update install for english man. --- sys-apps/calculate-install/ChangeLog | 7 + sys-apps/calculate-install/Manifest | 4 +- .../calculate-install-2.2.21-r3.ebuild | 42 + .../files/calculate-install-2.2.21-r3.patch | 446 +++++ sys-apps/calculate-templates/ChangeLog | 7 + sys-apps/calculate-templates/Manifest | 4 +- .../calculate-templates-2.2.21-r3.ebuild | 37 + .../files/calculate-templates-2.2.21-r3.patch | 1765 +++++++++++++++++ sys-apps/calculate-utilities/ChangeLog | 6 + sys-apps/calculate-utilities/Manifest | 3 +- .../calculate-utilities-2.2.21-r4.ebuild | 37 + 11 files changed, 2355 insertions(+), 3 deletions(-) create mode 100644 sys-apps/calculate-install/calculate-install-2.2.21-r3.ebuild create mode 100644 sys-apps/calculate-install/files/calculate-install-2.2.21-r3.patch create mode 100644 sys-apps/calculate-templates/calculate-templates-2.2.21-r3.ebuild create mode 100644 sys-apps/calculate-templates/files/calculate-templates-2.2.21-r3.patch create mode 100644 sys-apps/calculate-utilities/calculate-utilities-2.2.21-r4.ebuild diff --git a/sys-apps/calculate-install/ChangeLog b/sys-apps/calculate-install/ChangeLog index 6638467de..9ce22f510 100644 --- a/sys-apps/calculate-install/ChangeLog +++ b/sys-apps/calculate-install/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*calculate-install-2.2.21-r3 (23 Aug 2011) + + 23 Aug 2011; Mike Hiretsky (mhiretskiy) + +calculate-install-2.2.21-r3.ebuild, + +files/calculate-install-2.2.21-r3.patch: + Update for adding man + *calculate-install-2.2.21-r2 (22 Aug 2011) 22 Aug 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-install/Manifest b/sys-apps/calculate-install/Manifest index 162c94bb3..baff6ca31 100644 --- a/sys-apps/calculate-install/Manifest +++ b/sys-apps/calculate-install/Manifest @@ -15,6 +15,7 @@ AUX calculate-install-2.2.20-net_network.patch 1496 RMD160 142d7420565283eee8949 AUX calculate-install-2.2.20_2.2.21_rc1.patch 36707 RMD160 279605cc9ce454e93f5620d0151eaa5b5a83dc09 SHA1 f5e3104b869d74ae207604d6685924d79a2a1223 SHA256 b68a756710d7abf60fc61b0154e870e152b2d2d533e1ccf229189555f933e796 AUX calculate-install-2.2.21-r1.patch 1059 RMD160 b78b780b87f73504c45c4b9e6feb89a4489e101a SHA1 5eb9ff84ed9bf9c7a6b8706bda463451ccc804ea SHA256 412598c1c2ebe23f245f1e0597b0938b9be76050e8b21906c053202b9ec54025 AUX calculate-install-2.2.21-r2.patch 5802 RMD160 3b73c9b524785f6c1c1f82537bfff46b78d49dde SHA1 eb0954ca648bd0f0e2eabcb7b9da740c869bd518 SHA256 7c10369cd59f4a9fff6b2ebf0c7897f622edfbd8d9fc62aec296b9f6bb2a0cf8 +AUX calculate-install-2.2.21-r3.patch 18457 RMD160 2aceaf84cc1df2da2ad55846e499ade724a2eaad SHA1 e76ea035b2fffbe08e28cb065a6a2f62dc7bd738 SHA256 b976a06eb1f644654952241429113549f854c4b99ebefa28249a24afac16116c DIST calculate-install-2.2.18.tar.bz2 75850 RMD160 56b1058d1977957cc6ceb8322a049af4dbb8f0cc SHA1 4e990cf5bd6310942b54995293f1f7ea82726aa9 SHA256 2a1b9c3fa93a958f19f05af51f80adf25f5ee0867452fac0304ec721de19cd97 DIST calculate-install-2.2.19.tar.bz2 63943 RMD160 8c76315aea89d20239b11c7e6017766b5e5e93db SHA1 1127468d3b221333e820e142fc1b9afaef507ee3 SHA256 5dedcb4c3d42ca4d87b2a2fa0d72704be3748865907b991dddbeba493e0da80a DIST calculate-install-2.2.20.tar.bz2 65317 RMD160 f91f5b8e6a1f3a41cda246a983274b7665a98259 SHA1 a530fcc91cbb952e36e4e42175c45182d828a987 SHA256 06e3360e3d9e3e599d6696f121908390a241baa16fe9400657ea0a29c0f85fc1 @@ -42,7 +43,8 @@ EBUILD calculate-install-2.2.20-r9.ebuild 938 RMD160 d2beaf2db6e430ca8e0357f3805 EBUILD calculate-install-2.2.20.ebuild 774 RMD160 975cdfee5054db3a097a2edbd5bbd4db002b921d SHA1 efdeb24c9021ccbe384190f2e742d41620dd3e20 SHA256 549b961eeb2d3bcbfa526f3b5ed0368439a599e8a797d229a60bc8d0d7ae33c5 EBUILD calculate-install-2.2.21-r1.ebuild 960 RMD160 616508e423d7926c59c3c52a53b085fa28a174ac SHA1 57c81447cabf469331299f74ff4771a4f41a6487 SHA256 80e0fecf61a6ee9d13fe5dba1eefc276aeb07c49c745092581657b599e3883f8 EBUILD calculate-install-2.2.21-r2.ebuild 920 RMD160 458c506b292ce35083eee533ed507c46ffa1ee0a SHA1 04ed11daac73bd33e862e76318ad7a38305f10a8 SHA256 b05d919b5611cfe0aa019ce4deeeef5a218142b47ea0c90f7dff060cb88c497f +EBUILD calculate-install-2.2.21-r3.ebuild 937 RMD160 e17e318ad8f41758ee3b63505ed8cda5c2e220b4 SHA1 401c3f9bdcfe961f9106f5b93d06f58cb46c5c7b SHA256 d927d383bf6650e0600c0e1619ebe6c655ffe8cd0239bef8ceb2e46e0b573c22 EBUILD calculate-install-2.2.21.ebuild 804 RMD160 97f3e98ea3fd7bdf8e54ee23b5c2661c8962e19f SHA1 e7759746ffe19f70c159961a3e261bd09f2e89a1 SHA256 c6d80514eb5cd12eb9e9f687fdd54e2cbc1727a1e2b5b5cc3541e67536d51841 EBUILD calculate-install-2.2.9999.ebuild 595 RMD160 8f9b9a14fed39ded9c2a9d9343aa4e892d620172 SHA1 09aff28bdaa486868e2caddc7911732a905336ee SHA256 534e6c6e465177e269ce7beed96dab08a124878591088c1bf38095e855ca1180 -MISC ChangeLog 27105 RMD160 3e9b1d8cd05816f6949082b07e04dc7aa2682e55 SHA1 e154c532a1c7445a9a0710a778576343ba06b95c SHA256 d9c6860ac7d3c7d301a98987ce62157508831d2eb9f5570d3124641594cdd9a0 +MISC ChangeLog 27317 RMD160 f6c7801a969ccf6144fefa15995ce071f6a5759a SHA1 bee3459ddb0f555c48d2e77e5733ec0f51e98628 SHA256 f094078c5643966890f77c84960087edb63d11a209d2d997843ca7ded3697869 MISC metadata.xml 310 RMD160 769e4f17a9354da6b168b72a5d65d978f65bf6dd SHA1 83aaae376052d69c7327e880cf028ebc0dea608b SHA256 c29d3efc676d8308872920db5223c78469db86ac236b5d45c3ee98ceb8fca846 diff --git a/sys-apps/calculate-install/calculate-install-2.2.21-r3.ebuild b/sys-apps/calculate-install/calculate-install-2.2.21-r3.ebuild new file mode 100644 index 000000000..3a9eca51e --- /dev/null +++ b/sys-apps/calculate-install/calculate-install-2.2.21-r3.ebuild @@ -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.21 + ~sys-apps/calculate-lib-2.2.21 + 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}" + + # some bugfix, add english man + epatch "${FILESDIR}/calculate-install-2.2.21-r3.patch" +} + +pkg_postinst() { + einfo "For configure calculate-install perform:" + einfo " cl-install --install" +} diff --git a/sys-apps/calculate-install/files/calculate-install-2.2.21-r3.patch b/sys-apps/calculate-install/files/calculate-install-2.2.21-r3.patch new file mode 100644 index 000000000..15961ed38 --- /dev/null +++ b/sys-apps/calculate-install/files/calculate-install-2.2.21-r3.patch @@ -0,0 +1,446 @@ +diff --git data/calculate data/calculate +index 1ad6e8d..b6ad94a 100755 +--- data/calculate ++++ data/calculate +@@ -66,7 +66,8 @@ install_video_driver() + + # create user guest if system has not non-root user + create_nonroot_user() { +- if [[ -z $(variable_value cl_migrate_user | sed -r "s/[][,']|root//g") ]] && ++ if which cl-desktop &>/dev/null && ++ [[ -z $(variable_value cl_migrate_user | sed -r "s/[][,']|root//g") ]] && + [[ `variable_value os_install_linux_system` != "server" ]] + then + # passwd of non root user +@@ -83,16 +84,19 @@ create_nonroot_user() { + + # create/update all user profile + configure_users() { +- for user in $(variable_value cl_migrate_user | sed -r "s/[][,']//g") +- do +- cl-desktop $user +- done ++ if which cl-desktop &>/dev/null ++ then ++ for user in $(variable_value cl_migrate_user | sed -r "s/[][,']//g") ++ do ++ cl-desktop $user ++ done ++ fi + } + + start() { + install_video_driver +- LANG=C /usr/bin/cl-install --startup + LANG=C create_nonroot_user ++ LANG=C /usr/bin/cl-install --startup + LANG=C configure_users + + /usr/sbin/env-update +diff --git man/cl-install.1 man/cl-install.1 +new file mode 100644 +index 0000000..a843c0b +--- /dev/null ++++ man/cl-install.1 +@@ -0,0 +1,226 @@ ++.TH CL-INSTALL 1 "August 23, 2011" "Calculate Utilities" "Calculate Linux Installation" ++.SH NAME ++.PP ++cl-install - Installs Calculate Linux on HDD, USB-Flash or USB-HDD ++.SH SYNOPSIS ++[-d] [-w] [--mbr] [--type] [--iso] [-s] [--march] [--build] [-l] [-u] [--hostname] ++[--netconf] [--dhcp] [--ip] [--route] [--dns] [--proxy] [--ntp] [--nouuid] [--set] [-U] [-f] ++[--startup] [--install] [--uninstall] [--nospinner] ++[-P] [-p] [-v] [--filter] [--xml] [--color] [--version] [-h] ++.SH DESCRIPTION ++.PP ++cl-install - Calculate Linux installation tool. It supports installing on Hard Disk Drive, external hard disk and USB-stick. Image, stored in '/var/calculate/linux' or '/var/calculate/remote/linux' is used for installing. In case of installing from LiveCD/LiveUSB booted image is used. ++.PP ++Installation on hard disk can be done in usual mode or in interactive build mode for creating changed distribution. For installing in interactive build mode use '--build'. ++.PP ++Installation on external hard drive differs by the lack of hardware dependence. ++.PP ++By default, installing on USB-flash is done by copying of liveusb image with fat32 as a filesystem and syslinux bootloader. If needed, system can be installed with full file unpacking like installing on HDD. Use '--type' option for it. ++.SH OPTIONS ++.PP ++Options for ++\fBcl-install\fR: ++.PP ++\fB\-d\fR, \fB\-\-disk\fR \fIDISK[:[DIR:FILESYSTEM:OPTIONS]]\fR ++.RS 4 ++DISK - volume for installing or directory in case of remounting the part of filesystem hierarchy. DIR - mounting point, value 'none' cancels mounting point transferring. FILESYSTEM - file system, available values: ext2, ext3, ext4, reiserfs, xfs, jfs, btrfs, nilfs2. OPTIONS - mounting options, see 'man fstab'. For multiple volumes specifying use the option required number of times. ++.RE ++.PP ++\fB\-w\fR, \fB\-\-swap\fR \fIswap volume\fR ++.RS 4 ++.RE ++.PP ++\fB\-\-mbr\fR \fIboot disk\fR ++.RS 4 ++Disk for Master Boot Record (MBR). Value 'off' cancels boot record changing. ++.RE ++.PP ++\fB\-\-type\fR \fIdevice type\fR ++.RS 4 ++Device type. Valid values: hdd, usb-hdd, flash. ++.RE ++.PP ++\fB\-\-iso\fR \fIpath to file\fR ++.RS 4 ++Path to file, containing ISO image with distribution. If not specified, image of the same architecture is sought in '/var/calculate/linux' and '/var/calculate/remote/linux', or livecd is used in case of booting from LiveCD/LiveUSB. At finding multiple images, priority is given to more recent version. ++.RE ++.PP ++\fB\-s\fR, \fB\-\-os\fR \fIdistribution\fR ++.RS 4 ++The choice of the distribution, valid values "CDS", "CLD", "CLDG", "CLDX", "CLS", "CMC" и "CSS". If specified, required distro is sought in '/var/calculate/linux' and '/var/calculate/remote/linux'. ++.RE ++.PP ++\fB\-\-march\fR \fIarchitecture\fR ++.RS 4 ++CPU's architecture choising. Valid values: "i686", "x86_64". If specified, required distro is sought in '/var/calculate/linux' and '/var/calculate/remote/linux'. ++.RE ++.PP ++\fB\-\-build\fR ++.RS 4 ++Installing in interactive build mode. Is valid while installing on HDD. If specified, live image during boot will be mounted in a separate layer of aufs2 filesystem. Additional layers allow to separate changes from the results. ++.RE ++.PP ++\fB\-l\fR, \fB\-\-lang\fR \fIlanguage\fR ++.RS 4 ++Language choice. Valid values: 'bg_BG' - Bulgarian, 'de_DE' -German, 'en_US' - English, 'es_ES' - Spanish, 'fr_FR' - French, 'it_IT' - Italian, 'pl_PL' - Polish, 'pt_BR' - Portugal Brazilian, 'pt_PT' - Portugal , 'ro_RO' - Romanian, 'ru_RU' - Russian, 'uk_UA' - Ukrainian. ++.RE ++.PP ++\fB\-u\fR, \fB\-\-user\fR \fIuser\fR ++.RS 4 ++Users added to the installed system. For adding several users use the option required number of times. ++.RE ++.PP ++\fB\-\-hostname\fR \fIhostname\fR ++.RS 4 ++Short or full form of hostname. ++.RE ++.PP ++\fB\-\-netconf\fR \fInetwork manager\fR ++.RS 4 ++Network manager choice. Valid values: 'openrc' and 'networkmanager'. The latter can be chosen if NetworkManager is a part of the distro. ++.RE ++.PP ++\fB\-\-dhcp\fR \fIinterface\fR ++.RS 4 ++Get IP-address throw DHCP for specified interface. For specifying of two or more interfaces use the option required number of times. ++.RE ++.PP ++\fB\-\-ip\fR \fB[IFACE:]\fR\fIIP\fR ++.RS 4 ++IPv4 network address with CIDR specifying. IFACE can indicate a network interface. The default IFACE value is eth0. E.g. 192.168.0.1/24. Specifying of several network interfaces is allowed. ++.RE ++.PP ++\fB\-\-route\fR NETWORK:[GATEWAY][:IFACE[:SOURCE]] ++.RS 4 ++Routing rule: network, gateway, interface, source IP. For specifying default gateway, NETWORK can be set as 'default'. ++.RE ++.PP ++\fB\-\-dns\fR \fIDNS\fR ++.RS 4 ++Network address of DNS server. ++.RE ++.PP ++\fB\-\-proxy\fR \fIPROXY\fR ++.RS 4 ++Network address of proxy server. ++.RE ++.PP ++\fB\-\-ntp\fR \fINTP\fR ++.RS 4 ++Network address of NTP timeserver. ++.RE ++.PP ++\fB\-\-nouuid\fR ++.RS 4 ++Don't use UUID device names. If specified, usual device names (/dev/sda1, etc.) will be used. Use if you sure in what you do. ++.RE ++.PP ++\fB\-\-set\fR \fIVAR=VALUE\fR ++.RS 4 ++Changes internal variable value of Calculate utilities. For multiple values changing use the option required number of times. ++.RE ++.PP ++\fB\-U\fR, \fB\-\-update\fR ++.RS 4 ++Run install for new versions only. Handy to use with the second volume for system updating and '--force' option. ++.RE ++.PP ++\fB\-f\fR, \fB\-\-force\fR ++.RS 4 ++Don't ask questions while installing. ++.RE ++.PP ++\fB\-\-startup\fR ++.RS 4 ++Run configure of the current system. While running system configuration with templates is done, Calculate-utilities join to autoconfiguring of programs installed by package manager. Command is running while livecd booting or first system boot. It's possible to restore the initial configuration of the system. With language, network, video, etc. configuring options it is possible to change system configuration. ++.RE ++.PP ++\fB\-\-install\fR ++.RS 4 ++Configuring calculate-install for package configuration. Running this in Calculate Linux leads to joining package for autoconfiguring of programs installed by package manager. Utility is run by profile.bashrc script from calculate overlay. ++.RE ++.PP ++\fB\-\-uninstall\fR ++.RS 4 ++Disable package configuring by calculate-install. ++.RE ++.PP ++\fB\-\-nospinner\fR ++.RS 4 ++Disable progress bar of system installing. ++.RE ++.PP ++\fB\-P\fR ++.RS 4 ++Read passwords from standard input. If specified one or more users passwords are read from standard input. ++.RE ++.PP ++\fB\-p\fR, \fB\-\-show-partitions\fR ++.RS 4 ++Show info about present partitions. The info, shown in table view: size, device, label, mounting point, filesystem format, type, installed system. ++.RE ++.PP ++\fB\-v\fR, \fB\-\-show-variables\fR ++.RS 4 ++List environmental variables of Calculate utilities with their values and changing access flag. For full view use '-vv' ++.RE ++.PP ++\fB\-\-filter\fR \fIfilter\fR ++.RS 4 ++Variable filtering. Is used with '--show-variables'. E.g.: 'cl-install -v --filter=*video*'. ++.RE ++.PP ++\fB\-\-xml\fR ++.RS 4 ++Output variables in XML format. Is used with '--show-variables'. ++.RE ++.PP ++\fB\-\-color\fR \fIWHEN\fR ++.RS 4 ++Color using control. WHEN can take values 'never', 'always' or 'auto' for messages output with or without color. ++.RE ++.PP ++\fB\-\-version\fR ++.RS 4 ++Print version number of cl-install program and exit. ++.RE ++.PP ++\fB\-h\fR, \fB\-\-help\fR ++.RS 4 ++Print help and then exit. ++.RE ++.SH SEE ALSO ++.PP ++cl-builder(1), cl-image(1) ++.SH EXAMPLES ++.PP ++System installing to /dev/sda2 ++.nf ++cl-install -d /dev/sda2 ++.fi ++.PP ++Changing video driver on 'fglrx'. Before running be sure 'x11-drivers/ati-drivers' is installed. ++.nf ++cl-install --startup --set os_install_x11_video_drv=fglrx ++.fi ++.PP ++System installing on several partitions. In the example system is installed on sda2, all users settings and data are stored on sda5, sda1 is used as swap. ++.nf ++cl-install -d /dev/sda2 -d /dev/sda5:/var/calculate -d /var/calculate/home:/home -w /dev/sda1 --hostname calculatelinux ++.fi ++.PP ++System installing with network options specifying: ip address 192.168.1.20, mask 255.255.255.0, defailt gateway 192.168.1.1, DNS 192.168.1.2. As a network manager is used OpenRC. ++.nf ++cl-install -d /dev/sda2 --ip 192.168.1.20/24 --route default:192.168.1.1 --dns 192.168.1.2 --netconf openrc ++.fi ++.PP ++Router installing. In the example two network interfaces are configured, Input eth0: ip address 1.2.3.6, mask 255.255.255.252, gateway 1.2.3.5 and output eth1: ip address 192.168.1.1, mask 255.255.255.0. DNS address 8.8.8.8. Routing to network 192.168.3.0/24 is made throw gateway 192.168.1.2. ++.nf ++cl-install -d /dev/sda2 --ip eth0:1.2.3.6/30 --route default:1.2.3.5:eth0 --ip eth1:192.168.1.1 --route 192.168.3.0/24:192.168.1.2:eth1 --dns 8.8.8.8 ++.fi ++.SH AUTHORS ++.PP ++Calculate Utilities are developed by Calculate Ltd. http://www.calculate.ru ++.SH AUTOR ++.PP ++Man page originally written by Calculate Ltd. +diff --git man/ru/cl-install.1 man/ru/cl-install.1 +index f6888eb..57993a7 100644 +--- man/ru/cl-install.1 ++++ man/ru/cl-install.1 +@@ -1,4 +1,4 @@ +-.TH CL-INSTALL 1 "27 июля 2011" "Calculate Utilities" "Установка Calculate Linux" ++.TH CL-INSTALL 1 "23 августа 2011" "Calculate Utilities" "Установка Calculate Linux" + .SH НАЗВАНИЕ + .PP + cl-install - Установка Calculate Linux на жесткий диск, USB-Flash или USB-HDD +@@ -23,7 +23,7 @@ cl-install - программа установки дистрибутива Calc + .PP + \fB\-d\fR, \fB\-\-disk\fR \fIDISK[:[DIR:FILESYSTEM:OPTIONS]]\fR + .RS 4 +-DISK - раздел для установки или директория, в случае перемонтирования части файловой иерархии. DIR - точка монтирования, значение 'none' отменяет перенос точки монтирования. FILESYSTEM - файловая система, доступные значения ext2, ext3, ext4, reiserfs, xfs, jfs, btrfs. OPTIONS - опции монтирования, см. 'man fstab'. Для указания нескольких разделов для установки используйте параметр несколько раз. ++DISK - раздел для установки или директория, в случае перемонтирования части файловой иерархии. DIR - точка монтирования, значение 'none' отменяет перенос точки монтирования. FILESYSTEM - файловая система, доступные значения ext2, ext3, ext4, reiserfs, xfs, jfs, btrfs, nilfs2. OPTIONS - опции монтирования, см. 'man fstab'. Для указания нескольких разделов для установки используйте параметр несколько раз. + .RE + .PP + \fB\-w\fR, \fB\-\-swap\fR \fIраздел подкачки\fR +diff --git pym/cl_distr.py pym/cl_distr.py +index 057e50d..b8775ad 100644 +--- pym/cl_distr.py ++++ pym/cl_distr.py +@@ -136,7 +136,7 @@ class DistributiveRepository: + """Get info from content""" + origfilename = filename + if filename in DistributiveRepository.contentCache: +- return DistributiveRepository.contentCache[filename] ++ return DistributiveRepository.contentCache[filename].copy() + varsShare = self.varsShare + distr = None + # may be directory is isodir (directory which contains iso image) +@@ -184,7 +184,7 @@ class DistributiveRepository: + if distr: + distr.close() + DistributiveRepository.contentCache[origfilename] = d +- return d ++ return d.copy() + + def _getdistrinfo(self,filename): + """Get information by distributive""" +@@ -729,6 +729,7 @@ class PartitionDistributive(Distributive): + 'jfs':'/sbin/mkfs.jfs %s -f %s', + 'reiserfs':'/sbin/mkfs.reiserfs %s -f %s', + 'btrfs':'/sbin/mkfs.btrfs %s %s', ++ 'nilfs2':'/sbin/mkfs.nilfs2 %s %s', + 'xfs':'/sbin/mkfs.xfs %s -f %s', + 'vfat':'/usr/sbin/mkfs.vfat %s -F 32 %s', + 'ntfs-3g':'/usr/sbin/mkfs.ntfs %s -FQ %s', +@@ -739,6 +740,7 @@ class PartitionDistributive(Distributive): + 'ext3':'-L %s', + 'ext4':'-L %s', + 'btrfs':'-L %s', ++ 'nilfs2':'-L %s', + 'jfs':'-L %s', + 'reiserfs':'-l %s', + 'xfs':'-L %s', +@@ -752,6 +754,7 @@ class PartitionDistributive(Distributive): + 'ext4' : '83', + 'reiserfs' : '83', + 'btrfs' : '83', ++ 'nilfs2' : '83', + 'jfs' : '83', + 'xfs' : '83', + 'vfat' : '0b', +@@ -763,6 +766,7 @@ class PartitionDistributive(Distributive): + 'ext4' : '0700', + 'reiserfs' : '0700', + 'btrfs' : '0700', ++ 'nilfs2' : '0700', + 'jfs' : '0700', + 'xfs' : '0700', + 'vfat' : '0700', +diff --git pym/cl_install.py pym/cl_install.py +index 4f83b51..2358f7f 100644 +--- pym/cl_install.py ++++ pym/cl_install.py +@@ -305,6 +305,10 @@ class convertDictOpt: + "pair":{}, + "incompatible":[], + "makefs":"/sbin/mkfs.btrfs"}, ++ "nilfs2":{"options":[], ++ "pair":{}, ++ "incompatible":[], ++ "makefs":"/sbin/mkfs.nilfs2"}, + "jfs":{"options":[], + "pair":{}, + "incompatible":[], +@@ -1634,10 +1638,10 @@ class cl_install(color_print, SignalInterrupt): + _("Legacy grub not support boot from raid or lvm without" + " separate /boot partition")) + return False +- if bootDiskFormat == "btrfs": ++ if bootDiskFormat in ("btrfs","nilfs2"): + self.printERROR( +- _("Legacy grub not support boot from btrfs without" +- " separate /boot partition")) ++ _("Legacy grub not support boot from %s without" ++ " separate /boot partition")%bootDiskFormat) + return False + return True + +diff --git pym/cl_install_cmd.py pym/cl_install_cmd.py +index 3cfa6dd..8ef2078 100644 +--- pym/cl_install_cmd.py ++++ pym/cl_install_cmd.py +@@ -508,3 +508,15 @@ class install_cmd(share_cmd): + return True + else: + return False ++ ++ def parse_args(self, args=None, values=None): ++ """ ++ Preparse for catch non option --live ++ """ ++ rargs = self.optobj._get_args(args) ++ if rargs: ++ for arg in rargs: ++ if arg == "--live": ++ self.optobj.error(_("option %s:") %"--live" +\ ++ " " + _("option is depricated, use '--startup' option")) ++ return self.optobj.parse_args(args,values) +diff --git scripts/cl-install scripts/cl-install +index 441f504..e8e572d 100644 +--- scripts/cl-install ++++ scripts/cl-install +@@ -32,7 +32,7 @@ if __name__ == "__main__": + install = install_cmd() + install.logicObj.initVars() + # set lang +- ret = install.optobj.parse_args() ++ ret = install.parse_args() + if ret is False: + sys.exit(1) + options, args = ret +diff --git setup.py setup.py +index adbe1f0..b843b61 100755 +--- setup.py ++++ setup.py +@@ -83,20 +83,26 @@ class build_man( distutils.core.Command ) : + def finalize_options( self ) : + pass + ++ def _install_man(self,man,baseLocale): ++ baseMan = path.basename(man) ++ man_num = man[-1] ++ manPath = path.join(BUILD_MAN_PATH,baseLocale,"man%s"%man_num) ++ self.mkpath(manPath) ++ manPath = path.join(manPath,baseMan) ++ self.copy_file(man,manPath) ++ cout("compress %s\n"% manPath) ++ system("bzip2 -f %s"%manPath) ++ + def run( self ) : + buildManPath = BUILD_MAN_PATH + self.mkpath(buildManPath) + for locale in glob.glob("man/*"): + baseLocale = path.basename(locale) +- for man in glob.glob("%s/*.[12345678]"%locale) : +- baseMan = path.basename(man) +- man_num = man[-1] +- manPath = path.join(buildManPath,baseLocale,"man%s"%man_num) +- self.mkpath(manPath) +- manPath = path.join(manPath,baseMan) +- self.copy_file(man,manPath) +- cout("compress %s\n"% manPath) +- system("bzip2 -f %s"%manPath) ++ if os.path.isfile(locale) and locale[-1].isdigit(): ++ self._install_man(locale,"") ++ else: ++ for man in glob.glob("%s/*.[12345678]"%locale) : ++ self._install_man(man,baseLocale) + + class install_man( install_data ) : + description = "install man files" diff --git a/sys-apps/calculate-templates/ChangeLog b/sys-apps/calculate-templates/ChangeLog index 74aeb7038..80c7f9f70 100644 --- a/sys-apps/calculate-templates/ChangeLog +++ b/sys-apps/calculate-templates/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*calculate-templates-2.2.21-r3 (23 Aug 2011) + + 23 Aug 2011; Mike Hiretsky (mhiretskiy) + +calculate-templates-2.2.21-r3.ebuild, + +files/calculate-templates-2.2.21-r3.patch: + Update for bugfix + *calculate-templates-2.2.21-r2 (23 Aug 2011) 23 Aug 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-templates/Manifest b/sys-apps/calculate-templates/Manifest index 091ac32de..0f9d1d5b3 100644 --- a/sys-apps/calculate-templates/Manifest +++ b/sys-apps/calculate-templates/Manifest @@ -7,6 +7,7 @@ AUX calculate-templates-2.2.20-fix_cpufreq.patch 2333 RMD160 9b30c305e53000435b6 AUX calculate-templates-2.2.20-fix_mplayer.patch 2537 RMD160 97d2a54996d96065eea9078d95bad24a11c5ddbe SHA1 89dd1da77ee7e40f5b468aba8db97bdf5eff7f9d SHA256 777c3797ebc8b29f30fa2572fb0047037dbc8c50422764d5e1ad6d4d2f665bc9 AUX calculate-templates-2.2.21-r1.patch 4162 RMD160 4c8e5e8e2162ff9a58f09ed3646350587dec5f80 SHA1 c94b55a767251723799fa81c25373f9cca4c2279 SHA256 7cfcabcd241625f05f9a477ce8024732f47e2c7b44448d2466f18bf34ddd39ff AUX calculate-templates-2.2.21-r2.patch 61748 RMD160 18e68d3bb226eed91e5a61ddd11415db2cba9f89 SHA1 3764195fcab6a2bcb2b64027c9665036f2334488 SHA256 cfc7addf84d05ecabd7a3fffede935574a143ffdb0472b864084c94fd92edb01 +AUX calculate-templates-2.2.21-r3.patch 61785 RMD160 64241098bbf79f77fae1431a6b7c337976a21ff0 SHA1 c33b118bb1175d387bd1b96155520332b4c3cbb7 SHA256 ecd27e4406cd54c4a319f5ceb40d767abfaabe438cb037899c159be7456640c1 DIST calculate-templates-2.2.18.tar.bz2 233661 RMD160 c8e42c3ed8860193286ff8eaeddcd1c75bb1ef0b SHA1 f197621e5777c16aca9b892d30ede172eee50522 SHA256 d3d236c7e0760db3ad9ea79f0fed9d9e5f97d69acabbae3bbc9c9d2e62a50984 DIST calculate-templates-2.2.19.tar.bz2 233495 RMD160 bd6ec2efa456b838c15664e7779d01cd760cb124 SHA1 c0f79506fb676a8c37efbdff4a0514a3a8ddb29e SHA256 f5124a64393a3c6d4a03bd3c0065cc7f5a3586f6d5de5362d1b373048b2303ab DIST calculate-templates-2.2.20.tar.bz2 234266 RMD160 7368253076289f8e255ae325e629ffe73da060ec SHA1 b39b75801f8361a36eb6e8ce92da63dfef5230ca SHA256 b907b4630aca4942af66ffe24144959723879d25f4ce72e344639f86223b828a @@ -24,7 +25,8 @@ EBUILD calculate-templates-2.2.20-r2.ebuild 843 RMD160 12e3ca9a026072e3272746252 EBUILD calculate-templates-2.2.20.ebuild 581 RMD160 58415efe9da270f3cbac7be53099e3b3f2d0e9a1 SHA1 4cbf60bac722618b31285280de2279e809c2499f SHA256 e2045f5b13588448a0ab90b751fa4ba76ef85725af4401f34da4499f55053d9c EBUILD calculate-templates-2.2.21-r1.ebuild 695 RMD160 2a38bb7a5c1dc424ce9c9d95fbef8e70a6e485c0 SHA1 ff937d7663857debdacb52fbc8e9c0dc0f0e3f58 SHA256 b4092bab5c9ce7ec500cac4b32b6ea8a9ed706a3688e7ea68257b9664d4bd96e EBUILD calculate-templates-2.2.21-r2.ebuild 715 RMD160 85c7db6494ec112d4b2a381cd231255a8fe772b1 SHA1 b7ddcbbd9ddf8b86c5da68b44dc4ab78810a9469 SHA256 d1f60914a90a0600fddd48f577d5193436ad37f2ea0d4b367ceca9695f4b30ec +EBUILD calculate-templates-2.2.21-r3.ebuild 715 RMD160 7ecbb252bd2991456bdc64d40ea1f97241f355fe SHA1 ce297b57c2afc2cd6eabe7e55c8177c1e8576376 SHA256 f6bf1d62f016c555893c64e6712497ff371634ed8c08d5562561ae00606a96b4 EBUILD calculate-templates-2.2.21.ebuild 581 RMD160 3e8c0e9fd308c52caa861955c86a390a96127202 SHA1 9541b46b0bcf618c33285fd6e5f7167a72e92b31 SHA256 002834f9b50c2641a462562c68ad6715ab32c1c86723af664a833bc3be85eaec EBUILD calculate-templates-2.2.9999.ebuild 572 RMD160 14e53f7c05efbb563b793b1025669cbe79d0838c SHA1 226d287ce0a00609ed6c871321abf5000565227e SHA256 5df16332077472571e2d4aae47e958d1e6efe3a8d694b61053778f75a537142f -MISC ChangeLog 28383 RMD160 97676e237cc5858bc530642194f2a8535b69de1e SHA1 b7feab81883ce88942103e56f837d69ce75d7340 SHA256 2bdded5e62d3255aa50b909dbcb26875f852c8f8687b5d08aa4b4a9c6f7ed777 +MISC ChangeLog 28597 RMD160 51db38fef53fef93af982384c4f6c1b9a31fd2db SHA1 0c0137ff56d2017944af67f91a5be37ba6e982ec SHA256 f20633de1f285097d116776cbb56dacaae0ff5478846494f19c135b8af64beb1 MISC metadata.xml 338 RMD160 4a1a51881bdf09b961217d2056114ca4ccb8b4d2 SHA1 5fcb2724427f9ac5dda07abb5c829c24e6db9ae6 SHA256 175d9ae86b71b291a519414e816b05290d0e4be74726cc8d5449a500c51a3b2d diff --git a/sys-apps/calculate-templates/calculate-templates-2.2.21-r3.ebuild b/sys-apps/calculate-templates/calculate-templates-2.2.21-r3.ebuild new file mode 100644 index 000000000..5ed9e17d2 --- /dev/null +++ b/sys-apps/calculate-templates/calculate-templates-2.2.21-r3.ebuild @@ -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.21" + +RDEPEND="${DEPEND}" + +src_unpack() { + unpack "${A}" + cd "${S}" + + # bugfixes, update xautologin + epatch "${FILESDIR}/calculate-templates-2.2.21-r3.patch" +} + +src_compile() { +: +} + +src_install() { + dodir /usr/share/calculate/templates + insinto /usr/share/calculate/templates + doins -r * +} diff --git a/sys-apps/calculate-templates/files/calculate-templates-2.2.21-r3.patch b/sys-apps/calculate-templates/files/calculate-templates-2.2.21-r3.patch new file mode 100644 index 000000000..bec5e89c0 --- /dev/null +++ b/sys-apps/calculate-templates/files/calculate-templates-2.2.21-r3.patch @@ -0,0 +1,1765 @@ +diff --git desktop/desktop/00-patch-2.2.0.16/.calculate_directory desktop/desktop/00-patch-2.2.0.16/.calculate_directory +deleted file mode 100644 +index f6d18e2..0000000 +--- desktop/desktop/00-patch-2.2.0.16/.calculate_directory ++++ /dev/null +@@ -1 +0,0 @@ +-# Calculate append=skip belong(calculate-desktop)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.0.16 +diff --git desktop/desktop/00-patch-2.2.0.16/1ini_res_def.env desktop/desktop/00-patch-2.2.0.16/1ini_res_def.env +deleted file mode 100644 +index 023f00c..0000000 +--- desktop/desktop/00-patch-2.2.0.16/1ini_res_def.env ++++ /dev/null +@@ -1,12 +0,0 @@ +-# Calculate format=samba path=~/.calculate name=ini.env +- +-[resource] +-desktop = /home/#-ur_login-#/Desktop +-documents = #-ini(resource.path)-#/Documents +-downloads = #-ini(resource.path)-#/Downloads +-music = #-ini(resource.path)-#/Music +-pictures = #-ini(resource.path)-#/Pictures +-public = #-ini(resource.path)-#/Public +-templates = #-ini(resource.path)-#/Templates +-videos = #-ini(resource.path)-#/Videos +- +diff --git desktop/desktop/00-patch-2.2.0.16/2ini_res.env desktop/desktop/00-patch-2.2.0.16/2ini_res.env +deleted file mode 100644 +index ec7ae86..0000000 +--- desktop/desktop/00-patch-2.2.0.16/2ini_res.env ++++ /dev/null +@@ -1,146 +0,0 @@ +-# Calculate format=samba path=~/.calculate name=ini.env +- +-[resource] +-#?os_locale_lang==bg_BG# +-documents = #-ini(resource.path)-#/Документи +-downloads = #-ini(resource.path)-#/Свалени +-music = #-ini(resource.path)-#/Музика +-pictures = #-ini(resource.path)-#/Изображения +-public = #-ini(resource.path)-#/Публични +-templates = #-ini(resource.path)-#/Шаблони +-videos = #-ini(resource.path)-#/Видео +-#os_locale_lang# +-#?os_locale_lang==bg_BG&&ur_domain_set==off# +-desktop = /home/#-ur_login-#/Работен плот +-#os_locale_lang# +- +-#?os_locale_lang==de_DE# +-documents = #-ini(resource.path)-#/Dokumente +-downloads = #-ini(resource.path)-#/Downloads +-music = #-ini(resource.path)-#/Musik +-pictures = #-ini(resource.path)-#/Bilder +-public = #-ini(resource.path)-#/Öffentlich +-templates = #-ini(resource.path)-#/Vorlagen +-videos = #-ini(resource.path)-#/Videos +-#os_locale_lang# +-#?os_locale_lang==de_DE&&ur_domain_set==off# +-desktop = /home/#-ur_login-#/Arbeitsfläche +-#os_locale_lang# +- +-#?os_locale_lang==es_ES# +-documents = #-ini(resource.path)-#/Documentos +-downloads = #-ini(resource.path)-#/Descargas +-music = #-ini(resource.path)-#/Música +-pictures = #-ini(resource.path)-#/Imágenes +-public = #-ini(resource.path)-#/Público +-templates = #-ini(resource.path)-#/Plantillas +-videos = #-ini(resource.path)-#/Vídeos +-#os_locale_lang# +-#?os_locale_lang==es_ES&&ur_domain_set==off# +-desktop = /home/#-ur_login-#/Escritorio +-#os_locale_lang# +- +-#?os_locale_lang==fr_FR# +-documents = #-ini(resource.path)-#/Documents +-downloads = #-ini(resource.path)-#/Téléchargements +-music = #-ini(resource.path)-#/Musique +-pictures = #-ini(resource.path)-#/Images +-public = #-ini(resource.path)-#/Public +-templates = #-ini(resource.path)-#/Modèles +-videos = #-ini(resource.path)-#/Vidéos +-#os_locale_lang# +-#?os_locale_lang==fr_FR&&ur_domain_set==off# +-desktop = /home/#-ur_login-#/Bureau +-#os_locale_lang# +- +-#?os_locale_lang==it_IT# +-documents = #-ini(resource.path)-#/Documenti +-downloads = #-ini(resource.path)-#/Scaricati +-music = #-ini(resource.path)-#/Musica +-pictures = #-ini(resource.path)-#/Immagini +-public = #-ini(resource.path)-#/Pubblici +-templates = #-ini(resource.path)-#/Modelli +-videos = #-ini(resource.path)-#/Video +-#os_locale_lang# +-#?os_locale_lang==it_IT&&ur_domain_set==off# +-desktop = /home/#-ur_login-#/Ambiente grafico +-#os_locale_lang# +- +-#?os_locale_lang==pl_PL# +-documents = #-ini(resource.path)-#/Dokumenty +-downloads = #-ini(resource.path)-#/Pobrane +-music = #-ini(resource.path)-#/Muzyka +-pictures = #-ini(resource.path)-#/Obrazy +-public = #-ini(resource.path)-#/Publiczny +-templates = #-ini(resource.path)-#/Szablony +-videos = #-ini(resource.path)-#/Wideo +-#os_locale_lang# +-#?os_locale_lang==pl_PL&&ur_domain_set==off# +-desktop = /home/#-ur_login-#/Pulpit +-#os_locale_lang# +- +-#?os_locale_lang==pt_BR# +-documents = #-ini(resource.path)-#/Documentos +-downloads = #-ini(resource.path)-#/Download +-music = #-ini(resource.path)-#/Música +-pictures = #-ini(resource.path)-#/Imagens +-public = #-ini(resource.path)-#/Público +-templates = #-ini(resource.path)-#/Modelos +-videos = #-ini(resource.path)-#/Vídeos +-#os_locale_lang# +-#?os_locale_lang==pt_BR&&ur_domain_set==off# +-desktop = /home/#-ur_login-#/Área de trabalho +-#os_locale_lang# +- +-#?os_locale_lang==pt_PT# +-documents = #-ini(resource.path)-#/Documentos +-downloads = #-ini(resource.path)-#/Transferências +-music = #-ini(resource.path)-#/Música +-pictures = #-ini(resource.path)-#/Imagens +-public = #-ini(resource.path)-#/Público +-templates = #-ini(resource.path)-#/Modelos +-videos = #-ini(resource.path)-#/Vídeos +-#os_locale_lang# +-#?os_locale_lang==pt_PT&&ur_domain_set==off# +-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)-#/Загрузки +-music = #-ini(resource.path)-#/Музыка +-pictures = #-ini(resource.path)-#/Картинки +-public = #-ini(resource.path)-#/Общедоступные +-templates = #-ini(resource.path)-#/Шаблоны +-videos = #-ini(resource.path)-#/Видео +-#os_locale_lang# +-#?os_locale_lang==ru_RU&&ur_domain_set==off# +-desktop = /home/#-ur_login-#/Рабочий стол +-#os_locale_lang# +- +-#?os_locale_lang==uk_UA# +-documents = #-ini(resource.path)-#/Документи +-downloads = #-ini(resource.path)-#/Завантаження +-music = #-ini(resource.path)-#/Музика +-pictures = #-ini(resource.path)-#/Картинки +-public = #-ini(resource.path)-#/Загальнодоступні +-templates = #-ini(resource.path)-#/Шаблони +-videos = #-ini(resource.path)-#/Відео +-#os_locale_lang# +-#?os_locale_lang==uk_UA&&ur_domain_set==off# +-desktop = /home/#-ur_login-#/Робочий стіл +-#os_locale_lang# +- +diff --git desktop/desktop/00-patch-2.2.0.16/ini.env desktop/desktop/00-patch-2.2.0.16/ini.env +deleted file mode 100644 +index cccccca..0000000 +--- desktop/desktop/00-patch-2.2.0.16/ini.env ++++ /dev/null +@@ -1,7 +0,0 @@ +-# Calculate format=samba path=~/.calculate +- +-[ver] +-patch = 2.2.0.16 +- +-[update] +-patch = on +diff --git desktop/desktop/00-patch-2.2.10/.calculate_directory desktop/desktop/00-patch-2.2.10/.calculate_directory +index d44b259..9ea3814 100644 +--- desktop/desktop/00-patch-2.2.10/.calculate_directory ++++ desktop/desktop/00-patch-2.2.10/.calculate_directory +@@ -1 +1 @@ +-# Calculate append=skip belong(calculate-desktop)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.10 ++# Calculate append=skip belong(calculate-templates)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.10 +diff --git desktop/desktop/00-patch-2.2.12/.calculate_directory desktop/desktop/00-patch-2.2.12/.calculate_directory +index 92513a1..3f135e2 100644 +--- desktop/desktop/00-patch-2.2.12/.calculate_directory ++++ desktop/desktop/00-patch-2.2.12/.calculate_directory +@@ -1 +1 @@ +-# Calculate append=skip belong(calculate-desktop)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.12 ++# Calculate append=skip belong(calculate-templates)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.12 +diff --git desktop/desktop/00-patch-2.2.13/.calculate_directory desktop/desktop/00-patch-2.2.13/.calculate_directory +index ea391de..81943f4 100644 +--- desktop/desktop/00-patch-2.2.13/.calculate_directory ++++ desktop/desktop/00-patch-2.2.13/.calculate_directory +@@ -1 +1 @@ +-# Calculate append=skip belong(calculate-desktop)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.13 ++# Calculate append=skip belong(calculate-templates)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.13 +diff --git desktop/desktop/00-patch-2.2.22/.calculate_directory desktop/desktop/00-patch-2.2.22/.calculate_directory +new file mode 100644 +index 0000000..9259f63 +--- /dev/null ++++ desktop/desktop/00-patch-2.2.22/.calculate_directory +@@ -0,0 +1 @@ ++# Calculate append=skip belong(calculate-templates)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.22 +diff --git desktop/desktop/00-patch-2.2.22/ini-patch.env desktop/desktop/00-patch-2.2.22/ini-patch.env +new file mode 100644 +index 0000000..6b18c0f +--- /dev/null ++++ desktop/desktop/00-patch-2.2.22/ini-patch.env +@@ -0,0 +1,11 @@ ++# Calculate format=samba path=~/.calculate name=ini.env ini(ver.kde)!= ++ ++[ver] ++kopete = 4.6 ++kwallet = 4.6 ++plasma = 4.6 ++ ++[update] ++kopete = on ++kwallet = on ++plasma = on +diff --git desktop/desktop/00-patch-2.2.22/ini.env desktop/desktop/00-patch-2.2.22/ini.env +new file mode 100644 +index 0000000..7f8174a +--- /dev/null ++++ desktop/desktop/00-patch-2.2.22/ini.env +@@ -0,0 +1,7 @@ ++# Calculate format=samba path=~/.calculate ++ ++[ver] ++patch = 2.2.22 ++ ++[update] ++patch = on +diff --git desktop/desktop/00-patch-2.2.6/.calculate_directory desktop/desktop/00-patch-2.2.6/.calculate_directory +deleted file mode 100644 +index f1b5891..0000000 +--- desktop/desktop/00-patch-2.2.6/.calculate_directory ++++ /dev/null +@@ -1 +0,0 @@ +-# Calculate append=skip belong(calculate-desktop)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.6 +diff --git desktop/desktop/00-patch-2.2.6/audacious2-gtkui.desktop desktop/desktop/00-patch-2.2.6/audacious2-gtkui.desktop +deleted file mode 100644 +index 241f475..0000000 +--- desktop/desktop/00-patch-2.2.6/audacious2-gtkui.desktop ++++ /dev/null +@@ -1 +0,0 @@ +-# Calculate append=remove path=~/.local/share/applications +diff --git desktop/desktop/00-patch-2.2.6/audacious2.desktop desktop/desktop/00-patch-2.2.6/audacious2.desktop +deleted file mode 100644 +index 241f475..0000000 +--- desktop/desktop/00-patch-2.2.6/audacious2.desktop ++++ /dev/null +@@ -1 +0,0 @@ +-# Calculate append=remove path=~/.local/share/applications +diff --git desktop/desktop/00-patch-2.2.6/ini.env desktop/desktop/00-patch-2.2.6/ini.env +deleted file mode 100644 +index c166855..0000000 +--- desktop/desktop/00-patch-2.2.6/ini.env ++++ /dev/null +@@ -1,7 +0,0 @@ +-# Calculate format=samba path=~/.calculate +- +-[ver] +-patch = 2.2.6 +- +-[update] +-patch = on +diff --git desktop/desktop/00-patch-2.2.7/.calculate_directory desktop/desktop/00-patch-2.2.7/.calculate_directory +deleted file mode 100644 +index f06ef76..0000000 +--- desktop/desktop/00-patch-2.2.7/.calculate_directory ++++ /dev/null +@@ -1 +0,0 @@ +-# Calculate append=skip belong(calculate-desktop)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.7 +diff --git desktop/desktop/00-patch-2.2.7/Xcursor.xrdb desktop/desktop/00-patch-2.2.7/Xcursor.xrdb +deleted file mode 100644 +index b3c8ab0..0000000 +--- desktop/desktop/00-patch-2.2.7/Xcursor.xrdb ++++ /dev/null +@@ -1,2 +0,0 @@ +-# Calculate append=replace path=~/.config/xfce4 ini(ver.xfce)!= +-Xcursor.theme: neutral +diff --git desktop/desktop/00-patch-2.2.7/ini.env desktop/desktop/00-patch-2.2.7/ini.env +deleted file mode 100644 +index 5cf6df3..0000000 +--- desktop/desktop/00-patch-2.2.7/ini.env ++++ /dev/null +@@ -1,7 +0,0 @@ +-# Calculate format=samba path=~/.calculate +- +-[ver] +-patch = 2.2.7 +- +-[update] +-patch = on +diff --git desktop/desktop/00-patch-2.2.7/xsettings.xml desktop/desktop/00-patch-2.2.7/xsettings.xml +deleted file mode 100644 +index 54ae4a0..0000000 +--- desktop/desktop/00-patch-2.2.7/xsettings.xml ++++ /dev/null +@@ -1,8 +0,0 @@ +-# Calculate path=~/.config/xfce4/xfconf/xfce-perchannel-xml format=xml_xfce ini(ver.xfce)!= +- +- +- +- +- +- +- +diff --git desktop/desktop/00-patch-2.2.8/.calculate_directory desktop/desktop/00-patch-2.2.8/.calculate_directory +deleted file mode 100644 +index ef8044f..0000000 +--- desktop/desktop/00-patch-2.2.8/.calculate_directory ++++ /dev/null +@@ -1 +0,0 @@ +-# Calculate append=skip belong(calculate-desktop)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.8 +diff --git desktop/desktop/00-patch-2.2.8/10000000043.desktop desktop/desktop/00-patch-2.2.8/10000000043.desktop +deleted file mode 100644 +index 4e116f5..0000000 +--- desktop/desktop/00-patch-2.2.8/10000000043.desktop ++++ /dev/null +@@ -1,3 +0,0 @@ +-# Calculate format=kde ini(ver.xfce)!= link=/usr/share/applications/leafpad.desktop path=~/.config/xfce4/panel/launcher-43 +-[Desktop Entry] +-X-XFCE-Source=file:///usr/share/applications/leafpad.desktop +diff --git desktop/desktop/00-patch-2.2.8/ini.env desktop/desktop/00-patch-2.2.8/ini.env +deleted file mode 100644 +index 35b0f29..0000000 +--- desktop/desktop/00-patch-2.2.8/ini.env ++++ /dev/null +@@ -1,7 +0,0 @@ +-# Calculate format=samba path=~/.calculate +- +-[ver] +-patch = 2.2.8 +- +-[update] +-patch = on +diff --git desktop/desktop/00-patch-2.2.8/kcminputrc desktop/desktop/00-patch-2.2.8/kcminputrc +deleted file mode 100644 +index 059b0d8..0000000 +--- desktop/desktop/00-patch-2.2.8/kcminputrc ++++ /dev/null +@@ -1,8 +0,0 @@ +-# Calculate format=kde ini(ver.kde)!= path=~/.kde4/share/config +-[$Version] +-#для отмены сброса настройки cursorTheme +-update_info=mouse_cursor_theme.upd:kde3.4.99 +- +-[Mouse] +-#тема курсоров мыши +-cursorTheme=neutral +diff --git desktop/desktop/00-patch-2.2.8/kcminputrc-bad desktop/desktop/00-patch-2.2.8/kcminputrc-bad +deleted file mode 100644 +index b9e0ea2..0000000 +--- desktop/desktop/00-patch-2.2.8/kcminputrc-bad ++++ /dev/null +@@ -1,2 +0,0 @@ +-# Calculate ini(ver.kde)!= append=remove name=kcminputrc +- +diff --git desktop/desktop/00-patch-2.2.8/leafpadrc desktop/desktop/00-patch-2.2.8/leafpadrc +deleted file mode 100644 +index 62d9e78..0000000 +--- desktop/desktop/00-patch-2.2.8/leafpadrc ++++ /dev/null +@@ -1,8 +0,0 @@ +-# Calculate ini(ver.xfce)!= path=~/.config/leafpad +-0.8.17 +-600 +-400 +-Droid Sans Mono 10 +-1 +-0 +-0 +diff --git desktop/desktop/00-patch-2.2.8/xfce4-panel.xml desktop/desktop/00-patch-2.2.8/xfce4-panel.xml +deleted file mode 100644 +index 8eeac10..0000000 +--- desktop/desktop/00-patch-2.2.8/xfce4-panel.xml ++++ /dev/null +@@ -1,12 +0,0 @@ +-# Calculate format=xml_xfce ini(ver.xfce)!= path=~/.config/xfce4/xfconf/xfce-perchannel-xml +- +- +- +- +- +- +- +- +- +- +- +diff --git desktop/desktop/00-patch-2.2.9/.calculate_directory desktop/desktop/00-patch-2.2.9/.calculate_directory +deleted file mode 100644 +index 4a1be37..0000000 +--- desktop/desktop/00-patch-2.2.9/.calculate_directory ++++ /dev/null +@@ -1 +0,0 @@ +-# Calculate append=skip belong(calculate-desktop)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.9 +diff --git desktop/desktop/00-patch-2.2.9/dolphinrc desktop/desktop/00-patch-2.2.9/dolphinrc +deleted file mode 100644 +index 875c51e..0000000 +--- desktop/desktop/00-patch-2.2.9/dolphinrc ++++ /dev/null +@@ -1,4 +0,0 @@ +-# Calculate format=kde ini(ver.kde)!= path=~/.kde4/share/config +-[MainWindow] +-ToolBarsMovable=Disabled +- +diff --git desktop/desktop/00-patch-2.2.9/ini.env desktop/desktop/00-patch-2.2.9/ini.env +deleted file mode 100644 +index 3f00b77..0000000 +--- desktop/desktop/00-patch-2.2.9/ini.env ++++ /dev/null +@@ -1,7 +0,0 @@ +-# Calculate format=samba path=~/.calculate +- +-[ver] +-patch = 2.2.9 +- +-[update] +-patch = on +diff --git desktop/desktop/00-patch-2.2.9/plasmarc desktop/desktop/00-patch-2.2.9/plasmarc +deleted file mode 100644 +index b9a1272..0000000 +--- desktop/desktop/00-patch-2.2.9/plasmarc ++++ /dev/null +@@ -1,4 +0,0 @@ +-# Calculate format=plasma ini(ver.kde)!= path=~/.kde4/share/config +-[Theme] +-name=slim-glow +- +diff --git desktop/desktop/00-patch-2.2.9/send-attach.desktop desktop/desktop/00-patch-2.2.9/send-attach.desktop +deleted file mode 100644 +index 9590ed5..0000000 +--- desktop/desktop/00-patch-2.2.9/send-attach.desktop ++++ /dev/null +@@ -1,21 +0,0 @@ +-# Calculate format=kde ini(ver.kde)!= path=~/.kde4/share/kde4/services/ServiceMenu +-[Desktop Entry] +-Type=Service +-X-KDE-ServiceTypes=KonqPopupMenu/Plugin,all/allfiles +-Actions=openKmailAttachment +-Encoding=UTF-8 +-MimeType=application/octet-stream +-ExcludeServiceTypes=application/x-iso,kdedevice/*,inode/directory +- +-[Desktop Action openKmailAttachment] +-Name=Send File As Attachment +-Name[de]=Datei als Anhang versenden +-Name[en]=Send File As Attachment +-Name[fr]=Envoyer le fichier en pièce jointe +-Name[pt]=Enviar por correio-e +-Name[sk]=Poslať e-mailom +-Name[ru]=Отправить в KMail +- +-Icon=kmail +-Exec=kmail --composer --attach %F `echo attachment=\'file://%F\' | sed 's/ \//,file:\/\/\//g'` +-X-Ubuntu-Gettext-Domain=desktop_kdebase +diff --git desktop/desktop/20-kde-4.6/.kde4/share/apps/kopete/kopetechatwindow.rc desktop/desktop/20-kde-4.6/.kde4/share/apps/kopete/kopetechatwindow.rc +deleted file mode 100644 +index 4708080..0000000 +--- desktop/desktop/20-kde-4.6/.kde4/share/apps/kopete/kopetechatwindow.rc ++++ /dev/null +@@ -1,7 +0,0 @@ +- +- +- +- +- +- +- +diff --git desktop/desktop/20-kde-4.6/.kde4/share/apps/kopete/kopeteemailwindow.rc desktop/desktop/20-kde-4.6/.kde4/share/apps/kopete/kopeteemailwindow.rc +deleted file mode 100644 +index 5f7c52b..0000000 +--- desktop/desktop/20-kde-4.6/.kde4/share/apps/kopete/kopeteemailwindow.rc ++++ /dev/null +@@ -1,7 +0,0 @@ +- +- +- +- +- +- +- +diff --git desktop/desktop/20-kde-4.6/.kde4/share/apps/kwallet/kdewallet.kwl desktop/desktop/20-kde-4.6/.kde4/share/apps/kwallet/kdewallet.kwl +deleted file mode 100644 +index 3e8774c..0000000 +Binary files desktop/desktop/20-kde-4.6/.kde4/share/apps/kwallet/kdewallet.kwl and /dev/null differ +diff --git desktop/desktop/20-kde-4.6/.kde4/share/config/kdeglobals desktop/desktop/20-kde-4.6/.kde4/share/config/kdeglobals +index 4015931..150bd84 100644 +--- desktop/desktop/20-kde-4.6/.kde4/share/config/kdeglobals ++++ desktop/desktop/20-kde-4.6/.kde4/share/config/kdeglobals +@@ -5,15 +5,7 @@ emoticonsTheme=KMess-Cartoon + + #Fonts + [General] +-#?pkg(www-client/chromium)!=# +-BrowserApplication[$e]=file:///usr/share/applications/chromium-chromium.desktop +-#pkg# +-#?pkg(www-client/firefox)!=&&pkg(www-client/chromium)==# +-BrowserApplication[$e]=file:///home/#-ur_login-#/.local/share/applications/mozilla-firefox.desktop +-#pkg# +-#?pkg(www-client/firefox)==&&pkg(www-client/chromium)==# +-BrowserApplication[$e]=file:///usr/share/applications/kde4/konqbrowser.desktop +-#pkg# ++BrowserApplication[$e]=file:///usr/share/applications/calculate-browser.desktop + XftHintStyle=hintmedium + #?pkg(media-fonts/droid)!=# + desktopFont=Droid Sans,10,-1,5,50,0,0,0,0,0 +diff --git desktop/desktop/20-kde-4.6/.kde4/share/config/kopete.notifyrc desktop/desktop/20-kde-4.6/.kde4/share/config/kopete.notifyrc +deleted file mode 100644 +index 0e256cb..0000000 +--- desktop/desktop/20-kde-4.6/.kde4/share/config/kopete.notifyrc ++++ /dev/null +@@ -1,9 +0,0 @@ +-# Calculate format=kde +-[Event/kopete_contact_incoming] +-#реакция на входящее сообщение +-Action=Sound|Popup|Taskbar +- +-[Event/kopete_contact_online] +-#реакция когда пользователь вошел в сеть +-Action= +- +diff --git desktop/desktop/20-kde-4.6/.kde4/share/config/kopeterc desktop/desktop/20-kde-4.6/.kde4/share/config/kopeterc +deleted file mode 100644 +index cb33211..0000000 +--- desktop/desktop/20-kde-4.6/.kde4/share/config/kopeterc ++++ /dev/null +@@ -1,89 +0,0 @@ +-# Calculate format=kde append=replace +-#?env(client.os_remote_auth)!=&&ur_domain_set==on&&server(jabber.host)!=# +-[Account_JabberProtocol_#-ur_jid-#] +-AccountId=#-ur_jid-# +-AllowPlainTextPassword=true +-CustomServer=true +-Port=#-server(jabber.port)-# +-Protocol=JabberProtocol +-RememberPassword=true +-Server=#-server(jabber.host)-# +-UseSSL=true +-#env# +- +-[Behavior] +-#подключаться автоматически +-#?pkg(kde-base/kopete)<4.2# +-autoConnect=true +-#pkg# +-#?pkg(kde-base/kopete)>=4.2# +-initialStatus=Online +-#pkg# +- +-[ContactList] +-#показывать фотографии пользователей (если есть) +-contactListIconMode=IconPhoto +-#показывать пользователей не в сети +-showOfflineUsers=false +- +-[General Options] +-#размер окна +-Geometry=230,600 +-#фиксация панели инструментов +-#ToolBarsMovable=Disabled +-#отображение строки меню +-MenuBar=Disabled +-#статусная строка свернута +-ShownIdentityId= +- +-#[KopeteChatWindowIndividualMode][Toolbar mainToolBar] +-#отображение иконок в окне диалога +-#ToolButtonStyle=IconOnly +- +-#размер окна чата +-[KopeteChatWindowIndividualMode] +-#положение разделителя истории +-ChatViewSplitter=AAAA/wAAAAAAAAACAAAAlQAAAFMAAAAAAwEAAAAC +-Height 768=400 +-Height 800=400 +-Height 900=400 +-Height 1024=400 +-Height 1050=400 +-Height 1200=400 +-Width 1024=500 +-Width 1280=500 +-Width 1440=500 +-Width 1600=500 +-Width 1680=500 +-Width 1920=500 +- +-[MainWindow] +-Height 768=400 +-Height 800=400 +-Height 900=400 +-Height 1024=400 +-Height 1050=400 +-Height 1200=400 +-Width 1024=500 +-Width 1280=500 +-Width 1440=500 +-Width 1600=500 +-Width 1680=500 +-Width 1920=500 +- +-[Notification Messages] +-#?env(client.os_remote_auth)!=&&ur_domain_set==on&&server(jabber.host)!=# +-#выдавать предупреждение при проверке сертификата защищенного соединения +-KopeteTLSWarning#-ur_jid_host-#InvalidCertSelfSigned=false +-#env# +-#предупреждать что программа остается запущенной при закрытии главного окна +-hideOnCloseInfo=false +- +-[QuickSearchBar Settings] +-#скрытие панели поиска +-Hidden=true +- +-[ToolBar Settings] +-#отображение иконок в окне приложения +-ToolButtonStyle=IconOnly +- +diff --git desktop/desktop/20-kde-4.6/.kde4/share/config/kwalletrc desktop/desktop/20-kde-4.6/.kde4/share/config/kwalletrc +deleted file mode 100644 +index 02ee787..0000000 +--- desktop/desktop/20-kde-4.6/.kde4/share/config/kwalletrc ++++ /dev/null +@@ -1,10 +0,0 @@ +-# Calculate format=kde +-#applications that access is allowed +-[Auto Allow] +-kdewallet=Kopete,KMail,Konqueror,Chrome,Network Management,KDE Daemon,KDE-Dienst,Servicio de KDE,Démon de KDE,Demone KDE,Servidor do KDE,Serviço do KDE,Demon KDE,Служба KDE,Фонова служба KDE +- +-[Wallet] +-Close When Idle=false +-Enabled=true +-First Use=false +-Use One Wallet=true +diff --git desktop/desktop/20-kde-4.6/.kde4/share/config/plasma-desktop-appletsrc desktop/desktop/20-kde-4.6/.kde4/share/config/plasma-desktop-appletsrc +deleted file mode 100644 +index 672f36e..0000000 +--- desktop/desktop/20-kde-4.6/.kde4/share/config/plasma-desktop-appletsrc ++++ /dev/null +@@ -1,358 +0,0 @@ +-# Calculate format=plasma append=replace +-#------------------------------------------------------------------------------ +-#рабочий стол +-#------------------------------------------------------------------------------ +-[AppletGlobals][plasma_applet_pager] +-rows=1 +- +-[Containments][#-sum(cont,1)-#] +-activity= +-alignToGrid=true +-customIconSize=48 +-desktop=0 +-filter=0 +-filterFiles=* +-formfactor=0 +-geometry=0,0,#-os_x11_width-#,#-os_x11_height-# +-iconsLocked=false +-immutability=1 +-location=0 +-mimeFilter= +-plugin=folderview +-screen=0 +-url=desktop:/ +-wallpaperplugin=image +-wallpaperpluginmode=SingleImage +-#-sum(iconx,,10)-# +-#-sum(icony,,10)-# +-#-sum(iconcx,,112)-# +-#-sum(iconcy,,100)-# +-#-sum(iconcount,,2)-# +-savedPositions=1,7,Home.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,Share.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,FTP.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,#-sum(iconx,,10)-##-sum(icony,,icony+iconcy)-#calculate-install.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,partitionmanager.desktop,#-sum(iconx,iconx,10)-#,#-sum(icony,icony,icony+iconcy)-#,README.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,calculate-community.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-# +-zvalue=0 +-sortColumn=-1 +- +-[Containments][#-sum(cont,cont)-#][Wallpaper][image] +-slideTimer=600 +-slidepaths=/usr/share/wallpapers/ +-userswallpapers= +-wallpaper=/usr/share/wallpapers/Calculate_Linux +-wallpapercolor=56,111,150 +-wallpaperposition=0 +- +-#------------------------------------------------------------------------------ +-#верхняя панель +-#------------------------------------------------------------------------------ +-#-sum(panel,,31)-# +-#-sum(apporder,,0)-# +- +-[Containments][-#-sum(cont,cont+1)-#] +-desktop=-1 +-formfactor=2 +-geometry=0,0,#-os_x11_width-#,#-sum(panel,panel)-# +-immutability=1 +-location=3 +-plugin=panel +-screen=0 +-zvalue=150 +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,cont*100)-#] +-immutability=1 +-plugin=simplelauncher +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-icon=kde +-#?env(client.os_remote_auth)==||ur_domain_set==off# +-views=Applications,RunCommand,Leave +-#env# +-#?env(client.os_remote_auth)!=&&ur_domain_set==on# +-views=Applications,RunCommand,SwitchUser,LockScreen,Logout +-#env# +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder)-# +- +-#?env(client.os_remote_auth)==||ur_domain_set==off# +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=icon +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-Url=file:///home/#-ur_login-# +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +-#env# +- +-#?env(client.os_remote_auth)!=&&ur_domain_set==on# +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=icon +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-Url=file:///home/#-ur_login-#/Home +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=icon +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-Url=file:///home/#-ur_login-#/Share +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +-#env# +- +-#?env(client.os_remote_auth)!=&&ur_domain_set==on&&server(ftp.host)!=# +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=icon +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-Url=file:///home/#-ur_login-#/FTP +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +-#env# +-#?server(ftp.host)==# +-[Containments][#-sum(cont,cont)-#][Applets][!#-sum(app,app+1)-#] +-#-sum(apporder,,apporder+1)-# +-#server# +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=pager +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-#показывать номер рабочего стола - 0 +-displayedText=0 +-#отображать значки +-showWindowIcons=true +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=tasks +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-#группирование +-groupingStrategy=0 +-#максимум строк +-maxRows=1 +-#показывать задачи только с текущего рабочего стола +-showOnlyCurrentDesktop=true +-#сортировка +-sortingStrategy=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=trash +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +- +-[Containments][#-sum(cont,cont)-#][Applets][!#-sum(app,app+1)-#] +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=systemtray +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-hidden=kwalletmanager +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=digital-clock +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +- +-[Containments][#-sum(cont,cont)-#][Applets][999] +-immutability=1 +-plugin=lockout +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][999][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +- +-[Containments][#-sum(cont,cont)-#][Configuration] +-maximumSize=#-os_x11_width-#,#-sum(panel,panel)-# +-minimumSize=#-os_x11_width-#,#-sum(panel,panel)-# +- +-#------------------------------------------------------------------------------ +-#нижняя панель +-#------------------------------------------------------------------------------ +- +-#-sum(height,,44)-# +-#?hr_cdrom_set==on# +-#-sum(width,,height*14)-# +-#hr_cdrom_set# +-#?hr_cdrom_set==off# +-#-sum(width,,height*13)-# +-#hr_cdrom_set# +-#-sum(apporder,,0)-# +- +-#?pkg(net-irc/konversation)!=# +-#-sum(width,,width+height)-# +-#pkg# +- +-[Containments][-#-sum(cont,cont+1)-#] +-desktop=-1 +-formfactor=2 +-geometry=0,0,#-sum(width,width)-#,#-sum(height,height)-# +-immutability=1 +-location=4 +-plugin=panel +-screen=0 +-zvalue=150 +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,cont*100)-#] +-immutability=1 +-plugin=icon +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-Url=file:///usr/share/applications/calculate-browser.desktop +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder)-# +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=icon +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-Url=file:///usr/share/applications/calculate-mail.desktop +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +- +-#?pkg(net-irc/konversation)!=# +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=icon +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-Url=file:///usr/share/applications/calculate-chat.desktop +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +-#pkg# +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=icon +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-Url=file:///usr/share/applications/calculate-im.desktop +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=icon +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-Url=file:///usr/share/applications/calculate-writer.desktop +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=icon +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-Url=file:///usr/share/applications/calculate-calc.desktop +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=icon +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-Url=file:///usr/share/applications/calculate-calculator.desktop +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=icon +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-Url=file:///usr/share/applications/calculate-imageedit.desktop +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=icon +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-Url=file:///usr/share/applications/calculate-imageview.desktop +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=icon +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-Url=file:///usr/share/applications/calculate-audioplayer.desktop +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=icon +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-Url=file:///usr/share/applications/calculate-videoplayer.desktop +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +- +-#?hr_cdrom_set==on# +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=icon +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-Url=file:///usr/share/applications/calculate-imageburn.desktop +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +-#hr_cdrom_set# +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=icon +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-Url=file:///usr/share/applications/calculate-dict.desktop +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=icon +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-Url=file:///usr/share/applications/calculate-textedit.desktop +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=icon +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-Url=file:///usr/share/applications/calculate-terminal.desktop +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +- +-[General] +-immutability=2 +- +-[Containments][#-sum(cont,cont)-#][Configuration] +-maximumSize=#-sum(width,width)-#,#-sum(height,height)-# +-minimumSize=#-sum(width,width)-#,#-sum(height,height)-# +- +diff --git desktop/desktop/20-kde-4.6/.kde4/share/config/plasma-desktoprc desktop/desktop/20-kde-4.6/.kde4/share/config/plasma-desktoprc +deleted file mode 100644 +index da6d215..0000000 +--- desktop/desktop/20-kde-4.6/.kde4/share/config/plasma-desktoprc ++++ /dev/null +@@ -1,21 +0,0 @@ +-# Calculate format=plasma +-#расположение панелей +-[PlasmaViews][1] +-Alignment=132 +-Offset=0 +-panelVisibility=1 +- +-[PlasmaViews][2] +-Alignment=132 +-Offset=0 +-panelVisibility=1 +- +-[PlasmaViews][3] +-Offset=0 +-panelVisibility=0 +- +-[ViewIds] +-1=1 +-2=3 +-3=2 +- +diff --git desktop/desktop/20-kde-4.6/.kde4/share/config/plasmarc desktop/desktop/20-kde-4.6/.kde4/share/config/plasmarc +deleted file mode 100644 +index 133c3ab..0000000 +--- desktop/desktop/20-kde-4.6/.kde4/share/config/plasmarc ++++ /dev/null +@@ -1,5 +0,0 @@ +-# Calculate format=plasma +-#оформление +-[Theme] +-name=slim-glow +- +diff --git desktop/desktop/20-kopete-4.6/.calculate_directory desktop/desktop/20-kopete-4.6/.calculate_directory +new file mode 100644 +index 0000000..03e969f +--- /dev/null ++++ desktop/desktop/20-kopete-4.6/.calculate_directory +@@ -0,0 +1 @@ ++# Calculate append=skip belong(kopete)!=&&ini(update.kopete)!=off&&ini(ver.kopete)==&&pkg(kde-base/kopete)>=4.6 +diff --git desktop/desktop/20-kopete-4.6/ini.env desktop/desktop/20-kopete-4.6/ini.env +new file mode 100644 +index 0000000..f4970fe +--- /dev/null ++++ desktop/desktop/20-kopete-4.6/ini.env +@@ -0,0 +1,7 @@ ++# Calculate format=samba path=~/.calculate ++ ++[ver] ++kopete = 4.6 ++ ++[update] ++kopete = on +diff --git desktop/desktop/20-kopete-4.6/kopete.notifyrc desktop/desktop/20-kopete-4.6/kopete.notifyrc +new file mode 100644 +index 0000000..21911c8 +--- /dev/null ++++ desktop/desktop/20-kopete-4.6/kopete.notifyrc +@@ -0,0 +1,10 @@ ++# Calculate format=kde path=~/.kde4/share/config ++ ++[Event/kopete_contact_incoming] ++# response to an incoming message ++Action=Sound|Popup|Taskbar ++ ++[Event/kopete_contact_online] ++# reaction to the birth of a user in the online ++Action= ++ +diff --git desktop/desktop/20-kopete-4.6/kopetechatwindow.rc desktop/desktop/20-kopete-4.6/kopetechatwindow.rc +new file mode 100644 +index 0000000..0ad4d8d +--- /dev/null ++++ desktop/desktop/20-kopete-4.6/kopetechatwindow.rc +@@ -0,0 +1,8 @@ ++# Calculate path=~/.kde4/share/apps/kopete ++ ++ ++ ++ ++ ++ ++ +diff --git desktop/desktop/20-kopete-4.6/kopeteemailwindow.rc desktop/desktop/20-kopete-4.6/kopeteemailwindow.rc +new file mode 100644 +index 0000000..c7dfbff +--- /dev/null ++++ desktop/desktop/20-kopete-4.6/kopeteemailwindow.rc +@@ -0,0 +1,8 @@ ++# Calculate path=~/.kde4/share/apps/kopete ++ ++ ++ ++ ++ ++ ++ +diff --git desktop/desktop/20-kopete-4.6/kopeterc desktop/desktop/20-kopete-4.6/kopeterc +new file mode 100644 +index 0000000..d888cfa +--- /dev/null ++++ desktop/desktop/20-kopete-4.6/kopeterc +@@ -0,0 +1,86 @@ ++# Calculate format=kde append=replace path=~/.kde4/share/config ++ ++#?env(client.os_remote_auth)!=&&ur_domain_set==on&&server(jabber.host)!=# ++[Account_JabberProtocol_#-ur_jid-#] ++AccountId=#-ur_jid-# ++AllowPlainTextPassword=true ++CustomServer=true ++Port=#-server(jabber.port)-# ++Protocol=JabberProtocol ++RememberPassword=true ++Server=#-server(jabber.host)-# ++UseSSL=true ++#env# ++ ++[Behavior] ++# automatically connect ++#?pkg(kde-base/kopete)<4.2# ++autoConnect=true ++#pkg# ++#?pkg(kde-base/kopete)>=4.2# ++initialStatus=Online ++#pkg# ++ ++[ContactList] ++contactListIconMode=IconPhoto ++showOfflineUsers=false ++ ++[General Options] ++Geometry=230,600 ++# fixation toolbar ++#ToolBarsMovable=Disabled ++MenuBar=Disabled ++# the status bar is minimized ++ShownIdentityId= ++ ++#[KopeteChatWindowIndividualMode][Toolbar mainToolBar] ++# map icon in the dialog box ++#ToolButtonStyle=IconOnly ++ ++# size of the chat window ++[KopeteChatWindowIndividualMode] ++# position of the splitter stories ++ChatViewSplitter=AAAA/wAAAAAAAAACAAAAlQAAAFMAAAAAAwEAAAAC ++Height 768=400 ++Height 800=400 ++Height 900=400 ++Height 1024=400 ++Height 1050=400 ++Height 1200=400 ++Width 1024=500 ++Width 1280=500 ++Width 1440=500 ++Width 1600=500 ++Width 1680=500 ++Width 1920=500 ++ ++[MainWindow] ++Height 768=400 ++Height 800=400 ++Height 900=400 ++Height 1024=400 ++Height 1050=400 ++Height 1200=400 ++Width 1024=500 ++Width 1280=500 ++Width 1440=500 ++Width 1600=500 ++Width 1680=500 ++Width 1920=500 ++ ++[Notification Messages] ++#?env(client.os_remote_auth)!=&&ur_domain_set==on&&server(jabber.host)!=# ++# issue a warning when verifying a certificate protected connection ++KopeteTLSWarning#-ur_jid_host-#InvalidCertSelfSigned=false ++#env# ++# warn that the program is running when you close the main window ++hideOnCloseInfo=false ++ ++[QuickSearchBar Settings] ++# hide search bar ++Hidden=true ++ ++[ToolBar Settings] ++# display icons in the application ++ToolButtonStyle=IconOnly ++ +diff --git desktop/desktop/20-kwallet-4.6/.calculate_directory desktop/desktop/20-kwallet-4.6/.calculate_directory +new file mode 100644 +index 0000000..b2d6a13 +--- /dev/null ++++ desktop/desktop/20-kwallet-4.6/.calculate_directory +@@ -0,0 +1 @@ ++# Calculate append=skip belong(kwallet)!=&&ini(update.kwallet)!=off&&ini(ver.kwallet)==&&pkg(kde-base/kwallet)>=4.6 +diff --git desktop/desktop/20-kwallet-4.6/ini.env desktop/desktop/20-kwallet-4.6/ini.env +new file mode 100644 +index 0000000..713626c +--- /dev/null ++++ desktop/desktop/20-kwallet-4.6/ini.env +@@ -0,0 +1,7 @@ ++# Calculate format=samba path=~/.calculate ++ ++[ver] ++kwallet = 4.6 ++ ++[update] ++kwallet = on +diff --git desktop/desktop/20-kwallet-4.6/kwallet/.calculate_directory desktop/desktop/20-kwallet-4.6/kwallet/.calculate_directory +new file mode 100644 +index 0000000..ab3ea29 +--- /dev/null ++++ desktop/desktop/20-kwallet-4.6/kwallet/.calculate_directory +@@ -0,0 +1 @@ ++# Calculate path=~/.kde4/share/apps +diff --git desktop/desktop/20-kwallet-4.6/kwallet/kdewallet.kwl desktop/desktop/20-kwallet-4.6/kwallet/kdewallet.kwl +new file mode 100644 +index 0000000..3e8774c +Binary files /dev/null and desktop/desktop/20-kwallet-4.6/kwallet/kdewallet.kwl differ +diff --git desktop/desktop/20-kwallet-4.6/kwalletrc desktop/desktop/20-kwallet-4.6/kwalletrc +new file mode 100644 +index 0000000..5243adc +--- /dev/null ++++ desktop/desktop/20-kwallet-4.6/kwalletrc +@@ -0,0 +1,11 @@ ++# Calculate format=kde path=~/.kde4/share/config ++ ++# Applications that access is allowed ++[Auto Allow] ++kdewallet=Kopete,KMail,Konqueror,Chrome,Network Management,KDE Daemon,KDE-Dienst,Servicio de KDE,Démon de KDE,Demone KDE,Servidor do KDE,Serviço do KDE,Demon KDE,Служба KDE,Фонова служба KDE ++ ++[Wallet] ++Close When Idle=false ++Enabled=true ++First Use=false ++Use One Wallet=true +diff --git desktop/desktop/20-plasma-4.6/.calculate_directory desktop/desktop/20-plasma-4.6/.calculate_directory +new file mode 100644 +index 0000000..1eed3c1 +--- /dev/null ++++ desktop/desktop/20-plasma-4.6/.calculate_directory +@@ -0,0 +1 @@ ++# Calculate append=skip belong(plasma-workspace)!=&&ini(update.plasma)!=off&&ini(ver.plasma)==&&pkg(kde-base/plasma-workspace)>=4.6 +diff --git desktop/desktop/20-plasma-4.6/ini.env desktop/desktop/20-plasma-4.6/ini.env +new file mode 100644 +index 0000000..73be5bf +--- /dev/null ++++ desktop/desktop/20-plasma-4.6/ini.env +@@ -0,0 +1,7 @@ ++# Calculate format=samba path=~/.calculate ++ ++[ver] ++plasma = 4.6 ++ ++[update] ++plasma = on +diff --git desktop/desktop/20-plasma-4.6/plasma-desktop-appletsrc desktop/desktop/20-plasma-4.6/plasma-desktop-appletsrc +new file mode 100644 +index 0000000..d4799d6 +--- /dev/null ++++ desktop/desktop/20-plasma-4.6/plasma-desktop-appletsrc +@@ -0,0 +1,358 @@ ++# Calculate format=plasma append=replace path=~/.kde4/share/config ++#------------------------------------------------------------------------------ ++#рабочий стол ++#------------------------------------------------------------------------------ ++[AppletGlobals][plasma_applet_pager] ++rows=1 ++ ++[Containments][#-sum(cont,1)-#] ++activity= ++alignToGrid=true ++customIconSize=48 ++desktop=0 ++filter=0 ++filterFiles=* ++formfactor=0 ++geometry=0,0,#-os_x11_width-#,#-os_x11_height-# ++iconsLocked=false ++immutability=1 ++location=0 ++mimeFilter= ++plugin=folderview ++screen=0 ++url=desktop:/ ++wallpaperplugin=image ++wallpaperpluginmode=SingleImage ++#-sum(iconx,,10)-# ++#-sum(icony,,10)-# ++#-sum(iconcx,,112)-# ++#-sum(iconcy,,100)-# ++#-sum(iconcount,,2)-# ++savedPositions=1,7,Home.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,Share.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,FTP.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,#-sum(iconx,,10)-##-sum(icony,,icony+iconcy)-#calculate-install.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,partitionmanager.desktop,#-sum(iconx,iconx,10)-#,#-sum(icony,icony,icony+iconcy)-#,README.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,calculate-community.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-# ++zvalue=0 ++sortColumn=-1 ++ ++[Containments][#-sum(cont,cont)-#][Wallpaper][image] ++slideTimer=600 ++slidepaths=/usr/share/wallpapers/ ++userswallpapers= ++wallpaper=/usr/share/wallpapers/Calculate_Linux ++wallpapercolor=56,111,150 ++wallpaperposition=0 ++ ++#------------------------------------------------------------------------------ ++#верхняя панель ++#------------------------------------------------------------------------------ ++#-sum(panel,,31)-# ++#-sum(apporder,,0)-# ++ ++[Containments][-#-sum(cont,cont+1)-#] ++desktop=-1 ++formfactor=2 ++geometry=0,0,#-os_x11_width-#,#-sum(panel,panel)-# ++immutability=1 ++location=3 ++plugin=panel ++screen=0 ++zvalue=150 ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,cont*100)-#] ++immutability=1 ++plugin=simplelauncher ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++icon=kde ++#?env(client.os_remote_auth)==||ur_domain_set==off# ++views=Applications,RunCommand,Leave ++#env# ++#?env(client.os_remote_auth)!=&&ur_domain_set==on# ++views=Applications,RunCommand,SwitchUser,LockScreen,Logout ++#env# ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder)-# ++ ++#?env(client.os_remote_auth)==||ur_domain_set==off# ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=icon ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++Url=file:///home/#-ur_login-# ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++#env# ++ ++#?env(client.os_remote_auth)!=&&ur_domain_set==on# ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=icon ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++Url=file:///home/#-ur_login-#/Home ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=icon ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++Url=file:///home/#-ur_login-#/Share ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++#env# ++ ++#?env(client.os_remote_auth)!=&&ur_domain_set==on&&server(ftp.host)!=# ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=icon ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++Url=file:///home/#-ur_login-#/FTP ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++#env# ++#?server(ftp.host)==# ++[Containments][#-sum(cont,cont)-#][Applets][!#-sum(app,app+1)-#] ++#-sum(apporder,,apporder+1)-# ++#server# ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=pager ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++#показывать номер рабочего стола - 0 ++displayedText=0 ++#отображать значки ++showWindowIcons=true ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=tasks ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++#группирование ++groupingStrategy=0 ++#максимум строк ++maxRows=1 ++#показывать задачи только с текущего рабочего стола ++showOnlyCurrentDesktop=true ++#сортировка ++sortingStrategy=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=trash ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++ ++[Containments][#-sum(cont,cont)-#][Applets][!#-sum(app,app+1)-#] ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=systemtray ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++hidden=kwalletmanager ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=digital-clock ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++ ++[Containments][#-sum(cont,cont)-#][Applets][999] ++immutability=1 ++plugin=lockout ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][999][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++ ++[Containments][#-sum(cont,cont)-#][Configuration] ++maximumSize=#-os_x11_width-#,#-sum(panel,panel)-# ++minimumSize=#-os_x11_width-#,#-sum(panel,panel)-# ++ ++#------------------------------------------------------------------------------ ++#нижняя панель ++#------------------------------------------------------------------------------ ++ ++#-sum(height,,44)-# ++#?hr_cdrom_set==on# ++#-sum(width,,height*14)-# ++#hr_cdrom_set# ++#?hr_cdrom_set==off# ++#-sum(width,,height*13)-# ++#hr_cdrom_set# ++#-sum(apporder,,0)-# ++ ++#?pkg(net-irc/konversation)!=# ++#-sum(width,,width+height)-# ++#pkg# ++ ++[Containments][-#-sum(cont,cont+1)-#] ++desktop=-1 ++formfactor=2 ++geometry=0,0,#-sum(width,width)-#,#-sum(height,height)-# ++immutability=1 ++location=4 ++plugin=panel ++screen=0 ++zvalue=150 ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,cont*100)-#] ++immutability=1 ++plugin=icon ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++Url=file:///usr/share/applications/calculate-browser.desktop ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder)-# ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=icon ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++Url=file:///usr/share/applications/calculate-mail.desktop ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++ ++#?pkg(net-irc/konversation)!=# ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=icon ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++Url=file:///usr/share/applications/calculate-chat.desktop ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++#pkg# ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=icon ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++Url=file:///usr/share/applications/calculate-im.desktop ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=icon ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++Url=file:///usr/share/applications/calculate-writer.desktop ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=icon ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++Url=file:///usr/share/applications/calculate-calc.desktop ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=icon ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++Url=file:///usr/share/applications/calculate-calculator.desktop ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=icon ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++Url=file:///usr/share/applications/calculate-imageedit.desktop ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=icon ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++Url=file:///usr/share/applications/calculate-imageview.desktop ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=icon ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++Url=file:///usr/share/applications/calculate-audioplayer.desktop ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=icon ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++Url=file:///usr/share/applications/calculate-videoplayer.desktop ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++ ++#?hr_cdrom_set==on# ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=icon ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++Url=file:///usr/share/applications/calculate-imageburn.desktop ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++#hr_cdrom_set# ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=icon ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++Url=file:///usr/share/applications/calculate-dict.desktop ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=icon ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++Url=file:///usr/share/applications/calculate-textedit.desktop ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=icon ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++Url=file:///usr/share/applications/calculate-terminal.desktop ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++ ++[General] ++immutability=2 ++ ++[Containments][#-sum(cont,cont)-#][Configuration] ++maximumSize=#-sum(width,width)-#,#-sum(height,height)-# ++minimumSize=#-sum(width,width)-#,#-sum(height,height)-# ++ +diff --git desktop/desktop/20-plasma-4.6/plasma-desktoprc desktop/desktop/20-plasma-4.6/plasma-desktoprc +new file mode 100644 +index 0000000..72fa120 +--- /dev/null ++++ desktop/desktop/20-plasma-4.6/plasma-desktoprc +@@ -0,0 +1,22 @@ ++# Calculate format=plasma path=~/.kde4/share/config ++ ++# location of panels ++[PlasmaViews][1] ++Alignment=132 ++Offset=0 ++panelVisibility=1 ++ ++[PlasmaViews][2] ++Alignment=132 ++Offset=0 ++panelVisibility=1 ++ ++[PlasmaViews][3] ++Offset=0 ++panelVisibility=0 ++ ++[ViewIds] ++1=1 ++2=3 ++3=2 ++ +diff --git desktop/desktop/20-plasma-4.6/plasmarc desktop/desktop/20-plasma-4.6/plasmarc +new file mode 100644 +index 0000000..d28b6dc +--- /dev/null ++++ desktop/desktop/20-plasma-4.6/plasmarc +@@ -0,0 +1,5 @@ ++# Calculate format=plasma path=~/.kde4/share/config ++#оформление ++[Theme] ++name=slim-glow ++ +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 5f21119..a0bc2a5 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 ++# 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 + + # Update info + #-ini(desktop.audioplayer, audacious)-# +diff --git install/1merge/Desktop/400-AudioPlayer/audacious/calculate/audacious-3.0.desktop install/1merge/Desktop/400-AudioPlayer/audacious/calculate/audacious-3.0.desktop +new file mode 100644 +index 0000000..6387c9e +--- /dev/null ++++ install/1merge/Desktop/400-AudioPlayer/audacious/calculate/audacious-3.0.desktop +@@ -0,0 +1,9 @@ ++# 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/calculate-desktop/.calculate_directory install/1merge/calculate-desktop/.calculate_directory +new file mode 100644 +index 0000000..437bd6a +--- /dev/null ++++ install/1merge/calculate-desktop/.calculate_directory +@@ -0,0 +1,2 @@ ++# Calculate belong()!=&&cl_chroot_status==off&&pkg(sys-apps/calculate-desktop)!= name=etc path=/usr name=bin ++ +diff --git install/1merge/calculate-desktop/xautologin install/1merge/calculate-desktop/xautologin +new file mode 100644 +index 0000000..1173e71 +--- /dev/null ++++ install/1merge/calculate-desktop/xautologin +@@ -0,0 +1,15 @@ ++# Calculate chmod=0755 ++#!/bin/bash ++echo $BASHPID >/var/run/xinit.pid ++while true; ++do ++#?list(cl_migrate_user,1)!=# ++ env USER=#-list(cl_migrate_user,1)-# /usr/share/calculate/xdm/xdm --login ++ su - #-list(cl_migrate_user,1)-# -c 'source /etc/profile;/bin/bash /etc/X11/xinit/xinitrc' ++ env USER=#-list(cl_migrate_user,1)-# /usr/share/calculate/xdm/xdm --logout ++#list# ++#?list(cl_migrate_user,1)==# ++ : ++#list# ++done ++exit 0 +diff --git install/1merge/xorg-server/conf.d/xdm install/1merge/xorg-server/conf.d/xdm +index eb21521..b913445 100644 +--- install/1merge/xorg-server/conf.d/xdm ++++ install/1merge/xorg-server/conf.d/xdm +@@ -1,12 +1,19 @@ +-# Calculate comment=# ++# Calculate comment=# format=openrc + + CHECKVT=7 +-#?pkg(kde-base/kdm)!=# ++#?os_install_root_type==livecd||os_install_linux_shortname==CMC# ++DISPLAYMANAGER="xinit" ++START_STOP_ARGS="--background -- /usr/bin/xautologin -- vt$CHECKVT" ++#os_install_root_type# ++#?os_install_root_type!=livecd&&os_install_linux_shortname!=CMC&&pkg(kde-base/kdm)!=# + DISPLAYMANAGER="kdm" +-#pkg# +-#?pkg(gnome-base/gdm)!=&&pkg(kde-base/kdm)==# ++!START_STOP_ARGS=empty ++#os_install_root_type# ++#?os_install_root_type!=livecd&&os_install_linux_shortname!=CMC&&pkg(gnome-base/gdm)!=&&pkg(kde-base/kdm)==# + DISPLAYMANAGER="gdm" +-#pkg# +-#?pkg(x11-misc/slim)!=&&pkg(kde-base/kdm)==&&pkg(gnome-base/gdm)==# ++!START_STOP_ARGS=empty ++#os_install_root_type# ++#?os_install_root_type!=livecd&&os_install_linux_shortname!=CMC&&pkg(x11-misc/slim)!=&&pkg(kde-base/kdm)==&&pkg(gnome-base/gdm)==# + DISPLAYMANAGER="slim" +-#pkg# ++!START_STOP_ARGS=empty ++#os_install_root_type# diff --git a/sys-apps/calculate-utilities/ChangeLog b/sys-apps/calculate-utilities/ChangeLog index aa712d50f..6ac0d1ea8 100644 --- a/sys-apps/calculate-utilities/ChangeLog +++ b/sys-apps/calculate-utilities/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*calculate-utilities-2.2.21-r4 (23 Aug 2011) + + 23 Aug 2011; Mike Hiretsky (mhiretskiy) + +calculate-utilities-2.2.21-r4.ebuild: + Update for templates and install + *calculate-utilities-2.2.21-r3 (23 Aug 2011) 23 Aug 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest index 5c60369f8..543a164db 100644 --- a/sys-apps/calculate-utilities/Manifest +++ b/sys-apps/calculate-utilities/Manifest @@ -33,6 +33,7 @@ EBUILD calculate-utilities-2.2.20.ebuild 862 RMD160 192cb774b0a4c7dc0ce9f12a7736 EBUILD calculate-utilities-2.2.21-r1.ebuild 865 RMD160 d09702a54724755cca89e16bccb953ebad700625 SHA1 95f6bf58c10b76813b785edb86a434aaebd6d0a1 SHA256 7c2179eb3b399f465ce81ad5e705b35f605f2620d08fc179fe57159773be8e35 EBUILD calculate-utilities-2.2.21-r2.ebuild 877 RMD160 a1adfa7c7080b83fe20c407d7d7417b8ce6f03ae SHA1 68a1b428712369e87ad313bd2d2603ea83f26705 SHA256 483d5803fa79eca8ff47ee41c14098802e0b9b4f554044aa12052be1a04dd6a6 EBUILD calculate-utilities-2.2.21-r3.ebuild 877 RMD160 83114cae73ed03d3cd14b04c3702b9df4df28645 SHA1 ea7ac39881ec4693d2f28dcdaa5ecaa87fddd299 SHA256 211a7ca1c30914e1640fa4cc0bba8d5e7132cdd5c4bc6b22f64e82ab17ba477f +EBUILD calculate-utilities-2.2.21-r4.ebuild 877 RMD160 7e08a06ddbd0e1ca869a239eac9eec5432e007f0 SHA1 eb82a3b4da06cfa9f6ac16754709e3fcc3d6037a SHA256 20074ca0dbfb507f4bc1da8241ab6cebb2142aa2bfaf6b2a2453b4c584c67d11 EBUILD calculate-utilities-2.2.21.ebuild 862 RMD160 3786826c24e6bfc0fb9e5b413c85e429ae412723 SHA1 8beb4139d5f2828421d57c4ab7ba6e8a2e59d9ef SHA256 530ea787bfee6bd4308bb782b82a42f0e60d02fa692877135f3fe8402c4ba677 EBUILD calculate-utilities-2.2.9999.ebuild 840 RMD160 0c7324a9ed480118ac19f62b162c9ee62c25f964 SHA1 7dadab1430ed147334ed7e9b4fcc86dc99e25d56 SHA256 f3ee28f9f765e7302c83eb4a15a09bdf066f09e6b40e34f6d52157a946df5e66 -MISC ChangeLog 20609 RMD160 a67212622fd0f661781a880982d6f397441c82c1 SHA1 566f2c85e8fdfe379ecd81398ba87e5e5f66da67 SHA256 9ab0815e49ec8cb38bdb5b9a9e2f130e7739fa05bc5401045ebe1b36f1eaae69 +MISC ChangeLog 20792 RMD160 f9e67883bd7806a62c3014c453f969c8013fbfd2 SHA1 34ec7be4585c397047b15f34d1ec8a6079cff66a SHA256 18718dcffe76c167df7d7ee77aaedc671cd865db23bf747d0e8aa799aea9cdf5 diff --git a/sys-apps/calculate-utilities/calculate-utilities-2.2.21-r4.ebuild b/sys-apps/calculate-utilities/calculate-utilities-2.2.21-r4.ebuild new file mode 100644 index 000000000..4a0740e73 --- /dev/null +++ b/sys-apps/calculate-utilities/calculate-utilities-2.2.21-r4.ebuild @@ -0,0 +1,37 @@ +# 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.21-r3 + =sys-apps/calculate-templates-2.2.21-r3 + =sys-apps/calculate-lib-2.2.21-r1 + =sys-apps/calculate-i18n-2.2.21-r1 + + cl_assemble? ( =sys-apps/calculate-assemble-2.2.21-r1 ) + cl_builder? ( =sys-apps/calculate-builder-2.2.21 ) + cl_client? ( =sys-apps/calculate-client-2.2.21 ) + cl_desktop? ( =sys-apps/calculate-desktop-2.2.21 ) + cl_installgui? ( =app-misc/calculate-install-gui-2.2.21 ) + + cl_server? ( =sys-apps/calculate-server-2.1.14-r6 ) +" +