diff --git a/sys-apps/calculate-install/ChangeLog b/sys-apps/calculate-install/ChangeLog index ee2cb40f7..01f7dba0f 100644 --- a/sys-apps/calculate-install/ChangeLog +++ b/sys-apps/calculate-install/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*calculate-install-2.2.18-r3 (15 Jul 2011) + + 15 Jul 2011; Mike Hiretsky (mhiretskiy) + +calculate-install-2.2.18-r3.ebuild, + +files/calculate-install-2.2.18-to_2.2.19_rc2.patch: + Update to rc2 + *calculate-install-2.2.18-r2 (14 Jul 2011) 14 Jul 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-install/Manifest b/sys-apps/calculate-install/Manifest index ddeffae79..11b0b4608 100644 --- a/sys-apps/calculate-install/Manifest +++ b/sys-apps/calculate-install/Manifest @@ -1,9 +1,11 @@ AUX calculate-install-2.2.18-fix_unit_size.patch 1300 RMD160 071651b55f9c3d75184f94a5b7fc09a0b0477393 SHA1 95c2e4879da53679746640145bf4050ff8af278c SHA256 5f677fb05e9e9bee8bc84a6360da681f1d8d17d0a8945f431967d23edbd4dcb4 AUX calculate-install-2.2.18-to_2.2.19_rc1.patch 2145 RMD160 ff0242bbf53e10e1cd073f414660560085601816 SHA1 53fce5bfbf312fa59ef7b8284060f452c0dc83b6 SHA256 a1ff97026b5464a37879d72830f3b5ef8f93a08239ab5024c68d4509c83fecfe +AUX calculate-install-2.2.18-to_2.2.19_rc2.patch 3834 RMD160 5aeac0cc6ce8b889a50e70719592a86717a18f77 SHA1 56bf8ae25eefa1b72d639de66a433cf3853158b0 SHA256 b47e94a9bac6779f0a831ce275cad60f306a9939fa78407c905789186be01243 DIST calculate-install-2.2.18.tar.bz2 75850 RMD160 56b1058d1977957cc6ceb8322a049af4dbb8f0cc SHA1 4e990cf5bd6310942b54995293f1f7ea82726aa9 SHA256 2a1b9c3fa93a958f19f05af51f80adf25f5ee0867452fac0304ec721de19cd97 EBUILD calculate-install-2.2.18-r1.ebuild 896 RMD160 ee093622c27d416e091dbe7d79f4937dec59b9ef SHA1 725ebcabb3fc63fde3a6e804d3912caacd121fa7 SHA256 9d08644a337cafe7a5744e4ffdf7f8ff549c785bf03acd33349c441aedb72de2 EBUILD calculate-install-2.2.18-r2.ebuild 930 RMD160 b2b4b40d9ab712294224fcea75d657d43bdfd6bd SHA1 e42869e06014dc09148c1722ca473def3c9cb874 SHA256 3abfd4e13de0cb333c95668d72a08f606373ca03e21d68f63565da7e857c64d7 +EBUILD calculate-install-2.2.18-r3.ebuild 971 RMD160 62ee16eb832645a3275da557a6f28881764462d5 SHA1 130ec020e8656fdbf4f11b47f7ee6ff9f9d4e541 SHA256 f0102fc33ad24e91a222d7c824b615b3835f5d596fccac403537cd2868e0d0f8 EBUILD calculate-install-2.2.18.ebuild 718 RMD160 6036a151e5e5f44dc88f05943483889aac3db500 SHA1 733eb52ed024192f39a93961b2af8b4f4d8b9ed7 SHA256 a10787adc974dd82ca0272b461ad9b593cd441f821fb1696b57d2b97e3f4297f EBUILD calculate-install-2.2.9999.ebuild 595 RMD160 8f9b9a14fed39ded9c2a9d9343aa4e892d620172 SHA1 09aff28bdaa486868e2caddc7911732a905336ee SHA256 534e6c6e465177e269ce7beed96dab08a124878591088c1bf38095e855ca1180 -MISC ChangeLog 22959 RMD160 9057f821041647ba81f9644bffea4c9142b15e01 SHA1 36c18cd31ab180e7a701a57caa2c546550fb5a12 SHA256 63a59422acae6f33d818dc38a8e6ed2862afc7ff8785e71796f6a2881e801056 +MISC ChangeLog 23174 RMD160 49655ba69aa26ef13e8601f6ecd0883a93e4e88c SHA1 6e630c102bbb5123538e40dca0b23c0e9fa1cb76 SHA256 202085f51dc7d2170e1e22d038e856988047d247f105c4bf7a4cc4f1e6849565 MISC metadata.xml 310 RMD160 769e4f17a9354da6b168b72a5d65d978f65bf6dd SHA1 83aaae376052d69c7327e880cf028ebc0dea608b SHA256 c29d3efc676d8308872920db5223c78469db86ac236b5d45c3ee98ceb8fca846 diff --git a/sys-apps/calculate-install/calculate-install-2.2.18-r3.ebuild b/sys-apps/calculate-install/calculate-install-2.2.18-r3.ebuild new file mode 100644 index 000000000..798b33058 --- /dev/null +++ b/sys-apps/calculate-install/calculate-install-2.2.18-r3.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="3" + +inherit distutils eutils + +SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2" + +DESCRIPTION="The program of installation Calculate Linux" +HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="minimal" + +DEPEND="~sys-apps/calculate-templates-2.2.18 + ~sys-apps/calculate-lib-2.2.18 + app-portage/layman + !app-misc/livecd-tools + !minimal? ( sys-boot/grub + sys-apps/gptfdisk + sys-fs/dosfstools + sys-fs/squashfs-tools + sys-block/parted )" + +RDEPEND="${DEPEND}" + +src_unpack() { + unpack "${A}" + cd "${S}" + + # change unit of parition size and fix bug legecy grub installaion + # add bashlogin + epatch "${FILESDIR}/calculate-install-2.2.18-to_2.2.19_rc2.patch" +} + +pkg_postinst() { + einfo "For configure calculate-install perform:" + einfo " cl-install --install" +} diff --git a/sys-apps/calculate-install/files/calculate-install-2.2.18-to_2.2.19_rc2.patch b/sys-apps/calculate-install/files/calculate-install-2.2.18-to_2.2.19_rc2.patch new file mode 100644 index 000000000..fdaf73d8a --- /dev/null +++ b/sys-apps/calculate-install/files/calculate-install-2.2.18-to_2.2.19_rc2.patch @@ -0,0 +1,87 @@ +diff --git data/bashlogin data/bashlogin +new file mode 100755 +index 0000000..ea9493a +--- /dev/null ++++ data/bashlogin +@@ -0,0 +1,7 @@ ++#!/bin/bash ++ ++export HOME=/root ++cat /etc/motd 2>/dev/null ++cd /root ++[[ -e .bash_profile ]] && source .bash_profile ++exec -l /bin/bash -i +diff --git i18n/cl_install_bg.mo i18n/cl_install_bg.mo +index e4c3321..7f08954 100644 +Binary files i18n/cl_install_bg.mo and i18n/cl_install_bg.mo differ +diff --git i18n/cl_install_ru.mo i18n/cl_install_ru.mo +index e8ea763..b0d5d92 100644 +Binary files i18n/cl_install_ru.mo and i18n/cl_install_ru.mo differ +diff --git pym/cl_fill_install.py pym/cl_fill_install.py +index fb9434e..1b2e27b 100644 +--- pym/cl_fill_install.py ++++ pym/cl_fill_install.py +@@ -25,7 +25,7 @@ from os import readlink,access,R_OK + from cl_utils import isMount,typeFile,getTupleVersion,pathJoin,isFstabMount,\ + listDirectory, getAvailableX11Drivers, getUUIDDict, \ + isPkgInstalled, process, checkUtils, readLinesFile, \ +- lspci ++ lspci, getPartitionSize + from cl_distr import DistributiveRepository,PartitionDistributive + from cl_fill import clLocale + from operator import itemgetter +@@ -381,7 +381,7 @@ class fillVars(object, glob_attr): + disk_hash[partition]['part'] = parts[4] + if len(parts)>5 and "swap" in parts[5]: + disk_hash[partition]['format'] = 'swap' +- disk_hash[partition]['size'] = parts[3] ++ disk_hash[partition]['size'] = getPartitionSize(partition) + # fill format, name and uuid + execStr = self.getProgPath('/sbin/blkid') + res = self._runos(execStr) +diff --git pym/cl_install.py pym/cl_install.py +index 97404c5..f2cf84c 100644 +--- pym/cl_install.py ++++ pym/cl_install.py +@@ -1279,7 +1279,7 @@ class cl_install(color_print, SignalInterrupt): + if filter(lambda x: x != '/', usedMP): + if self.clVars.Get('os_install_scratch') == "on": + self.printERROR( +- _("Builder mode is not support multipartition")) ++ _("Builder mode is not support multipartition install")) + return False + + # check specified devices +@@ -1735,7 +1735,7 @@ class cl_install(color_print, SignalInterrupt): + mbrDisk = self.clVars.Get('os_install_mbr') + mbrDiskNum = self.varSelect( + "os_device_map",where="os_device_dev",eq=mbrDisk) +- if not mbrDiskNum: ++ if not mbrDiskNum and mbrDiskNum != 0: + raise DistributiveError(_("Cann't determine mbr disk")) + for line in ("root (hd%s)"%bootDisk, + "setup (hd%d)"%mbrDiskNum, +diff --git setup.py setup.py +index fd47b8d..ec5aaae 100755 +--- setup.py ++++ setup.py +@@ -31,7 +31,8 @@ share_calculate_dir = "/usr/share/calculate" + data_dirs_share = ['i18n'] + data_files += [('/etc/init.d', ['data/calculate']), + ('/usr/share/calculate/doc', ['data/handbook-en.html', +- 'data/handbook-ru.html'])] ++ 'data/handbook-ru.html']), ++ ('/bin',['data/bashlogin'])] + #template_calculate_dir = os.path.join(share_calculate_dir, "templates") + #template_replace_dirname = "install" + +@@ -75,7 +76,8 @@ class cl_install_data(install_data): + def run (self): + install_data.run(self) + #data_file = [("/etc/init.d/calculate-2.2",0755)] +- data_file = [("/etc/init.d/calculate",0755)] ++ data_file = [("/etc/init.d/calculate",0755), ++ ("/bin/bashlogin",0755)] + fileNames = map(lambda x: os.path.split(x[0])[1], data_file) + listNames = map(lambda x: filter(lambda y: y, x[0].split("/")), + data_file) diff --git a/sys-apps/calculate-templates/ChangeLog b/sys-apps/calculate-templates/ChangeLog index b910e258e..5b90c7d20 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.18-r2 (15 Jul 2011) + + 15 Jul 2011; Mike Hiretsky (mhiretskiy) + +calculate-templates-2.2.18-r2.ebuild, + +files/calculate-templates-2.2.18-to_2.2.19_rc2.patch: + Update to rc2 + *calculate-templates-2.2.18-r1 (14 Jul 2011) 14 Jul 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-templates/Manifest b/sys-apps/calculate-templates/Manifest index 81d8148e2..b3262f97a 100644 --- a/sys-apps/calculate-templates/Manifest +++ b/sys-apps/calculate-templates/Manifest @@ -1,7 +1,9 @@ AUX calculate-templates-2.2.18-fix_corrupting_calculateenv.patch 628 RMD160 494cf84e27c85b9a51c41089de70b73cc1da714f SHA1 db81ba9bd4922d2b02dda0ed17adcd0f762b9b70 SHA256 e0fe5f803f77e476742dd0ac3d208fa63835e690774538a0deb79e84ff9b3686 +AUX calculate-templates-2.2.18-to_2.2.19_rc2.patch 5487 RMD160 b7bcd0c83dcb31b3b09ada14f94d459ae06a0dba SHA1 ce93a9002fb8a6d1539b84e34eb48e556e8f3150 SHA256 7cf15d3cb3c98a590b5c0ab758d56a1a7349e4f22c191dc90059693bd9cba74d DIST calculate-templates-2.2.18.tar.bz2 233661 RMD160 c8e42c3ed8860193286ff8eaeddcd1c75bb1ef0b SHA1 f197621e5777c16aca9b892d30ede172eee50522 SHA256 d3d236c7e0760db3ad9ea79f0fed9d9e5f97d69acabbae3bbc9c9d2e62a50984 EBUILD calculate-templates-2.2.18-r1.ebuild 726 RMD160 304648d6a89e09efc0d061bb4be7db19d564d8a4 SHA1 ca21af5b2a2e8eac31ff229044ac46a24fd21c40 SHA256 205eda568dfcef50964a9b86ad3699f2b3d3a197eb2f54d6e4d7c7bbb7173d22 +EBUILD calculate-templates-2.2.18-r2.ebuild 725 RMD160 6ec963874d8a33e1189375af85c25c15c86296a4 SHA1 bff6d5cb2293c2af4688d1e6ba076fbeeb94c268 SHA256 5d2b047b17af6be7d726c6235aac967936868e5d1695fb457a2ebf645e47fe72 EBUILD calculate-templates-2.2.18.ebuild 581 RMD160 7069b5e31c10ade1bc04c3e1f4ff769ae0f80712 SHA1 d024d43f3c1496321bab619518c300d69385952c SHA256 c30ceff00fc644d3e968050f1cd7ceeffcf916d8d8fc5db723db13b0666ab500 EBUILD calculate-templates-2.2.9999.ebuild 572 RMD160 14e53f7c05efbb563b793b1025669cbe79d0838c SHA1 226d287ce0a00609ed6c871321abf5000565227e SHA256 5df16332077472571e2d4aae47e958d1e6efe3a8d694b61053778f75a537142f -MISC ChangeLog 26277 RMD160 e7d827eba2e2155226a3f3fd383a06f9013d3073 SHA1 140899d3928621bbcc638db8c94eb864de0b920a SHA256 92f40ad334293f2866d11b56f7ef0e146da46bb5470cfd9d81ff88c9430a47b5 +MISC ChangeLog 26498 RMD160 a3bbfe3a0b09adfe9a8d25797383466a7027eb3d SHA1 05aede6cc4ee47671ecddecee22e820bedf70a9c SHA256 6081aa286cde62a593f4a379f9fbef14deee25d977b92c76bc4c1d900d5a5294 MISC metadata.xml 338 RMD160 4a1a51881bdf09b961217d2056114ca4ccb8b4d2 SHA1 5fcb2724427f9ac5dda07abb5c829c24e6db9ae6 SHA256 175d9ae86b71b291a519414e816b05290d0e4be74726cc8d5449a500c51a3b2d diff --git a/sys-apps/calculate-templates/calculate-templates-2.2.18-r2.ebuild b/sys-apps/calculate-templates/calculate-templates-2.2.18-r2.ebuild new file mode 100644 index 000000000..1fd6996da --- /dev/null +++ b/sys-apps/calculate-templates/calculate-templates-2.2.18-r2.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.18" + +RDEPEND="${DEPEND}" + +src_unpack() { + unpack "${A}" + cd "${S}" + + # update to 2.2.19 rc2 patch + epatch "${FILESDIR}/calculate-templates-2.2.18-to_2.2.19_rc2.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.18-to_2.2.19_rc2.patch b/sys-apps/calculate-templates/files/calculate-templates-2.2.18-to_2.2.19_rc2.patch new file mode 100644 index 000000000..4060c6d82 --- /dev/null +++ b/sys-apps/calculate-templates/files/calculate-templates-2.2.18-to_2.2.19_rc2.patch @@ -0,0 +1,88 @@ +diff --git install/1merge/00-calculate-install/calculate2.env install/1merge/00-calculate-install/calculate2.env +index cead32f..6866fd0 100644 +--- install/1merge/00-calculate-install/calculate2.env ++++ install/1merge/00-calculate-install/calculate2.env +@@ -1,4 +1,8 @@ +-# Calculate format=samba path=/etc/calculate ++# Calculate format=samba path=/etc/calculate cl_chroot_status==off||ac_install_system==up autoupdate ++ ++#?ac_install_system!=up&&exists(/etc/calculate/calculate2.env,root)!=# ++#-load(empty,/etc/calculate/calculate2.env,root)-# ++#ac_install_system# + + [install] + os_install_net_settings = #-os_install_net_conf-# +diff --git install/1merge/baselayout/motd.en install/1merge/baselayout/motd.en +index a9b53cb..eef29e7 100644 +--- install/1merge/baselayout/motd.en ++++ install/1merge/baselayout/motd.en +@@ -1,4 +1,4 @@ +-# Calculate append=replace os_install_locale_language!=ru ++# Calculate append=replace os_install_locale_language!=ru name=motd + Welcome to the #-os_install_linux_name-# Installation CD! + + If any ethernet adapters were detected at boot, they should be auto-configured +diff --git install/1merge/baselayout/motd.ru install/1merge/baselayout/motd.ru +index 2a42829..639a782 100644 +--- install/1merge/baselayout/motd.ru ++++ install/1merge/baselayout/motd.ru +@@ -1,4 +1,4 @@ +-# Calculate append=replace os_install_locale_language==ru ++# Calculate append=replace os_install_locale_language==ru name=motd + Добро πожаловать в установочный диск #-os_install_linux_name-#! + + Если какой-либо из сетевых адаπтеров был обнаружен πри загрузке, он будет +diff --git install/1merge/networkmanager/system-connections/.calculate_directory install/1merge/networkmanager/system-connections/.calculate_directory +index b3a2ea7..fee6107 100644 +--- install/1merge/networkmanager/system-connections/.calculate_directory ++++ install/1merge/networkmanager/system-connections/.calculate_directory +@@ -1 +1 @@ +-# Calculate path=/etc/NetworkManager os_install_net_settings!=networkmanager&&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_net_conf==networkmanager||ac_install_system==up&&os_install_net_conf==networkmanager||os_install_root_type==livecd&&os_install_net_conf==networkmanager +diff --git install/1merge/openrc/conf.d/net install/1merge/openrc/conf.d/net +index 4d39ad5..863cc52 100644 +--- install/1merge/openrc/conf.d/net ++++ install/1merge/openrc/conf.d/net +@@ -1,4 +1,4 @@ +-# 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 ++# Calculate comment=# os_install_net_settings!=openrc&&cl_chroot_status==off&&os_install_net_conf==openrc||ac_install_system==up&&os_install_net_conf==openrc||os_install_root_type==livecd&&os_install_net_conf==openrc + + #?os_install_linux_system==server# + modules="!plug" +@@ -6,24 +6,36 @@ modules="!plug" + #?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# ++config_#-list(os_install_net_interfaces,0)-#="dhcp" ++#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# ++config_#-list(os_install_net_interfaces,1)-#="dhcp" ++#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# ++config_#-list(os_install_net_interfaces,2)-#="dhcp" ++#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# ++config_#-list(os_install_net_interfaces,3)-#="dhcp" ++#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# diff --git a/sys-apps/calculate-utilities/ChangeLog b/sys-apps/calculate-utilities/ChangeLog index 9ce1c5a14..6933dbd93 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.18-r4 (15 Jul 2011) + + 15 Jul 2011; Mike Hiretsky (mhiretskiy) + +calculate-utilities-2.2.18-r4.ebuild: + Update for templates and install + *calculate-utilities-2.2.18-r2 (14 Jul 2011) 14 Jul 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest index b3a657b1b..77210b58c 100644 --- a/sys-apps/calculate-utilities/Manifest +++ b/sys-apps/calculate-utilities/Manifest @@ -1,6 +1,7 @@ EBUILD calculate-utilities-2.2.18-r1.ebuild 837 RMD160 6d67af30f0ef3ca5a5be4a8f42024475105b3614 SHA1 512d8584bf37d465375aeddac2025651c2128d6b SHA256 6f23d0c91d558e4a2ab68f9a2cff12cfcae68c0b72e89c906326bd366cc88862 EBUILD calculate-utilities-2.2.18-r2.ebuild 840 RMD160 a7cbfca6f5e3dbd6a2de54c3784a9a8c32a9bd67 SHA1 5e840d33d0773eaebbae9746c5ea9f10b459b744 SHA256 6d72f0e416f26e1765e95231ff7705ebe81cddb5d12d4245fbc095a4db1c0eed EBUILD calculate-utilities-2.2.18-r3.ebuild 838 RMD160 1438723a5ce675846cd60ec0571947d9928b8bda SHA1 a95a856486bb59072820996d4b0979c01372060e SHA256 668d19ff81aeae169673822e8561b0a0dbc81d605a46760b57f13c15b5a98009 +EBUILD calculate-utilities-2.2.18-r4.ebuild 838 RMD160 1c1d3d84cf446d36e5b9373f570186a5b52db1ed SHA1 f683f25979bce0732ee55a4719db30d63896766f SHA256 67eb01ad30c8ffbc8d29ea8022ce216dda2a427b91b10480af5031e8790b9fb8 EBUILD calculate-utilities-2.2.18.ebuild 829 RMD160 e73b8763bd13098473327959bc435ff52d470836 SHA1 b394d0126e846d4780a77f2f89429f6bf8734a27 SHA256 550f341dc60ca43b23100152a58c30178cb1c88456d007bb1439fb4cb949fcd1 EBUILD calculate-utilities-2.2.9999.ebuild 840 RMD160 0c7324a9ed480118ac19f62b162c9ee62c25f964 SHA1 7dadab1430ed147334ed7e9b4fcc86dc99e25d56 SHA256 f3ee28f9f765e7302c83eb4a15a09bdf066f09e6b40e34f6d52157a946df5e66 -MISC ChangeLog 15703 RMD160 e066d1351267ef2cffa05762039b9799e028f839 SHA1 9d5a8c88b0a9d049f88feb5992d6ad50654e3c19 SHA256 f4611c020f204b9694753d192896d2328c274265418cbe153e5ffe5812ca6859 +MISC ChangeLog 15886 RMD160 c777aea381e20fb9d2911f918d0deef6d59e78ed SHA1 fc0ce70b1b5a653da5f053ffc50bba22b44f963d SHA256 bb105ae6d7dcfa639a4fae82d0e1cc63f275731dbc9d50f2735fb16ab3990810 diff --git a/sys-apps/calculate-utilities/calculate-utilities-2.2.18-r4.ebuild b/sys-apps/calculate-utilities/calculate-utilities-2.2.18-r4.ebuild new file mode 100644 index 000000000..5fd12b9c8 --- /dev/null +++ b/sys-apps/calculate-utilities/calculate-utilities-2.2.18-r4.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.18-r3 + =sys-apps/calculate-templates-2.2.18-r2 + =sys-apps/calculate-lib-2.2.18-r2 + + cl_assemble? ( =sys-apps/calculate-assemble-2.2.18 ) + cl_builder? ( =sys-apps/calculate-builder-2.2.18 ) + cl_client? ( =sys-apps/calculate-client-2.2.18 ) + cl_desktop? ( =sys-apps/calculate-desktop-2.2.18 ) + cl_installgui? ( =app-misc/calculate-install-gui-2.2.18 ) + + cl_server? ( =sys-apps/calculate-server-2.1.14-r5 ) +" +