Update utilities

atratsevskiy
Mike Hiretsky 13 years ago
parent 74f359106d
commit 7b39c3299a

@ -4,6 +4,7 @@ AUX calculate-builder-2.2.25-r2.patch 2365 RMD160 fc409a93dfeb599cb48aca2faec986
AUX calculate-builder-2.2.25-r3.patch 2377 RMD160 27c4080989f7d04f20908b1465e441bd9cd2a0b8 SHA1 182103315319ee3e322d09323321fed61f81e6af SHA256 f6b6b65b52347491756ff18070f3603405d9cbccbbe85b2ce14552ab5beb4a4f
AUX calculate-builder-2.2.25-r4.patch 2386 RMD160 99aa33b2591f5bf5e43f37276854732c19183169 SHA1 8d435aaa38d0fe64dcf6b06903b1e179a12df389 SHA256 463a74fcd4f7fc1f72c0b2476cb91778225c6176cd93628c47fb61259be1f9d1
AUX calculate-builder-2.2.25-r5.patch 2671 RMD160 c6787fde2fb41b756cb75e10646aac326bd8e0c6 SHA1 7e29c88907c9dbf62e985a2d65bc5104e0d26ba2 SHA256 aeed4dd42a04fb156c687f920e9b046bc2a8d5030a7880a59e7042a08bdfb628
AUX calculate-builder-2.2.26-r1.patch 415 RMD160 bf672af71a47185997031ac54a75ba7b35cff123 SHA1 14aca25a343bbb83c0fbc0fa8671468fb95aea45 SHA256 64beb206c47fe1bd912528de5f6df4c11f255bb25a5289b949a4f364e3f649a8
DIST calculate-builder-2.2.24.tar.bz2 26996 RMD160 b5cdfe057ccb0496ed4c1470570575086c2d58fd SHA1 1b68631826c8499be03b0e3ad1062ccc2c4d9d0f SHA256 8b995b5dbe5a1d9e98178f68720e7a30dfb02829ddf2f63b131786d962bf1c12
DIST calculate-builder-2.2.25.tar.bz2 27120 RMD160 1640be4f5e2ac4971a26f575d85a28c694a88c1d SHA1 c92c128bf5f3ef83a731ae086432aecda06a6ffd SHA256 09d1493afb699113abb55e3646280b72424e5a4c48e83d9a180ef56e4d630c95
DIST calculate-builder-2.2.26.tar.bz2 27348 RMD160 216a169afec92ec9f2e85e9a3d1fe52bce923216 SHA1 e0b5d6fe30065e438b336d5651692110e4151d35 SHA256 35c140fedf963b677b29efce4c0a48a7bc3b9c0ffb02d660ebc302a12c7c01d5
@ -14,6 +15,7 @@ EBUILD calculate-builder-2.2.25-r3.ebuild 733 RMD160 8166db204d1c276604f977332ae
EBUILD calculate-builder-2.2.25-r4.ebuild 733 RMD160 a0de3d30e4795528f084cfda025d71c01c384053 SHA1 105adb0401ab63f3b27c3e64a8322d21adbc12b8 SHA256 641c04e1684d583c915ec3b23bab6f96febc055b0eb90ae9ac2518ae4197b99d
EBUILD calculate-builder-2.2.25-r5.ebuild 733 RMD160 077a5e14f139f630f8a88b7b3fa80537113cf2ce SHA1 54461fd34d5486ab5f76b4b59570135bdac9ca02 SHA256 41cd3cee1e24bb6a8e08ec41185f054208c6980313cf682bdd62b62b37abf029
EBUILD calculate-builder-2.2.25.ebuild 587 RMD160 c38399cd061403ee737f9a48d4745616d1316462 SHA1 21203db1197e07e301629171a2aacb4e380e3248 SHA256 a9e1686b3265d283e374cf16297d3e9ef8ea7f1b7fd16e7817f1f0a776d015a8
EBUILD calculate-builder-2.2.26-r1.ebuild 723 RMD160 14f828e6d2cb73dad98fff15aa535e0a6680c57f SHA1 bdaacc33adf9ea614c42df30e071c0f77a30e6b0 SHA256 23335e300b9d0a087dc09e6983259cbb8b5faf8d893159bc4ab25561ae6dc7f4
EBUILD calculate-builder-2.2.26.ebuild 587 RMD160 c6374863fa2f838d50786de6341ca2f0cf7ca204 SHA1 7e815cb2a62b100f78ba5deb5159f0b8b0b91438 SHA256 6d1b5cc3249da743d8c9313b75ad97799a64e56e53bd144205d98fee72fdf3f6
EBUILD calculate-builder-2.2.9999.ebuild 571 RMD160 9342f8bb6fee2525ea214551f177a21170c8f320 SHA1 640d9424326321e45c59241384d3bdec58ff0a22 SHA256 829ecb63e72f27ae5f1cab9a22b3fad06addd81e7cf0f73fb99926dfe1d52102
MISC ChangeLog 19794 RMD160 15615f619599d27f0b49b14e228c82c707a8eeff SHA1 a58253503d3f91d751fafcd408a96f67e892cb0f SHA256 22b7748033c79af09d06e85ab16c6481472fb47a73eba225a1380527a18af67b

@ -0,0 +1,31 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The utilities for builder tasks of Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND=">=sys-kernel/calckernel-3.4.18
~sys-apps/calculate-install-2.2.26
!<sys-apps/calculate-1.4.0_p20100921
app-cdr/cdrkit
sys-fs/squashfs-tools"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# change init.d/calculate-builder
epatch "${FILESDIR}/calculate-builder-2.2.26-r1.patch"
}

@ -0,0 +1,13 @@
diff --git data/calculate-builder data/calculate-builder
index 944ecb7..b05fb1f 100644
--- data/calculate-builder
+++ data/calculate-builder
@@ -7,7 +7,7 @@ depend() {
KERNEL_VERSION=`uname -r`
KERNEL_VERSION_CONF=${KERNEL_VERSION//./_}
-KERNEL_VERSION_CONF="modules_${KERNEL_VERSION_CONF//-/_}"
+KERNEL_VERSION_CONF="modules_3"
MODULES_PATH="/lib/modules/${KERNEL_VERSION}"
CONF_FILE="/etc/conf.d/modules"

@ -1,6 +1,7 @@
AUX calculate-install-2.2.24-r8.patch 24102 RMD160 773f84eb37e90a4c1c246a2c2b2040ea9d5642dd SHA1 8194e70ac276d06b1883773f8dbb2b082bb79ff4 SHA256 e4ae1f9905ab23aa77aa6995ff1b5f20783df473ea1339ef493917bff1b56e62
AUX calculate-install-2.2.26-r1.patch 4481 RMD160 63434bcbd9c9900485947f3584db42d391c4c645 SHA1 5484c734eb4e632b29964285a712a82ad5598b51 SHA256 ac3f282157f4b5c7a6b42ba27ecbb845bd5c733eb7e93cef7eafc920cee16a03
AUX calculate-install-2.2.26-r2.patch 5209 RMD160 fc5aac1f00291850663f57f46e42a7e98ee43479 SHA1 f6a4ad6a1fb34ec7888a929914f25420463ace5b SHA256 63ee55c476d501445dabb96391540265b9b2cb6594eeb7b1ee53f516526faa45
AUX calculate-install-2.2.26-r3.patch 5983 RMD160 c712232d4fb0b6d8eadce61e741f0328a1c94283 SHA1 ec1c76db7eacf1ae3205b56d7871cb565114c52e SHA256 5bc9879f1eb907a746a9b5286d4d9086d26b217ed88c72931aed024f0e6ee944
DIST calculate-install-2.2.24.tar.bz2 74207 RMD160 0e76e106863c8f7ae8f715ff600cbf34af53d44f SHA1 156b8438d4be79f897dcb83218152b4efcb3bfe1 SHA256 3fd7a542d484e2bd2da7b7f03685a90e5711a14190e5e53818001c54356c61b5
DIST calculate-install-2.2.25.tar.bz2 74546 RMD160 2b2d99d46392d0f1745aeb6ac9cac4bb9f7bb9e2 SHA1 1964438679458921e4f3548b88fa834bc3c4a7df SHA256 3242489b990ec4533c5f03c5c9292a0b65568a495043f5728a770abee8124b0d
DIST calculate-install-2.2.26.tar.bz2 74307 RMD160 d15ec46d5b8d779a4ca6b74f25460c6058595ea2 SHA1 b7eaa322c002f665548a86ae4a81d6f60f3a9a44 SHA256 9e0480285c3455baca94df84cc22605dcfea4fa9c9f46ca4bf73b3210e31c5bf
@ -8,6 +9,7 @@ EBUILD calculate-install-2.2.24-r8.ebuild 1023 RMD160 06260431895d9b8aafdf41909d
EBUILD calculate-install-2.2.25.ebuild 804 RMD160 314f552718fc78389ca6b17987c4d74225bee1b5 SHA1 5b255a89f5dd2ee418ea127ec0f1b107f4e71af8 SHA256 b87a5c223250ba51eba0085bcaf79f7aec7d562fa23c411a683ade5d4ffe868d
EBUILD calculate-install-2.2.26-r1.ebuild 925 RMD160 fe11bbc7d052ccee9f6eae42b4d350cd0ea0a5ae SHA1 93d02186dd409c7b7b5749b7da38e563c4dc0568 SHA256 ed774ce2e8309221edfb508ae0adecd40bbf3e6cb3fd9d5a2dd8077796c743c9
EBUILD calculate-install-2.2.26-r2.ebuild 946 RMD160 467820f13353e55f3d8821428ff6181735577c57 SHA1 74be4a1d7d96d89ee84c6e188cdb9d05c5fddef6 SHA256 28fa17b1739e746390e2cad4cc9d2398c911c76a6747940089a6ec53c84ed2f0
EBUILD calculate-install-2.2.26-r3.ebuild 925 RMD160 8979e1ef444a154dbec301523a99daec9b9344f0 SHA1 cfb319d32030d779a88777d9ae91bacfc3ce1410 SHA256 8dd5864c2ebfd44a9f0147b74abafd6dc5017eecd9bc4be70f055a862f9b97b7
EBUILD calculate-install-2.2.26.ebuild 804 RMD160 e53f04092d54410d63b98298649cfa65179d8390 SHA1 bbfbc0f31a9a835d149e181e5cff445b2fc301a7 SHA256 fee76fdcf34b6871a00a0e0d14a08f7639276938f782f6580a0303a4ff49bd27
EBUILD calculate-install-2.2.9999.ebuild 611 RMD160 f90528448a4ab5c0c7ca0bfeb48bf301e303e9e0 SHA1 6273678653d87c58eeb3a0545804d7e8cf56e3bd SHA256 ab95c392853331769aabe6b26089f95238a1dd5a7d027c46483e5855d97d0c20
EBUILD calculate-install-3.0.9999.ebuild 609 RMD160 b1a02262dbab9319b6b916460646b526aa43a9a3 SHA1 0c64a92b658890fe5b4a5ee22f35eb143da377dc SHA256 d4cead60af00c67ddcb1aa01e2095437fb1bfe2ca7f717456048ad3e8f039a23

@ -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.26
~sys-apps/calculate-lib-2.2.26
app-portage/layman
!app-misc/livecd-tools
!minimal? ( sys-boot/grub
sys-apps/gptfdisk
>=sys-apps/util-linux-2.19.1
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# add new variable
epatch "${FILESDIR}/calculate-install-2.2.26-r3.patch"
}
pkg_postinst() {
einfo "For configure calculate-install perform:"
einfo " cl-install --install"
}

@ -0,0 +1,158 @@
diff --git man/cl-install.1 man/cl-install.1
index f2ddcee..229116e 100644
--- man/cl-install.1
+++ man/cl-install.1
@@ -135,6 +135,11 @@ Changes Xorg server resolution.
Changes frame buffer resolution.
.RE
.PP
+\fB\-\-scheduler\fR \fISCHEDULER\fR
+.RS 4
+Changes I/O scheduler.
+.RE
+.PP
\fB\-\-timezone\fR \fITIMEZONE\fR
.RS 4
Changes timezone.
diff --git man/ru/cl-install.1 man/ru/cl-install.1
index 6aeb790..a619a81 100644
--- man/ru/cl-install.1
+++ man/ru/cl-install.1
@@ -130,6 +130,11 @@ IPv4 адрес сети с указанием CIDR. IFACE может обозн
Изменить разрешение для frame buffer.
.RE
.PP
+\fB\-\-scheduler\fR \fISCHEDULER\fR
+.RS 4
+Изменить I/O планировщик.
+.RE
+.PP
\fB\-\-timezone\fR \fITIMEZONE\fR
.RS 4
Изменить часовой пояс.
diff --git pym/cl_fill_install.py pym/cl_fill_install.py
index 0e2c057..9606ddc 100644
--- pym/cl_fill_install.py
+++ pym/cl_fill_install.py
@@ -29,7 +29,7 @@ from cl_utils import isMount,typeFile,getTupleVersion,pathJoin,isFstabMount,\
FStab, lspci, getInstalledVideo,getDeviceType, \
getPartitionType, getOsProberHash, getProgPath, \
getRaidPartitions, getLvmPartitions, getLvmGroups, \
- getPasswdUsers
+ getPasswdUsers, readFile, readLinesFile
from cl_distr import DistributiveRepository,PartitionDistributive
from cl_fill import clLocale
from operator import itemgetter
@@ -732,7 +732,7 @@ class fillVars(object, glob_attr):
root_dev = filter(lambda x: x in root_dev,
self.Get('os_device_dev'))
if root_dev:
- root_dev = root_dev[0]
+ root_dev = root_dev[0].rpartition('/')[2]
pathScheduler = '/sys/block/%s/queue/scheduler'%root_dev
if access(pathScheduler,R_OK):
res = re.search("\[([^\]]+)\]",
@@ -741,6 +741,17 @@ class fillVars(object, glob_attr):
return res.groups()[0]
return "cfq"
+ def get_os_kernel_schedulers(self):
+
+ """Get scheduler for install root device"""
+ root_dev = self.Get('os_device_dev')
+ if root_dev:
+ root_dev = root_dev[0].rpartition('/')[2]
+ pathScheduler = '/sys/block/%s/queue/scheduler'%root_dev
+ return map(lambda x:x.strip("[]"),
+ readFile(pathScheduler).strip().split())
+ return []
+
def get_os_install_lvm_set(self):
"""Using lvm"""
lvm = filter(lambda x:x[1] != '' and "lvm" in x[0],
@@ -1470,3 +1481,13 @@ class fillVars(object, glob_attr):
return nonRootUsers[0]
else:
return ""
+
+ def get_os_install_kernel_cpufreq(self):
+ """Get cpufreq (and other from modules_3= param) from conf.d/modules"""
+ cpufreqmods = map(lambda x:x.partition('=')[2].strip("\n '\""),
+ filter(lambda x:x.startswith('modules_3'),
+ readLinesFile('/etc/conf.d/modules')))
+ if cpufreqmods:
+ return cpufreqmods[0]
+ else:
+ return ""
diff --git pym/cl_install_cmd.py pym/cl_install_cmd.py
index 7706961..935aa06 100644
--- pym/cl_install_cmd.py
+++ pym/cl_install_cmd.py
@@ -145,6 +145,10 @@ CMD_OPTIONS = [{'shortOption':"d",
'optVal':"<width>x<height>",
'help':_("set frame buffer resolution")
},
+ {'longOption':"scheduler",
+ 'optVal':"SCHEDULER",
+ 'help':_("set I/O scheduler")
+ },
{'longOption':"timezone",
'optVal':"TIMEZONE",
'help':_("set the timezone")
@@ -315,6 +319,17 @@ class install_cmd(share_cmd):
value=route,
example="default:192.168.1.1"))
# if system installation
+ if values.scheduler:
+ if not values.scheduler in \
+ self.logicObj.clVars.Get('os_kernel_schedulers'):
+ self.optobj.error(self.errorWithExample.format(
+ optname="--scheduler",
+ errormess=_("%s specifing error")%"scheduler",
+ value=values.scheduler,
+ example="deadline"))
+ else:
+ self.logicObj.clVars.Set('os_install_kernel_scheduler',
+ values.scheduler,force=True)
if not (values.install or values.uninstall
or values.startup or values.live):
if values.v is False and \
@@ -412,11 +427,13 @@ class install_cmd(share_cmd):
startup=values.startup):
return False
if values.X:
- if not self.clVars.Set('os_install_x11_resolution', values.X,
+ if not self.logicObj.clVars.Set(
+ 'os_install_x11_resolution', values.X,
force=True):
return False
if values.fb:
- if not self.clVars.Set('os_install_fb_resolution',
+ if not self.logicObj.clVars.Set(
+ 'os_install_fb_resolution',
"%s-32"%values.fb,
force=True):
return False
diff --git pym/cl_vars_install.py pym/cl_vars_install.py
index 8d7f59d..fd13dd5 100644
--- pym/cl_vars_install.py
+++ pym/cl_vars_install.py
@@ -155,12 +155,18 @@ class Data:
# install scheduler
os_install_kernel_scheduler = {}
+ # list of schedulers
+ os_kernel_schedulers = {}
+
# install kernel attributes
os_install_kernel_attr = {}
# install kernel resume
os_install_kernel_resume = {}
+ # install cpufreq modules
+ os_install_kernel_cpufreq = {}
+
# system image for installation
cl_image = {}

@ -8,6 +8,7 @@ AUX calculate-templates-2.2.25-r7.patch 10623 RMD160 40f9d51774192d4c6a9641c45af
AUX calculate-templates-2.2.26-r1.patch 3384 RMD160 e1cd42354138fc25460bfa42506c28a147363b93 SHA1 ab7dfa989ca5841cc7143c591c70da5780713690 SHA256 afadb40e88398035ddd8f5c14357bb45074e68f956d045a70fd62c7f3ad3eb6d
AUX calculate-templates-2.2.26-r2.patch 3409 RMD160 03419eea4616fd1f2743539263f3ed3d58f46527 SHA1 89b9d426a2465c5ebfebb0ef31625296bdcea997 SHA256 93f3b2d2e8914a847b2f5ce31b367b371ff8a4cdb8493066cd501257732cfdb2
AUX calculate-templates-2.2.26-r3.patch 3674 RMD160 645ae2a0dec4f29dc0df88c24ff7af1c50d75846 SHA1 a3702e59b2eefe3ce5d9fa05c25691cc5d6c4f84 SHA256 1fc9c150265b2a66e96b2110fe68ec8b57a0762497e8ed234885fa97932b0c74
AUX calculate-templates-2.2.26-r4.patch 4511 RMD160 37cd22007af41e3799f71b059a9e2340a93e441c SHA1 8d233e7fe8ab643a0a671087264c97fbf10ff7fe SHA256 9f3df96340d476705c0d88add86feb86946612f2287e5b3d501b6236ec5672b7
DIST calculate-templates-2.2.24-r9.tar.bz2 248040 RMD160 a4523a32ce2374bb993821f0a7f70d34476ccc69 SHA1 705b710ebbf6110d0aea9c64da4faa4a83208c6d SHA256 87ac54def8fd64491ddaeb613a588393f9670cd6b9c654b90e01deed9c9e1e03
DIST calculate-templates-2.2.25-r3.tar.bz2 248748 RMD160 90ea765808f2aa73079df10e35105691594b01ff SHA1 1a2543f98fc2f503595f31da136eceeb437f9889 SHA256 08292837f7f63648c5c39dfeb334d9e47e6dfc479b2a5d0b5066dbc8cfd28a34
DIST calculate-templates-2.2.25.tar.bz2 248801 RMD160 e25f0aacb69d7a8c2ad05bc6a9963542d6da089c SHA1 094baf9b4f04dd3edd626e69f1e9f1d67c3acbaf SHA256 89e48b483f74681911ba76af1372e5e71f92c69b022ee267362efba010f19df2
@ -23,6 +24,7 @@ EBUILD calculate-templates-2.2.25-r7.ebuild 828 RMD160 2eb01d7f2e96b615737f130be
EBUILD calculate-templates-2.2.25.ebuild 582 RMD160 15014412aaccd88cbc047be175962878d49cabfd SHA1 fd2ddf693700c8c6c6df06c013cf1d9cbfc5c9df SHA256 17797276c8bc240cc6185b30de0a636018ed3029adb3839bd7491a2a421f2f3d
EBUILD calculate-templates-2.2.26-r2.ebuild 708 RMD160 c31aadacf90d40fd997145f1fd49f47915e07ee5 SHA1 81ef734f7b373fd2e4e229f9ae3c5d569452bfb4 SHA256 79274a858e308a67f735edd601533adba1ffff4cf7a880e676584f09111b021e
EBUILD calculate-templates-2.2.26-r3.ebuild 715 RMD160 3d7dd15c39758fdd0dad91ca942d2bb3b79ec849 SHA1 1c90f76eeffe62f8a5e01ae6c8457144287875df SHA256 3d305040e0620cb71dc5a517413980c2c88739a47b97000da3ead96a61df0964
EBUILD calculate-templates-2.2.26-r4.ebuild 718 RMD160 830573071152d3b05b60db6070da1ed1284acb03 SHA1 a72be61c680a70aedfe7d35a4014b9fe09b819ce SHA256 e50aa395e9fc6ff8a42cc0e20be0809931e6647961d15ca2870deab6887c009f
EBUILD calculate-templates-2.2.26.ebuild 582 RMD160 3dcf8661ba167ffb576dad192db64541289c6943 SHA1 1819d2a7ad16d01a21a52f202db86feed371452e SHA256 b5a2bf38e4a28bd4034a12d90b6a9ebd01f871064532f9cffbb75a9c5f1a5ea0
EBUILD calculate-templates-2.2.9999.ebuild 588 RMD160 8cafdd0daa7954e72c0b1268de2bcb6231c60d29 SHA1 505be2090f00df6c97b9b7e8b25716c7c0c1299a SHA256 2cbfb74187bc5d197ea7d2187d570b8e1981eba5f724623d44f461435a25d5a6
MISC ChangeLog 39068 RMD160 d83234555422ee931a82d29cb951fb3a09fd7739 SHA1 ce9cd4e3a00c25018223866b42d7f94923c1eceb SHA256 bd6b3f6bf2a572e1de1edabe8e0040b2293a5955b78c5aa5f54b87b708b745fb

@ -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.26"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# fix conf.d/modules for openrc
epatch "${FILESDIR}/calculate-templates-2.2.26-r4.patch"
}
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

@ -0,0 +1,91 @@
diff --git desktop/desktop/60-skype-2.2/Logs/.calculate_directory desktop/desktop/60-skype-2.2/Logs/.calculate_directory
new file mode 100644
index 0000000..afec7e6
--- /dev/null
+++ desktop/desktop/60-skype-2.2/Logs/.calculate_directory
@@ -0,0 +1 @@
+# Calculate
diff --git install/1live/calculate-utilities/fixOpenrc install/1live/calculate-utilities/fixOpenrc
new file mode 100644
index 0000000..0af0038
--- /dev/null
+++ install/1live/calculate-utilities/fixOpenrc
@@ -0,0 +1,8 @@
+# Calculate path=/tmp name=fixOpenrc exec=/bin/bash ac_install_system!=up&&cl_belong_pkg!=&&pkg(sys-apps/openrc)!=
+
+if [[ -z `find /etc/conf.d -name "*cfg*modules" -exec grep "^modules_3" {} \;` ]]
+then
+ find /etc/conf.d -name "*cfg*modules" -delete
+ rc-update add calculate-builder boot
+fi
+true
diff --git install/1live/openrc/conf.d/modules install/1live/openrc/conf.d/modules
new file mode 100644
index 0000000..5d6b9bd
--- /dev/null
+++ install/1live/openrc/conf.d/modules
@@ -0,0 +1,2 @@
+# Calculate format=openrc ac_install_system!=up&&cl_belong_pkg!=
+modules_3="#-os_install_kernel_cpufreq-#"
diff --git install/1merge/Desktop/200-Writer/libreoffice/calculate/writer-3.4.3.2.desktop install/1merge/Desktop/200-Writer/libreoffice/calculate/writer-3.4.3.2.desktop
index c2f95e7..dd212d6 100644
--- install/1merge/Desktop/200-Writer/libreoffice/calculate/writer-3.4.3.2.desktop
+++ install/1merge/Desktop/200-Writer/libreoffice/calculate/writer-3.4.3.2.desktop
@@ -1,4 +1,4 @@
-# Calculate format=kde link=/usr/lib/libreoffice/share/xdg/writer.desktop name=calculate-writer.desktop mirror pkg(app-office/libreoffice)>=3.4.3.2
+# Calculate format=kde link=/usr/lib/libreoffice/share/xdg/writer.desktop name=calculate-writer.desktop mirror pkg(app-office/libreoffice)>=3.4.3.2&&os_install_arch_machine==i686
# Update info
#-ini(desktop.writer, libreoffice)-#
diff --git install/1merge/Desktop/200-Writer/libreoffice/calculate/writer-3.4.3.2.desktop.amd64 install/1merge/Desktop/200-Writer/libreoffice/calculate/writer-3.4.3.2.desktop.amd64
new file mode 100644
index 0000000..3acfbe9
--- /dev/null
+++ install/1merge/Desktop/200-Writer/libreoffice/calculate/writer-3.4.3.2.desktop.amd64
@@ -0,0 +1,8 @@
+# Calculate format=kde link=/usr/lib64/libreoffice/share/xdg/writer.desktop name=calculate-writer.desktop mirror pkg(app-office/libreoffice)>=3.4.3.2&&os_install_arch_machine==x86_64
+
+# Update info
+#-ini(desktop.writer, libreoffice)-#
+
+# Hide icon
+[Desktop Entry]
+NoDisplay=true
diff --git install/1merge/Desktop/210-Calc/libreoffice/calculate/calc-3.4.3.2.desktop install/1merge/Desktop/210-Calc/libreoffice/calculate/calc-3.4.3.2.desktop
index 8ec5dcb..972c545 100644
--- install/1merge/Desktop/210-Calc/libreoffice/calculate/calc-3.4.3.2.desktop
+++ install/1merge/Desktop/210-Calc/libreoffice/calculate/calc-3.4.3.2.desktop
@@ -1,4 +1,4 @@
-# Calculate format=kde link=/usr/lib/libreoffice/share/xdg/calc.desktop name=calculate-calc.desktop mirror pkg(app-office/libreoffice)>=3.4.3.2
+# Calculate format=kde link=/usr/lib/libreoffice/share/xdg/calc.desktop name=calculate-calc.desktop mirror pkg(app-office/libreoffice)>=3.4.3.2&&os_install_arch_machine==i686
# Update info
#-ini(desktop.calc, libreoffice)-#
diff --git install/1merge/Desktop/210-Calc/libreoffice/calculate/calc-3.4.3.2.desktop.amd64 install/1merge/Desktop/210-Calc/libreoffice/calculate/calc-3.4.3.2.desktop.amd64
new file mode 100644
index 0000000..f9fa2d7
--- /dev/null
+++ install/1merge/Desktop/210-Calc/libreoffice/calculate/calc-3.4.3.2.desktop.amd64
@@ -0,0 +1,8 @@
+# Calculate format=kde link=/usr/lib64/libreoffice/share/xdg/calc.desktop name=calculate-calc.desktop mirror pkg(app-office/libreoffice)>=3.4.3.2&&os_install_arch_machine==x86_64
+
+# Update info
+#-ini(desktop.calc, libreoffice)-#
+
+# Hide icon
+[Desktop Entry]
+NoDisplay=true
diff --git install/1merge/libreoffice-3.4.4.2/.calculate_directory install/1merge/libreoffice-3.4.4.2/.calculate_directory
new file mode 100644
index 0000000..82eef0c
--- /dev/null
+++ install/1merge/libreoffice-3.4.4.2/.calculate_directory
@@ -0,0 +1 @@
+# Calculate belong(libreoffice)!=&&pkg(app-office/libreoffice)>3.4.4&&pkg(app-office/libreoffice)<3.5&&pkg(kde-base/kdelibs)!= path=/etc name=env.d
diff --git install/1merge/libreoffice-3.4.4.2/99libreoffice install/1merge/libreoffice-3.4.4.2/99libreoffice
new file mode 100644
index 0000000..d01b3db
--- /dev/null
+++ install/1merge/libreoffice-3.4.4.2/99libreoffice
@@ -0,0 +1 @@
+OOO_FORCE_DESKTOP=kde

@ -2,6 +2,12 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-utilities-2.2.26-r5 (28 Nov 2011)
28 Nov 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+calculate-utilities-2.2.26-r5.ebuild:
Update for install,builder,templates
*calculate-utilities-2.2.26-r4 (25 Nov 2011)
25 Nov 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

@ -19,7 +19,8 @@ EBUILD calculate-utilities-2.2.25.ebuild 861 RMD160 e4d64358df7a0d26719652d50927
EBUILD calculate-utilities-2.2.26-r2.ebuild 867 RMD160 1a31f8e098b5ce84697e6b5f7a09b6dc15a53566 SHA1 53e38eff40a5390b5857f45dcb446fdd30c8c3ca SHA256 57b6c7a44a421e728f25ec5ded6bef7a643d7f5e05353f70e30754684f9e4cf8
EBUILD calculate-utilities-2.2.26-r3.ebuild 867 RMD160 d2bccb369bec6373c99299b781b90d07fe511dcf SHA1 0df9bf0d67c0345e274a07e046190e21ce6ca9eb SHA256 2bda04eea42db866e7b10a1c3eaf52b0befb870fc97df841ddcd9d20f57b28cb
EBUILD calculate-utilities-2.2.26-r4.ebuild 870 RMD160 6ef3d0fdbb10c458d376d82552c0bd4087ba780b SHA1 b73cde8c9cf313e11e84f875b865d9bfff634851 SHA256 f4efb1a5cbf040b73ec8329b3c69ad0c32424fc16afdac43ad819784612f75fa
EBUILD calculate-utilities-2.2.26-r5.ebuild 873 RMD160 6b1790e98e5032f9b9c16d318bd8c3ce7fbf462e SHA1 decb651c2f9aefaa7fc12f0ee270a59218348595 SHA256 f5bb493a6f359c04031db62e39ba4fb60bc1fb37b6eaa05744d0ef877843ed1d
EBUILD calculate-utilities-2.2.26.ebuild 858 RMD160 689a2c02fbba4a04bc6103d21e1c28eea9c1b084 SHA1 ec3fdd0e02e7e24bf06286997cb41fdf861c034f SHA256 3e72263a6417c5bd713b5329d48fb0e2a26782a249c975ffc2bc3ddb1558e860
EBUILD calculate-utilities-2.2.9999.ebuild 842 RMD160 f2c0fdc1068614b71a37f2226dcde4883ebd2876 SHA1 99f673a52934f552589baf6d12ed9bffc03b8ebd SHA256 56d97b7d2ce11d23b25d9036b4e2ee196b547ce1d11b0cc349a8205515b66bf1
EBUILD calculate-utilities-3.0.9999.ebuild 441 RMD160 ec17f871ec70a322cff866048e50c150931e0e95 SHA1 d0e036ba01e6a71ad14e6f3e6735bbd0f325df99 SHA256 30c6cd4ce478016cb75458314ea4e745ccb1501be33f14c3a2593d9d0e670c9c
MISC ChangeLog 34445 RMD160 0e7a6e35bf5c76cbc4b759182c87d4b291068310 SHA1 2b78d312a9c2e86afec860f3c1a77f04c091678f SHA256 d29e66c9e7b039491b9134d70b4f46468089e3f7b970a5a9307d0108e7fb2170
MISC ChangeLog 34632 RMD160 ec8f5cf23e341dc4e7b91247e01535d5d4bcb4c1 SHA1 6287d74227c56e7046e9c4ffc3b1edcf53198058 SHA256 e3be19490c4fd48c1f3e33fa3eeaa9382bc1226fd5951d93227f59bcdde73969

@ -0,0 +1,36 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=3
DESCRIPTION="Calculate Utilities meta package"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
SRC_URI=""
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="
cl_assemble
cl_builder
cl_client
cl_desktop
cl_installgui
cl_server
"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-2.2.26-r3
=sys-apps/calculate-templates-2.2.26-r4
=sys-apps/calculate-lib-2.2.26
=sys-apps/calculate-i18n-2.2.26-r1
cl_assemble? ( =sys-apps/calculate-assemble-2.2.26-r1 )
cl_builder? ( =sys-apps/calculate-builder-2.2.26-r1 )
cl_client? ( =sys-apps/calculate-client-2.2.26 )
cl_desktop? ( =sys-apps/calculate-desktop-2.2.26 )
cl_installgui? ( =app-misc/calculate-install-gui-2.2.26 )
cl_server? ( =sys-apps/calculate-server-2.1.15 )
"
Loading…
Cancel
Save