From c8bdddfa8ecabff68faa32f13bbdd9d77ece2a2c Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Fri, 17 Jun 2011 14:57:11 +0400 Subject: [PATCH] Update templates. --- sys-apps/calculate-templates/Manifest | 2 + .../calculate-templates-2.2.16-r5.ebuild | 37 +++++ .../calculate-templates-2.2.16-many_fix.patch | 126 ++++++++++++++++++ sys-apps/calculate-utilities/Manifest | 1 + .../calculate-utilities-2.2.16-r8.ebuild | 36 +++++ 5 files changed, 202 insertions(+) create mode 100644 sys-apps/calculate-templates/calculate-templates-2.2.16-r5.ebuild create mode 100644 sys-apps/calculate-templates/files/calculate-templates-2.2.16-many_fix.patch create mode 100644 sys-apps/calculate-utilities/calculate-utilities-2.2.16-r8.ebuild diff --git a/sys-apps/calculate-templates/Manifest b/sys-apps/calculate-templates/Manifest index 302dfc7de..f05fd565c 100644 --- a/sys-apps/calculate-templates/Manifest +++ b/sys-apps/calculate-templates/Manifest @@ -1,6 +1,7 @@ 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_variable_bug.patch 827 RMD160 0352e4877b12e60dc02c5bdf609d0ae4d9c320a5 SHA1 ee38fead790ba2be8c0cd860caecfac01448bda4 SHA256 5ed1e434e7809c3df1a6cc68a8b5f27aaa1d0cc77ca1f7decb2edfe07ee08aee +AUX calculate-templates-2.2.16-many_fix.patch 5757 RMD160 577ba12cf752466984722d73894aa890312c240d SHA1 4e0dd282a6c0a9878b767c5a964f41740d3e7334 SHA256 094ade697f420faaf36edc83dc3fc5755ab8476b0d8c50b0f01103d6dfc09d20 AUX calculate-templates-2.2.16-udev_runlevel.patch 664 RMD160 1bbdbcc1b85db4f7aa912f37793b79279db5e34c SHA1 4fbc223b674cae230cb5834adffaa15b09beee67 SHA256 f9f089808ce30e3716ed6836173af73ccee6a871e077721c3e3fea046dccada0 DIST calculate-templates-2.2.15.tar.bz2 231070 RMD160 df93588bb98c449447b276d124ebfc7062fcac7a SHA1 881f004803062de7b0d2704fbb9b81abb40f378f SHA256 6f252027a037111662ae89a9007405f8d474967a79015690fb85cebd749d6858 DIST calculate-templates-2.2.16.tar.bz2 231990 RMD160 ad50cc16875daae294ee2ddd674481a57e4ce874 SHA1 5d90afc0dceca2d80ca5cb20a3d18c04dfb60abd SHA256 bca54589f5fa75054d8d9572650411fa2fe4776869331fe7fe37d75f4b442c16 @@ -10,6 +11,7 @@ EBUILD calculate-templates-2.2.16-r1.ebuild 718 RMD160 b895824c54c056ad2048c9759 EBUILD calculate-templates-2.2.16-r2.ebuild 819 RMD160 23fe4054610a206253eede0a808ffaee6ad0e1ae SHA1 8e8b6e7c79d659d27aacf1eb1e41ae1699f6801a SHA256 296f0e4dc85a00952ed0cfff810e4bd8bf9c80ecca4e12b783d08bce21f077c9 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.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 diff --git a/sys-apps/calculate-templates/calculate-templates-2.2.16-r5.ebuild b/sys-apps/calculate-templates/calculate-templates-2.2.16-r5.ebuild new file mode 100644 index 000000000..03e132d1c --- /dev/null +++ b/sys-apps/calculate-templates/calculate-templates-2.2.16-r5.ebuild @@ -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.16" + +RDEPEND="${DEPEND}" + +src_unpack() { + unpack "${A}" + cd "${S}" + + # fix variable bug + epatch "${FILESDIR}/calculate-templates-2.2.16-many_fix.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-many_fix.patch b/sys-apps/calculate-templates/files/calculate-templates-2.2.16-many_fix.patch new file mode 100644 index 000000000..a007a0071 --- /dev/null +++ b/sys-apps/calculate-templates/files/calculate-templates-2.2.16-many_fix.patch @@ -0,0 +1,126 @@ +diff --git a/desktop/desktop/20-kde-4.6/.kde4/share/config/ksplashrc b/desktop/desktop/20-kde-4.6/.kde4/share/config/ksplashrc +index e323c6c..a69927b 100644 +--- a/desktop/desktop/20-kde-4.6/.kde4/share/config/ksplashrc ++++ b/desktop/desktop/20-kde-4.6/.kde4/share/config/ksplashrc +@@ -2,9 +2,9 @@ + #тема загрузки рабочего стола + [KSplash] + Engine=KSplashX +-#?os_install_locale_lang!=pt_BR# ++#?os_locale_lang!=pt_BR# + Theme=CalculateSplash#-case(capitalize,os_locale_language)-# +-#os_install_locale_lang# +-#?os_install_locale_lang==pt_BR# ++#os_locale_lang# ++#?os_locale_lang==pt_BR# + Theme=CalculateSplashPt +-#os_install_locale_lang# ++#os_locale_lang# +diff --git a/install/1merge/glibc/locale.gen b/install/1merge/glibc/locale.gen +index cf85a94..15cff6b 100644 +--- a/install/1merge/glibc/locale.gen ++++ b/install/1merge/glibc/locale.gen +@@ -26,7 +26,6 @@ nn_NO.UTF-8 UTF-8 + pl_PL.UTF-8 UTF-8 + #Portuguese + pt_PT.UTF-8 UTF-8 +-pt_PT.UTF-8@euro UTF-8 + #Russian + ru_RU.UTF-8 UTF-8 + #Spanish +diff --git a/install/1merge/grub2/default.grub b/install/1merge/grub2/default.grub +index a3f5f9f..67ddb16 100644 +--- a/install/1merge/grub2/default.grub ++++ b/install/1merge/grub2/default.grub +@@ -2,17 +2,27 @@ + GRUB_DISABLE_RECOVERY=true + GRUB_DEFAULT=saved + GRUB_TIMEOUT=3 +-GRUB_CMDLINE_LINUX_DEFAULT="console=tty1 udev quiet doscsi" +-GRUB_CMDLINE_LINUX="video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=silent,theme:tty1 #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-#" ++#?pkg(media-gfx/cld-themes)!=||pkg(media-gfx/cldx-themes)!=||pkg(media-gfx/cldg-themes)!=||pkg(media-gfx/cls-themes)!=||pkg(media-gfx/cds-themes)!=||pkg(media-gfx/cmc-themes)!=# ++GRUB_CMDLINE_LINUX="video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=silent,theme:tty1 #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-# console=tty1 udev quiet" ++#pkg# ++#?pkg(media-gfx/cld-themes)==&&pkg(media-gfx/cldx-themes)==&&pkg(media-gfx/cldg-themes)==&&pkg(media-gfx/cls-themes)==&&pkg(media-gfx/cds-themes)==&&pkg(media-gfx/cmc-themes)==# ++GRUB_CMDLINE_LINUX="video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=off,theme:tty1 #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-# console=tty1 udev quiet" ++#pkg# + GRUB_TERMINAL="gfxterm" + GRUB_GFXMODE="auto" + GRUB_BACKGROUND="/boot/grub/grub-calculate.png" + GRUB_COLOR_NORMAL="white/black" + GRUB_COLOR_HIGHLIGHT="magenta/black" + GRUB_VIDEO_BACKEND="vbe" +-#?os_install_linux_subname==# ++#?os_install_linux_subname==&&os_install_scratch==off# + GRUB_DISTRIBUTOR="#-os_install_linux_name-#" + #os_install_linux_subname# +-#?os_install_linux_subname!=# ++#?os_install_linux_subname!=&&os_install_scratch==off# + GRUB_DISTRIBUTOR="#-os_install_linux_name-# #-os_install_linux_subname-#" + #os_install_linux_subname# ++#?os_install_linux_subname==&&os_install_scratch==on# ++GRUB_DISTRIBUTOR="#-os_install_linux_name-# Builder" ++#os_install_linux_subname# ++#?os_install_linux_subname!=&&os_install_scratch==on# ++GRUB_DISTRIBUTOR="#-os_install_linux_name-# #-os_install_linux_subname-# Builder" ++#os_install_linux_subname# +diff --git a/install/1merge/openrc/boot.runlevels/.calculate_directory b/install/1merge/openrc/boot.runlevels/.calculate_directory +new file mode 100644 +index 0000000..e5f23f4 +--- /dev/null ++++ b/install/1merge/openrc/boot.runlevels/.calculate_directory +@@ -0,0 +1,2 @@ ++# Calculate path=/etc/runlevels name=boot ++ +diff --git a/install/1merge/openrc/boot.runlevels/consolefont b/install/1merge/openrc/boot.runlevels/consolefont +new file mode 100644 +index 0000000..fb62863 +--- /dev/null ++++ b/install/1merge/openrc/boot.runlevels/consolefont +@@ -0,0 +1 @@ ++# Calculate link=/etc/init.d/consolefont symbolic +diff --git a/install/1merge/openrc/default.runlevels/.calculate_directory b/install/1merge/openrc/default.runlevels/.calculate_directory +new file mode 100644 +index 0000000..7e25c99 +--- /dev/null ++++ b/install/1merge/openrc/default.runlevels/.calculate_directory +@@ -0,0 +1,2 @@ ++# Calculate path=/etc/runlevels name=default cl_chroot_status==off ++ +diff --git a/install/1merge/openrc/default.runlevels/numlock b/install/1merge/openrc/default.runlevels/numlock +new file mode 100644 +index 0000000..0bc43c1 +--- /dev/null ++++ b/install/1merge/openrc/default.runlevels/numlock +@@ -0,0 +1 @@ ++# Calculate link=/etc/init.d/numlock symbolic hr_laptop!= +diff --git a/install/1merge/openrc/defaultrunlevel/.calculate_directory b/install/1merge/openrc/defaultrunlevel/.calculate_directory +deleted file mode 100644 +index 7e25c99..0000000 +--- a/install/1merge/openrc/defaultrunlevel/.calculate_directory ++++ /dev/null +@@ -1,2 +0,0 @@ +-# Calculate path=/etc/runlevels name=default cl_chroot_status==off +- +diff --git a/install/1merge/openrc/defaultrunlevel/wicd b/install/1merge/openrc/defaultrunlevel/wicd +deleted file mode 100644 +index 0bc43c1..0000000 +--- a/install/1merge/openrc/defaultrunlevel/wicd ++++ /dev/null +@@ -1 +0,0 @@ +-# Calculate link=/etc/init.d/numlock symbolic hr_laptop!= +diff --git a/install/1merge/udev/sysinit/.calculate_directory b/install/1merge/udev/sysinit/.calculate_directory +new file mode 100644 +index 0000000..0f7257b +--- /dev/null ++++ b/install/1merge/udev/sysinit/.calculate_directory +@@ -0,0 +1,2 @@ ++# Calculate path=/etc/runlevels ++ +diff --git a/install/1merge/udev/sysinit/udev b/install/1merge/udev/sysinit/udev +new file mode 100644 +index 0000000..568c5de +--- /dev/null ++++ b/install/1merge/udev/sysinit/udev +@@ -0,0 +1 @@ ++# Calculate link=/etc/init.d/udev symbolic diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest index 75f717b00..4e169e264 100644 --- a/sys-apps/calculate-utilities/Manifest +++ b/sys-apps/calculate-utilities/Manifest @@ -13,6 +13,7 @@ EBUILD calculate-utilities-2.2.16-r3.ebuild 835 RMD160 f84cb05a48401db24066b12fd EBUILD calculate-utilities-2.2.16-r5.ebuild 838 RMD160 9845d647992a22ae7f2f2820d02618b899b411ab SHA1 cc474c09d0c063700a6df558d38ca4e1df55db5b SHA256 904dab1a4523ba775678a018801fdfe86239d816b83c680c05d5c280daef886f 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.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 diff --git a/sys-apps/calculate-utilities/calculate-utilities-2.2.16-r8.ebuild b/sys-apps/calculate-utilities/calculate-utilities-2.2.16-r8.ebuild new file mode 100644 index 000000000..4618126fa --- /dev/null +++ b/sys-apps/calculate-utilities/calculate-utilities-2.2.16-r8.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-r5 + =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 ) +" +