From 7b6cb4890ab0d270a8711de17b85d6aeae252e83 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Mon, 27 Jun 2011 18:26:34 +0400 Subject: [PATCH] Update for templates. --- sys-apps/calculate-templates/ChangeLog | 7 + sys-apps/calculate-templates/Manifest | 4 +- .../calculate-templates-2.2.17-r7.ebuild | 37 +++ ...alculate-templates-2.2.17_2.2.18_rc3.patch | 292 ++++++++++++++++++ sys-apps/calculate-utilities/ChangeLog | 6 + sys-apps/calculate-utilities/Manifest | 3 +- .../calculate-utilities-2.2.17-r11.ebuild | 36 +++ 7 files changed, 383 insertions(+), 2 deletions(-) create mode 100644 sys-apps/calculate-templates/calculate-templates-2.2.17-r7.ebuild create mode 100644 sys-apps/calculate-templates/files/calculate-templates-2.2.17_2.2.18_rc3.patch create mode 100644 sys-apps/calculate-utilities/calculate-utilities-2.2.17-r11.ebuild diff --git a/sys-apps/calculate-templates/ChangeLog b/sys-apps/calculate-templates/ChangeLog index 6530d8864..cb2d6197f 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.17-r7 (27 Jun 2011) + + 27 Jun 2011; Mike Hiretsky (mhiretskiy) + +calculate-templates-2.2.17-r7.ebuild, + +files/calculate-templates-2.2.17_2.2.18_rc3.patch: + Update to 2.2.18_rc3. + *calculate-templates-2.2.17-r6 (27 Jun 2011) 27 Jun 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-templates/Manifest b/sys-apps/calculate-templates/Manifest index e35de54e5..1587688ab 100644 --- a/sys-apps/calculate-templates/Manifest +++ b/sys-apps/calculate-templates/Manifest @@ -10,6 +10,7 @@ AUX calculate-templates-2.2.17-fix_default_grub.patch 1054 RMD160 ee615500496c20 AUX calculate-templates-2.2.17-fix_nm_applets.patch 1565 RMD160 a277588b557c779977d82ef76e1d75ecaebc9193 SHA1 3ee95d115cdc9132a3bbe743c0fc644e49c14f29 SHA256 a514b7f6d4e19ec0792b1dbea0c0ba8ac4ef8a2b447285761c03951fb3798b04 AUX calculate-templates-2.2.17_2.2.18_rc1.patch 12917 RMD160 8da94b86383e48c7817d2fc16d5ca7b20e98fffe SHA1 3877ff28c667828465b697866fc17541ad157091 SHA256 fb7283eebb2c15eeac4c13cd61033f96791444c632a1cceadc647cac4c910f74 AUX calculate-templates-2.2.17_2.2.18_rc2.patch 12980 RMD160 3db3ff2189210c57112180f88c14e89170a6c362 SHA1 b6c6f6339b4a738ade6b3de0fb83737080d3846a SHA256 f70ce143c4119d012d4ce99b6892ebc5c6501429bcbad0d074fda42bb7519789 +AUX calculate-templates-2.2.17_2.2.18_rc3.patch 12979 RMD160 f8a346a04c5315e6ff07852f55e310b898455e09 SHA1 f51fb41ea9367ed42c5ff9c84a48fe95568ec2f4 SHA256 385b0a8f147daa0b7a346e91630692bf6538acead9490c9217b3d96a387da9b6 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 DIST calculate-templates-2.2.17.tar.bz2 232607 RMD160 07757917dd29340942bd32fc92e72317322c3b5a SHA1 51d261f0dda34ac7a86e67c95563c3f58dbf7eb8 SHA256 fb70270ddac2ed2d4ede8e579d01a2dca5ee58f965edc093f1ed3b475feca228 @@ -28,7 +29,8 @@ EBUILD calculate-templates-2.2.17-r3.ebuild 912 RMD160 5d6f46b1786bb0eb12b3f0a45 EBUILD calculate-templates-2.2.17-r4.ebuild 998 RMD160 4cb54e989cd3a0f35cb1a0268103b9a7d469b67d SHA1 c46277219df6f1c455132ccef4fd285743fcce24 SHA256 be196789ddf7b66bdb3a99f4509a32b4c4e9a18a9d08b6825a84ddfff80d462d EBUILD calculate-templates-2.2.17-r5.ebuild 715 RMD160 fbd1853bbbb04362ba120b10ca4c2c6cda22b0c9 SHA1 080aa41605f17902eeb44ba80f5cc3d7a42dd6e2 SHA256 7d553af9574a5300a8ed303c5437c6aece4e2eaf298bce9ff28fbd7c59411e55 EBUILD calculate-templates-2.2.17-r6.ebuild 715 RMD160 73bc152aa96a0f3cf2241db38f6d12754b5944df SHA1 07a0d1ecbd33d56f4c8f580a420796e37d2922f3 SHA256 1008cc2be182dcb21c3c5e9ca1ac41ec37dedcacdaf58df0bd2cfa984a7f2afb +EBUILD calculate-templates-2.2.17-r7.ebuild 715 RMD160 1ad65784cfd4127849dc1d957312de7ea031c1dd SHA1 d5bfc402c3706d8ea23fe25a3847e2dd12845484 SHA256 635e6838b8630633b8d1d2efea46138255d515c09b449250835fb5da02847b04 EBUILD calculate-templates-2.2.17.ebuild 581 RMD160 991699af00f53a98e27423e7b9a549260682b499 SHA1 769663ae8634d3725c7c6e96a4e830d73e2489e8 SHA256 4483ec21865c2f5b25f7114b08afe89b11d83fcd141484df0372633ba3304537 EBUILD calculate-templates-2.2.9999.ebuild 572 RMD160 14e53f7c05efbb563b793b1025669cbe79d0838c SHA1 226d287ce0a00609ed6c871321abf5000565227e SHA256 5df16332077472571e2d4aae47e958d1e6efe3a8d694b61053778f75a537142f -MISC ChangeLog 23936 RMD160 b2413a6ecf15de2e57775342a934cff00c7f31ae SHA1 0d165b0ccd51fb3562a414f6d3c9caadf0b923f4 SHA256 042226525ab3a21e307043bde5fd2d8a52addf418fa06554c3d7225683379c0b +MISC ChangeLog 24162 RMD160 2735f8c74d9b3330236a2977cf1cbc0104318abc SHA1 a3a66067c7f8bb7fdf3ae269d51ef036a36d75bd SHA256 12c7c869b6f2b1b75044e544dfaaf4fab77af0669f832eee85796680e13c86ea MISC metadata.xml 338 RMD160 4a1a51881bdf09b961217d2056114ca4ccb8b4d2 SHA1 5fcb2724427f9ac5dda07abb5c829c24e6db9ae6 SHA256 175d9ae86b71b291a519414e816b05290d0e4be74726cc8d5449a500c51a3b2d diff --git a/sys-apps/calculate-templates/calculate-templates-2.2.17-r7.ebuild b/sys-apps/calculate-templates/calculate-templates-2.2.17-r7.ebuild new file mode 100644 index 000000000..29eba9f32 --- /dev/null +++ b/sys-apps/calculate-templates/calculate-templates-2.2.17-r7.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.17" + +RDEPEND="${DEPEND}" + +src_unpack() { + unpack "${A}" + cd "${S}" + + # patch to 2.2.18_rc3 + epatch "${FILESDIR}/calculate-templates-2.2.17_2.2.18_rc3.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.17_2.2.18_rc3.patch b/sys-apps/calculate-templates/files/calculate-templates-2.2.17_2.2.18_rc3.patch new file mode 100644 index 000000000..78f5a4f2f --- /dev/null +++ b/sys-apps/calculate-templates/files/calculate-templates-2.2.17_2.2.18_rc3.patch @@ -0,0 +1,292 @@ +diff --git builder/iso/calcboot/isolinux/keymap.cfg builder/iso/calcboot/isolinux/keymap.cfg +index d4abb5e..9da49d6 100644 +--- builder/iso/calcboot/isolinux/keymap.cfg ++++ builder/iso/calcboot/isolinux/keymap.cfg +@@ -80,6 +80,11 @@ LABEL keymap:pt_PT + KERNEL calcmenu.c32 + APPEND isolinux.cfg calculate=,keymap:pt_PT + ++LABEL keymap:ro_RO ++ MENU LABEL Romanian ++ KERNEL calcmenu.c32 ++ APPEND isolinux.cfg calculate=,keymap:ro_RO ++ + LABEL keymap:ru_RU + MENU LABEL Russian + KERNEL calcmenu.c32 +diff --git builder/iso/calcboot/isolinux/lang.cfg builder/iso/calcboot/isolinux/lang.cfg +index aefb539..c008495 100644 +--- builder/iso/calcboot/isolinux/lang.cfg ++++ builder/iso/calcboot/isolinux/lang.cfg +@@ -50,6 +50,11 @@ LABEL lang:ru_RU + KERNEL calcmenu.c32 + APPEND isolinux.cfg calculate=lang:ru_RU,keymap:ru_RU,timezone:Europe/Moscow + ++LABEL lang:ro_RO ++ MENU LABEL Romanian ++ KERNEL calcmenu.c32 ++ APPEND isolinux.cfg calculate=lang:ro_RO,keymap:ro_RO,timezone:Europe/Istanbul ++ + LABEL lang:es_ES + MENU LABEL Espanol + KERNEL calcmenu.c32 +diff --git desktop/00-desktop-init/empty_dir/2ini_res.env desktop/00-desktop-init/empty_dir/2ini_res.env +index ba4c0a6..13bac65 100644 +--- desktop/00-desktop-init/empty_dir/2ini_res.env ++++ desktop/00-desktop-init/empty_dir/2ini_res.env +@@ -118,6 +118,19 @@ videos = #-ini(resource.path)-#/Видео + desktop = /home/#-ur_login-#/Рабочий стол + #os_locale_lang# + ++#?os_locale_lang==ro_RO# ++documents = #-ini(resource.path)-#/Documente ++downloads = #-ini(resource.path)-#/Descărcări ++music = #-ini(resource.path)-#/Muzică ++pictures = #-ini(resource.path)-#/Poze ++public = #-ini(resource.path)-#/Public ++templates = #-ini(resource.path)-#/Templates ++videos = #-ini(resource.path)-#/Video ++#os_locale_lang# ++#?os_locale_lang==ro_RO&&ur_domain_set==off# ++desktop = /home/#-ur_login-#/Desktop ++#os_locale_lang# ++ + #?os_locale_lang==uk_UA# + documents = #-ini(resource.path)-#/Документи + downloads = #-ini(resource.path)-#/Завантаження +diff --git desktop/desktop/00-patch-2.2.0.16/2ini_res.env desktop/desktop/00-patch-2.2.0.16/2ini_res.env +index ba4c0a6..ec7ae86 100644 +--- desktop/desktop/00-patch-2.2.0.16/2ini_res.env ++++ desktop/desktop/00-patch-2.2.0.16/2ini_res.env +@@ -105,6 +105,19 @@ videos = #-ini(resource.path)-#/Vídeos + desktop = /home/#-ur_login-#/Desktop + #os_locale_lang# + ++#?os_locale_lang==ro_RO# ++documents = #-ini(resource.path)-#/Documente ++downloads = #-ini(resource.path)-#/Descărcări ++music = #-ini(resource.path)-#/Muzică ++pictures = #-ini(resource.path)-#/Poze ++public = #-ini(resource.path)-#/Public ++templates = #-ini(resource.path)-#/Templates ++videos = #-ini(resource.path)-#/Video ++#os_locale_lang# ++#?os_locale_lang==ro_RO&&ur_domain_set==off# ++desktop = /home/#-ur_login-#/Desktop ++#os_locale_lang# ++ + #?os_locale_lang==ru_RU# + documents = #-ini(resource.path)-#/Документы + downloads = #-ini(resource.path)-#/Загрузки +diff --git desktop/desktop/30-gnome-2.26/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ro desktop/desktop/30-gnome-2.26/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ro +new file mode 100644 +index 0000000..a40c1af +--- /dev/null ++++ desktop/desktop/30-gnome-2.26/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ro +@@ -0,0 +1,12 @@ ++# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==ro_RO ++ ++ ++ ++
  • ++ ro ++
    • ++
  • ++ us ++
    • ++     ++     +diff --git desktop/desktop/30-gnome-2.30/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ro desktop/desktop/30-gnome-2.30/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ro +new file mode 100644 +index 0000000..a40c1af +--- /dev/null ++++ desktop/desktop/30-gnome-2.30/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ro +@@ -0,0 +1,12 @@ ++# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==ro_RO ++ ++ ++ ++
  • ++ ro ++
    • ++
  • ++ us ++
    • ++     ++     +diff --git desktop/desktop/60-firefox-3.5/.mozilla/firefox/calculate.default/prefs.js desktop/desktop/60-firefox-3.5/.mozilla/firefox/calculate.default/prefs.js +index 846e584..3d9432e 100644 +--- desktop/desktop/60-firefox-3.5/.mozilla/firefox/calculate.default/prefs.js ++++ desktop/desktop/60-firefox-3.5/.mozilla/firefox/calculate.default/prefs.js +@@ -71,6 +71,9 @@ user_pref("spellchecker.dictionary", "pt"); + #?pkg(www-plugins/spell-mozilla-plugin)!=&&os_locale_language==ru# + user_pref("spellchecker.dictionary", "ru"); + #pkg# ++#?pkg(www-plugins/spell-mozilla-plugin)!=&&os_locale_language==ro# ++user_pref("spellchecker.dictionary", "ro"); ++#pkg# + #?pkg(www-plugins/spell-mozilla-plugin)!=&&os_locale_language==uk# + user_pref("spellchecker.dictionary", "uk-UA"); + #pkg# +diff --git install/1merge/00-calculate-install/calculate2.env install/1merge/00-calculate-install/calculate2.env +new file mode 100644 +index 0000000..cead32f +--- /dev/null ++++ install/1merge/00-calculate-install/calculate2.env +@@ -0,0 +1,4 @@ ++# Calculate format=samba path=/etc/calculate ++ ++[install] ++os_install_net_settings = #-os_install_net_conf-# +diff --git install/1merge/glibc/locale.gen install/1merge/glibc/locale.gen +index 15cff6b..c087558 100644 +--- install/1merge/glibc/locale.gen ++++ install/1merge/glibc/locale.gen +@@ -26,6 +26,8 @@ nn_NO.UTF-8 UTF-8 + pl_PL.UTF-8 UTF-8 + #Portuguese + pt_PT.UTF-8 UTF-8 ++#Romanian ++ro_RO.UTF-8 UTF-8 + #Russian + ru_RU.UTF-8 UTF-8 + #Spanish +diff --git install/1merge/grub2/default.grub install/1merge/grub2/default.grub +index 67ddb16..f719541 100644 +--- install/1merge/grub2/default.grub ++++ install/1merge/grub2/default.grub +@@ -8,8 +8,8 @@ GRUB_CMDLINE_LINUX="video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,spla + #?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_TERMINAL=del ++GRUB_GFXMODE="1024x768" + GRUB_BACKGROUND="/boot/grub/grub-calculate.png" + GRUB_COLOR_NORMAL="white/black" + GRUB_COLOR_HIGHLIGHT="magenta/black" +diff --git install/1merge/networkmanager/plasma-applet-networkmanagement.desktop install/1merge/networkmanager/plasma-applet-networkmanagement.desktop +new file mode 100644 +index 0000000..2b3b677 +--- /dev/null ++++ install/1merge/networkmanager/plasma-applet-networkmanagement.desktop +@@ -0,0 +1,8 @@ ++# Calculate path=/usr/share/kde4/services pkg(kde-base/kdelibs)!= format=kde ++[Desktop Entry] ++#?os_install_net_conf==networkmanager# ++X-KDE-Library=plasma_applet_networkmanagement ++#os_install_net_conf# ++#?os_install_net_conf!=networkmanager# ++X-KDE-Library= ++#os_install_net_conf# +diff --git install/1merge/networkmanager/system-connections/.calculate_directory install/1merge/networkmanager/system-connections/.calculate_directory +index 4401bf6..b3a2ea7 100644 +--- install/1merge/networkmanager/system-connections/.calculate_directory ++++ install/1merge/networkmanager/system-connections/.calculate_directory +@@ -1 +1 @@ +-# Calculate path=/etc/NetworkManager exists(/etc/NetworkManager/system-connections,root)==&&cl_chroot_status==off&&os_install_root_type!=livecd||ac_install_system==up ++# Calculate path=/etc/NetworkManager os_install_net_settings!=networkmanager&&cl_chroot_status==off&&os_install_root_type!=livecd||ac_install_system==up +diff --git install/1merge/nm-applet/.calculate_directory install/1merge/nm-applet/.calculate_directory +new file mode 100644 +index 0000000..6f79f0c +--- /dev/null ++++ install/1merge/nm-applet/.calculate_directory +@@ -0,0 +1,2 @@ ++# Calculate belong()!=&&cl_chroot_status==off&&pkg(gnome-extra/nm-applet)!= path=/etc/xdg name=autostart ++ +diff --git install/1merge/nm-applet/nm-applet.desktop install/1merge/nm-applet/nm-applet.desktop +new file mode 100644 +index 0000000..d32af0f +--- /dev/null ++++ install/1merge/nm-applet/nm-applet.desktop +@@ -0,0 +1,8 @@ ++# Calculate format=kde ++[Desktop Entry] ++#?os_install_net_conf==networkmanager# ++X-GNOME-Autostart-enabled=true ++#os_install_net_conf# ++#?os_install_net_conf!=networkmanager# ++X-GNOME-Autostart-enabled=false ++#os_install_net_conf# +diff --git install/1merge/openrc/conf.d/net install/1merge/openrc/conf.d/net +index a40ea98..4d39ad5 100644 +--- install/1merge/openrc/conf.d/net ++++ install/1merge/openrc/conf.d/net +@@ -1,22 +1,30 @@ +-# Calculate comment=# exists(/etc/conf.d/net,root)==&&cl_chroot_status==off&&os_install_root_type!=livecd&&os_install_net_conf==openrc||ac_install_system==up&&os_install_net_conf==openrc ++# Calculate comment=# os_install_net_settings!=openrc&&cl_chroot_status==off&&os_install_root_type!=livecd&&os_install_net_conf==openrc||ac_install_system==up&&os_install_net_conf==openrc + + #?os_install_linux_system==server# + modules="!plug" + #os_install_linux_system# + #?list(os_install_net_interfaces,0)!=&&list(os_install_net_dhcp_set,0)!=on&&list(os_install_net_ip,0)!=# + config_#-list(os_install_net_interfaces,0)-#=( "#-list(os_install_net_ip,0)-#/#-list(os_install_net_cidr,0)-#" ) ++#list# ++#?list(os_install_net_interfaces,0)!=&&list(os_install_net_dhcp_set,0)!=on&&list(os_install_net_ip,0)!=&&list(os_install_net_route,0)!=# + routes_#-list(os_install_net_interfaces,0)-#="#-list(os_install_net_route,0)-#" + #list# + #?list(os_install_net_interfaces,1)!=&&list(os_install_net_dhcp_set,1)!=on&&list(os_install_net_ip,1)!=# + config_#-list(os_install_net_interfaces,1)-#=( "#-list(os_install_net_ip,1)-#/#-list(os_install_net_cidr,1)-#" ) ++#list# ++#?list(os_install_net_interfaces,1)!=&&list(os_install_net_dhcp_set,1)!=on&&list(os_install_net_ip,1)!=&&list(os_install_net_route,1)!=# + routes_#-list(os_install_net_interfaces,1)-#="#-list(os_install_net_route,1)-#" + #list# + #?list(os_install_net_interfaces,2)!=&&list(os_install_net_dhcp_set,2)!=on&&list(os_install_net_ip,2)!=# + config_#-list(os_install_net_interfaces,2)-#=( "#-list(os_install_net_ip,2)-#/#-list(os_install_net_cidr,2)-#" ) ++#list# ++#?list(os_install_net_interfaces,2)!=&&list(os_install_net_dhcp_set,2)!=on&&list(os_install_net_ip,2)!=&&list(os_install_net_route,2)!=# + routes_#-list(os_install_net_interfaces,2)-#="#-list(os_install_net_route,2)-#" + #list# + #?list(os_install_net_interfaces,3)!=&&list(os_install_net_dhcp_set,3)!=on&&list(os_install_net_ip,3)!=# + config_#-list(os_install_net_interfaces,3)-#=( "#-list(os_install_net_ip,3)-#/#-list(os_install_net_cidr,3)-#" ) ++#list# ++#?list(os_install_net_interfaces,3)!=&&list(os_install_net_dhcp_set,3)!=on&&list(os_install_net_ip,3)!=&&list(os_install_net_route,3)!=# + routes_#-list(os_install_net_interfaces,3)-#="#-list(os_install_net_route,3)-#" + #list# + #?os_install_net_dns!=# +diff --git install/1merge/sudo/sudoers install/1merge/sudo/sudoers +index 961a5bf..25c4cde 100644 +--- install/1merge/sudo/sudoers ++++ install/1merge/sudo/sudoers +@@ -1,4 +1,4 @@ +-# Calculate comment=# ++# Calculate comment=# chmod=0400 + + Defaults env_reset + #?os_install_root_type==livecd# +diff --git install/1system/calculate-install/calculate2.env install/1system/calculate-install/calculate2.env +index d83a0f6..27df9f5 100644 +--- install/1system/calculate-install/calculate2.env ++++ install/1system/calculate-install/calculate2.env +@@ -6,6 +6,10 @@ os_install_dev_from = #-os_root_dev-# + # NTP is a protocol designed to synchronize the clocks of computers over a network. + os_install_ntp = #-os_install_ntp-# + #os_root_type# ++#pkg(sys-apps/calculate-install)>2.2.17-r1&&os_root_type=hdd# ++# name of net manager which is used ++os_install_net_settings = #-os_install_net_conf-# ++#pkg# + + #?os_install_linux_ver>10.8.81# + [main] +diff --git install/2laptop/lenovo/sudo/sudoers install/2laptop/lenovo/sudo/sudoers +index dc81e5e..f252dae 100644 +--- install/2laptop/lenovo/sudo/sudoers ++++ install/2laptop/lenovo/sudo/sudoers +@@ -1,4 +1,4 @@ +-# Calculate format=patch path=/etc ++# Calculate format=patch path=/etc chmod=0400 + (# BEGIN laptop configuration) + .*(# END laptop configuration) + \1 +diff --git install/2laptop/samsung/sudo/sudoers install/2laptop/samsung/sudo/sudoers +index ee88674..4b5b0f7 100644 +--- install/2laptop/samsung/sudo/sudoers ++++ install/2laptop/samsung/sudo/sudoers +@@ -1,4 +1,4 @@ +-# Calculate format=patch path=/etc ++# Calculate format=patch path=/etc chmod=0400 + (# BEGIN laptop configuration) + .*(# END laptop configuration) + \1 diff --git a/sys-apps/calculate-utilities/ChangeLog b/sys-apps/calculate-utilities/ChangeLog index 878922929..0eac1ab94 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.17-r11 (27 Jun 2011) + + 27 Jun 2011; Mike Hiretsky (mhiretskiy) + +calculate-utilities-2.2.17-r11.ebuild: + Update for templates. + *calculate-utilities-2.2.17-r10 (27 Jun 2011) 27 Jun 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest index c70aaecfe..db1b048db 100644 --- a/sys-apps/calculate-utilities/Manifest +++ b/sys-apps/calculate-utilities/Manifest @@ -18,6 +18,7 @@ EBUILD calculate-utilities-2.2.16-r9.ebuild 838 RMD160 860152120f6a6e35ee51258bb EBUILD calculate-utilities-2.2.16.ebuild 829 RMD160 dee34889a7f8ab23011ca57685573d0c3b7ba2ef SHA1 e2dcd703f0045e6d8c5647c131c0a72f7d03a9b0 SHA256 f2666edf4ce390eeea6cfc5f3750742a93b861ad1f431aac9ec2c6eeefbf3af7 EBUILD calculate-utilities-2.2.17-r1.ebuild 838 RMD160 730c47dc92b94fb5d654ea0519619595814eb823 SHA1 e4295b0baf7b7415d98217f41e077ae272904889 SHA256 b011892b1f94debc03abf616965018b56a4ed9adf8b2b3849ce10ea18c412ec9 EBUILD calculate-utilities-2.2.17-r10.ebuild 841 RMD160 0cd4014138a1d4585316e3ac24890314ba6cc069 SHA1 d31db1a7e31b27bc5fb1f051533b2a393a9dba2f SHA256 e26b4522a08e7bc77d1d3b85f5f3db13bca31c74a8a4c73220d1c2c0cc57eaea +EBUILD calculate-utilities-2.2.17-r11.ebuild 841 RMD160 f243bf2d3a25a121a1edcbb2a384ec92dc8d64eb SHA1 cd1f509667dde32d96658263990ccf772c8babfc SHA256 4e3687a8adde6d28f87a49b5b98aa2070dce89be79cf63270a729b9a22d7163d EBUILD calculate-utilities-2.2.17-r2.ebuild 838 RMD160 77c6a1fe6fe2a5362c5d687d4bf9d6ae4ba55640 SHA1 90dc1b30046b1207424b969140f3d8659f2298c8 SHA256 bfb285120cd0df0cad0283c2fab7d5b26148f207d2a8e4a2a63becc8a4c84b60 EBUILD calculate-utilities-2.2.17-r3.ebuild 838 RMD160 41fda29d1dedca885073afba581ccefd3984f398 SHA1 6985b9720b7957900d7048d67334e9c804d873a8 SHA256 7a27dee7d29e940f8d0c2c87f0c4553771c120afa672ca40fde9b0da38cd1504 EBUILD calculate-utilities-2.2.17-r4.ebuild 838 RMD160 50ebe6b7429697cb961f398ce26b06bd36d76d56 SHA1 f1772a64f1fd35cd7f7d0441eb00e7d5b0b9e8ef SHA256 6eacc7fb52b06b241b5c389eea3f78644bf041f27951d9fa05317873f3745822 @@ -28,4 +29,4 @@ EBUILD calculate-utilities-2.2.17-r8.ebuild 841 RMD160 274fa8d79b0f5dbf687dec6ed EBUILD calculate-utilities-2.2.17-r9.ebuild 841 RMD160 bbbca3c558b7f99cf801bf2ebcff71fdf8c559c0 SHA1 1f215ef2dd184779fd81e8006180cba0fc774ea4 SHA256 520c283973458ca547e62396b80b7531d1641d75de8103a5a86d52e2587d95a1 EBUILD calculate-utilities-2.2.17.ebuild 829 RMD160 29fb0a089833990a144d2f31cad389d4feaad2a6 SHA1 a2a0a45be11ccbb49772f0bc04dc0be2c68ea361 SHA256 0f96a85ef7e239058d62387237df40e3ba19e310e963226398d91413967a60b3 EBUILD calculate-utilities-2.2.9999.ebuild 840 RMD160 0c7324a9ed480118ac19f62b162c9ee62c25f964 SHA1 7dadab1430ed147334ed7e9b4fcc86dc99e25d56 SHA256 f3ee28f9f765e7302c83eb4a15a09bdf066f09e6b40e34f6d52157a946df5e66 -MISC ChangeLog 13780 RMD160 4131492637b68d4e0eada96d5f7fc99ac2bf2d96 SHA1 08255d8c02a08103795bbbf2256c5bb43c4e6364 SHA256 04d383aca210056f03ad0ba0efcbe46d879c8d571975b4090492f935ac753234 +MISC ChangeLog 13954 RMD160 2b7a0674bdaefb84ef867dbcd01d4d975cd6bbd6 SHA1 baa5ab55cc225bd5fa2049b4e495049f1400c1db SHA256 35fff8bddecbcab241d11c39e3751f1f6c4543e2fe4c78c2ba892e5b143fa891 diff --git a/sys-apps/calculate-utilities/calculate-utilities-2.2.17-r11.ebuild b/sys-apps/calculate-utilities/calculate-utilities-2.2.17-r11.ebuild new file mode 100644 index 000000000..5d5614b5b --- /dev/null +++ b/sys-apps/calculate-utilities/calculate-utilities-2.2.17-r11.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.17-r3 + =sys-apps/calculate-templates-2.2.17-r7 + =sys-apps/calculate-lib-2.2.17-r3 + + cl_assemble? ( =sys-apps/calculate-assemble-2.2.17-r1 ) + cl_builder? ( =sys-apps/calculate-builder-2.2.17 ) + cl_client? ( =sys-apps/calculate-client-2.2.17 ) + cl_desktop? ( =sys-apps/calculate-desktop-2.2.17 ) + cl_installgui? ( =app-misc/calculate-install-gui-2.2.17 ) + + cl_server? ( =sys-apps/calculate-server-2.1.14-r4 ) +" +