diff --git a/sys-apps/calculate-install/ChangeLog b/sys-apps/calculate-install/ChangeLog index 6b9ff5851..ee2cb40f7 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-r2 (14 Jul 2011) + + 14 Jul 2011; Mike Hiretsky (mhiretskiy) + +calculate-install-2.2.18-r2.ebuild, + +files/calculate-install-2.2.18-to_2.2.19_rc1.patch: + Update for bugfix + *calculate-install-2.2.18-r1 (01 Jul 2011) 01 Jul 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-install/Manifest b/sys-apps/calculate-install/Manifest index ff83b7dd8..b50a60ab3 100644 --- a/sys-apps/calculate-install/Manifest +++ b/sys-apps/calculate-install/Manifest @@ -1,7 +1,9 @@ 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 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 932 RMD160 58d8b3049aff0a442c250e99c3ebe7d5ed986059 SHA1 cfffed7c2a5918a20ba4a0d776032b281a9d73a1 SHA256 8f8eba36071b0dfe73074a01b8f94c7026c6180d09a3085c9815f368e01b46c9 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 22740 RMD160 9c41b93974e4acbf44e1b82144cb84c427102007 SHA1 a69b3b6b5f15635d300a5e1eed8b7fb16c2668a6 SHA256 5c13696d6aa8bd886d01a624d6ccd2a6a58697caa233e50abc0e107428409aed +MISC ChangeLog 22959 RMD160 9057f821041647ba81f9644bffea4c9142b15e01 SHA1 36c18cd31ab180e7a701a57caa2c546550fb5a12 SHA256 63a59422acae6f33d818dc38a8e6ed2862afc7ff8785e71796f6a2881e801056 MISC metadata.xml 310 RMD160 769e4f17a9354da6b168b72a5d65d978f65bf6dd SHA1 83aaae376052d69c7327e880cf028ebc0dea608b SHA256 c29d3efc676d8308872920db5223c78469db86ac236b5d45c3ee98ceb8fca846 diff --git a/sys-apps/calculate-install/calculate-install-2.2.18-r2.ebuild b/sys-apps/calculate-install/calculate-install-2.2.18-r2.ebuild new file mode 100644 index 000000000..48e17264b --- /dev/null +++ b/sys-apps/calculate-install/calculate-install-2.2.18-r2.ebuild @@ -0,0 +1,40 @@ +# 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 + !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 + epatch "${FILESDIR}/calculate-install-2.2.18-to_2.2.19_rc1.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_rc1.patch b/sys-apps/calculate-install/files/calculate-install-2.2.18-to_2.2.19_rc1.patch new file mode 100644 index 000000000..e33c8e609 --- /dev/null +++ b/sys-apps/calculate-install/files/calculate-install-2.2.18-to_2.2.19_rc1.patch @@ -0,0 +1,44 @@ +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 a/sys-apps/calculate-lib/ChangeLog b/sys-apps/calculate-lib/ChangeLog index 71f21ced2..79b59323b 100644 --- a/sys-apps/calculate-lib/ChangeLog +++ b/sys-apps/calculate-lib/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*calculate-lib-2.2.18-r2 (14 Jul 2011) + + 14 Jul 2011; Mike Hiretsky (mhiretskiy) + +calculate-lib-2.2.18-r2.ebuild, + +files/calculate-lib-2.2.18-to_2.2.19_rc1.patch: + Update for bugfix + *calculate-lib-2.2.18-r1 (01 Jul 2011) 01 Jul 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-lib/Manifest b/sys-apps/calculate-lib/Manifest index f7e7b5aa0..3b44835fb 100644 --- a/sys-apps/calculate-lib/Manifest +++ b/sys-apps/calculate-lib/Manifest @@ -1,4 +1,5 @@ AUX calculate-lib-2.2.18-part_size.patch 1622 RMD160 04d1b40a63e63d2f78c853203e1013842398f90f SHA1 5001fa1aaf70acd4afaed823c3d975a51806547d SHA256 dcc7bb6d8474ed76fbb2f152097a58cf36ea0bebca53193efc09368a0e75957c +AUX calculate-lib-2.2.18-to_2.2.19_rc1.patch 3700 RMD160 29b1ff4dee8ebff2f9a131e5018c37a320f087d6 SHA1 a48e08a8137c4947fa205efc80af334f7919df52 SHA256 69e9c79672668ee38e1233cbc5529e094109da34940cb0f769cf5470c6ba2b53 DIST calculate-lib-2.1.11.tar.bz2 61687 RMD160 93ca4f84ff2cd7018addfd4de162959d78e51f78 SHA1 53149951c346fea7709cb43b4d8ebefe63acb0fd SHA256 62976c08d4fb4810389ace6f5a99abb5a962f6c8d9053ff943d0669480fb5599 DIST calculate-lib-2.1.8.tar.bz2 61178 RMD160 4a4ed063a9b4d3b82723f5f6eb046c97ad9fcda1 SHA1 93eb20057afff6e98c409388e1259a3ad078bb7a SHA256 ef8e315001663da7a45e69b82dc7c158fb0e10bd567efa95bf8a654ed441144a DIST calculate-lib-2.2.18.tar.bz2 111559 RMD160 294326d180c3de46ef1f5c56d4da10313e123d87 SHA1 e6340c81573421eca1f8b882f4a4929830df8bdd SHA256 8e8c0124ab9e2efa270fba9529c36a4dd12aa6d616d005e35945bbd999b6a3a5 @@ -6,8 +7,9 @@ EBUILD calculate-lib-2.1.11.ebuild 585 RMD160 742e544ac2f98074ac2cf29227c931e213 EBUILD calculate-lib-2.1.8-r1.ebuild 730 RMD160 a207fbb024eaedeff679eb052b6ca04f289f914f SHA1 68c72562dc796958dd83dc4c59b2444678180b52 SHA256 b6a343b0f4d9e557ca42f5505c56c2373c04d1fa98191cf03b15cd0cdd0bb603 EBUILD calculate-lib-2.1.8-r2.ebuild 810 RMD160 ff412a1e0f7ea1ec3493738e23e3e7ec9334d49d SHA1 251a1fa961d07ef51c1c29ff930f73839b838bc8 SHA256 9cb04ff79362d497c9ac6a52353933683201337cb50104ab7a0b70ba6fdb04c1 EBUILD calculate-lib-2.2.18-r1.ebuild 771 RMD160 eda4eab869e40a9c4d1dbdbdfcb0e7946d2d836f SHA1 ba562876a59cb4f5d6bb0c8465e5d24c78b52619 SHA256 e80632e105470436a3262d8c79815d5e10c7e3a46d4b50b0f8b6c90a070c4350 +EBUILD calculate-lib-2.2.18-r2.ebuild 803 RMD160 6c558b839ae38bd14f89f4c2e764d7efc0b9e038 SHA1 48eb95535a129dda0d7ac28fe2a3947914cbe369 SHA256 0a0b4fe0ae4fa0408e7aa595df83cd4b943659006908926861d032b7a463c513 EBUILD calculate-lib-2.2.18.ebuild 639 RMD160 d2dda2492b257947c88e37acdfdcffd30266ef29 SHA1 c0fee75613aa560848d32f7314737bc094d0dceb SHA256 bafff10516a4b7557c379e20592026a684be9b34dd38b381e136bd457c2c1dc0 EBUILD calculate-lib-2.2.9999.ebuild 726 RMD160 6dce718f317825c712f7c9595a3e712ef6222cf9 SHA1 42e1607a36e826310ef5ed317d717c5aa8acc2bf SHA256 dce73aafa346ea1fd88b6e99d8f6184a562de56e3eb871c1b5849890b13c34c2 EBUILD calculate-lib-9999.ebuild 476 RMD160 3df165f011b324fa8dc37d0443e941263943dd61 SHA1 069ab864dc83f32c69c4349d807d25e1196756ee SHA256 07a628ede4f47849908dd543f879ab8b40a5ca887b892fa0f5cf6c1ef2a24cab -MISC ChangeLog 22786 RMD160 83e4f24a0a428c64f3fedd256946825247db79e2 SHA1 fd7c31288a4f4b86cf9511fc3f652f05f5e438d1 SHA256 f67f7b075a1c8da4c303ef512d679271330ae8c217653c5d036a56ba838b501f +MISC ChangeLog 22993 RMD160 2ea1416fd09f07f5f335e936b31ef6be12d22aa5 SHA1 52aa98ca0ff65eb027da903ce1366233fab44cab SHA256 c963926cbd2997fe0c683ef3f28038fad0952e6249195180cdaefc7242584c8f MISC metadata.xml 303 RMD160 774b65ed76939d6878496ad6ef6451849bdced05 SHA1 7d08569697a290ede98c88ab59db3cdc3037bd15 SHA256 181519d9679fd9aee9a7a9806733a50728d3da0b1e0ad54f31499200f7f5c6ec diff --git a/sys-apps/calculate-lib/calculate-lib-2.2.18-r2.ebuild b/sys-apps/calculate-lib/calculate-lib-2.2.18-r2.ebuild new file mode 100644 index 000000000..0c29a022b --- /dev/null +++ b/sys-apps/calculate-lib/calculate-lib-2.2.18-r2.ebuild @@ -0,0 +1,32 @@ +# 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 library for Calculate 2" +HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" +LICENSE="Apache-2.0" +SLOT="2.2" +KEYWORDS="~amd64 ~x86" +IUSE="minimal" +DEPEND="!=dev-python/pyxml-0.8 + sys-apps/iproute2 + sys-apps/file[python]" +RDEPEND="${DEPEND}" + +src_unpack() { + unpack "${A}" + cd "${S}" + + # add part size function and fix work with python2.6 + epatch "${FILESDIR}/calculate-lib-2.2.18-to_2.2.19_rc1.patch" +} diff --git a/sys-apps/calculate-lib/files/calculate-lib-2.2.18-to_2.2.19_rc1.patch b/sys-apps/calculate-lib/files/calculate-lib-2.2.18-to_2.2.19_rc1.patch new file mode 100644 index 000000000..1d2f984c7 --- /dev/null +++ b/sys-apps/calculate-lib/files/calculate-lib-2.2.18-to_2.2.19_rc1.patch @@ -0,0 +1,93 @@ +diff --git pym/cl_template.py pym/cl_template.py +index 2a348c4..757c493 100644 +--- pym/cl_template.py ++++ pym/cl_template.py +@@ -2006,9 +2006,9 @@ class blocText: + r = captionTxtBloc.search(text) + if r: + headersTxt.append(r.group(0)) +- txtSpl = text.split(r.group(0)) ++ txtSpl = text.partition(r.group(0)) + blocTxt = txtSpl[0] +- txtWr = txtSpl[1] ++ txtWr = txtSpl[2] + rb = bodyTxtBloc.search(blocTxt) + if not blocTxt: + blocsTxt.append(blocTxt) +@@ -2018,9 +2018,9 @@ class blocText: + r = captionTxtBloc.search(txtWr) + if r: + headersTxt.append(r.group(0)) +- txtSpl = txtWr.split(r.group(0)) ++ txtSpl = txtWr.partition(r.group(0)) + blocTxt = txtSpl[0] +- txtWr = txtSpl[1] ++ txtWr = txtSpl[2] + rb = bodyTxtBloc.search(blocTxt) + if rb: + blocsTxt.append(rb.group(0)) +diff --git pym/cl_utils.py pym/cl_utils.py +index 025b051..5d4d51a 100644 +--- pym/cl_utils.py ++++ pym/cl_utils.py +@@ -1001,3 +1001,33 @@ def lspci(filtername=None,shortInfo=False): + 'vendor':sfunc(device[2]),\ + 'name':sfunc(device[3])} + return retData ++ ++def getUdevDeviceInfo(path="",name=""): ++ """Get device info by syspath of name""" ++ udevadmCmd = getProgPath('/sbin/udevadm') ++ typeQuery = "--path" if path else "--name" ++ value = path if path else name ++ return dict( ++ filter(lambda x:x[0], ++ map(lambda x:x.partition("=")[0::2], ++ process(udevadmCmd,"info","--query","property", ++ typeQuery,value).read().split("\n")))) ++ ++def getPartitionSize(dev): ++ """Get partition size""" ++ SECTORSIZE=512 ++ syspath = getUdevDeviceInfo(name=dev).get('DEVPATH','') ++ if syspath: ++ sizeFile = pathJoin("/sys",syspath,"size") ++ if path.exists(sizeFile): ++ size = float(open(sizeFile,'r').read().strip())*SECTORSIZE ++ suffix = ((1024**0,""), ++ (1024**1,"KiB"), ++ (1024**2,"MiB"), ++ (1024**3,"GiB"), ++ (1024**4,"TiB"), ++ (1024**5,"PiB")) ++ suffix = filter(lambda x:size >=x[0],suffix)[-1] ++ if suffix: ++ return "%.1f %s"%(size/suffix[0],suffix[1]) ++ return "0" +diff --git pym/format/samba.py pym/format/samba.py +index 47a0d94..6776289 100644 +--- pym/format/samba.py ++++ pym/format/samba.py +@@ -46,9 +46,6 @@ class samba(objShare): + # Для добавления перевода строки между областями если его нет + xmlAreas = xpath.Evaluate("child::area", self.docObj.body) + for xmlArea in xmlAreas: +- if xmlArea.previousSibling and\ +- self.docObj.getTypeField(xmlArea.previousSibling) == "br": +- continue + firstArea = False + xmlFields = xpath.Evaluate("child::field", xmlArea) + if not (xmlFields and\ +diff --git pym/utils/ip.py pym/utils/ip.py +index a1ec1be..2ec2852 100644 +--- pym/utils/ip.py ++++ pym/utils/ip.py +@@ -48,7 +48,7 @@ IP_ADDR_NET = "(%(ipaddr)s)/((%(ipnet)s))"%{'ipaddr':IP_NET, + reIp = re.compile("^{0}$".format(IP_ADDR)) + reNetSuffix = re.compile("^{0}$".format(IP_NET_SUFFIX)) + reNet = re.compile("^{0}$".format(IP_ADDR_NET)) +-reMask = re.compile("^{}$".format(IP_MASK)) ++reMask = re.compile("^{0}$".format(IP_MASK)) + + def checkIp(ip): + """Check ip""" diff --git a/sys-apps/calculate-templates/ChangeLog b/sys-apps/calculate-templates/ChangeLog index 3617a7dce..b910e258e 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-r1 (14 Jul 2011) + + 14 Jul 2011; Mike Hiretsky (mhiretskiy) + +calculate-templates-2.2.18-r1.ebuild, + +files/calculate-templates-2.2.18-fix_corrupting_calculateenv.patch: + Update for bugfix + *calculate-templates-2.2.18 (29 Jun 2011) 29 Jun 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-templates/Manifest b/sys-apps/calculate-templates/Manifest index 2801ff081..a4b946d63 100644 --- a/sys-apps/calculate-templates/Manifest +++ b/sys-apps/calculate-templates/Manifest @@ -1,5 +1,7 @@ +AUX calculate-templates-2.2.18-fix_corrupting_calculateenv.patch 628 RMD160 494cf84e27c85b9a51c41089de70b73cc1da714f SHA1 db81ba9bd4922d2b02dda0ed17adcd0f762b9b70 SHA256 e0fe5f803f77e476742dd0ac3d208fa63835e690774538a0deb79e84ff9b3686 DIST calculate-templates-2.2.18.tar.bz2 233661 RMD160 c8e42c3ed8860193286ff8eaeddcd1c75bb1ef0b SHA1 f197621e5777c16aca9b892d30ede172eee50522 SHA256 d3d236c7e0760db3ad9ea79f0fed9d9e5f97d69acabbae3bbc9c9d2e62a50984 +EBUILD calculate-templates-2.2.18-r1.ebuild 728 RMD160 e245cf9fb50cd08618902672ba94dbb1c8d7ba38 SHA1 9d5cdf47f57ce8196b0e7895f11970fbbe448596 SHA256 25accec86c1148518d7412366376250dfa3e566782c8c850c52baf1a7916d64a 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 26038 RMD160 81e818cc05f7cc5c9d2b28ab3117612eb445f0db SHA1 1747dafb0cacc13db733af06fda224cc78151b9c SHA256 eca9262c1594e7279a20434305acdb5bf3a848eb6d9a156348ee3342bd7c7488 +MISC ChangeLog 26277 RMD160 e7d827eba2e2155226a3f3fd383a06f9013d3073 SHA1 140899d3928621bbcc638db8c94eb864de0b920a SHA256 92f40ad334293f2866d11b56f7ef0e146da46bb5470cfd9d81ff88c9430a47b5 MISC metadata.xml 338 RMD160 4a1a51881bdf09b961217d2056114ca4ccb8b4d2 SHA1 5fcb2724427f9ac5dda07abb5c829c24e6db9ae6 SHA256 175d9ae86b71b291a519414e816b05290d0e4be74726cc8d5449a500c51a3b2d diff --git a/sys-apps/calculate-templates/calculate-templates-2.2.18-r1.ebuild b/sys-apps/calculate-templates/calculate-templates-2.2.18-r1.ebuild new file mode 100644 index 000000000..52303c479 --- /dev/null +++ b/sys-apps/calculate-templates/calculate-templates-2.2.18-r1.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}" + + # bug fix patch + epatch "${FILESDIR}/calculate-templates-2.2.18-fix_corrupting_calculateenv.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-fix_corrupting_calculateenv.patch b/sys-apps/calculate-templates/files/calculate-templates-2.2.18-fix_corrupting_calculateenv.patch new file mode 100644 index 000000000..8f1be8f77 --- /dev/null +++ b/sys-apps/calculate-templates/files/calculate-templates-2.2.18-fix_corrupting_calculateenv.patch @@ -0,0 +1,14 @@ +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 a/sys-apps/calculate-utilities/ChangeLog b/sys-apps/calculate-utilities/ChangeLog index b97fe2a28..9ce1c5a14 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-r2 (14 Jul 2011) + + 14 Jul 2011; Mike Hiretsky (mhiretskiy) + +calculate-utilities-2.2.18-r2.ebuild: + Update for templates install lib + *calculate-utilities-2.2.18 (29 Jun 2011) 29 Jun 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest index 6487b61e0..b6134f806 100644 --- a/sys-apps/calculate-utilities/Manifest +++ b/sys-apps/calculate-utilities/Manifest @@ -1,4 +1,5 @@ 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.ebuild 829 RMD160 e73b8763bd13098473327959bc435ff52d470836 SHA1 b394d0126e846d4780a77f2f89429f6bf8734a27 SHA256 550f341dc60ca43b23100152a58c30178cb1c88456d007bb1439fb4cb949fcd1 EBUILD calculate-utilities-2.2.9999.ebuild 840 RMD160 0c7324a9ed480118ac19f62b162c9ee62c25f964 SHA1 7dadab1430ed147334ed7e9b4fcc86dc99e25d56 SHA256 f3ee28f9f765e7302c83eb4a15a09bdf066f09e6b40e34f6d52157a946df5e66 -MISC ChangeLog 15520 RMD160 4fd913a3b0c46a64984403142ad6b6bc52660e73 SHA1 4a31ac486e6b040e62f0ba1a07a059d767b5b7ec SHA256 8a2f7f174ddc71d728fa92d4cb77c5ca3107082a2e419ea62452656d7479aa8e +MISC ChangeLog 15703 RMD160 e066d1351267ef2cffa05762039b9799e028f839 SHA1 9d5a8c88b0a9d049f88feb5992d6ad50654e3c19 SHA256 f4611c020f204b9694753d192896d2328c274265418cbe153e5ffe5812ca6859 diff --git a/sys-apps/calculate-utilities/calculate-utilities-2.2.18-r2.ebuild b/sys-apps/calculate-utilities/calculate-utilities-2.2.18-r2.ebuild new file mode 100644 index 000000000..0b2ddd8ce --- /dev/null +++ b/sys-apps/calculate-utilities/calculate-utilities-2.2.18-r2.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-r2 + =sys-apps/calculate-templates-2.2.18-r1 + =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-r4 ) +" +