Update templates.

atratsevskiy
Mike Hiretsky 13 years ago
parent d0d1e09f72
commit d7cbc06328

@ -9,6 +9,7 @@ AUX calculate-templates-2.2.26-r1.patch 3384 RMD160 e1cd42354138fc25460bfa42506c
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
AUX calculate-templates-2.2.26-r5.patch 4958 RMD160 dfc4f1f79d7d7d15d2591bf6103b1dbc14c073cb SHA1 c6afadb7c385357ac5116f3090839bddd9efa4bc SHA256 3f17781ff95e5e57aed472f0d02eb9826089653e48cc9381e696f472341c097f
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
@ -25,6 +26,7 @@ EBUILD calculate-templates-2.2.25.ebuild 582 RMD160 15014412aaccd88cbc047be17596
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-r5.ebuild 739 RMD160 80f92b7854be590670d09b79640dc8162c7b347f SHA1 925c0908e4c24c1b46bdc8d865142daac236f2c5 SHA256 69e2f9c5e6d04f4ccbf50f94e5cc9a4c5ebcc6ebf309328363bcbb3f41a63f80
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, fix alsasound patch
epatch "${FILESDIR}/calculate-templates-2.2.26-r5.patch"
}
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

@ -0,0 +1,104 @@
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/alsa-utils/init.d/alsasound install/1merge/alsa-utils/init.d/alsasound
index f6cb83a..3a8cf94 100644
--- install/1merge/alsa-utils/init.d/alsasound
+++ install/1merge/alsa-utils/init.d/alsasound
@@ -16,7 +16,7 @@
if ! grep -q "PCM Playback Volume" ${alsastatedir}/asound.state
then
sed -ri "s/^\}/\
- control.39 \{\\n\
+ control.99 \{\\n\
iface MIXER\\n\
name 'PCM Playback Volume'\\n\
value.0 255\\n\
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-r6 (29 Nov 2011)
29 Nov 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+calculate-utilities-2.2.26-r6.ebuild:
Update for templates
*calculate-utilities-2.2.26-r5 (28 Nov 2011)
28 Nov 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

@ -20,7 +20,8 @@ EBUILD calculate-utilities-2.2.26-r2.ebuild 867 RMD160 1a31f8e098b5ce84697e6b5f7
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-r6.ebuild 873 RMD160 4703ab7719a321202831981a1aaa3253c7386f39 SHA1 115677c1987a22d67e0bea1a9a03c57053efcaf6 SHA256 10fe966720cb7d8cfb7914b3618a60d68ff5c34aa84a89f8dc41c0080cee91c3
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 34632 RMD160 ec8f5cf23e341dc4e7b91247e01535d5d4bcb4c1 SHA1 6287d74227c56e7046e9c4ffc3b1edcf53198058 SHA256 e3be19490c4fd48c1f3e33fa3eeaa9382bc1226fd5951d93227f59bcdde73969
MISC ChangeLog 34803 RMD160 3e9e78f195097b1cefc45e320608b963d4a97217 SHA1 a15d2b0bac831758fc2d9a9f3b4111df8d01fb46 SHA256 8237caddd21f9ff1eda498b439f76f68b1d4db4cb27fbf847d5c36a5b24fa281

@ -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-r5
=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