From 62c4cdf00b9abbb61d4fee6bd1d891effb8dff2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?=
 =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= <mh@calculate.ru>
Date: Mon, 3 Dec 2012 16:06:12 +0400
Subject: [PATCH] Update assemble

---
 .../assemble/prepare/etc/portage/make.profile |   1 +
 sys-apps/calculate-assemble/Manifest          |   2 +
 .../calculate-assemble-2.2.30-r2.ebuild       |  30 +++
 .../files/calculate-assemble-2.2.30-r2.patch  | 239 ++++++++++++++++++
 sys-apps/calculate-builder/Manifest           |   2 +
 .../calculate-builder-2.2.30-r6.ebuild        |  34 +++
 .../files/calculate-builder-2.2.30-r6.patch   | 206 +++++++++++++++
 sys-apps/calculate-utilities/Manifest         |   1 +
 .../calculate-utilities-2.2.30-r13.ebuild     |  30 +++
 9 files changed, 545 insertions(+)
 create mode 100644 profiles/templates/2.2/assemble/prepare/etc/portage/make.profile
 create mode 100644 sys-apps/calculate-assemble/calculate-assemble-2.2.30-r2.ebuild
 create mode 100644 sys-apps/calculate-assemble/files/calculate-assemble-2.2.30-r2.patch
 create mode 100644 sys-apps/calculate-builder/calculate-builder-2.2.30-r6.ebuild
 create mode 100644 sys-apps/calculate-builder/files/calculate-builder-2.2.30-r6.patch
 create mode 100644 sys-apps/calculate-utilities/calculate-utilities-2.2.30-r13.ebuild

diff --git a/profiles/templates/2.2/assemble/prepare/etc/portage/make.profile b/profiles/templates/2.2/assemble/prepare/etc/portage/make.profile
new file mode 100644
index 000000000..8afb1e88b
--- /dev/null
+++ b/profiles/templates/2.2/assemble/prepare/etc/portage/make.profile
@@ -0,0 +1 @@
+# Calculate append=remove
diff --git a/sys-apps/calculate-assemble/Manifest b/sys-apps/calculate-assemble/Manifest
index 58da67003..25ee674c4 100644
--- a/sys-apps/calculate-assemble/Manifest
+++ b/sys-apps/calculate-assemble/Manifest
@@ -7,6 +7,7 @@ AUX calculate-assemble-2.2.29-fix_work_with_3.0.patch 7024 SHA256 95945f1f914d59
 AUX calculate-assemble-2.2.29-r9.patch 20925 SHA256 e5db45710283457a065e3dabe2c389c24e8d130b314ef5a8263a827aedfb5244 SHA512 951cbccb57c9eb4f11b852fe58b4df21f73780f48963723b1f7a07125fd41f4888fcc46d9a8e18d69cca2dbc29f634cd28f17eafd1159d0719aa0dad91f7dc7b WHIRLPOOL 6822363e3037f40e7161e8d54f9b23a3c210e3b2cf3e3ebc4296faf003ac1f73964828e80807d575830671cb8494d876e598044fc1a3609de9d8a86af585801c
 AUX calculate-assemble-2.2.29-resolve_install_deps.patch 6080 SHA256 9b3d598804ec5cd5725132b827ef09ba6ded8e2c9adc81bf42d5ab44e78bcc85 SHA512 ac20a4ec3bd1f038cefa1b45c707d47220aead9ab3813f694a00d3855fce7b734768b54d5acc45087436e6e3b8efb2578c103e722b450889fb6cc6cdd97c84bf WHIRLPOOL ea55e513a82f0a302867e50202aec4f500e4606ebde7d88c18d93c5cf63e352d91cc7600e00b0cb49599e8ec9c4de553697ced9821f371cfa38837be4f375e2d
 AUX calculate-assemble-2.2.30-r1.patch 4285 SHA256 8dae56b2a7cef808fef12942c250b8ed46ec0e98272a868103c74b2b2d742821 SHA512 2c816cb5081f5ea23a4dfed087d43eeb5abb4a3e3d62681165336c062ff9b5786b3491b5cd38c66fa89ab791d5ee1b6b5707f008f1e30eb0b3c6f2b999cf07f5 WHIRLPOOL b3325b0ce5c0f32c375e013f1e5e47a8c1d037886215ef9d56ca4241c924834c5a7b6236283f609f8e3b6a00cda1e2ee98598291d1aa6a2ee23fc81095137362
+AUX calculate-assemble-2.2.30-r2.patch 10635 SHA256 5cd7850456431824c5eb8bb345e8c547cee097de937e5ed0bcf32a3b1e8ea336 SHA512 446960e252c824a4733e8dd3df9e47c1110f466b7dcb30fced0907a55dfd21ef2a3158a78e438038e071fa85bbf6a2d20474e4d4c3c30f0d5b7d340a522456d8 WHIRLPOOL 44bf54694a28a0c0104193eaedf7a47f5d00f5dcfd1a57a6b9e7179b393c0e0563e89371439d0011f5e9883a3e4e28b664c834ce50fd2649bbbbdd5100a1a397
 DIST calculate-assemble-2.2.29.tar.bz2 26801 SHA256 667ea38456ed7b66d3b20e01bc1390372c8c4e4e32c3c8b19ae6329a56f3da80 SHA512 2b61b0f8b7266657687eca63fdcf5a0e3d072bcf9edf414328850f87a9aeba86b08da7b8c4057f2330379db5f744f455c21a39c7f1ab97b269ecc11e3803cb36 WHIRLPOOL 7dde2541ab0ed8311f8791da7db608059d2ee5b39451460df02214974d1394519a4287bc1fb2807a3a1efad1f6b05d45fa6dc9baf5d4edf1fcaabc45d8bf911c
 DIST calculate-assemble-2.2.30.tar.bz2 28740 SHA256 3958e8fc0aac7a704e3d3cba4fffde6a77e9925cbc621d375dbae39518110ad4 SHA512 75dbb69352e9762f4e26729a4cd9ad6e3cf6301dc3e259573e6b3fe3f6d1b5c1c61ba4b36b8783c938fd4f526db259bdeb472db09cd0626a29ae159138a0da69 WHIRLPOOL 027ccd5cee6e53f1c30e212b937129111e1af80f066248ec8a94a7f5a7fcd722fed1f765a7537bb4f206c201e83e5c10818c67a2aa091d071b99ef1e880a400f
 EBUILD calculate-assemble-2.2.29-r2.ebuild 817 SHA256 ae02fca6c57cbddc12e0ae4fd15558ddd526a5f7c6f5ad9b80146dd9fc4d0fa3 SHA512 766638d8fcee73cf71a95592ac09870d7bfd547ed474c1b6f557a0b9742920e548c988cf38bfef4efd56ea9ec51ade02c6fd369214f873af44d68ef4689f9914 WHIRLPOOL 08e8440b6e3ca00dc93f46554e18b33a7b56efa54da077fbcf04bcfa2cfbf16f705610fed79ae0d574596ae5dde617a8274b21480e07163d982c0e44e82d7386
@@ -18,6 +19,7 @@ EBUILD calculate-assemble-2.2.29-r7.ebuild 1277 SHA256 20405259e61050b3c92a0a4e5
 EBUILD calculate-assemble-2.2.29-r8.ebuild 1277 SHA256 20405259e61050b3c92a0a4e57b47d3037491a2d704db9f25c5783c89195a9e1 SHA512 8fb06254ec1569bd03b9efcbbb7c4c2c7b6865ef3c3b9635d687d52721c798703368f8951d90b15d2d8d0c734d45e38b751a157a29862a3812f69ffc20d5f7a8 WHIRLPOOL 6480015d2da5a7ee68ce5bba3f6575bcaaea37196e727559499f20ab4a7061ef3283199522b73afbd8b0ff714ca3d814eca240d62b8df1077bc7421a3de54ce8
 EBUILD calculate-assemble-2.2.29-r9.ebuild 688 SHA256 fbfc42238943b7f5834693757890f84ed13f1a545e085195c173c0afaf9e9170 SHA512 6aafde9f59afa4d5a4c8c29042fc66495efad11e666775f5b6f22015016b96f19706860ead5b5209a8bb7b3452cd5f30f90396beb59de48d7ab7cc0d464be40d WHIRLPOOL d79c9dfa5ca33bb7a59e7b5bdb8d355232d130d4dc869007939d3145aed115ea38b67d8951a62ffcfd3184ea13fa10a027b2843ea0b68b8b2700c87d7e037094
 EBUILD calculate-assemble-2.2.30-r1.ebuild 688 SHA256 002d98e482a6ff70ec006980f5a5dfa2f2063233c967dd1313ea771347a392d4 SHA512 d2c54d0d9a4abb8fb0acef4f258215fde8e0e9ff087bcb5f62bed997831f0bf42006a34c28275f6c8598777196c98b89b01c66abfc694799e3662b07fc4679c3 WHIRLPOOL 4158b57dcdd591ac05aeeb69d75db9372f1c1a3a05463713dad7013a0966643d34189e54c2858a182fd069c506463c67df5fe45064bc55b6448285f122ee947d
+EBUILD calculate-assemble-2.2.30-r2.ebuild 679 SHA256 7bc973a95fbb43c1605f4af0bc0585f542dcad60dd24938740c01881bfdbd311 SHA512 9a55ec3842b05a6bca3dc1f4c90d32db6241c07b5f526c3dba418fcfa0f39c474fa19521584beba6ceaad43fd3e3fe3839faee4a97ab9de13294ae8377c17dbb WHIRLPOOL 708a044a92397da897f8c4d7c86fa17985e94dc52b95c1f563e7764ef11461e0e396d676646afcd8a671fa4c04386c89cda675f25ba5aa11bbd98762f989afa7
 EBUILD calculate-assemble-2.2.30.ebuild 566 SHA256 32a365ce380ff51d3064443252bc85455da52a55f6255816cfc511d526f8e83c SHA512 a9c8fcc6a3833255a7bcf6446d450602085cda1d3770a4a5bfcfa8a83092075e4d66a79837b3817d5d1f03492f63f917d9490a45f88119ac8fc29aae39a22db8 WHIRLPOOL 72f890ea8527d636f6f74b15155fd7cd31bca9410bcf16a7a4d960588b087ec50f9b94f5b2560fc21d5611cddb226d06da1fa4cbde6ce27a45d38a3490e0184b
 EBUILD calculate-assemble-2.2.9999.ebuild 572 SHA256 5bc8194c32bc4677cf79eaf6ae5f2112cafa51ae900dc3ebb6e879d9414858ea SHA512 62a111e959134709ef7529bfe87ccdfb20b103efc5305bf497ee9f427b3f956f180cd5c612641e557607606de9dbae3326c7881cc16afd9372b752ef65d63c93 WHIRLPOOL 8340a2b45b9941a61473ec4d66d944524dcf6f973ad9a03b9b92471cf5c92199949b2d707e7f738d86bbc9774eebac561df52891385e57d75aa811f47b4c5821
 MISC ChangeLog 16686 SHA256 759d02ea5f6029eab950ac93cf54a1c43dcc007a82be8e42cb82eac38369e979 SHA512 d4927fc6204a0a496248edbf3daf5b9259f0fc519a759c1dc8a6d6c2abab33074e75cd29e1696af3debaaac23548d0dc021e8d28c21d5c38cb8b2f06a973be0d WHIRLPOOL 7bd8bf84215ef77ec4035419f79d3226f3db13d6fb417e2b882bd4899bc240764ccc5a32154d8469153dc1c052936aad886a69916148bbf2bffa8d782b343401
diff --git a/sys-apps/calculate-assemble/calculate-assemble-2.2.30-r2.ebuild b/sys-apps/calculate-assemble/calculate-assemble-2.2.30-r2.ebuild
new file mode 100644
index 000000000..90174f804
--- /dev/null
+++ b/sys-apps/calculate-assemble/calculate-assemble-2.2.30-r2.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=""
+
+DEPEND="~sys-apps/calculate-builder-2.2.30"
+
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	# up to r2 version
+	epatch "${FILESDIR}/calculate-assemble-2.2.30-r2.patch"
+}
diff --git a/sys-apps/calculate-assemble/files/calculate-assemble-2.2.30-r2.patch b/sys-apps/calculate-assemble/files/calculate-assemble-2.2.30-r2.patch
new file mode 100644
index 000000000..ebc89b7e3
--- /dev/null
+++ b/sys-apps/calculate-assemble/files/calculate-assemble-2.2.30-r2.patch
@@ -0,0 +1,239 @@
+diff --git pym/cl_assemble.py pym/cl_assemble.py
+index 3c5158f..4e29776 100644
+--- pym/cl_assemble.py
++++ pym/cl_assemble.py
+@@ -100,8 +100,7 @@ class cl_assemble(color_print):
+     # foraction - perform only for cl_action == value
+     DEFAULT_FORACTION = ('make','syncupdate','update')
+     ACTION_LIST = \
+-            [
+-             # emerge -e system first
++            [# emerge -e system first
+              {'command':'emerge -e system',
+               'message':_("First execute '%s'")%'emerge -e system',
+               'step':'firstsystem',
+@@ -164,10 +163,10 @@ class cl_assemble(color_print):
+               'condition':'dev-lang/perl',
+               'progname':'perl-cleaner'},
+              # install meta package
+-             {'command':'emerge --noreplace calculate-meta',
+-              'checkcommand':'find /var/db/pkg/app-misc -name "calculate-meta*"',
+-              'condition':'^$',
+-              'step':'meta'},
++             #{'command':'emerge --noreplace calculate-meta',
++             # 'checkcommand':'find /var/db/pkg/app-misc -name "calculate-meta*"',
++             # 'condition':'^$',
++             # 'step':'meta'},
+              # update packages with fix newuse
+              #{'command':'emerge -D --newuse world',
+              # 'step':'newuse'},
+@@ -621,9 +620,13 @@ class cl_assemble(color_print):
+             self.printMessageForTest(_("Installing %s")%'dev-vcs/git')
+             self.runChroot("USE='-perl -curl -webdav' emerge -1 git")
+ 
+-        emergeSync = "emerge --sync"
++        if not isPkgInstalled('app-portage/eix',prefix=self.assemblePath):
++            self.printMessageForTest(_("Installing %s")%'app-portage/eix')
++            self.runChroot("emerge -1 eix")
++
++        emergeSync = "eix-sync"
+         self.printMessageForTest(_("Updating portages"))
+-        self.runChroot(emergeSync)
++        self.runChroot(emergeSync,showProcess=True)
+ 
+         emergeLayman = "USE='git' emerge layman"
+         self.printMessageForTest(_("Installing %s")%"layman")
+@@ -704,6 +707,14 @@ class cl_assemble(color_print):
+             self.clVars.Set('cl_action',self.mainAction,True)
+         self.printByResult(True)
+ 
++    def _rebuildWorld(self):
++        """
++        Rebuild world
++        """
++        if self.clVars.Get('cl_assemble_rebuild_world') == 'on':
++            self.printMessageForTest(_("Re-create world"))
++            self.runChroot("cl-core --method update --rebuild-world")
++
+     def configureFunc(self,force=False,nounmount=False):
+         """Function of configure partition for assembling by make"""
+         # print info
+@@ -730,25 +741,38 @@ class cl_assemble(color_print):
+             if nounmount:
+                 self.targetDistr = None
+ 
+-            pathAppMisc = pathJoin(self.assemblePath,'/var/db/pkg/app-misc')
+-            metaPackage = self.clVars.Get('cl_assemble_meta').rpartition('/')[2]
+-
+             if not isinstance(self.sourceDistr,IsoDistributive) and \
+                 self.clVars.Get('cl_assemble_branch') == '':
+                 self._unpackPortage()
+ 
++            # rename make profile
++            newProfile = path.join(self.assemblePath,'etc/portage/make.profile')
++            oldProfile = path.join(self.assemblePath,'etc/make.profile')
++            if path.islink(newProfile) and \
++               not path.islink(oldProfile):
++                os.rename(newProfile,oldProfile)
++
+             self._prepareMount()
+             self.prepareTemplates(True,changeAction=True)
+ 
+-            if path.exists(pathAppMisc) and metaPackage and \
+-                filter(lambda x:metaPackage in x, os.listdir(pathAppMisc)):
++            if isPkgInstalled('sys-apps/calculate-update',
++                              prefix=self.assemblePath):
++                self._rebuildWorld()
+                 self.setupTemplates(True,changeAction=True)
+                 self.writeVar('cl_assemble_make','')
+                 return True
+ 
+-            self._updatePackages()
++            fullAssemble = not isPkgInstalled('sys-apps/calculate-install',
++                               prefix=self.assemblePath)
++            if fullAssemble:
++                self._updatePackages()
++            else:
++                emergeSync = "eix-sync"
++                self.printMessageForTest(_("Updating portages"))
++                self.runChroot(emergeSync,showProcess=True)
+             self.setupTemplates(True,changeAction=True)
+ 
++
+             self.printMessageForTest(
+                 _("Enabling calculate-install to configure packages"))
+             if "calculate" in self.clVars.Get('os_assemble_system_profile'):
+@@ -756,15 +780,16 @@ class cl_assemble(color_print):
+                 # need emerge with USE="minimal", but emerging 
+                 # will install iproute2 with USE="minimal" also
+                 self.runChroot("emerge -1 sys-apps/iproute2")
+-                self.runChroot("USE='minimal -pxe' emerge "
+-                               'sys-apps/calculate-install '
+-                               'sys-apps/calculate-core')
+-                if path.exists(path.join(self.clVars.Get('cl_assemble_path'),
+-                             "usr/sbin/cl-core")):
+-                    self.runChroot("/usr/sbin/cl-core --append-variable "
+-                               "cl_merges=calculate-install")
++                if isPkgInstalled('sys-apps/calculate-utilities',
++                                  prefix=self.assemblePath):
++                    self.runChroot("emerge -u sys-apps/calculate-update "
++                                   "sys-apps/calculate-utilities")
+                 else:
+-                    self.runChroot("cl-install --install")
++                    self.runChroot("USE='minimal -pxe' emerge "
++                                   'sys-apps/calculate-update '
++                                   'dev-python/pyopenssl '
++                                   'sys-apps/calculate-install '
++                                   'sys-apps/calculate-core')
+             else:
+                 self.printByResult(skip=True)
+ 
+@@ -772,9 +797,16 @@ class cl_assemble(color_print):
+             self.printMessageForTest(_("Installing %s")%"portage")
+             self.runChroot(emergePortage)
+ 
++            self._rebuildWorld()
++
++            if not fullAssemble:
++                self.setupTemplates(True,changeAction=True)
++                self.writeVar('cl_assemble_make','')
++                return True
++
+             if not isinstance(self.sourceDistr,IsoDistributive):
+                 self.printMessageForTest(_("Receiving kernel sources"))
+-                self.runChroot('USE="-vmlinuz" emerge '
++                self.runChroot('USE="-minimal -vmlinuz" emerge '
+                                "sys-kernel/calculate-sources")
+ 
+             if not isinstance(self.sourceDistr,IsoDistributive):
+@@ -917,7 +949,7 @@ class cl_assemble(color_print):
+                 chrootCommand = process(*commandLine,stderr=ERRval,
+                                 stdout=IOval,envdict=envdict)
+             DEBUG(self._getCommand(chrootCommand.command))
+-            if raiseError and chrootCommand.failed():
++            if chrootCommand.failed() and raiseError:
+                 raise AssembleError(
+                     _("An error occurred when executing the command")+
+                       ":\n    %s"%self._getCommand(chrootCommand.command))
+@@ -1450,7 +1482,7 @@ class cl_assemble(color_print):
+ 
+     def checkDowngrades(self):
+         """Run check downgrades"""
+-        cmd = self.runChroot("FORMAT='{downgrade}%{FORMAT_ALL}{}' eix -I",
++        cmd = self.runChroot("/usr/bin/eix -T",
+                              raiseError=False,
+                              showProcess=True)
+         return True
+@@ -1662,7 +1694,7 @@ class cl_assemble(color_print):
+         while drivers:
+             repeatDrivers = []
+             for verName,maskName,drvVer in drivers:
+-                rePackage = re.compile("^\[ebuild[^\]]+]\s+(\S+)")
++                rePackage = re.compile("^\[ebuild[^\]]+]\s+([^\s:]+)")
+                 checkprocess = self.runChroot(
+                             "emerge -pv %s"%
+                             drvVer, raiseError=False,joinErr=True)
+diff --git pym/cl_assemble_cmd.py pym/cl_assemble_cmd.py
+index 64ea758..5733c0e 100644
+--- pym/cl_assemble_cmd.py
++++ pym/cl_assemble_cmd.py
+@@ -74,6 +74,9 @@ CMD_OPTIONS = [{'shortOption':"d",
+                {'longOption':"no-buildpkg",
+                 'help':_("create no binary packages for all merged packages")
+                },
++               {'longOption':"skip-rebuild-world",
++                'help':_("do not rebuild world file")
++               },
+                {'longOption':"set"},
+                {'shortOption':"f",
+                 'longOption':"force",
+@@ -142,8 +145,11 @@ class assemble_cmd(share_cmd):
+             self.checkChoice("--source",values.source, validSources)
+         if values.name:
+             if not self.logicObj.setName(values.name):
+-                self.error(_("option %s")%"--name"+
++                self.optobj.error(_("option %s")%"--name"+
+                     ": "+ _("invalid value '%s'"%values.name))
++        if values.skip_rebuild_world:
++            self.logicObj.clVars.Set('cl_assemble_rebuild_world',
++                                     "off",True)
+         return (values, args)
+ 
+     def isScratch(self):
+diff --git pym/cl_fill_assemble.py pym/cl_fill_assemble.py
+index c0a7a39..21e7832 100644
+--- pym/cl_fill_assemble.py
++++ pym/cl_fill_assemble.py
+@@ -166,10 +166,7 @@ class fillVars(object, glob_attr):
+ 
+     def get_cl_assemble_meta(self):
+         """Meta package for world building"""
+-        if "calculate" in self.Get('os_assemble_system_profile'):
+-            return "app-misc/%s-meta"%\
+-                self.Get('os_assemble_linux_shortname').lower()
+-        return "system"
++        return "world"
+ 
+     def get_cl_assemble_snapshot_portage(self):
+         """Find latest snapshot"""
+@@ -490,7 +487,7 @@ class fillVars(object, glob_attr):
+ 
+     def get_cl_assemble_drivers_info(self):
+         """matrix for prepare driver script"""
+-        return [[]]
++        return []
+ 
+     def prepareScript(self,info):
+         """
+diff --git pym/cl_vars_assemble.py pym/cl_vars_assemble.py
+index 9858c04..3664c16 100644
+--- pym/cl_vars_assemble.py
++++ pym/cl_vars_assemble.py
+@@ -164,3 +164,7 @@ class Data:
+ 
+     # part of script for driver installing
+     cl_assemble_drivers_script = {'mode':'r'}
++
++    # execute cl-core --method update --rebuild-world on assemble
++    cl_assemble_rebuild_world = {'mode':'w',
++                                 'value':'on'}
diff --git a/sys-apps/calculate-builder/Manifest b/sys-apps/calculate-builder/Manifest
index 818eeadc6..ee6bfda8d 100644
--- a/sys-apps/calculate-builder/Manifest
+++ b/sys-apps/calculate-builder/Manifest
@@ -11,6 +11,7 @@ AUX calculate-builder-2.2.30-check_kernel.patch 3862 SHA256 d09c74aa0feeed049104
 AUX calculate-builder-2.2.30-fix_cl_kernel.patch 2870 SHA256 47d38323be70fdbc24677e02c597adeeb8acf032e12cfcde65a16c904035b606 SHA512 1d191ae58ba06b2f0ba8a970a009325ea8385badad0f51db4e2d690dfb7de4a5be59689dfe0e4f3abb7f7571384bfe7459645f1d7c252929b43a652c17fed567 WHIRLPOOL dd3ecd66960352f071cd8edacc03effd5f7597a94e4bd11d341a2b46c387507d2638e4ac386bc2c4ccdef2aba379e821df070d1e100f115bed98e671ba906446
 AUX calculate-builder-2.2.30-r4.patch 0 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 SHA512 cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e WHIRLPOOL 19fa61d75522a4669b44e39c1d2e1726c530232130d407f89afee0964997f7a73e83be698b288febcf88e3e03c4f0757ea8964e59b63d93708b138cc42a66eb3
 AUX calculate-builder-2.2.30-r5.patch 7644 SHA256 0a8bb50208f4abf91417b04eef79884b651257c09ce0eb03a5f059b008e388cf SHA512 868f767071781ac115dab3c00609efc8ca54d67062a1030637982d6dd4ec7b60e012205290822f67077abe835b08d7e42134e0c594f22d4653da0fa204e4a7c9 WHIRLPOOL 59048aa571d9cd2c6ccdf97d90f7349d6c8308ac8db996f79a41f7281a6c07a14e6a6b960461793aa15983770b460edf777438b974cc6ffb30a1a13cc8b56b29
+AUX calculate-builder-2.2.30-r6.patch 9261 SHA256 ba5d8eae88c268536b0886f0018a3ed0c1f0faba2631325924d3780ee014301e SHA512 530c4f65af5da106e20e12d6deb81b344224870e098c871738a4a24c729c64023774445ae1aa4505b343c33805c03e9b873e903b64d3a872225ecaeb1a9025da WHIRLPOOL 72863773345b07f23d5d5c367e0f7e3e03941c498c872d8fc9b2cd119de859b45850bdd92731f014c783f63376a18dccb1d7ecf9b0f88278772e68efcb4c3e87
 DIST calculate-builder-2.2.29.tar.bz2 29488 SHA256 007c2f2be161ed4ca9bfbb20e10a41d91d96135a6b76bbc0a833ffb5518268ee SHA512 35206c4f62baf7822639adea276484c6c136afa9910577a3f6c907ecc2f43c3ebb2bc5b9b1484969508ae5799292aa8ac64d6803348d381f6f352d24fb920133 WHIRLPOOL f5c6751743074abbf4bd6e98c06af7b2de0e68773456773dbb582664c5fc1fc00d4e1896979f7f459c2d2a887859840294a246b324d49a9b66aeb7236f428788
 DIST calculate-builder-2.2.30.tar.bz2 31257 SHA256 d227f1de5bfa9ef1a78890518693c0e5b812c27c1531fb284825b240acd158ff SHA512 c0ae9a29e13e97e0e53e5643849279dc64945982b8f014a8d12509fedb0d10bbc38ac454361789d58ad2ef6d7e2cd2d27b23fd548f43b798a335f6316eca08d7 WHIRLPOOL 6f8dfb02737bde154b489234bde287904fe37c81b72d4d6fad1351eade21a4458a9d1878338ed6c811d49bea4a22fdecc1631e7fe3aaf74052397c6fd697a3f7
 EBUILD calculate-builder-2.2.29-r6.ebuild 746 SHA256 280b95e0dcd7ece529b21b41ab3596502f0dabdf8622328426c58cdc8073fba4 SHA512 e77b11eb3a38e0bfb7147d1fb44873d80e6cd50fb7f3061d8424616a6534b3ea1e74a9ee4ba2388c4e83b411ab001c485a32636810f00026c5216e3eec6401eb WHIRLPOOL ef8be9ca7e1239c705622d69cc870fd6e5f028293a475383777c9818bd2c46a85997c21471c4bfc121821634f134bcec58a6625a0435f3bba75a738bf1b92c76
@@ -22,6 +23,7 @@ EBUILD calculate-builder-2.2.30-r2.ebuild 925 SHA256 ad177d22b5248bb08135a1d81a2
 EBUILD calculate-builder-2.2.30-r3.ebuild 816 SHA256 7881295c0529385d11946ef1834be2ecb8c7f33fa4e490af282df6568918338c SHA512 1adbcf1f3badd0e1948357b48cf37b2313d33f6e01274cc7b9c36d36e3148b8b74672a98588728cc41b185c11dba213b287d8348cdd1b1f6c59eec2e776ad18c WHIRLPOOL f253748d6b0ba82043ad198ae27bc296b9c421173d6f4843d7ddcd7629b8921cc7d38e9e7947ffe9ed721ffe3c9bd900c1a511f417e041580643461971efab62
 EBUILD calculate-builder-2.2.30-r4.ebuild 844 SHA256 4cf411f470f431b067c10cc8c9c91959e45273a07373239ec43944a94202ca23 SHA512 152a4106f465b17b1b8b978dd78141a1297e338236fcb994e663039e63aaac64d9f5b880a8dad77ccd7a6e86abcb1e173805f718464d249fa8bfef87c70505c5 WHIRLPOOL 972a8a2f1faadd59b37028f854e719a5fe9807139cf9de7e7804ac84b62ff23158a00a6ae401a58cda5b548bf73f1962098e769366e77dc4355c009b2d75502a
 EBUILD calculate-builder-2.2.30-r5.ebuild 844 SHA256 6ca4d09ece5d365f2d3ddffffdba651a320eb083aaf435020412d8dd9f272aaf SHA512 a17af9f46762d8555f2fa39c3f3b7e4c4da278113b47217e1acabc10e97a9f1fb23bb0ad721cfe388cc48e5dc368bac0499b39ccb4603203a7fd212d7a25ba4a WHIRLPOOL b9310f3eade3191cd099f88ea2fb58082bd81bfeef0244ea4bf57d40cf8cc8c4812b123e16afb10b0d5e261ae692c78370a2b1be0a5a6b8eee49f87e6b1e77d8
+EBUILD calculate-builder-2.2.30-r6.ebuild 835 SHA256 0ebd1d41e697d393f7d4fa72aeab45cc2b0f7912843cd763f35654d4ad4ab3ad SHA512 92f2fcd41c425eb91e5e39e20b30a50ad7f3bd40d572dc63d9cdcbe3c13b0f98d94e771e6ecae7e374e44c9e0f2b2b841b845b051f36f642a693a70941dccd49 WHIRLPOOL 4fbbe9ba4566c0076133477cad9b12cb42eb67021957e004329c1b5482bc7818df70fe08b5a3f420a0779475ff66467b0198cb5bbbef5357d811d2980c182da2
 EBUILD calculate-builder-2.2.30.ebuild 668 SHA256 8068e4dcd2613a52b5ad9a11e6084f519c523abafa7f6a5f214c70d3c262af4e SHA512 9eedcd56b7c4a45feff5348360c41775566b07c552190eb6ec2e9a2c14e2e0af212fe3efc66580834e5900caa9cb584550bf3234c16c183095e8c5c5d264d378 WHIRLPOOL 17a17382c23f457d2e8a0643d5e26f3dab0ac6c6b936fda71ad7fb6d5f44975984c5548ab7924d287c609a2f4f0975c5f4c2ce391c1dfa93d552650d1bfa5a43
 EBUILD calculate-builder-2.2.9999.ebuild 645 SHA256 12bd65856844de72d88588937b6a65b39b7dec7eaba06d028e8c5a78ef6b28a5 SHA512 fc6396dad3a92a5a746f4ed32caf092ede65898e4822e52ad541faaa44467a4f81daf6f261af8eb20017c6155923e2011433e4b15071d7098392c901ae3a5078 WHIRLPOOL fd0151c3ce9fa98c5ca63470e561487c063293727006da10446c0a2ac2c65305042a5359bc0163840c1dd4502d67641453dddaf5cded552dacf6c5c97ccc7402
 MISC ChangeLog 20663 SHA256 f05f75b85860fc850514bd6bcaa1671c6de2ead417071f28ccbec647528f58a2 SHA512 2bcbfd0212333bbf8bfd1fc4de894ee50b71b0671e4769fd40a1aee4fbab0260919b447f109e3b02047835c6e0eb93c04ea6ce135836144d078c09f0c5615d95 WHIRLPOOL dbf2791d84acf8567520bfd90462650ca9c9c0da7a3515e9e5695c3a419cfd043e235d8d681704f33a0c99272e93563de0fc6426f9476f894a48d52a21409462
diff --git a/sys-apps/calculate-builder/calculate-builder-2.2.30-r6.ebuild b/sys-apps/calculate-builder/calculate-builder-2.2.30-r6.ebuild
new file mode 100644
index 000000000..9d2f9c003
--- /dev/null
+++ b/sys-apps/calculate-builder/calculate-builder-2.2.30-r6.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=""
+
+DEPEND=">=sys-kernel/calckernel-3.4.18
+	~sys-apps/calculate-lib-2.2.30
+	!<sys-apps/calculate-1.4.0_p20100921
+	app-cdr/cdrkit
+	sys-fs/squashfs-tools"
+
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	# add check on fully kernel sources, fix initrd run, fix using new themes
+	epatch "${FILESDIR}/calculate-builder-2.2.30-r6.patch"
+}
diff --git a/sys-apps/calculate-builder/files/calculate-builder-2.2.30-r6.patch b/sys-apps/calculate-builder/files/calculate-builder-2.2.30-r6.patch
new file mode 100644
index 000000000..04b4515a3
--- /dev/null
+++ b/sys-apps/calculate-builder/files/calculate-builder-2.2.30-r6.patch
@@ -0,0 +1,206 @@
+diff --git pym/cl_builder.py pym/cl_builder.py
+index 2cc5334..180a0b3 100644
+--- pym/cl_builder.py
++++ pym/cl_builder.py
+@@ -328,7 +328,7 @@ class cl_builder(color_print):
+         createdDev = self.createUrandom(mp)
+         self.dispatchConf(mp)
+         self.updatePortage(mp)
+-        self.clearPortage(mp)
++        #self.clearPortage(mp)
+         self.updateMan(mp)
+         self.removeUrandom(mp,createdDev)
+ 
+@@ -578,8 +578,12 @@ class cl_builder(color_print):
+         """Get list for portage exclude by 'cl_builder_tree'"""
+         if self.clVars.Get('cl_builder_tree') == 'off':
+             portagePath = pathJoin(sourceDirectory,"usr/portage")
+-            return map(lambda x: path.join("usr/portage",x),
+-                  filter(lambda x: not x in ( "eclass", "licenses", "profiles"),
++            overlayPath = pathJoin(sourceDirectory,"var/lib/layman/calculate")
++            return map(lambda x: path.join("var/lib/layman/calculate",x),
++                  filter(lambda x: not x in ("distfiles", "eclass", ".git","profiles"),
++                  listDirectory(overlayPath))) + \
++                  map(lambda x: path.join("usr/portage",x),
++                  filter(lambda x: not x in ("distfiles", "eclass", ".git","profiles"),
+                   listDirectory(portagePath)))
+         else:
+             return []
+diff --git pym/cl_fill_builder.py pym/cl_fill_builder.py
+index fbaf6df..77727f1 100644
+--- pym/cl_fill_builder.py
++++ pym/cl_fill_builder.py
+@@ -281,11 +281,31 @@ class fillVars(object, varsShare):
+         systemRoot = self.Get('cl_builder_path')
+         return str(countFiles(systemRoot))
+ 
++    def getVersionFromCalculateEnv(self,systemroot):
++        """Get version from calculate ini"""
++        pathname = path.join(systemroot,
++                      'var/lib/layman/calculate/profiles/calculate.env')
++        if path.exists(pathname):
++            FD = open(pathname)
++            data = FD.readlines()
++            FD.close()
++            verList = filter(lambda y:y,
++                                   map(lambda x:\
++                                       len(x.split("="))==2 and\
++                                       x.split("=")[0].strip() == "os_linux_ver" and\
++                                       x.split("=")[1].strip(), data))
++            if verList:
++                reVer=re.compile("^((\d+\.)*\d|\d+)$",re.S)
++                reRes = filter(reVer.search,verList)
++                if reRes:
++                    return reRes[0]
++
+     def get_os_builder_linux_ver(self):
+         """Build system ver"""
+         linuxShortName = self.Get("os_builder_linux_shortname")
+         rootSystem = self.Get('cl_builder_path')
+         return self.getVersionFromMetapackage(rootSystem,linuxShortName) or \
++            self.getVersionFromCalculateEnv(rootSystem) or \
+             self.getVersionFromCalculateIni(rootSystem) or \
+             self.getVersionFromGentooFiles(rootSystem) or "0"
+ 
+diff --git pym/cl_image_cmd.py pym/cl_image_cmd.py
+index f05ac27..9564bec 100644
+--- pym/cl_image_cmd.py
++++ pym/cl_image_cmd.py
+@@ -70,6 +70,9 @@ CMD_OPTIONS = [{'shortOption':"p",
+                 'optVal':"TIMEZONE",
+                 'help':_("timezone by default")
+                },
++               {'longOption':'keep-tree',
++                'help':_("keep portage tree in image")
++               },
+                {'longOption':"set"},
+                {'shortOption':"f",
+                 'longOption':"force",
+@@ -170,6 +173,9 @@ class image_cmd(share_cmd):
+         if values.noisohybrid:
+             self.logicObj.clVars.Set('cl_builder_isohybrid_set','off',True)
+ 
++        if values.keep_tree:
++            self.logicObj.clVars.Set('cl_builder_tree','on',True)
++
+         if args and args[0] == "squash":
+             self.logicObj.clVars.Set('cl_builder_iso_path','/mnt/flash',True)
+         if values.timezone and not self.logicObj.setTimezone(values.timezone):
+diff --git pym/cl_kernel.py pym/cl_kernel.py
+index b6e3c35..456efad 100644
+--- pym/cl_kernel.py
++++ pym/cl_kernel.py
+@@ -74,12 +74,23 @@ class cl_kernel(color_print):
+         """Test directory for kernel sources"""
+         makefilepath = path.join(dirpath,'Makefile')
+         kbuildpath = path.join(dirpath,'Kbuild')
+-        if not path.exists(makefilepath) \
+-            or not path.exists(kbuildpath) \
+-            or not "Kbuild for top-level directory of the kernel" in \
++        if path.exists(makefilepath) \
++            and path.exists(kbuildpath) \
++            and "Kbuild for top-level directory of the kernel" in \
+                 open(kbuildpath,'r').read():
+-            return False
+-        return True
++            return True
++        return False
++
++    def _testFullKernelDirectory(self,dirpath):
++        """To check the directory for full kernel sources
++        
++        Kernel may be installed with minimal (later vmlinuz) flag"""
++        documentationPath = path.join(dirpath,'Documentation')
++        driversPath = path.join(dirpath,'drivers')
++        if path.exists(documentationPath) \
++            and path.exists(driversPath):
++            return True
++        return False
+ 
+     def setNoColor(self):
+         self.color = False
+@@ -95,19 +106,7 @@ class cl_kernel(color_print):
+                    mrproper=False,target="all"):
+         """Run kernel compilation"""
+         clVars = self.clVars
+-        for themePkg in ['media-gfx/cldx-themes',
+-                         'media-gfx/cld-themes',
+-                         'media-gfx/cldg-themes',
+-                         'media-gfx/cls-themes',
+-                         'media-gfx/cds-themes',
+-                         'media-gfx/cmc-themes']:
+-            installed = getPkgInstalled(themePkg,
+-                                       prefix=self.clVars.Get('cl_chroot_path'))
+-            if installed and installed[0]['PV'].startswith('12'):
+-                themeName = "calculate"
+-                break
+-        else:
+-            themeName = "tty1"
++        themeName = "calculate"
+         standardParams = ["--splash=%s"%themeName, "--unionfs",
+                           "--all-ramdisk-modules","--disklabel",
+                           "--no-save-config", "--firmware","--udev",
+diff --git pym/cl_kernel_cmd.py pym/cl_kernel_cmd.py
+index 3a85ada..54edbc0 100644
+--- pym/cl_kernel_cmd.py
++++ pym/cl_kernel_cmd.py
+@@ -121,12 +121,30 @@ class kernel_cmd(share_cmd):
+             self.checkIncompatibleParam("initrd")
+         if values.symlink:
+             self.checkIncompatibleParam("symlink")
+-        if values.k:
+-            if not self.logicObj._testKernelDirectory(values.k):
+-                self.optobj.error("%s:'%s'"%
+-                    (_("wrong kernel source directory"),values.k))
+-            else:
+-                self.logicObj.clVars.Set('cl_kernel_src_path',values.k,True)
++        if not values.v:
++            if values.k:
++                if not self.logicObj._testKernelDirectory(values.k):
++                    self.optobj.error("%s:'%s'"%
++                        (_("wrong kernel source directory"),values.k))
++                elif not values.initrd and \
++                     not self.logicObj._testFullKernelDirectory(values.k) \
++                        and self.checkNotEbuildParam(values,"postinst"):
++                    self.optobj.error(("%s:'%s'"%
++                        (_("in directory of kernel source not "
++                           "enough needed files"),
++                            values.k))+"\n"+
++                            _("Probably calculate-sources was "
++                              "compiled with USE 'minimal'"))
++                else:
++                    self.logicObj.clVars.Set('cl_kernel_src_path',values.k,True)
++            elif self.checkNotEbuildParam(values,"postinst"):
++                if not values.initrd and \
++                    not self.logicObj._testFullKernelDirectory(
++                        self.logicObj.clVars.Get('cl_kernel_src_path')):
++                    self.optobj.error((_("in default directory of kernel "
++                       "source not enough needed files")+"\n"+
++                       _("Probably calculate-sources was "
++                         "compiled with USE 'minimal'")))
+         if values.c and values.o:
+             self.optobj.error("%s: %s"%(_("incompatible options"),
+                               self.getStringIncompatibleOptions(["c","o"])))
+@@ -161,6 +179,9 @@ class kernel_cmd(share_cmd):
+     def checkEbuildParam(self,options,phase):
+         return not options.ebuild or os.environ["EBUILD_PHASE"] == phase
+ 
++    def checkNotEbuildParam(self,options,phase):
++        return not options.ebuild or os.environ["EBUILD_PHASE"] != phase
++
+     def makeKernel(self,options):
+         """Run kernel compilation, installation, optimization"""
+         # if set ebuild param check cur EBUILD_PHASE, run kernel compilation
+diff --git pym/cl_vars_builder.py pym/cl_vars_builder.py
+index 44e4965..c1fd439 100644
+--- pym/cl_vars_builder.py
++++ pym/cl_vars_builder.py
+@@ -98,7 +98,7 @@ class Data:
+     cl_builder_kernel_suffix = {}
+ 
+     # include portage directory from image
+-    cl_builder_tree = {'value':'on'}
++    cl_builder_tree = {'value':'off'}
+ 
+     cl_builder_isohybrid_set = {'value':'on'}
+ 
diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest
index 28f7fad1a..e094c8ce2 100644
--- a/sys-apps/calculate-utilities/Manifest
+++ b/sys-apps/calculate-utilities/Manifest
@@ -18,6 +18,7 @@ EBUILD calculate-utilities-2.2.30-r1.ebuild 788 SHA256 c0f7e2ba8bb4a796795faae84
 EBUILD calculate-utilities-2.2.30-r10.ebuild 671 SHA256 88faff7091d0234aacc950e1eaf9a0bb5cbad367b6cc0808a634609e79105500 SHA512 74f2dd410b55a85c5d3a48499cd6a813ec63a04f8134b28d3d6be27ccb1c3fe85bf9f5c83b6cf11f5cbedaa398faa0f83e6c6727c3340d6d3f812dbe3c2f4a7b WHIRLPOOL 8f94d78d2b8c7c006d7393941aac83479704a6f7985c0a876a7bf04f83c08667d51d55025f156623bdc6cb119155d56a34c74cf81ab8d6527d0289453fced0c9
 EBUILD calculate-utilities-2.2.30-r11.ebuild 674 SHA256 d307e2215aeececb988dd73c02d1640fd8b72e1ed597fc5f52ab7e074040e7f7 SHA512 576765e55f0662e06866a6781e38d13e0424cd3469547e16220b573ece3bc12f867abd1051cdb0593d6d9352de1fd032a2c2b2ee7562b2ff4a7f9e249d5daca2 WHIRLPOOL 635c1d0055aaa9ec9c16a08fb7690fe4f178d86c1d068e01b1e57f5f45e084ff29617832d3da78d5ffbb1fe6d2fad6e105393f56d61cf92f77ec41f4acd22c01
 EBUILD calculate-utilities-2.2.30-r12.ebuild 674 SHA256 1863e7384380c8c20f4fe5f9aa756b2754526a6c98222a63f08cb7090ccced13 SHA512 dfacb9111a27a70f0062cd76bce0d3113488a91cf0a7d929160ef1b18b840dfeb4862bed4112a0dd03d9bda859501f44d09b32f845f35f96078d93d835e51ad0 WHIRLPOOL dc075cc1b6d28c24b8e0cf308390b055f5850896194cca00962e3d09ea379e085dbc8c8e170e307335e8af8753dc8e216699d73dbf5fc741ba14ae00d18a8975
+EBUILD calculate-utilities-2.2.30-r13.ebuild 665 SHA256 d81b0109e5f013ced4b419c065089ae515e060bbfdbf2e71c9661b1c7c91c23e SHA512 68b4ca6d1f8cc91b6078dbdd88e5ec65056e5e5c5f58496d798afeb0a7e3e54152c78e060f5670fe347885d85c4a8fdd2d21466c1a8864ae90453d4f03c03a90 WHIRLPOOL ef8143d2406d2ed3c31e9ab83daa259d8b924fad42df678a33be69c599207e80369192b8ea01ac2dfe82276270eb2579689005fcbcc019cce3d40b1b50f91924
 EBUILD calculate-utilities-2.2.30-r2.ebuild 794 SHA256 ebd5cd6b2b6c971db57084bd3183ccafb30ee21402471a773069ad7b244764a9 SHA512 7043083c962dca01342458d792413196cf105f8001a0784350abe8c1af5fc0a292d64d8293764251235e73d9d2831a9552aba46a43fd3e6c8e0fb931168ea4e5 WHIRLPOOL 690e6c006f002512f58217ad4d48302e742d37cd036a2aebc929139c127a216131369c5d3143a99b46421c107efe341808eb75e331a66cd7617567f3d388d58e
 EBUILD calculate-utilities-2.2.30-r3.ebuild 794 SHA256 cfef25a959b986d43d7f31f9be14cd383f2dab42cfd3f03d973bfdc8d41b9519 SHA512 b3682fa5f5ded63bd7c951f7aa5200a43548d34191823a88138c529b18d38716c8b16c695899a4b67b022e6cac670d82d4fbe37d638228479a71026706559551 WHIRLPOOL 8e9e20192fc20e1f6705b7609bafbff30192390e8472a64516adfffd55e3f44728e9bda6bb60662ca01a7600f5f6c2c71bf207eea1ad37f5a5e26a454809f380
 EBUILD calculate-utilities-2.2.30-r4.ebuild 794 SHA256 5e02c2cb156fb647c7618147bd083dd63d1d96528338a57ff60ec084cdd73b2d SHA512 e7fa2992305db3dba55fb1fb78f64c303a139527796b527d42b8912b51c95fa780571221e9c6a17573f0ced9a8066fbcaf08ef9f099c8d809a24739a55a86c0f WHIRLPOOL 1a7a5195e326a8822e1a29e4a28919166a8288f424b47f06c19e9c61184b6e7da64b362849e631eb58c2570640e329b7750bb8652297ce3dc2948642f21a6598
diff --git a/sys-apps/calculate-utilities/calculate-utilities-2.2.30-r13.ebuild b/sys-apps/calculate-utilities/calculate-utilities-2.2.30-r13.ebuild
new file mode 100644
index 000000000..416b97f72
--- /dev/null
+++ b/sys-apps/calculate-utilities/calculate-utilities-2.2.30-r13.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=""
+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.30
+	=sys-apps/calculate-i18n-2.2.30-r1
+
+	cl_assemble? ( =sys-apps/calculate-assemble-2.2.30-r2 )
+	cl_builder? ( =sys-apps/calculate-builder-2.2.30-r6 )
+
+	cl_server? ( =sys-apps/calculate-server-2.1.16-r5 )
+"