Update builder

sys-apps/calculate-builder/Manifest

@@ -1,8 +1,10 @@
 AUX calculate-builder-2.2.30-fix_builder.patch 1216 SHA256 6d40f758e3fef56568026debf7c8092dc2e210dde60474d6abb4b1f0e775944f SHA512 5c07f1257acbf54d4be4c901ab06943bc80b382ab73b47310fb42553f588012b3f199e3a3691d419ef60c7f356892ca7e8475ea7cd45d8e1dc9ded82e80f793f WHIRLPOOL f6e69afa09794949cfd2bef9c2762bc8695f7fcd0310f14261a8e145d24ec3157e96b918ba00379972b0e74652a9d0a9a956f054bf3f1ab7e43cb81e94122711
 AUX calculate-builder-2.2.30-r6.patch 9261 SHA256 ba5d8eae88c268536b0886f0018a3ed0c1f0faba2631325924d3780ee014301e SHA512 530c4f65af5da106e20e12d6deb81b344224870e098c871738a4a24c729c64023774445ae1aa4505b343c33805c03e9b873e903b64d3a872225ecaeb1a9025da WHIRLPOOL 72863773345b07f23d5d5c367e0f7e3e03941c498c872d8fc9b2cd119de859b45850bdd92731f014c783f63376a18dccb1d7ecf9b0f88278772e68efcb4c3e87
+AUX calculate-builder-2.2.31-r1.patch 887 SHA256 d5902c6007554121c118b505537fa750001393ca42907e2d526d26d477bfb4a7 SHA512 1691a0e525f92022490fa41cd49bb7b87020a406688088500cdb3dd43c940735dfa4d4864074c638c7450037fc4bc3536aa351a9a2df99ee63582d0088aad0b2 WHIRLPOOL fdb0d46cdb87ea4017446fdf14d53efdea0c99f1cb8f315a5d0787ce103a9e7e2b7197ee4d22476a2da93f8e98bd70f3ff7a9ef3ff2be9ca7980e233067517f7
 DIST calculate-builder-2.2.30.tar.bz2 31257 SHA256 d227f1de5bfa9ef1a78890518693c0e5b812c27c1531fb284825b240acd158ff SHA512 c0ae9a29e13e97e0e53e5643849279dc64945982b8f014a8d12509fedb0d10bbc38ac454361789d58ad2ef6d7e2cd2d27b23fd548f43b798a335f6316eca08d7 WHIRLPOOL 6f8dfb02737bde154b489234bde287904fe37c81b72d4d6fad1351eade21a4458a9d1878338ed6c811d49bea4a22fdecc1631e7fe3aaf74052397c6fd697a3f7
 DIST calculate-builder-2.2.31.tar.bz2 31745 SHA256 42bdbc62319205a1ac68c8e80c822bd6679cd43e98caa9b1140d499872887e60 SHA512 5b3832b9fe910502a953a90e4af289691dde095b17c6a8cd4d059eb8f9fd90880963afec758dea97d0e15eabeebed4ec3325ef91f83ed71b3a08c382b30e220c WHIRLPOOL 399d4f9f308fbe1f0e57a45ba0e0e92a1f5aefcbdec5ffaa664fd955f0f8383f4542f5f229c9ab96127cecc95a1de8e31abb390ed32d306c7ecf970f6cb16fca
 EBUILD calculate-builder-2.2.30-r7.ebuild 948 SHA256 d7218587956d9bb0a4ca5dacd97b645bffbe2ae9600454e669e4e9ca4ac417ba SHA512 6003ff9a46c87e7ebd5bb379d4af8c09583af57409dcc7a24f34d1c7cdae057ad35cf55e1d7e7345d6c1f2dc375fdc043daaf4e34b4c3cc76496e4a15ff3c4e9 WHIRLPOOL d399e8688266b32d7bcd024b633fbfc5327cbc089f64389e0cdce9000dec21e2d4a6690b85b8f631c66f13082d979f5272ab875cf502eb398284f5c0f0512cd2
+EBUILD calculate-builder-2.2.31-r1.ebuild 800 SHA256 9e568c5c9fc52e01ad01a62afe7a45de699866aff93df00200e59337b1b2ca78 SHA512 c09934ff2af3f12393ecbd097b27d482a8ba7dcbb968ffe7fd78e2673f0efc4743ccf94b1458d1698e5be5570e337dccba6a415c3353503f5cef44587552dfc3 WHIRLPOOL 310074784170b5fa9bbff03b848ebc961aa6b8a9ddac01f79005a6ee094b14ffe1e4a58d0b99c9d4753f9c6e830ed7c32a8fe23b2a71edf2e078c583462e143f
 EBUILD calculate-builder-2.2.31.ebuild 668 SHA256 d5d3e22b4c1ff9b201f3da282a590e8a61691ddb35db87d5796ccfbd3e543a8a SHA512 19100ac3601e502e5efdeed7304829d04b110918ccb103bc00c594a8991c9df51f718ef9a9ec61ab8f41449a430b814679a658805058281b91b1776f6b07eb3e WHIRLPOOL e1cc47f8e841b34f54962826c544cdec3bed00b3d6b9c8227a3168e2842f8100870c025410d753ce343d8253da2b75b2ead98598b09d15d4eef6c2403de81895
 EBUILD calculate-builder-2.2.9999.ebuild 645 SHA256 12bd65856844de72d88588937b6a65b39b7dec7eaba06d028e8c5a78ef6b28a5 SHA512 fc6396dad3a92a5a746f4ed32caf092ede65898e4822e52ad541faaa44467a4f81daf6f261af8eb20017c6155923e2011433e4b15071d7098392c901ae3a5078 WHIRLPOOL fd0151c3ce9fa98c5ca63470e561487c063293727006da10446c0a2ac2c65305042a5359bc0163840c1dd4502d67641453dddaf5cded552dacf6c5c97ccc7402
 MISC ChangeLog 20663 SHA256 f05f75b85860fc850514bd6bcaa1671c6de2ead417071f28ccbec647528f58a2 SHA512 2bcbfd0212333bbf8bfd1fc4de894ee50b71b0671e4769fd40a1aee4fbab0260919b447f109e3b02047835c6e0eb93c04ea6ce135836144d078c09f0c5615d95 WHIRLPOOL dbf2791d84acf8567520bfd90462650ca9c9c0da7a3515e9e5695c3a419cfd043e235d8d681704f33a0c99272e93563de0fc6426f9476f894a48d52a21409462

sys-apps/calculate-builder/calculate-builder-2.2.31-r1.ebuild

@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+SUPPORT_PYTHON_ABIS="1"
+PYTHON_DEPEND="2:2.7"
+RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
+
+inherit distutils eutils
+
+SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
+
+DESCRIPTION="The utilities for builder tasks of Calculate Linux"
+HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND=">=sys-kernel/calckernel-3.4.18
+	~sys-apps/calculate-lib-2.2.31
+	!<sys-apps/calculate-1.4.0_p20100921
+	app-cdr/cdrkit
+	sys-fs/squashfs-tools"
+
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	# remove depricated templates
+	epatch "${FILESDIR}/calculate-builder-2.2.31-r1.patch"
+}

sys-apps/calculate-builder/files/calculate-builder-2.2.31-r1.patch

@@ -0,0 +1,19 @@
+commit 9ce0b5d57f15ee7066f88c394e80a6400aa02ee4
+Author: Mike Hiretsky <mh@calculate.ru>
+Date:   Thu Feb 7 16:40:18 2013 +0400
+
+    Remove depricated templates from image
+
+diff --git pym/cl_builder.py pym/cl_builder.py
+index df1e212..5872586 100644
+--- pym/cl_builder.py
++++ pym/cl_builder.py
+@@ -582,6 +582,8 @@ class cl_builder(color_print):
+             return map(lambda x: path.join("var/lib/layman/calculate",x),
+                   filter(lambda x: not x in ("distfiles", "eclass", ".git","profiles"),
+                   listDirectory(overlayPath))) + \
++                  [pathJoin(sourceDirectory,
++                    "var/lib/layman/calculate/profiles/templates/depricated")] + \
+                   map(lambda x: path.join("usr/portage",x),
+                   filter(lambda x: not x in ("distfiles", "eclass", ".git","profiles"),
+                   listDirectory(portagePath)))

sys-apps/calculate-utilities/Manifest

@@ -1,4 +1,5 @@
 EBUILD calculate-utilities-2.2.30-r18.ebuild 677 SHA256 73902c8c8b214450bc5d78dd210c54dde11dc929ea8575d6bcf377f109c05130 SHA512 8c078bba7095405a00c44296318d9e78da6d0e1fc861f04d8209c2055311726ca198de9b447255781fa18d870cd0e299b83cbcee883eff8ce3e573ffbf9b74ec WHIRLPOOL f2811e6d6a7d214803b9843a849aab43eb0d117ba9993b64965a94694091ae057520b5a7ebea007eaaccbd352348a4feec0dec248b9a2dc498157737e244c6bd
+EBUILD calculate-utilities-2.2.31-r1.ebuild 668 SHA256 420809129edfe57fae1bd82a8e99fd17c8428945b1494ccb960c0376a8b7970e SHA512 bc0f4a25cd7e86a132f9f19516d2a9ce8dab37d42c38cd285cb5900a8348e9e1843da182f0946a5f94f6e743e64441e6a5a85b2633123831ddeb3126170fdb2f WHIRLPOOL 57c3aa6e115f5b2ea205f0950966421091549aa6a6e1e346f171018cec98401175782605eb37e1bc5e62023a1565f5becad4ac8200c6a0e781c6690269f226d6
 EBUILD calculate-utilities-2.2.31.ebuild 665 SHA256 ae87f3614957179ca66f4e1f322dcb280ec89d408bf43a1528c5387b928deed9 SHA512 864f85ae7b8d3a5b648e00f8fdd2b31ce553b7be097cac09d8f11d8d9ca59e091501b90a163e25f2bd123f0585bf1158b1ec99447d03e2b433a6d72369bcc1b3 WHIRLPOOL c4bb4621eea6a14778066ff39e53c4a7e2fc576d29a1291a716edb2a1ae50358b9510d9ad2785bbd2d83e82a10dfe1ff1d567fdfa448c8a416dd1fbbe7a2f4dd
 EBUILD calculate-utilities-2.2.9999.ebuild 842 SHA256 56d97b7d2ce11d23b25d9036b4e2ee196b547ce1d11b0cc349a8205515b66bf1 SHA512 fc7802b92ade52210fa7381b55c48638da6d9adee6d2f03f18d6bdd0050756089b3ca8de944f4e865517554523b40737abe9f22587ecae74079eec563f80868b WHIRLPOOL f1382f0629a8dae37aaecf40cb8cbc3682bde3b43e92c9c6a84cda75897dc5d5de043233fb7a3f929749520b05fe3af94187c7a3ccdae4e252e83699d871f225
 EBUILD calculate-utilities-3.1.1-r3.ebuild 761 SHA256 70e0fb66ae382253295eeb211bd9ead7cd0e9cb0308362f6d2eacf6e2d382c0f SHA512 2ac5b5accbd60460defc2d51c035834842c9088829e1876fa60c854f718406f41f20cd6351990d396328e7d56caa66b0751c597b357948a4db4ab6bc56f0ffec WHIRLPOOL ac28164c7b3811c9dc03418d11cb0f79c6fa71bf969f93d06f7dbf2435cf898f3f16da80032bc112785e0e7e71fa6ac8f8a1bb7e6731f4561603d7b5590b619d

sys-apps/calculate-utilities/calculate-utilities-2.2.31-r1.ebuild

@@ -0,0 +1,30 @@
+# Copyright 1999-2012 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_server
+"
+
+RDEPEND="${RDEPEND}
+	!sys-apps/calculate-templates
+	!<sys-apps/calculate-install-3.0.0_alpha1
+	=sys-apps/calculate-lib-2.2.31
+	=sys-apps/calculate-i18n-2.2.31
+
+	cl_assemble? ( =sys-apps/calculate-assemble-2.2.31 )
+	cl_builder? ( =sys-apps/calculate-builder-2.2.31-r1 )
+
+	cl_server? ( =sys-apps/calculate-server-2.1.16-r7 )
+"