Update templates for fix syntax bug.

atratsevskiy
Mike Hiretsky 14 years ago
parent 388440d8af
commit aa263e6e46

@ -2,6 +2,13 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-templates-2.2.12-r1 (24 Mar 2011)
24 Mar 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+calculate-templates-2.2.12-r1.ebuild,
+files/calculate-templates-2.2.12-backport.patch:
Update for fix syntax bug.
*calculate-templates-2.2.12 (22 Mar 2011)
22 Mar 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

@ -2,11 +2,13 @@ AUX calculate-templates-2.2.11-calckernel_autoupdate.patch 728 RMD160 b84f74124b
AUX calculate-templates-2.2.11-fix_scratch.patch 1947 RMD160 3ab46c1ea554004d279949b238f0a8ed4084a671 SHA1 38d8d6815c10e5f77b52764f5e7841b96f98d06f SHA256 fef78c5a3b356a731dd0c4151e980c1aa3bb03b15bc24721d71a2ee6078b5e5f
AUX calculate-templates-2.2.11-hide_couch2.patch 655 RMD160 86a7f509cf3cad59ad7d036c8422836bac774bb3 SHA1 cdf3646f97690800f44e745cfd4df792fabfa4bd SHA256 607521fe6c76dd90c56e7b12810ddaac82022202053a7226dfbb6c8f6ffa7f4e
AUX calculate-templates-2.2.11-syntax_fix.patch 3135 RMD160 b5d93694234c6a433d30bb5858086aea39b281fd SHA1 be55aeb5d88738a04c599431a7e4da56f22ac5d4 SHA256 b15cdfbbf32cc9628d903d6360d6001cbb7542e3a225a8b618ada2e03d905395
AUX calculate-templates-2.2.12-backport.patch 2887 RMD160 2def06bd3e0fe63792d3475e4f199067d702856c SHA1 d3daf08586bc36b04c07f06ef0656664a400e134 SHA256 14ec23ef79b8283cc6778c1a54d837cde783739bd2e7c36f6d0cc908d6c6b4f4
DIST calculate-templates-2.2.11.tar.bz2 228156 RMD160 76eba34642bde38cfcd71bc5127b91cdecd74bc8 SHA1 9ae1ce001f1369a9435c8a6deb48d651874b1287 SHA256 035f7d11976eff2bad68179b29b161164e6f7774886392b28aff6aacfbf49822
DIST calculate-templates-2.2.12.tar.bz2 229142 RMD160 035e3c9e5d93965af9121954ca9e4d9c9a355c60 SHA1 5e4fab13b684131e28809871802da2f29edbd8c1 SHA256 1b433e0d6e116cbe060a58c101a81327e5d2d0071a24fbdbb2d8300b6985965b
EBUILD calculate-templates-2.2.11-r5.ebuild 902 RMD160 6ae28a3179b342aaec547bd8be8002a2b78a43e5 SHA1 87e809ace60dcd34ea1520cf8370170e75435e0b SHA256 8627071e30b62d513b600fb35a004650f5b0df2af83326e8fec9c5f25a2905bd
EBUILD calculate-templates-2.2.11-r6.ebuild 1008 RMD160 ded55a538fdfdc0820a885709728f40fd067a423 SHA1 3ca3832caaa24b3d65d3ee968a25baee6b123640 SHA256 06b976358048e2cd1e86cdd1a952678f06469f5720b4c7d4899696ca5b03f606
EBUILD calculate-templates-2.2.12-r1.ebuild 688 RMD160 202d39eede1b6d458ef1109daf5080f2ea0d6bc0 SHA1 3bdcbbe39a41bc75c634449902fd70216a118f1b SHA256 f5b7350ae9d8aaf2f6098715d7b14d0f51bd8151a0bfc0205708f4334747df95
EBUILD calculate-templates-2.2.12.ebuild 561 RMD160 bd2d8a44063930c59ecba7e653da3b306c85d73a SHA1 09a164f020651097511533dd7356e05683c4ed76 SHA256 3c4a030ae75066ed0e05dc5a8ad8ddf99b2612ec0b72b8962494d81a536b055d
EBUILD calculate-templates-2.2.9999.ebuild 572 RMD160 f3863438bdc490429c0fe18ff2e885ee566c3e61 SHA1 d9baafda4369d59124caa73245d3f8ec10613382 SHA256 13edc4707924171922107591bf9dd842e350aaaac9874505e039b0a68b093e70
MISC ChangeLog 18387 RMD160 879e4b9372da2dbd4a3235a7a0793cf75e438cf4 SHA1 33399f96054164fcd8aa0499043647a6079de5ff SHA256 649ca6197f94746a6998aaf35478120975040ef264b392f1527d33bcf82fdf70
MISC ChangeLog 18616 RMD160 03014fe1c59e2db65c51589966654ac26e0460a6 SHA1 16263de8674d70598f5868dc9845cf78b620208e SHA256 80758f402518fa693cfa6839eb519e749b2449e80441476d3d417df4a3f648e8
MISC metadata.xml 338 RMD160 4a1a51881bdf09b961217d2056114ca4ccb8b4d2 SHA1 5fcb2724427f9ac5dda07abb5c829c24e6db9ae6 SHA256 175d9ae86b71b291a519414e816b05290d0e4be74726cc8d5449a500c51a3b2d

@ -0,0 +1,37 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils 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=""
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# backport patch
epatch "${FILESDIR}/calculate-templates-2.2.12-backport.patch"
}
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

@ -0,0 +1,44 @@
diff --git builder/iso/calcboot/isolinux/isolinux.cfg.desktop.oldkernel builder/iso/calcboot/isolinux/isolinux.cfg.desktop.oldkernel
index ead6f23..6cc2f39 100644
--- builder/iso/calcboot/isolinux/isolinux.cfg.desktop.oldkernel
+++ builder/iso/calcboot/isolinux/isolinux.cfg.desktop.oldkernel
@@ -1,4 +1,4 @@
-# Calculate name=isolinux.cfg os_builder_linux_system==desktop&&pkg(sys-kernel/calculate-sources)<2.6.32.33||os_builder_linux_system==desktop&&pkg(sys-kernel/calculate-sources)>2.6.33&&pkg(sys-kernel/calculate-sources)<2.6.37.4#
+# Calculate name=isolinux.cfg os_builder_linux_system==desktop&&pkg(sys-kernel/calculate-sources)<2.6.32.33||os_builder_linux_system==desktop&&pkg(sys-kernel/calculate-sources)>2.6.33&&pkg(sys-kernel/calculate-sources)<2.6.37.4
DEFAULT calcmenu.c32
INCLUDE common.cfg
diff --git builder/iso/calcboot/isolinux/isolinux.cfg.server.oldkernel builder/iso/calcboot/isolinux/isolinux.cfg.server.oldkernel
index 69245ee..b6ba85c 100644
--- builder/iso/calcboot/isolinux/isolinux.cfg.server.oldkernel
+++ builder/iso/calcboot/isolinux/isolinux.cfg.server.oldkernel
@@ -1,4 +1,4 @@
-# Calculate name=isolinux.cfg os_builder_linux_system==server&&pkg(sys-kernel/calculate-sources)<2.6.32.33||os_builder_linux_system==server&&pkg(sys-kernel/calculate-sources)>2.6.33&&pkg(sys-kernel/calculate-sources)<2.6.37.4#
+# Calculate name=isolinux.cfg os_builder_linux_system==server&&pkg(sys-kernel/calculate-sources)<2.6.32.33||os_builder_linux_system==server&&pkg(sys-kernel/calculate-sources)>2.6.33&&pkg(sys-kernel/calculate-sources)<2.6.37.4
DEFAULT calcmenu.c32
INCLUDE common.cfg
diff --git install/1merge/baselayout/gentoo-release install/1merge/baselayout/gentoo-release
new file mode 100644
index 0000000..739cc33
--- /dev/null
+++ install/1merge/baselayout/gentoo-release
@@ -0,0 +1,6 @@
+#?os_install_linux_subname!=#
+#-os_install_linux_name-# #-os_install_linux_ver-# #-os_install_linux_subname-#
+#os_install_linux_subname#
+#?os_install_linux_subname==#
+#-os_install_linux_name-# #-os_install_linux_ver-#
+#os_install_linux_subname#
diff --git install/1merge/portage/make.conf install/1merge/portage/make.conf
index a539fe6..6928e79 100644
--- install/1merge/portage/make.conf
+++ install/1merge/portage/make.conf
@@ -60,6 +60,7 @@ ACCEPT_LICENSE="*"
#?os_install_linux_shortname==CLD||os_install_linux_shortname==CLDG||os_install_linux_shortname==CLDX||os_install_linux_shortname==CDS#
#PORTAGE_BINHOST="http://77.88.19.68/calculate/#-os_install_linux_shortname-#/grp/#-os_install_arch_machine-#"
#PORTAGE_BINHOST="ftp://ftp.linux.kiev.ua/pub/Linux/Calculate/#-os_install_linux_shortname-#/grp/#-os_install_arch_machine-#"
+#PORTAGE_BINHOST="ftp://opennix.tula.su/calculate/#-os_install_linux_shortname-#/grp/#-os_install_arch_machine-#"
#os_install_linux_shortname#
#?os_install_locale_language!=ru&&os_install_locale_language!=bg#

@ -2,6 +2,12 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-utilities-2.2.12-r2 (24 Mar 2011)
24 Mar 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+calculate-utilities-2.2.12-r2.ebuild:
Update for templates.
*calculate-utilities-2.2.12-r1 (24 Mar 2011)
24 Mar 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

@ -1,4 +1,5 @@
EBUILD calculate-utilities-2.2.11-r12.ebuild 838 RMD160 d5c72a8b4ec2d1471f7d911ff917d5698cbac1f0 SHA1 171b8aa3bbfdacb02e73506e377f9d1d66989872 SHA256 6624f4d903bfef433f25b52ed82119a8f970e3b67f2f55496bc7c8cb72a3a2a1
EBUILD calculate-utilities-2.2.12-r1.ebuild 832 RMD160 5882f622681fd9ecbbde1bba49a4204114ef8c8f SHA1 3dd06830aa9849d25f9cc2308e093d5e4921ae2e SHA256 303e0f23064db2a13e0e05a286dd2731c0ccb5d488fe725a330f2b8325c08d00
EBUILD calculate-utilities-2.2.12-r2.ebuild 835 RMD160 3286a38d46db2bfa4eca99cfbed396fdd90a6ff9 SHA1 3e297c5c65e1c2cc9db7eeb9b5322aa74ceab8b5 SHA256 53e1e723ae085567d94f5c15aa42169b1663aa3f1b3f5578861404f3b0129dfd
EBUILD calculate-utilities-2.2.12.ebuild 826 RMD160 2e3f045d37568bcfb15248163b4c04800fefeeac SHA1 2cf9f0cc76002be25ac85c4303f06b6a2506eefc SHA256 aa38dccd206fea10ded4f3d8daf39e4c68e17a4c4420cbc524d043a4c0ddc60b
MISC ChangeLog 4194 RMD160 b7e9b7ca92a8ad2c8f53631e8687cc45a1c51904 SHA1 481e82a1247d419700c6db7be868f9bb2bf312d6 SHA256 47eb9532ceebeaa59be1b27950c10644b8199a8a49bf55de3525401db45c01d0
MISC ChangeLog 4366 RMD160 a73542da8eb1526394703df3d36e9b5413fb031d SHA1 23030fcb24694eed7a11dd86f17cb89fc968a8d4 SHA256 7b04f41b2c001f34f6b56b78b2012383065e2e806d790a1d7c57ec78feb9c3d1

@ -0,0 +1,36 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=2
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.12-r1
=sys-apps/calculate-templates-2.2.12-r1
=sys-apps/calculate-lib-2.2.12
cl_assemble? ( =sys-apps/calculate-assemble-2.2.12-r1 )
cl_builder? ( =sys-apps/calculate-builder-2.2.12 )
cl_client? ( =sys-apps/calculate-client-2.2.12 )
cl_desktop? ( =sys-apps/calculate-desktop-2.2.12 )
cl_installgui? ( =app-misc/calculate-install-gui-2.2.12 )
cl_server? ( =sys-apps/calculate-server-2.1.13 )
"
Loading…
Cancel
Save