diff --git a/sys-apps/calculate-templates/ChangeLog b/sys-apps/calculate-templates/ChangeLog index 1fa39c324..df609febf 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.16-r6 (17 Jun 2011) + + 17 Jun 2011; Mike Hiretsky (mhiretskiy) + +calculate-templates-2.2.16-r6.ebuild, + +files/calculate-templates-2.2.16-fix_update_grub2.patch: + UPdate grub2 + *calculate-templates-2.2.16-r3 (17 Jun 2011) 17 Jun 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-templates/Manifest b/sys-apps/calculate-templates/Manifest index aab1f733e..723471a92 100644 --- a/sys-apps/calculate-templates/Manifest +++ b/sys-apps/calculate-templates/Manifest @@ -1,5 +1,6 @@ AUX calculate-templates-2.2.15-ntfs_mount.patch 485 RMD160 49f1a2bd98da6779ec7746cb4d318d89e627d7b7 SHA1 7b369bfdcc509daa4caaab66a408c0663feab694 SHA256 fb0a29438c6652ac3a1d66cfb4c587bddd2bbc2dd5025a4113cca19b8ac2d79b AUX calculate-templates-2.2.16-clean_dev.patch 395 RMD160 bed144222a7bc3a6c21628435b1d1b69f8b1bc3e SHA1 773823d4c09e6b28e54c08bc31671c24dba18fe0 SHA256 66de5c10ad83bd5f593d33dba4a8486af048eea5737ca4c1f16cae1b4bd03287 +AUX calculate-templates-2.2.16-fix_update_grub2.patch 638 RMD160 54db9d8124f5a8fa21c703e8496d482abf4f986a SHA1 d15551224c57538b79d2c87d89d427ef5467a04d SHA256 b5f46a2bc102f53bb417a5edc7203e95cb000d2f8cef0a36afd614442b1b6b37 AUX calculate-templates-2.2.16-fix_variable_bug.patch 827 RMD160 0352e4877b12e60dc02c5bdf609d0ae4d9c320a5 SHA1 ee38fead790ba2be8c0cd860caecfac01448bda4 SHA256 5ed1e434e7809c3df1a6cc68a8b5f27aaa1d0cc77ca1f7decb2edfe07ee08aee AUX calculate-templates-2.2.16-many_fix.patch 5685 RMD160 1968f13bd59ff2fec5a5a95a43cf7b679f34067c SHA1 3b5ccf94a26a68c5d510d2fcf3fa6e83fc061278 SHA256 6371f16d085b38bf14a1036bc02ab4eb96e518f8fda02500e410c68a6192db39 AUX calculate-templates-2.2.16-udev_runlevel.patch 664 RMD160 1bbdbcc1b85db4f7aa912f37793b79279db5e34c SHA1 4fbc223b674cae230cb5834adffaa15b09beee67 SHA256 f9f089808ce30e3716ed6836173af73ccee6a871e077721c3e3fea046dccada0 @@ -12,7 +13,8 @@ EBUILD calculate-templates-2.2.16-r2.ebuild 819 RMD160 23fe4054610a206253eede0a8 EBUILD calculate-templates-2.2.16-r3.ebuild 907 RMD160 88d62fa36ac974ad4bf179c4d68aef3e6ed5a0cb SHA1 5079bf164a1ef44f79203cb0fb4ffb848970141a SHA256 9a4d5472f9c58f00c0b96cd5111aa075d57d44502f9f0587caec0f684dc54f3d EBUILD calculate-templates-2.2.16-r4.ebuild 819 RMD160 23fe4054610a206253eede0a808ffaee6ad0e1ae SHA1 8e8b6e7c79d659d27aacf1eb1e41ae1699f6801a SHA256 296f0e4dc85a00952ed0cfff810e4bd8bf9c80ecca4e12b783d08bce21f077c9 EBUILD calculate-templates-2.2.16-r5.ebuild 710 RMD160 351de063b806621905ed4cf87c07af1181256a1f SHA1 b74ec6f07f87351bc1e9d3cbcef8bc2de9927186 SHA256 a8e5f7b02820d6e55f68146764424f77f66e60f42d634cdffe321ba6e97b365f +EBUILD calculate-templates-2.2.16-r6.ebuild 809 RMD160 65feb7c914b5db32bc36fa59db0dcd94bcd3437d SHA1 5ccb3bdb5701e26d9bda6c227fd32f04bdcd7a36 SHA256 c5a450b553855cf3f2ac4835dbcbd9520b4699ca8d923269ce7c92229017ff99 EBUILD calculate-templates-2.2.16.ebuild 581 RMD160 e90f17422eed60fe9e68d5854a2f911f3553eb00 SHA1 4a9be464e21b3e31380de5ef94889710ce6fe806 SHA256 a54f409c05a8cbce66600f723bdfb272c696dada737b5507ebce56f970da29dd EBUILD calculate-templates-2.2.9999.ebuild 572 RMD160 14e53f7c05efbb563b793b1025669cbe79d0838c SHA1 226d287ce0a00609ed6c871321abf5000565227e SHA256 5df16332077472571e2d4aae47e958d1e6efe3a8d694b61053778f75a537142f -MISC ChangeLog 22391 RMD160 edf3b7360ea6517bc58a443cc8ebb3acf589657d SHA1 e98eadc6e0ca7a5545459f3c531d854f57069cef SHA256 8106c5c216dcda558b3570c488f29bdefc0a870a11f9ef82a94ec7f95e8ccc71 +MISC ChangeLog 22614 RMD160 17ca0411935bf82c2d2b8af2e0e1cbc6d548c48e SHA1 24e18d2ec48b777473e9615a5a6b796b85ddb4f6 SHA256 1b5f79b979382aa4be9227c99afe159c16b735a1f4c02208ac033a628f758feb MISC metadata.xml 338 RMD160 4a1a51881bdf09b961217d2056114ca4ccb8b4d2 SHA1 5fcb2724427f9ac5dda07abb5c829c24e6db9ae6 SHA256 175d9ae86b71b291a519414e816b05290d0e4be74726cc8d5449a500c51a3b2d diff --git a/sys-apps/calculate-templates/calculate-templates-2.2.16-r6.ebuild b/sys-apps/calculate-templates/calculate-templates-2.2.16-r6.ebuild new file mode 100644 index 000000000..fcf0b9b4e --- /dev/null +++ b/sys-apps/calculate-templates/calculate-templates-2.2.16-r6.ebuild @@ -0,0 +1,39 @@ +# 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.16" + +RDEPEND="${DEPEND}" + +src_unpack() { + unpack "${A}" + cd "${S}" + + # fix variable bug + epatch "${FILESDIR}/calculate-templates-2.2.16-many_fix.patch" + # fix grub2 update config + epatch "${FILESDIR}/calculate-templates-2.2.16-fix_update_grub2.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.16-fix_update_grub2.patch b/sys-apps/calculate-templates/files/calculate-templates-2.2.16-fix_update_grub2.patch new file mode 100644 index 000000000..91bbcbeee --- /dev/null +++ b/sys-apps/calculate-templates/files/calculate-templates-2.2.16-fix_update_grub2.patch @@ -0,0 +1,15 @@ +commit 7ff49ef7feef78973a9e0cf48899ada8a4458fc7 +Author: Mike Hiretsky +Date: Fri Jun 17 15:13:22 2011 +0400 + + Fix grub2 update config. + +diff --git a/install/1merge/grub2/update-grub b/install/1merge/grub2/update-grub +index d574225..561679f 100644 +--- a/install/1merge/grub2/update-grub ++++ b/install/1merge/grub2/update-grub +@@ -1,3 +1,3 @@ +-# Calculate path=/tmp exec=/bin/bash os_install_root_type!=livecd ++# Calculate path=/tmp exec=/bin/bash os_install_root_type!=livecd&&exists(/sbin/grub-mkconfig,root)!= + + CHROOT_PATH=#-cl_chroot_grub-# /sbin/grub-mkconfig >#-cl_chroot_path-#/boot/grub/grub.cfg 2>/dev/null diff --git a/sys-apps/calculate-utilities/ChangeLog b/sys-apps/calculate-utilities/ChangeLog index 870411b69..4a5ac78ed 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.16-r9 (17 Jun 2011) + + 17 Jun 2011; Mike Hiretsky (mhiretskiy) + +calculate-utilities-2.2.16-r9.ebuild: + Update for templates. + *calculate-utilities-2.2.16-r6 (17 Jun 2011) 17 Jun 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest index 4e169e264..96f469ae3 100644 --- a/sys-apps/calculate-utilities/Manifest +++ b/sys-apps/calculate-utilities/Manifest @@ -14,6 +14,7 @@ EBUILD calculate-utilities-2.2.16-r5.ebuild 838 RMD160 9845d647992a22ae7f2f2820d EBUILD calculate-utilities-2.2.16-r6.ebuild 838 RMD160 bfb8ec8683ad8b4f6fea90f423ae75a07e3a18ff SHA1 e03bceedf7a857f5b94bd0d73b619d0772334fa7 SHA256 fa0ad9c9b54fd18e71c584d1de688beb42e559d4029de4dff92d600e43022152 EBUILD calculate-utilities-2.2.16-r7.ebuild 838 RMD160 4d48ee6d8663886d511ab9c972d776d5040ab3ed SHA1 225ce03d203607703c025873911779b2a7e17af7 SHA256 f8052f8dabdd324a0a62654e9db7f916384dc644affed7394b57070d513ba50d EBUILD calculate-utilities-2.2.16-r8.ebuild 838 RMD160 3ece201fcefd6cb4d4813742658991a4d338721e SHA1 1b46fa9829570f6a64e700a3b2056d6fbc583f7b SHA256 74b34c332b2faa2b70eac1aa7f7418ebcc8fa7a1376a4e84d8acc392a009ebde +EBUILD calculate-utilities-2.2.16-r9.ebuild 838 RMD160 860152120f6a6e35ee51258bbef3729c9b53a311 SHA1 8c980cf20a6853c05a2c5bca56a5e3e86865190a SHA256 1f234a0841146b71e3b9683ae5a71ad4896d31c2f3f5a3583a4c52e435cd1ced EBUILD calculate-utilities-2.2.16.ebuild 829 RMD160 dee34889a7f8ab23011ca57685573d0c3b7ba2ef SHA1 e2dcd703f0045e6d8c5647c131c0a72f7d03a9b0 SHA256 f2666edf4ce390eeea6cfc5f3750742a93b861ad1f431aac9ec2c6eeefbf3af7 EBUILD calculate-utilities-2.2.9999.ebuild 840 RMD160 0c7324a9ed480118ac19f62b162c9ee62c25f964 SHA1 7dadab1430ed147334ed7e9b4fcc86dc99e25d56 SHA256 f3ee28f9f765e7302c83eb4a15a09bdf066f09e6b40e34f6d52157a946df5e66 -MISC ChangeLog 11703 RMD160 6a69a081c9c4802737bed1bf5dca8dbe1c81b1ac SHA1 35040b48552a8542edfc72b6c0d41899176cfc92 SHA256 7322c612d6fe2e69cefb749f9c8ef78c35c5daf581599d063a36ac03510842b3 +MISC ChangeLog 11875 RMD160 e0925eb5fead3f69bf82e70579fe983cbdd9ef8f SHA1 ed5ef61ae588a95cbfd244acd3252a49a1d7d0b0 SHA256 cb4a26b2a4aa1a4043024bbd77dd3f181f40da76319132cc6b2ffb3006a8c5fd diff --git a/sys-apps/calculate-utilities/calculate-utilities-2.2.16-r9.ebuild b/sys-apps/calculate-utilities/calculate-utilities-2.2.16-r9.ebuild new file mode 100644 index 000000000..0d1461959 --- /dev/null +++ b/sys-apps/calculate-utilities/calculate-utilities-2.2.16-r9.ebuild @@ -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.16 + =sys-apps/calculate-templates-2.2.16-r6 + =sys-apps/calculate-lib-2.2.16-r1 + + cl_assemble? ( =sys-apps/calculate-assemble-2.2.16 ) + cl_builder? ( =sys-apps/calculate-builder-2.2.16-r4 ) + cl_client? ( =sys-apps/calculate-client-2.2.16 ) + cl_desktop? ( =sys-apps/calculate-desktop-2.2.16 ) + cl_installgui? ( =app-misc/calculate-install-gui-2.2.16 ) + + cl_server? ( =sys-apps/calculate-server-2.1.14-r2 ) +" +