From 21e01419ac6fd66ac8a862d8afdb35c9dd4810b7 Mon Sep 17 00:00:00 2001
From: Mike Hiretsky <mh@calculate.ru>
Date: Mon, 3 Oct 2011 18:00:31 +0400
Subject: [PATCH] Update calculate-builder.

---
 sys-apps/calculate-builder/ChangeLog          |  7 +++
 sys-apps/calculate-builder/Manifest           |  4 +-
 .../calculate-builder-2.2.24-r3.ebuild        | 32 +++++++++++
 .../files/calculate-builder-2.2.24-r3.patch   | 57 +++++++++++++++++++
 sys-apps/calculate-utilities/ChangeLog        |  6 ++
 sys-apps/calculate-utilities/Manifest         |  3 +-
 .../calculate-utilities-2.2.24-r16.ebuild     | 36 ++++++++++++
 7 files changed, 143 insertions(+), 2 deletions(-)
 create mode 100644 sys-apps/calculate-builder/calculate-builder-2.2.24-r3.ebuild
 create mode 100644 sys-apps/calculate-builder/files/calculate-builder-2.2.24-r3.patch
 create mode 100644 sys-apps/calculate-utilities/calculate-utilities-2.2.24-r16.ebuild

diff --git a/sys-apps/calculate-builder/ChangeLog b/sys-apps/calculate-builder/ChangeLog
index 9b928e939..960ed1fd6 100644
--- a/sys-apps/calculate-builder/ChangeLog
+++ b/sys-apps/calculate-builder/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*calculate-builder-2.2.24-r3 (03 Oct 2011)
+
+  03 Oct 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+  +calculate-builder-2.2.24-r3.ebuild,
+  +files/calculate-builder-2.2.24-r3.patch:
+  Update for feature
+
 *calculate-builder-2.2.24-r2 (29 Sep 2011)
 
   29 Sep 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
diff --git a/sys-apps/calculate-builder/Manifest b/sys-apps/calculate-builder/Manifest
index 6b837ea24..fce06cdd3 100644
--- a/sys-apps/calculate-builder/Manifest
+++ b/sys-apps/calculate-builder/Manifest
@@ -1,9 +1,11 @@
 AUX calculate-builder-2.2.24-r1.patch 2551 RMD160 3d01601506bc6178ee5a0ecef3772ceaf41f8f1d SHA1 cdd27e6e4ae567e2bf88023f3cc2e8db0236df38 SHA256 846e60fa3255abad18666bb74f1f9bd253c35224bb4b227abf0640d7477e037c
 AUX calculate-builder-2.2.24-r2.patch 1058 RMD160 0d0eeaac3ea4d5ebc2cc8e5a54daa11001007d53 SHA1 aefdcd72e494c0b97d4fe0c3891f4a7a60bc452b SHA256 d29c7eb2dd3bdd6ab14add61f4d40ff17a01e5365873a3e63ae5db80d18d8ce2
+AUX calculate-builder-2.2.24-r3.patch 2530 RMD160 9ae77c0eff7821b14526497c61b101acd8e654d2 SHA1 d96952b30d2b2a94dc94fc28641394b41c1c80b6 SHA256 e2c61e5440632c398d9f5395b225e3ed3fc848dc26093e2d21d95c3569717b03
 DIST calculate-builder-2.2.24.tar.bz2 26996 RMD160 b5cdfe057ccb0496ed4c1470570575086c2d58fd SHA1 1b68631826c8499be03b0e3ad1062ccc2c4d9d0f SHA256 8b995b5dbe5a1d9e98178f68720e7a30dfb02829ddf2f63b131786d962bf1c12
 EBUILD calculate-builder-2.2.24-r1.ebuild 710 RMD160 45008dff24e10002966838c4d48f10ea4d159565 SHA1 598e97ad47e60393795bb27039deae44e0c2b85f SHA256 05569d35ff6efbed09eb8a93ddd2ef774506823fb99806f8efd4a4e23de1057e
 EBUILD calculate-builder-2.2.24-r2.ebuild 714 RMD160 ab7ba19ba5cb38d2d4fa0bcf45b00a360539cbce SHA1 058b1007d0c28a1f276e1c91e9e536e16b1691e6 SHA256 3f3041eb22eb4637b4b5d1faa275215580219b8a369fcfa2c036d71d7a4a0e30
+EBUILD calculate-builder-2.2.24-r3.ebuild 766 RMD160 d7f12a1adbce5d176e17b5db07221c80f818b389 SHA1 e993fcc667fbb0028c5ff80c770cc6546ba1790c SHA256 f35f4f8aff03b9d93a89f394a867c4f8970c95fe1b7faf4cea28b0fa8c31f5d4
 EBUILD calculate-builder-2.2.24.ebuild 588 RMD160 4ab4eb3ba650bf43594b70b68d9e3c9844d14bcf SHA1 f754e4af234393852b58ffbbbc8aff3d18408007 SHA256 1f138c0c6dca0195f43c4aca60a87632980ee9c2f7dcc3c8658d487c97b45ec4
 EBUILD calculate-builder-2.2.9999.ebuild 557 RMD160 d6e0da8ee7ba77531266337a099a0e0e067d40ae SHA1 c92269a96eea95799d1cbd1860d0ee5b2a452e28 SHA256 6a99eb07e7beb65b1a14d4479e0ecab3da3b608733bb1c09ea739a71ed3eb869
-MISC ChangeLog 17766 RMD160 e960eb53f64777a0e834453ae5ebbdc23a54b433 SHA1 e8513da0e7e5441cef72fa007e2a9d372365ae57 SHA256 47da68795bddbe719767562428f52939ad62d5cf1f4d7af8ec7b094cd79697f4
+MISC ChangeLog 17975 RMD160 1f8c3ac58c3ba32965f7dbd59ad4a084b78b61fa SHA1 48d24f3f1a35f1bab1fdadacb40ea45a0e85ed54 SHA256 bced43a694d661c77dcb921be2a9b3d266c3a177206a633a57552ae40a5955fe
 MISC metadata.xml 270 RMD160 b5ff308a82cd6e594c2f04731cdbe9f80a945042 SHA1 58dbf7eb15bb2e6c6c8514f483e51dfacd1c62e9 SHA256 b65e150429ecbf36cf03d094f4e3e7518f536c61289cecff6b817326703d58a0
diff --git a/sys-apps/calculate-builder/calculate-builder-2.2.24-r3.ebuild b/sys-apps/calculate-builder/calculate-builder-2.2.24-r3.ebuild
new file mode 100644
index 000000000..fffc4c56b
--- /dev/null
+++ b/sys-apps/calculate-builder/calculate-builder-2.2.24-r3.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 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-install-2.2.24
+	!<sys-apps/calculate-1.4.0_p20100921
+	app-cdr/cdrkit
+	sys-fs/squashfs-tools"
+
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	# fix run chroot command, add ability use kernel config
+	# by profile suffix
+	epatch "${FILESDIR}/calculate-builder-2.2.24-r3.patch"
+}
diff --git a/sys-apps/calculate-builder/files/calculate-builder-2.2.24-r3.patch b/sys-apps/calculate-builder/files/calculate-builder-2.2.24-r3.patch
new file mode 100644
index 000000000..d19e4a3fa
--- /dev/null
+++ b/sys-apps/calculate-builder/files/calculate-builder-2.2.24-r3.patch
@@ -0,0 +1,57 @@
+diff --git pym/cl_builder.py pym/cl_builder.py
+index 4745b47..bece647 100644
+--- pym/cl_builder.py
++++ pym/cl_builder.py
+@@ -188,7 +188,11 @@ class cl_builder(color_print):
+             envdict.update(os.environ)
+             commandLine = ["chroot",chroot,
+                                 "/bin/bash","-c",command]
+-            chrootCommand = process(*commandLine,stderr=PIPE,
++            if self.clVars.Get('os_builder_arch_machine') != \
++                self.clVars.Get('os_arch_machine') and \
++                self.clVars.Get('os_arch_machine') == 'x86_64':
++                commandLine = ["linux32"]+commandLine
++            chrootCommand = process(*commandLine,stderr=STDOUT,
+                                 stdout=PIPE,envdict=envdict)
+         except KeyboardInterrupt:
+             chrootCommand.kill()
+@@ -275,7 +279,6 @@ class cl_builder(color_print):
+             os.unlink(curProfileFile)
+             os.symlink(newProfile,curProfileFile)
+ 
+-
+     def restoreProfile(self):
+         """Restore profile"""
+         if not self.curProfile:
+diff --git pym/cl_fill_builder.py pym/cl_fill_builder.py
+index cb6744d..841b387 100644
+--- pym/cl_fill_builder.py
++++ pym/cl_fill_builder.py
+@@ -121,11 +121,26 @@ class fillVars(object, varsShare):
+             shortVer = shortVerSearch.group()
+         else:
+             return ""
++        # find best config
++        makeProfile = '/etc/make.profile'
++        profileSpec = ''
++        if path.islink(makeProfile):
++            linkTarget = os.readlink('/etc/make.profile')
++            parentDir, profileSpecification = path.split(linkTarget)
++            if parentDir.endswith('x86') or parentDir.endswith('amd64'):
++                profileSpec = profileSpecification
+         configName = "config-%(system)s-%(march)s-%(ver)s" % \
+                 {'system':self.Get('os_linux_system'),
+                  'march':self.Get('os_arch_machine'),
+                  'ver':shortVer}
+-        if path.exists(path.join(kernelDirs,configName)):
++        configNameSpec = "config-%(system)s-%(march)s-%(ver)s-%(spec)s" % \
++                {'system':self.Get('os_linux_system'),
++                 'march':self.Get('os_arch_machine'),
++                 'ver':shortVer,
++                 'spec':profileSpec}
++        if profileSpec and path.exists(path.join(kernelDirs,configNameSpec)):
++            return path.join(kernelDirs,configNameSpec)
++        elif path.exists(path.join(kernelDirs,configName)):
+             return path.join(kernelDirs,configName)
+         return ""
+ 
diff --git a/sys-apps/calculate-utilities/ChangeLog b/sys-apps/calculate-utilities/ChangeLog
index 949842117..e413836d6 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.24-r16 (03 Oct 2011)
+
+  03 Oct 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+  +calculate-utilities-2.2.24-r16.ebuild:
+  Update for builder
+
 *calculate-utilities-2.2.24-r15 (30 Sep 2011)
 
   30 Sep 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest
index da3ad2ae7..a424cd725 100644
--- a/sys-apps/calculate-utilities/Manifest
+++ b/sys-apps/calculate-utilities/Manifest
@@ -5,6 +5,7 @@ EBUILD calculate-utilities-2.2.24-r12.ebuild 886 RMD160 5bd53b7327aadbec836350e1
 EBUILD calculate-utilities-2.2.24-r13.ebuild 886 RMD160 5bd53b7327aadbec836350e19439f17e1c3a1cf0 SHA1 7b8a1aa7708dacb4cf48e0364b32e05e335ec146 SHA256 676d5c2035da0d36407b0bf8b0d542cab098284daa711ac9e9de9ce7627a8264
 EBUILD calculate-utilities-2.2.24-r14.ebuild 886 RMD160 7a5304240ec71f69b181dbc80d278ec251989120 SHA1 9328eca153deee5dffaa8478e5b32e8da365357e SHA256 60a27af30a2d617444ca0bcc99a4dde5ec88d52fa7c45d8ab43611d0ea6a6234
 EBUILD calculate-utilities-2.2.24-r15.ebuild 886 RMD160 65c1492ada189d37beee62cb4f5332199fdd5c4d SHA1 202aba0d8ff899a4ddf9c641ca12046dceba170f SHA256 f31a1520673defdbb114cae3180b471f07a7c171696c3025da69144921277d9a
+EBUILD calculate-utilities-2.2.24-r16.ebuild 886 RMD160 61b0d4ff24facb0d5e61f25ab73141530b015de4 SHA1 b6ac556265dbb487ef0bd6bd166be1b2283800cc SHA256 c49009184b8a35e536c65b553216afd1b8d02459dc9a7b7ea040cd2edab328b2
 EBUILD calculate-utilities-2.2.24-r2.ebuild 867 RMD160 df598038cc6cc3971cab35ed7984a1dd590bec98 SHA1 a77db53bab42d35ae2677224e3ebc0c26a650a59 SHA256 db8f05e541179081778143f3706c10e42febe96c72fe5a2feceefeff73fd5a50
 EBUILD calculate-utilities-2.2.24-r3.ebuild 873 RMD160 8f0b91ade772b6642311b50efd772daa5a4c76cc SHA1 ad4cfb779ce2a85b9dfe6bc040bff73827fce20b SHA256 3d4ea669782aed05bcc33a16117ef01e22c28585e300b751fb5162a13d990901
 EBUILD calculate-utilities-2.2.24-r4.ebuild 873 RMD160 70f067baed3cd831660617cc2d7a5997712b7fa4 SHA1 a307de135d4ab9526036861ef51f9caa8eef0fd4 SHA256 0024670d48e1510cd2a20f28c623d4f72c9963f66b3f723a5c1e55935362088f
@@ -15,4 +16,4 @@ EBUILD calculate-utilities-2.2.24-r8.ebuild 885 RMD160 fc01b867dd5b79294cdf05819
 EBUILD calculate-utilities-2.2.24-r9.ebuild 885 RMD160 64810ea35986869adff8dd3298607985978e6e59 SHA1 5951c55c53517cb66a87276101aac01c9afcf99f SHA256 7a9c5a4e8710dd651474ec505853102858c44bc7bffb9716d3752924297c610c
 EBUILD calculate-utilities-2.2.24.ebuild 861 RMD160 71a8eac35eade9be90df9cacbb5b4d9ba07d3664 SHA1 258da46af67a0e0995074a9c7f01b33234711ca9 SHA256 f1a33869f243365632a9af11ab9ed2538a6b2c183dd9ddbf28d48ad564df3d54
 EBUILD calculate-utilities-2.2.9999.ebuild 840 RMD160 0c7324a9ed480118ac19f62b162c9ee62c25f964 SHA1 7dadab1430ed147334ed7e9b4fcc86dc99e25d56 SHA256 f3ee28f9f765e7302c83eb4a15a09bdf066f09e6b40e34f6d52157a946df5e66
-MISC ChangeLog 28761 RMD160 d178d123e2653ca82d02867ca7a52738d3dbe762 SHA1 2394078f18ce3668d36ccb96c7b417e9bfc8a4bd SHA256 1bd48859403b632cac7adf21f6fa77c7e660a725cffefbf963bf7db57ee2d546
+MISC ChangeLog 28932 RMD160 56cfd4619af1714ba13f20442043a8d9daf88d84 SHA1 eae5956fff03eb3b6fd67fff26f86ebba7a546e1 SHA256 84392a43b207e6805cb16b215feeb9c931616fe2dca66c8aeb1b38954be15284
diff --git a/sys-apps/calculate-utilities/calculate-utilities-2.2.24-r16.ebuild b/sys-apps/calculate-utilities/calculate-utilities-2.2.24-r16.ebuild
new file mode 100644
index 000000000..faf3b8d8e
--- /dev/null
+++ b/sys-apps/calculate-utilities/calculate-utilities-2.2.24-r16.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.24-r7
+	=sys-apps/calculate-templates-2.2.24-r12
+	=sys-apps/calculate-lib-2.2.24-r2
+	=sys-apps/calculate-i18n-2.2.24-r1
+
+	cl_assemble? ( =sys-apps/calculate-assemble-2.2.24 )
+	cl_builder? ( =sys-apps/calculate-builder-2.2.24-r3 )
+	cl_client? ( =sys-apps/calculate-client-2.2.24-r1 )
+	cl_desktop? ( =sys-apps/calculate-desktop-2.2.24-r2 )
+	cl_installgui? ( =app-misc/calculate-install-gui-2.2.24-r1 )
+
+	cl_server? ( =sys-apps/calculate-server-2.1.14-r6 )
+"