Restore builder

sys-apps/calculate-builder/Manifest

@@ -1,9 +1,10 @@
+AUX calculate-builder-2.2.31-discard_clt.patch 1188 SHA256 a031bd16155be1148d1b0ca74157feaf365014ed969e76da95707c8a07ad3024 SHA512 f88a304039b5878ef89cc87284db7b50e630959c7eb32c59da124774dc6691ceba548425dead40e99bd494e2a717f1924a4674ec223410057c006b2b4979f78a WHIRLPOOL 66791ac9dc64645c4a2986f7b34c00721dafc9b700cf1556a8973c4c3372c184d6c1b8a0f2207933af1f05f69e9fe02b7216669b5a03118d2056f854ee99350e
 AUX calculate-builder-2.2.31-fix_isohybrid.patch 1083 SHA256 ef4c83ab9eb7bae56c890dbe4433b1c2c886131820cb12853095c6e041aeb927 SHA512 fb30171ab20e62cff5a60b7e7a01610fbf4ca156db073c6ca63e6da1ea57d63516bc24d41bc64f25e561a899a814a179d1bee505386915a3b177f874927ec650 WHIRLPOOL 3ea158aafc3f2fd87a2d293bc8d77f5c23939c21bc6a2dc051b84ea4b25d253531e23772d56a35ef6d212130d8e89dfc7c273a5367b28da3d3e65784682d97d7
 AUX calculate-builder-2.2.31-fix_version.patch 490 SHA256 0cb649bec5a26beb75cae7faf5963a778ae37ea43270fbda92c0fe04e6c5db38 SHA512 420649875895790bc7c73dfb0ef295f4675ce13bfc41aa3c43b63e484daf4c642546a17c008a3c42efb55fef105d216f28035788a2bba9cf0305748112df9207 WHIRLPOOL 44cc2a54e306560a736e46826ba7e2db1bd4e449755e641192a1c6ce86791d93187691528e7f28a8138fe48cd41b1452d8bb76916e39dd60663f2fa21b44571e
 AUX calculate-builder-2.2.31-grub2.patch 785 SHA256 1c67842caaa4abbbba17a69ba9cb84d6b847e3d4aa2b561adcab30b0042d3994 SHA512 f4f0f22488eecca434f82e4aaf73c86169d022e95ed0dddfe2dc8ce5c41989e9839cbe6b815c5e77a80175399dd228523aaca01252686a97ef3b37256840fdd5 WHIRLPOOL de8781e9ff03193a6f3ec4e99f94fabc7158fa25d67e0196a4d614423020b75d86b48b68003a933310e81cb2eebd28f08e8f77a1b17daf0f98042a62c4903220
 AUX calculate-builder-2.2.31-r4.patch 2756 SHA256 8ba7ff17f887f205ed403bca4d824d22e0d810d33fe2be5cbe83828f080043de SHA512 8719191f27590c53275b1758be1b0c690576e3c3260bda15cafeca998ff02003c552f23240745a43ba49a6d498f73ad38e6ceba6605c94bb54dffde7cda6a939 WHIRLPOOL 620d1bac4119d7deaf1251253143127a5847a64e6e66ff22ca44b444a583d5867fb5ed0f354374a6ade65e2bdb467ef22123e22486d9c09f19144d48a1e8736f
 DIST calculate-builder-2.2.31.tar.bz2 31745 SHA256 42bdbc62319205a1ac68c8e80c822bd6679cd43e98caa9b1140d499872887e60 SHA512 5b3832b9fe910502a953a90e4af289691dde095b17c6a8cd4d059eb8f9fd90880963afec758dea97d0e15eabeebed4ec3325ef91f83ed71b3a08c382b30e220c WHIRLPOOL 399d4f9f308fbe1f0e57a45ba0e0e92a1f5aefcbdec5ffaa664fd955f0f8383f4542f5f229c9ab96127cecc95a1de8e31abb390ed32d306c7ecf970f6cb16fca
-EBUILD calculate-builder-2.2.31-r9.ebuild 1196 SHA256 8bd7c51e10d2872229ff5155c3252e6c8554397f08a52543364c971470aaad97 SHA512 a758b7d7b2860a18390d2db0d7164a20eb2bc916549d41c3fa3a38afd589463af635e00ff2d277b096c0994e44e16063ff67a298d8106c238984ab05fed4fd33 WHIRLPOOL 7255257d2123b15f0daf50a755b2fa5ae0f5253c0fab8f5cf23ad183765f66d3d1dcfc5fdd3adab694ec5d9704642032c568f48b5225d9a0140ebd13e2bdd671
+EBUILD calculate-builder-2.2.31-r10.ebuild 1276 SHA256 7f639d54d926bda2cb9e1de850871ae733a84b9d42b13f1265cbf2a5b7ef386d SHA512 8451eee8a353ee1044637b1155a558880f6e1a03ed9e5fc9f71219930b2a8ec33deb07b04049f3fa418bb7984816d39500e92303f9acd0a96fef310f557cc308 WHIRLPOOL 1f15008dc7a4ae15a114ad19468d11ebf0b08d416c042fcf52d408a6d68b2004940524157d6a17022d7f3e606865006ab473a61f900e06ec7e88de94000e6500
 EBUILD calculate-builder-2.2.9999.ebuild 645 SHA256 12bd65856844de72d88588937b6a65b39b7dec7eaba06d028e8c5a78ef6b28a5 SHA512 fc6396dad3a92a5a746f4ed32caf092ede65898e4822e52ad541faaa44467a4f81daf6f261af8eb20017c6155923e2011433e4b15071d7098392c901ae3a5078 WHIRLPOOL fd0151c3ce9fa98c5ca63470e561487c063293727006da10446c0a2ac2c65305042a5359bc0163840c1dd4502d67641453dddaf5cded552dacf6c5c97ccc7402
 MISC ChangeLog 20663 SHA256 f05f75b85860fc850514bd6bcaa1671c6de2ead417071f28ccbec647528f58a2 SHA512 2bcbfd0212333bbf8bfd1fc4de894ee50b71b0671e4769fd40a1aee4fbab0260919b447f109e3b02047835c6e0eb93c04ea6ce135836144d078c09f0c5615d95 WHIRLPOOL dbf2791d84acf8567520bfd90462650ca9c9c0da7a3515e9e5695c3a419cfd043e235d8d681704f33a0c99272e93563de0fc6426f9476f894a48d52a21409462
 MISC metadata.xml 270 SHA256 b65e150429ecbf36cf03d094f4e3e7518f536c61289cecff6b817326703d58a0 SHA512 dbfa2e214285bbe643553158f8ce084d93b34cdc10201917e001d26ca96fb76c9aaafdd7573f1827348d831dd7ddcc238fec560544b6efaca08c6eb9aa053cf3 WHIRLPOOL 42d8cc3e4ac41511cb0468bd1622001addef5263562a31c07a040cbe6f412278ee9d2124e864d987793629df5f3dd1c8b145a93715785d290ab917ccd14de9ea

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

@@ -39,4 +39,6 @@ src_unpack() {
 	epatch "${FILESDIR}/calculate-builder-2.2.31-grub2.patch"
 	# fix isohybrid for i686
 	epatch "${FILESDIR}/calculate-builder-2.2.31-fix_isohybrid.patch"
+	# discard clt
+	epatch "${FILESDIR}/calculate-builder-2.2.31-discard_clt.patch"
 }

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

@@ -0,0 +1,28 @@
+commit 3229268d1f24a02ab72a15a89a8a4e100c7effc9
+Author: Mike Hiretsky <mh@calculate.ru>
+Date:   Mon Mar 25 09:41:15 2013 +0400
+
+    Discard clt templates from prepare image
+
+diff --git pym/cl_builder.py pym/cl_builder.py
+index 19480cd..56228f2 100644
+--- pym/cl_builder.py
++++ pym/cl_builder.py
+@@ -127,7 +127,7 @@ class cl_builder(color_print):
+         #self.clVars.Set("cl_root_path","/", True)
+         self.clVars.Set("cl_action","squash", True)
+         self.clVars.Set("cl_chroot_path",directory, True)
+-        self.clTempl = template(self.clVars)
++        self.clTempl = template(self.clVars,cltObj=False)
+         dirsFiles = self.clTempl.applyTemplates()
+         self.createDevNodes(directory)
+         self.clTempl.closeFiles()
+@@ -144,7 +144,7 @@ class cl_builder(color_print):
+             self.clVars.Get('cl_builder_squash_path'))
+         self.clVars.Set("cl_chroot_path",chrootPath, True)
+         self.clVars.Set("cl_root_path","..", True)
+-        self.clTempl = template(self.clVars)
++        self.clTempl = template(self.clVars,cltObj=False)
+         dirsFiles = self.clTempl.applyTemplates()
+         self.clTempl.closeFiles()
+         if self.clTempl.getError():