From cdf074973af550a1bfd0be6033b84bd19d824812 Mon Sep 17 00:00:00 2001
From: Mike Hiretsky <mh@calculate.ru>
Date: Thu, 10 Nov 2011 16:40:09 +0400
Subject: [PATCH] Update builder.

---
 sys-apps/calculate-builder/ChangeLog          |  7 +++
 sys-apps/calculate-builder/Manifest           |  4 +-
 .../calculate-builder-2.2.25-r3.ebuild        | 31 ++++++++++++
 .../files/calculate-builder-2.2.25-r3.patch   | 50 +++++++++++++++++++
 sys-apps/calculate-utilities/ChangeLog        |  4 ++
 .../calculate-utilities-2.2.25-r11.ebulid     | 36 +++++++++++++
 6 files changed, 131 insertions(+), 1 deletion(-)
 create mode 100644 sys-apps/calculate-builder/calculate-builder-2.2.25-r3.ebuild
 create mode 100644 sys-apps/calculate-builder/files/calculate-builder-2.2.25-r3.patch
 create mode 100644 sys-apps/calculate-utilities/calculate-utilities-2.2.25-r11.ebulid

diff --git a/sys-apps/calculate-builder/ChangeLog b/sys-apps/calculate-builder/ChangeLog
index 80f8ed573..abe0a6752 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.25-r3 (10 Nov 2011)
+
+  10 Nov 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+  +calculate-builder-2.2.25-r3.ebuild,
+  +files/calculate-builder-2.2.25-r3.patch:
+  Update for hide cl-make -T
+
 *calculate-builder-2.2.25-r2 (10 Nov 2011)
 
   10 Nov 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
diff --git a/sys-apps/calculate-builder/Manifest b/sys-apps/calculate-builder/Manifest
index daea5d6da..a12d3446c 100644
--- a/sys-apps/calculate-builder/Manifest
+++ b/sys-apps/calculate-builder/Manifest
@@ -1,12 +1,14 @@
 AUX calculate-builder-2.2.24-r4.patch 2924 RMD160 767fe1d3416c27820da427fdb15f1c71525c7c91 SHA1 91854f98a855c5bb67a9f5edc15ad6fed70909af SHA256 eccbf5d5fcbfbdd436ae14ae01063d5d0934a2cf7e0b53a985a1d86fb21672b6
 AUX calculate-builder-2.2.25-r1.patch 632 RMD160 7318f3b7f6035fc5b20ae68003f531aecf5fe323 SHA1 4853f4988a58fd0a31459d51fc27e34e62d328db SHA256 a775f339439b4cb06b6303525cc9592deade46aff6e0aa5914630539dfc4045c
 AUX calculate-builder-2.2.25-r2.patch 2365 RMD160 fc409a93dfeb599cb48aca2faec986582a0d31e8 SHA1 f5f7e173d6a727c0bc84de0162ea8fd5842c556d SHA256 9ae17916e9ab6b052d3418f05bef0a8053c5e603820830726706baed118b313e
+AUX calculate-builder-2.2.25-r3.patch 2377 RMD160 27c4080989f7d04f20908b1465e441bd9cd2a0b8 SHA1 182103315319ee3e322d09323321fed61f81e6af SHA256 f6b6b65b52347491756ff18070f3603405d9cbccbbe85b2ce14552ab5beb4a4f
 DIST calculate-builder-2.2.24.tar.bz2 26996 RMD160 b5cdfe057ccb0496ed4c1470570575086c2d58fd SHA1 1b68631826c8499be03b0e3ad1062ccc2c4d9d0f SHA256 8b995b5dbe5a1d9e98178f68720e7a30dfb02829ddf2f63b131786d962bf1c12
 DIST calculate-builder-2.2.25.tar.bz2 27120 RMD160 1640be4f5e2ac4971a26f575d85a28c694a88c1d SHA1 c92c128bf5f3ef83a731ae086432aecda06a6ffd SHA256 09d1493afb699113abb55e3646280b72424e5a4c48e83d9a180ef56e4d630c95
 EBUILD calculate-builder-2.2.24-r4.ebuild 802 RMD160 29cb4abf312190806c36dd6ed8aeb6cab9d939c0 SHA1 84f26f980d4d4a7eb1e5249be43b2dfa650269a8 SHA256 c7097cff6366d2e4df5f108436c8692f3343c3aaf30eb04509e66cf3563dea10
 EBUILD calculate-builder-2.2.25-r1.ebuild 711 RMD160 a40b4872d072c38f2ae466485bb4573826ef137d SHA1 847bdf8cde159cbaa49ba973c7fd1cec634701bb SHA256 83294a75f8faa81e4f100af7df20fe62d231432202d193cb1775303ce26de9d3
 EBUILD calculate-builder-2.2.25-r2.ebuild 733 RMD160 d6e107a22480a999fd42418dc40c2c0bcc51c736 SHA1 1ce3827c59055e1fd1fd1537c0f499e0961154ab SHA256 93c7ef50f107f41801e4f1b83ff03846f14db8ccc82ff2582556ce832d6fcdc9
+EBUILD calculate-builder-2.2.25-r3.ebuild 733 RMD160 8166db204d1c276604f977332ae533a72f43bf76 SHA1 c6eed96607804f320428c8d234d6766f8eb73ab5 SHA256 8079ad4114d8accd8d27aa04e57b0b70dc6dc86dd8d530dc3cfbeef3f165df9c
 EBUILD calculate-builder-2.2.25.ebuild 587 RMD160 c38399cd061403ee737f9a48d4745616d1316462 SHA1 21203db1197e07e301629171a2aacb4e380e3248 SHA256 a9e1686b3265d283e374cf16297d3e9ef8ea7f1b7fd16e7817f1f0a776d015a8
 EBUILD calculate-builder-2.2.9999.ebuild 571 RMD160 9342f8bb6fee2525ea214551f177a21170c8f320 SHA1 640d9424326321e45c59241384d3bdec58ff0a22 SHA256 829ecb63e72f27ae5f1cab9a22b3fad06addd81e7cf0f73fb99926dfe1d52102
-MISC ChangeLog 18978 RMD160 21dc59b4ab8f1148625525a57e6688bf27f8263c SHA1 e68f7e2d4610bff175c5800c61faaeadc17c5f98 SHA256 f4d7ae37fe3fd6467d6139960b92b504fbab46374ac06bdcd04a409872e03f8f
+MISC ChangeLog 19195 RMD160 91eb429091d7d13f8529505091d9de0b1ea3abd0 SHA1 770a906e5cbe8fafff0192ad467814b6c9c4d685 SHA256 9b4c65cb19e846196259776b93f52cee2602f74f3bb5b637c0718a215976dfaf
 MISC metadata.xml 270 RMD160 b5ff308a82cd6e594c2f04731cdbe9f80a945042 SHA1 58dbf7eb15bb2e6c6c8514f483e51dfacd1c62e9 SHA256 b65e150429ecbf36cf03d094f4e3e7518f536c61289cecff6b817326703d58a0
diff --git a/sys-apps/calculate-builder/calculate-builder-2.2.25-r3.ebuild b/sys-apps/calculate-builder/calculate-builder-2.2.25-r3.ebuild
new file mode 100644
index 000000000..82cd1cc07
--- /dev/null
+++ b/sys-apps/calculate-builder/calculate-builder-2.2.25-r3.ebuild
@@ -0,0 +1,31 @@
+# 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.25
+	!<sys-apps/calculate-1.4.0_p20100921
+	app-cdr/cdrkit
+	sys-fs/squashfs-tools"
+
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	# Auto run cl-make -T, support git portages
+	epatch "${FILESDIR}/calculate-builder-2.2.25-r3.patch"
+}
diff --git a/sys-apps/calculate-builder/files/calculate-builder-2.2.25-r3.patch b/sys-apps/calculate-builder/files/calculate-builder-2.2.25-r3.patch
new file mode 100644
index 000000000..a8fbdd301
--- /dev/null
+++ b/sys-apps/calculate-builder/files/calculate-builder-2.2.25-r3.patch
@@ -0,0 +1,50 @@
+diff --git pym/cl_builder.py pym/cl_builder.py
+index 7a72d81..4406fe9 100644
+--- pym/cl_builder.py
++++ pym/cl_builder.py
+@@ -25,7 +25,8 @@ import traceback
+ from os import path
+ from cl_utils import process,pathJoin,getRunCommands,getTupleVersion,\
+                         childMounts,_toUNICODE,isMount,typeFile, \
+-                        removeDir, pathJoin,listDirectory, getSquashList
++                        removeDir, pathJoin,listDirectory, getSquashList, \
++                        readFile
+ from subprocess import STDOUT,PIPE
+ from cl_print import color_print
+ from cl_datavars import DataVars
+@@ -262,9 +263,23 @@ class cl_builder(color_print):
+             updateLayman = self.runChroot(distrPath,"layman -s calculate")
+             self.printByResult(updateLayman.success())
+ 
++        self.printByResult(True)
++
++        builderPath = self.clVars.Get('cl_builder_path')
++        for gitName,gitDir in (('portage','/usr/portage'),
++                       ('overlay','/var/lib/layman/calculate')):
++            gitHead = pathJoin(builderPath,gitDir,".git/HEAD")
++            if "heads/develop" in readFile(gitHead):
++                self.printMessageForTest(
++                    _("Changing {repname} repository branch to '{branch}'").
++                        format(repname=gitName,
++                               branch='master'))
++                changeBranch = self.runChroot(distrPath,
++                    "cd %s;git fetch;git checkout master"%gitDir)
++                self.printByResult(changeBranch.success())
++
+         self.applyTemplatesForSquash(distrPath)
+         # change make.profile
+-        builderPath = self.clVars.Get('cl_builder_path')
+         curProfileFile = pathJoin(builderPath,"etc/make.profile")
+         self.curProfile = os.readlink(curProfileFile)
+         profile = self.clVars.Get('os_builder_profile')
+@@ -666,9 +681,7 @@ class cl_builder(color_print):
+             return False
+         self.printSUCCESS(_("System built successfully"))
+         if self.assembleIso:
+-            self.printWARNING(_("If you want to emerge packages manually "
+-                        "on the system you are assembling, please execute:"))
+-            self.printWARNING("  cl-make -p %s -T"%
++            os.system("cl-make -p %s -fT &>/dev/null"%
+                               self.clVars.Get('os_builder_profile'))
+         return True
+ 
diff --git a/sys-apps/calculate-utilities/ChangeLog b/sys-apps/calculate-utilities/ChangeLog
index 9742760fe..bfb4fadd1 100644
--- a/sys-apps/calculate-utilities/ChangeLog
+++ b/sys-apps/calculate-utilities/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  10 Nov 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+  +calculate-utilities-2.2.25-r11.ebulid:
+  Update for builder
+
 *calculate-utilities-2.2.25-r10 (10 Nov 2011)
 
   10 Nov 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
diff --git a/sys-apps/calculate-utilities/calculate-utilities-2.2.25-r11.ebulid b/sys-apps/calculate-utilities/calculate-utilities-2.2.25-r11.ebulid
new file mode 100644
index 000000000..7a00d014d
--- /dev/null
+++ b/sys-apps/calculate-utilities/calculate-utilities-2.2.25-r11.ebulid
@@ -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.25
+	=sys-apps/calculate-templates-2.2.25-r7
+	=sys-apps/calculate-lib-2.2.25-r1
+	=sys-apps/calculate-i18n-2.2.25-r1
+
+	cl_assemble? ( =sys-apps/calculate-assemble-2.2.25-r5 )
+	cl_builder? ( =sys-apps/calculate-builder-2.2.25-r3 )
+	cl_client? ( =sys-apps/calculate-client-2.2.25 )
+	cl_desktop? ( =sys-apps/calculate-desktop-2.2.25 )
+	cl_installgui? ( =app-misc/calculate-install-gui-2.2.25 )
+
+	cl_server? ( =sys-apps/calculate-server-2.1.14-r6 )
+"