Исправлена пересборка пакетов

sys-apps/calculate-assemble/Manifest

@@ -7,9 +7,11 @@ AUX calculate-assemble-2.2.31-rebuild_changed.patch 7918 SHA256 9031fcbfb2b750dc
 AUX calculate-assemble-2.2.31-video_script.patch 1148 SHA256 629fb65eba9bff6f5e47b357cdbca14ca945b9848221caf8d13c2dafe504f53f SHA512 64d4b6ca7b119e1ee5a0b4c75b2cfebb6d738c5616018f9d09de43694ddeea2182a77aab85646b6096d6d92ae24f61d4368a3fac4eb76b6ab4ef02a186d32d96 WHIRLPOOL d1b47d83ea170aebdc1f1b19c8dc85ddb5b6047d5bf057c87c0864bd0836b5bce12fc36eb882d10207b5b92a349f3ec3af93449867607f43e6a24c4041e331ef
 AUX calculate-assemble-2.2.31-video_script2.patch 825 SHA256 b44dc9d7fc9e0550ae01857322313e5e0e558a0c050b6393072f5ff1da966194 SHA512 c2657c5afca7887440dc337bdfa94392e39fd90c3aa4d011b44c0ea5427c3a63d98df3f9324f3266777c24228c01fe1623ca6bb24f7c73871674ff16cde482a8 WHIRLPOOL bd18de7a17d33c2434854b4e79c0c579ac2619d6ba9b43f3524403fc7596b351f0e938180742e2db9562305a68c0edb15ba5504835fd463c0dd2f5aa3dc6a639
 AUX calculate-assemble-2.2.31-video_script3.patch 646 SHA256 d10a0a4c1e46367a4d8668cfb893050f9700426e0148e00e38c2c58c20758855 SHA512 795b884e2712b77162c1f58ddacabd7cf723c13a5a493414be87b8dd5f900369c2237764164cce70e69d19f0caea359a07e4fdc5f908c11aa835e7bc4482520a WHIRLPOOL eb88da8ccef1b40e4f26d5495e75aa0431197ae38be16f502a01a3afc2ca9ffca5b19d67e73fb3162de63a942badb2f35061dd394154d8935bf315feafc099b3
+AUX calculate-assemble-2.2.32-fix_rebuild.patch 886 SHA256 65c768b43173bd2f998be76becbae687dbbd794036e15dc69637feedd796c157 SHA512 5b7f28bb693fd398af00919565c7b3cdbb9e0c8714e4af449f1562120648945a498c4b00d856ba6279110deca82453763dc1698452444b788179be026a839108 WHIRLPOOL 10a4729ea871f5a82db73c0777ea76c2107232263c42f965339a3fadc528f7d2d3da35aeed9bd8a1417daf78b32709bb4d62d5b50f5ef61fae64de828e6c93b8
 DIST calculate-assemble-2.2.31.tar.bz2 28977 SHA256 8488de0b12ee9a9c30d0dd8d5f16f8da11b8b135147ffa29856c91a757afaad8 SHA512 50f9c0cd8442630c882a23a41e73b29355758cd91d4f9911f01c27d2dd7bf0c4b5bc90226075d4cb01ee05829652ed134ae80f89e1795beef5089989e142c223 WHIRLPOOL c3317c2843dc82b77abcecdc3120bbc1df7a31b4cb3dd33de623b2cb30ac9ec40e4cf2662f898eccb41d5a3cc2e75a9e3cbe34f4d989cb6463c3f5524aa43df7
 DIST calculate-assemble-2.2.32.tar.bz2 28061 SHA256 729c79b66f6d1d8fbfe6cfd212e436c9e2ea608009896303e6a6e53f92f15f17 SHA512 357902866ee722c1c51c9616684d553f59f317582fa661a32c252c9360eb79937755c54c63f538b7e1565108da9920eda3c0358cd2612d805515dde632fe3e68 WHIRLPOOL 40a5826a6c27cc61cf0a201f1b2907dd97ab195c0a2754aa916e4d2e95db467877d4af854eaeb12b7e75fe6bca9413306c94fceed81be201347543aafe132ad5
 EBUILD calculate-assemble-2.2.31-r10.ebuild 1368 SHA256 ae9718e5b87a35f6708ada87ea7b8f29b2031c5e2df87ae0e90f22dc977cc8ed SHA512 be1457491673113a35f55953a9ccf34ce8a7b797744ae718bb1f58cbe08fb9e46b41fbeee43e8f66321a2097c07f790428de0696c628e79ab3224493f6ff6820 WHIRLPOOL a85d04571b5b3c7013c2b3c5b3270dcf529a5afbf31f43076709599a46c487947988429d7839e7ed05a4e73ed45a54a0f42c76c1eee33324f5c14bd91c6d60c5
+EBUILD calculate-assemble-2.2.32-r1.ebuild 709 SHA256 482e8cd13e7c5770ee0cec5f4e93dd554587db937ca5d495cdef83cbfdcfb3cc SHA512 823bda43679e012cf2ac08803a186035ff9ac7ed075d059d0966da69e26ce004a91d668bd18748134d0683ed7b08615398a8e3bd4784caec3ee0cd1659dd3edd WHIRLPOOL b3d00cd984758a172d5c5337381988acee4550a19b3c76b5e120a6e70bb87b58e7b2a05c4d7945785e078dd151b3640c6b9ac6053626ff41a5f604c9e22bf41b
 EBUILD calculate-assemble-2.2.32.ebuild 566 SHA256 cae8f870e393cdb7b07ad55a10799e83670056ef743be34b898b346b56921da0 SHA512 c30264d36da9476154308b8a949d1bbb034d108f47b42025d0bb2c3bc001297a1e51294ee52bfcd973a8ef770fd9fd1879d70763cacb72e40c476610376e4002 WHIRLPOOL 6a4a37d2b23050ab1c6c3a1b2324b59255f0c2146e8df60cd0b98ec3af74ad1330c1c7d96ebb6eacaa56201d74f1ac41e614e88f3c4c2a94e2b71689e21979d5
 EBUILD calculate-assemble-2.2.9999.ebuild 572 SHA256 5bc8194c32bc4677cf79eaf6ae5f2112cafa51ae900dc3ebb6e879d9414858ea SHA512 62a111e959134709ef7529bfe87ccdfb20b103efc5305bf497ee9f427b3f956f180cd5c612641e557607606de9dbae3326c7881cc16afd9372b752ef65d63c93 WHIRLPOOL 8340a2b45b9941a61473ec4d66d944524dcf6f973ad9a03b9b92471cf5c92199949b2d707e7f738d86bbc9774eebac561df52891385e57d75aa811f47b4c5821
 MISC ChangeLog 16686 SHA256 759d02ea5f6029eab950ac93cf54a1c43dcc007a82be8e42cb82eac38369e979 SHA512 d4927fc6204a0a496248edbf3daf5b9259f0fc519a759c1dc8a6d6c2abab33074e75cd29e1696af3debaaac23548d0dc021e8d28c21d5c38cb8b2f06a973be0d WHIRLPOOL 7bd8bf84215ef77ec4035419f79d3226f3db13d6fb417e2b882bd4899bc240764ccc5a32154d8469153dc1c052936aad886a69916148bbf2bffa8d782b343401

sys-apps/calculate-assemble/calculate-assemble-2.2.32-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"
+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 assembling tasks of Calculate Linux"
+HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND="~sys-apps/calculate-builder-2.2.32"
+
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	# fix rebuild changed packages
+	epatch "${FILESDIR}/calculate-assemble-2.2.32-fix_rebuild.patch"
+}

sys-apps/calculate-assemble/files/calculate-assemble-2.2.32-fix_rebuild.patch

@@ -0,0 +1,21 @@
+commit 2e769052f2634658df6b04280a7bf4ba1f4fa487
+Author: Mike Khiretskiy <mh@calculate.ru>
+Date:   Thu Aug 14 10:09:42 2014 +0400
+
+    Исправлена пересборка изменных пакетов (уделены MERGING)
+
+diff --git pym/cl_assemble.py pym/cl_assemble.py
+index 0d03a51..2b2f141 100644
+--- pym/cl_assemble.py
++++ pym/cl_assemble.py
+@@ -1869,7 +1869,9 @@ class cl_assemble(color_print):
+                         yield pkg.atom
+                 except EbuildInfoError:
+                     yield pkg.atom
+-        rebuild_list = map(lambda x:"=%s"%x, rebuild_generator())
++        rebuild_list = map(lambda x:"=%s"%x, 
++                       filter(lambda x:"MERGING" not in x,
++                       rebuild_generator()))
+         print "Package list:", ",".join(rebuild_list)
+         if rebuild_list:
+             rebuild_packages = " ".join(rebuild_list)

sys-apps/calculate-utilities/Manifest

@@ -1,5 +1,6 @@
 EBUILD calculate-utilities-2.2.31-r31.ebuild 677 SHA256 6b43b1d0be24831662b7c8c44d194d216e22480ee884db180b84a0e33db8cffd SHA512 2fe9a1e3917ae0ec21795cfb9cc47641acd2a17e887177abe85dc8ee63237a43ff2ba4a2240d59690427f01538b975dc34fac3b770b1ecc81bd7194e55b7fe3b WHIRLPOOL 18367f6166146d97675512a0907e0335291f79aecd27add8922c78537181480c6c72e5aec5e674994e0d5f89cfcdf38310badb6ed9c1777e164456267b9212eb
 EBUILD calculate-utilities-2.2.31-r32.ebuild 677 SHA256 8967dea72902b4dc30a7f6cf5ebe7834f5cc9f59140d69ac191e204800b9445a SHA512 77a14e75a80d286776971c7a792fb6ed79ef01c138be4cd160765e9b47ab7ce6870c21e3e5d8e61417e00f64b30a5cb5c35d4fe447eb4fbe958daa95de87a399 WHIRLPOOL 08723dece4f5cf3965086ba63f42f6fb34e6d765b813884973935f2582f925840e760db275cd46c7c995b700a915af2b123ad0492c9d80e2eb4db8c093c4b62d
+EBUILD calculate-utilities-2.2.32-r1.ebuild 669 SHA256 ff9bd3d5ded75f80e3299a192a59970929306ca165fc2e0a048fc7dadeff5848 SHA512 03cfeb45032c69743b0a409648d10702a15043b17de60ad0163198d475410ca4d8d22a5d09466a56fef8a555e84bbc32768f3734197cb1d7970432ee7a67d195 WHIRLPOOL f0fb480ed9cb1a93d3743634abac47cbd825a3b470f6275eb5ad8aaaa92cea4ab35b9a29539230929db67f166eb91d72d17ab1b2d95367c23d39ec3f9c320ac2
 EBUILD calculate-utilities-2.2.32.ebuild 666 SHA256 c300ca4b789c28d3453944234df8b3925d1ebf251df92a0a6171b992bda51bce SHA512 d95d7500d424777dbabf925c4e161cb19f276ec8b6e5cc49aff97144b904a5d23ad6e9f1aceb76b84bfddff9bc15189d5ed2c188b2598edf8d88c9ce1d63f910 WHIRLPOOL a5d6ce431558ea256eb7e11623af4ace8feaffb04d60794a2810d25e60c37ff7532d46ff5825cd798c131d520590d56732562aff7d26160561f1d59469c99c3b
 EBUILD calculate-utilities-2.2.9999.ebuild 831 SHA256 630a2373531bdbda2cac289c82332b3688d57d00b403795b93f68cce36824265 SHA512 cf7553e27cd0772548f746d97ab90093c2aa945e34273aa29df222727684451b6ceadda577e2ac0af943a61f84871286d1505ee3682020437a449542f2750255 WHIRLPOOL c48a8b8d9b64ebd3e32105cfad5b86db16373e3ab90e2fc50c7d2cf8908840ea91ba7a32c537a6406feb1f37d03a21619e0b1e33f1ef11a1047c21a6393d0284
 EBUILD calculate-utilities-3.1.9-r34.ebuild 772 SHA256 843d57c3732232408adfdc60e09b53599d5afca31bb9ef303cec5697c45f78cf SHA512 9aefe0888d9357fbef0cf7e7807f48c3e965a15e30170481b793880a42780d2588fb9f2e3407f214c88b18917c705fc12c896e64f606b08f3e4c8487324005e8 WHIRLPOOL 3778616d8139d3011f115518e694a5d6517a8febbda8b1296578170b266a7e1017d45cc07ebd4c87c9108f2eaa4beab802b1015a3f29f9677222fc9e1d98869c

sys-apps/calculate-utilities/calculate-utilities-2.2.32-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.32
+	=sys-apps/calculate-i18n-2.2.32
+
+	cl_assemble? ( =sys-apps/calculate-assemble-2.2.32-r1 )
+	cl_builder? ( =sys-apps/calculate-builder-2.2.32 )
+
+	cl_server? ( =sys-apps/calculate-server-2.1.16-r12 )
+"