From a5bce9a9b4c8870e60dc34f7a70398569ca7f51e Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Tue, 29 Mar 2011 10:28:33 +0400 Subject: [PATCH] Update templates. --- sys-apps/calculate-templates/ChangeLog | 7 ++ sys-apps/calculate-templates/Manifest | 4 +- .../calculate-templates-2.2.12-r2.ebuild | 37 +++++++++ ...calculate-templates-2.2.12-backport2.patch | 80 +++++++++++++++++++ sys-apps/calculate-utilities/ChangeLog | 6 ++ sys-apps/calculate-utilities/Manifest | 3 +- .../calculate-utilities-2.2.12-r8.ebuild | 36 +++++++++ 7 files changed, 171 insertions(+), 2 deletions(-) create mode 100644 sys-apps/calculate-templates/calculate-templates-2.2.12-r2.ebuild create mode 100644 sys-apps/calculate-templates/files/calculate-templates-2.2.12-backport2.patch create mode 100644 sys-apps/calculate-utilities/calculate-utilities-2.2.12-r8.ebuild diff --git a/sys-apps/calculate-templates/ChangeLog b/sys-apps/calculate-templates/ChangeLog index fc33498c5..25dd5f866 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.12-r2 (29 Mar 2011) + + 29 Mar 2011; Mike Hiretsky (mhiretskiy) + +calculate-templates-2.2.12-r2.ebuild, + +files/calculate-templates-2.2.12-backport2.patch: + Update templates. + *calculate-templates-2.2.12-r1 (24 Mar 2011) 24 Mar 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-templates/Manifest b/sys-apps/calculate-templates/Manifest index ae5e0b344..d87afb346 100644 --- a/sys-apps/calculate-templates/Manifest +++ b/sys-apps/calculate-templates/Manifest @@ -3,12 +3,14 @@ AUX calculate-templates-2.2.11-fix_scratch.patch 1947 RMD160 3ab46c1ea554004d279 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 3258 RMD160 866c215e484df9d3d04599bd3629221fe6590897 SHA1 da8da03ad2c4f68054ee9b60b0fb067626f782e0 SHA256 8fbf1f80883ec4dc90acf2e3e10e62f9151b05c154750b85d2b6ebfc9e133a23 +AUX calculate-templates-2.2.12-backport2.patch 3242 RMD160 87a90fc6495ab16bc5fcde336ca2c5937c944fbb SHA1 a761ad92e74345e4c55b7f90f786e6965ebf5f12 SHA256 ab5942db418378413813ccfab2c4818468ea0fdcd12f7874be154da17ca203bf 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-r2.ebuild 689 RMD160 9e0bd7233fbc4fa8e931544420e88c827e526cb0 SHA1 116d6e70fb45464a9fe0efead98fae1bb2e6830b SHA256 36b928deb5e553c967f2dcb70a2397af28ffb639e5f2b1d46f13aa96e59b6046 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 18616 RMD160 03014fe1c59e2db65c51589966654ac26e0460a6 SHA1 16263de8674d70598f5868dc9845cf78b620208e SHA256 80758f402518fa693cfa6839eb519e749b2449e80441476d3d417df4a3f648e8 +MISC ChangeLog 18837 RMD160 01fd4578b0fd14570d9c861e0706e02dc9d174f4 SHA1 efc4db1f761f203ae460a03197b6dc5e7b38e1ac SHA256 0080b08d7e09c51c0de036ea10e944538c89a4a009d55fe4e08c47a43317443b MISC metadata.xml 338 RMD160 4a1a51881bdf09b961217d2056114ca4ccb8b4d2 SHA1 5fcb2724427f9ac5dda07abb5c829c24e6db9ae6 SHA256 175d9ae86b71b291a519414e816b05290d0e4be74726cc8d5449a500c51a3b2d diff --git a/sys-apps/calculate-templates/calculate-templates-2.2.12-r2.ebuild b/sys-apps/calculate-templates/calculate-templates-2.2.12-r2.ebuild new file mode 100644 index 000000000..98036d7f2 --- /dev/null +++ b/sys-apps/calculate-templates/calculate-templates-2.2.12-r2.ebuild @@ -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-backport2.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.12-backport2.patch b/sys-apps/calculate-templates/files/calculate-templates-2.2.12-backport2.patch new file mode 100644 index 000000000..e2f23c0d4 --- /dev/null +++ b/sys-apps/calculate-templates/files/calculate-templates-2.2.12-backport2.patch @@ -0,0 +1,80 @@ +diff --git assemble/prepare/etc/python.config assemble/prepare/etc/python.config +index 6422815..f810ae2 100644 +--- assemble/prepare/etc/python.config ++++ assemble/prepare/etc/python.config +@@ -1,2 +1,2 @@ + # Calculate path=/etc/env.d/python name=config +-python2.6 ++python2.7 +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/gdm/custom.conf install/1merge/gdm/custom.conf +index 2b4bf50..d242939 100644 +--- install/1merge/gdm/custom.conf ++++ install/1merge/gdm/custom.conf +@@ -12,7 +12,7 @@ GraphicalThemedColor=#170b0a + #pkg# + + [server-Standard] +-command=/usr/bin/X -audit 0 vt7 -dpi 96 ++command=/usr/bin/X -audit 0 -dpi 96 + + [daemon] + #?os_install_root_type!=livecd# +diff --git install/1merge/kdm/kdmrc install/1merge/kdm/kdmrc +index a6f145c..fbc04b2 100644 +--- install/1merge/kdm/kdmrc ++++ install/1merge/kdm/kdmrc +@@ -73,7 +73,7 @@ AllowNullPasswd=true + AllowShutdown=All + NoPassEnable=false + NoPassUsers= +-ServerArgsLocal=-nolisten tcp vt7 -dpi 96 ++ServerArgsLocal=-nolisten tcp -dpi 96 + ServerCmd=/usr/bin/X -br -novtswitch + #?os_install_x11_video_drv==fglrx# + # System freezes after logout with GDM or KDM ATI +diff --git install/1merge/openrc/rc.conf install/1merge/openrc/rc.conf +index 1616719..71a8d1d 100644 +--- install/1merge/openrc/rc.conf ++++ install/1merge/openrc/rc.conf +@@ -5,3 +5,5 @@ rc_interactive="YES" + no_umounts="/newroot.*:/lib/splash/cache:/lib64/splash/cache" + #use all net.* for network atapters (need for CDS) + rc_hotplug="*" ++#nothing special type ++rc_sys="" +diff --git install/1merge/portage/make.conf install/1merge/portage/make.conf +index a539fe6..270567f 100644 +--- install/1merge/portage/make.conf ++++ install/1merge/portage/make.conf +@@ -60,6 +60,8 @@ 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-#" ++#PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/#-os_install_linux_shortname-#/grp/#-os_install_arch_machine-#" + #os_install_linux_shortname# + + #?os_install_locale_language!=ru&&os_install_locale_language!=bg# +diff --git install/1merge/slim/slim.conf install/1merge/slim/slim.conf +index 45ba731..7aa80e1 100644 +--- install/1merge/slim/slim.conf ++++ install/1merge/slim/slim.conf +@@ -1,5 +1,5 @@ + # Calculate format=proftpd +-xserver_arguments -nolisten tcp -br -deferglyphs 16 vt7 -dpi 96 ++xserver_arguments -nolisten tcp -br -deferglyphs 16 -dpi 96 + + #?os_install_root_type==livecd# + auto_login yes diff --git a/sys-apps/calculate-utilities/ChangeLog b/sys-apps/calculate-utilities/ChangeLog index b990ce9f2..1884bf84f 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.12-r8 (29 Mar 2011) + + 29 Mar 2011; Mike Hiretsky (mhiretskiy) + +calculate-utilities-2.2.12-r8.ebuild: + Update for templates. + *calculate-utilities-2.2.12-r7 (28 Mar 2011) 28 Mar 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest index 2c23b2d44..49269de58 100644 --- a/sys-apps/calculate-utilities/Manifest +++ b/sys-apps/calculate-utilities/Manifest @@ -6,5 +6,6 @@ EBUILD calculate-utilities-2.2.12-r4.ebuild 838 RMD160 451dec0c1a0a2b80f99f179ab EBUILD calculate-utilities-2.2.12-r5.ebuild 841 RMD160 a0895d160e25d74bc13e10703c7b7cdcf4fae600 SHA1 fdb62c8f56d956e4867d1ada6a2fcb854f2880ed SHA256 57c5bf9424f36cdc48a20d01b25db3323b3706173673241964d9dff1a2e5a861 EBUILD calculate-utilities-2.2.12-r6.ebuild 841 RMD160 b8d7bcd04aa9d403ecd055527e185847a34a65fc SHA1 94a4b940cc3b6c2d310e38e427c3d595e3948415 SHA256 db944afdcac437ec865cf8250a96672a61e4a4a84599df26b0953b6848ab1486 EBUILD calculate-utilities-2.2.12-r7.ebuild 841 RMD160 9a915669c1fabdbc090c848190c45e9366879239 SHA1 2cce7146c5713829838262892860868550c16400 SHA256 cd0cda329d09c0ac8f21b11d8cf24097f4ba7711a21d3fa2c9659ade8d3c207e +EBUILD calculate-utilities-2.2.12-r8.ebuild 841 RMD160 1cb7413eb8d09493685c5de8e2553e73f8ab3646 SHA1 4f014d98ce55d3a96a78c88c83c3caebe6d5ef1b SHA256 f5387f5cc1bef1d075f415437f6ded62168077eb5fe37d5a8e223ea8b5aab47b EBUILD calculate-utilities-2.2.12.ebuild 826 RMD160 2e3f045d37568bcfb15248163b4c04800fefeeac SHA1 2cf9f0cc76002be25ac85c4303f06b6a2506eefc SHA256 aa38dccd206fea10ded4f3d8daf39e4c68e17a4c4420cbc524d043a4c0ddc60b -MISC ChangeLog 5251 RMD160 472b5ce55ce9895e038cb2f79315cacc519f1286 SHA1 bbf87604575d9b2ceb561c5ac1b22ea575cfcbd5 SHA256 acd4943bf21b2021d41d8dafab649ef215df1cf393675527919d5bb0c889e476 +MISC ChangeLog 5423 RMD160 d32b69fe47dc85a42f97e65ceb11b9f50f521536 SHA1 c3e60eef2d379c84c117b7c0038ccc728b54a4b2 SHA256 ba7edad8c9f6d5cae7608e362f029539d2d6ab723ab42ab324e98ee1d9a50e59 diff --git a/sys-apps/calculate-utilities/calculate-utilities-2.2.12-r8.ebuild b/sys-apps/calculate-utilities/calculate-utilities-2.2.12-r8.ebuild new file mode 100644 index 000000000..5b81f6f1f --- /dev/null +++ b/sys-apps/calculate-utilities/calculate-utilities-2.2.12-r8.ebuild @@ -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-r2 + =sys-apps/calculate-templates-2.2.12-r2 + =sys-apps/calculate-lib-2.2.12-r2 + + cl_assemble? ( =sys-apps/calculate-assemble-2.2.12-r2 ) + cl_builder? ( =sys-apps/calculate-builder-2.2.12-r2 ) + 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 ) +" +