diff --git a/sys-apps/calculate-assemble/Manifest b/sys-apps/calculate-assemble/Manifest index 85aa63336..b9e2c6b84 100644 --- a/sys-apps/calculate-assemble/Manifest +++ b/sys-apps/calculate-assemble/Manifest @@ -2,11 +2,13 @@ AUX calculate-assemble-2.2.28-downgrade_check.patch 1384 RMD160 ef3a6cd9e0b01131 AUX calculate-assemble-2.2.28-python2.7_install.patch 963 RMD160 e660a7adf10ef67c3d4a9b215c8dfa136953c09b SHA1 bcb676e475b4a35284b419a050b4651b18a87f6b SHA256 6f209e6ff89788db4266719d3046a69c19e9142c3dc5433352fc7d9bf26780fb AUX calculate-assemble-2.2.28-python_updater.patch 1007 RMD160 2af36b804109f1ed0bedc1c7fc1e3cc1472309af SHA1 06185ffe506c58ae21b5cff41035acc3d0d77b2a SHA256 aca1c137e6a01de48dd4341cf66d588f34efc849d0fcd957bac9de9223a47534 AUX calculate-assemble-2.2.28-update_world_bdeps.patch 696 RMD160 aa058b4258ebecad7d8e17aaf1b55cd2b9e62029 SHA1 27b476ea9afac6dffc39da8377e97739c1c15365 SHA256 b994dc5edb71bf85f55db5fb01328372cd9589735cab1ea3711947511f6d3b1a +AUX calculate-assemble-2.2.29-fix_work_with_3.0.patch 7024 RMD160 a979802b5e32e1bee928b9cb1455259e7fccf106 SHA1 12ee0ee4e64eb2d9aa67035a6c6c343f466adeec SHA256 95945f1f914d5941f8da2a277d3feb7b32d707656dc2bc4e69a9eb8e9c701f5f AUX calculate-assemble-2.2.29-resolve_install_deps.patch 6080 RMD160 c48ff2185d4e79577ffca03548f1d6c37c3bc361 SHA1 72e6c5cc1d543f1f7f381b8b7da8d6acaf1d1ef2 SHA256 9b3d598804ec5cd5725132b827ef09ba6ded8e2c9adc81bf42d5ab44e78bcc85 DIST calculate-assemble-2.2.28.tar.bz2 26649 RMD160 b1d93606159e539aeb462100f16f74c00fcaa58b SHA1 50e258ea83d6e45042d02e538202fe88c294964a SHA256 ee49670a9de34721b5f228e65430cdde0ab4e6d9f63c74b8f6b72fb487911ff8 DIST calculate-assemble-2.2.29.tar.bz2 26801 RMD160 bdcad3c4f67c2030522005e5240a80f44e407aaa SHA1 cd4163a19664d7aaf164b644e5246305117534d6 SHA256 667ea38456ed7b66d3b20e01bc1390372c8c4e4e32c3c8b19ae6329a56f3da80 EBUILD calculate-assemble-2.2.28-r5.ebuild 959 RMD160 00f88d26bb1ce8fc96b678daafc4f5270f5dae3b SHA1 ebf4ffdbfcc9d1adba61a5489152a5d9d6a5ef52 SHA256 1a9ffdbadab94582121fd6b9babcffa1c7dccd3918691384a6c02a10bb49f0d7 EBUILD calculate-assemble-2.2.29-r1.ebuild 628 RMD160 5f23e5779b3c29abf9488619634ecd51545d7e2d SHA1 314ea94cac979a823076084d0ed9a2a8e04acffd SHA256 581aee82e1df4f7cde5df109a67fc99dcb4e7e4567b37fa074705275ebb557f8 +EBUILD calculate-assemble-2.2.29-r2.ebuild 732 RMD160 5a34bf088cbee706e92093b1a14021d22f8f8d92 SHA1 061d88b0002b4533aaed1be84f2c5b1b5109701d SHA256 a00d8f93068b5e263f72d9e898eb21b275ae66fa95b035bc45596f82ef415a4d EBUILD calculate-assemble-2.2.29.ebuild 481 RMD160 17a1e11611512e000a947b55766673d6f74f8e15 SHA1 65964cc682d13c74e2f0c4941c07422f5a1a730d SHA256 ffd8934651250abbf7adde8ce2218391c1f684ee2da24c0bf429f79dc4719783 EBUILD calculate-assemble-2.2.9999.ebuild 498 RMD160 2c78ad8ec93daa2714f37760bf62f1071160ba4b SHA1 31812083d2ac1e171b95e02519888690a747a706 SHA256 0371109c66629a5895716c2e5c867a3bb15437d9bbec95b9c5fe387de8bea62e MISC ChangeLog 16531 RMD160 80f48b2586d89deeb11f886bd04f748fb0ed7912 SHA1 272ed7e7e96bd24c0d887a98086de3c4aa13376f SHA256 1030550948678eea2ed6b524372f6673ecaf508f89057b3a0419a3f2a1c986f0 diff --git a/sys-apps/calculate-assemble/calculate-assemble-2.2.29-r2.ebuild b/sys-apps/calculate-assemble/calculate-assemble-2.2.29-r2.ebuild new file mode 100644 index 000000000..352a8bfc4 --- /dev/null +++ b/sys-apps/calculate-assemble/calculate-assemble-2.2.29-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" + +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.29" + +RDEPEND="${DEPEND}" + +src_unpack() { + unpack "${A}" + cd "${S}" + + # resolve install depends + epatch "${FILESDIR}/calculate-assemble-2.2.29-resolve_install_deps.patch" + + # fix work with 3.0 utilities + epatch "${FILESDIR}/calculate-assemble-2.2.29-fix_work_with_3.0.patch" +} diff --git a/sys-apps/calculate-assemble/files/calculate-assemble-2.2.29-fix_work_with_3.0.patch b/sys-apps/calculate-assemble/files/calculate-assemble-2.2.29-fix_work_with_3.0.patch new file mode 100644 index 000000000..f31ab25ac --- /dev/null +++ b/sys-apps/calculate-assemble/files/calculate-assemble-2.2.29-fix_work_with_3.0.patch @@ -0,0 +1,150 @@ +commit c5eaa99bfa6ab5036bae65b1a6d0d6e15480f1d1 +Author: Хирецкий Михаил +Date: Wed Jul 18 14:34:51 2012 +0400 + + Fix fetch video drivers, assemble from scratch + +diff --git a/pym/cl_assemble.py b/pym/cl_assemble.py +index f7c8e08..d8a1f90 100644 +--- a/pym/cl_assemble.py ++++ b/pym/cl_assemble.py +@@ -539,9 +539,6 @@ class cl_assemble(color_print): + + def _migratePortage(self): + if self.clVars.Get('cl_assemble_branch'): +- if not isPkgInstalled('dev-vcs/git'): +- self.printMessageForTest(_("Installing %s")%'dev-vcs/git') +- self.runChroot("emerge -1 git") + portagePath = pathJoin(self.assemblePath,'usr/portage') + gitConfig = pathJoin(portagePath, '.git/config') + # check for repository contains .git and +@@ -556,18 +553,17 @@ class cl_assemble(color_print): + removeDir(portagePath) + getPortage = "git clone --depth 1 -n {gitrep} {portage}".format( + gitrep=self.clVars.Get('cl_assemble_sync'), +- portage='/usr/portage') +- self.runChroot(getPortage) ++ portage=portagePath) ++ self.runCommand(getPortage) + else: + getPortage = "cd {portage};git fetch".format( + gitrep=self.clVars.Get('cl_assemble_sync'), +- portage='/usr/portage') +- self.runChroot(getPortage) ++ portage=portagePath) ++ self.runCommand(getPortage) + updateBranch= "cd {portage};git checkout {branch}".format( +- portage='/usr/portage', ++ portage=portagePath, + branch=self.clVars.Get('cl_assemble_branch')) +- self.runChroot(updateBranch) +- ++ self.runCommand(updateBranch) + portagePkg = getPkgInstalled('sys-apps/portage', + prefix=self.assemblePath) + portageMinVer = getTupleVersion('2.2.0_alpha72') +@@ -592,8 +588,9 @@ class cl_assemble(color_print): + lastEbuild + self.runChroot(emergePortage) + restoreManifest = \ +- 'cd /usr/portage;git checkout sys-apps' +- self.runChroot(restoreManifest) ++ 'cd {portage};git checkout sys-apps'.format( ++ portage=portagePath) ++ self.runCommand(restoreManifest) + else: + portagePath = pathJoin(self.assemblePath,'usr/portage') + gitConfig = pathJoin(portagePath, '.git/config') +@@ -604,13 +601,17 @@ class cl_assemble(color_print): + if path.exists(pathOverlay): + updateBranch= \ + "cd {portage};git pull;git checkout {branch}".format( +- portage='/var/lib/layman/calculate', ++ portage=pathOverlay, + branch=self.clVars.Get('cl_assemble_branch')) +- self.runChroot(updateBranch) ++ self.runCommand(updateBranch) + + def _updatePackages(self): + """Update portage and calculate overlay""" + self._migratePortage() ++ if not isPkgInstalled('dev-vcs/git',prefix=self.assemblePath): ++ self.printMessageForTest(_("Installing %s")%'dev-vcs/git') ++ self.runChroot("USE='-perl -curl' emerge -1 git") ++ + emergeSync = "emerge --sync" + self.printMessageForTest(_("Updating portages")) + self.runChroot(emergeSync) +@@ -747,8 +748,14 @@ class cl_assemble(color_print): + # will install iproute2 with USE="minimal" also + self.runChroot("emerge -1 sys-apps/iproute2") + self.runChroot("USE='minimal -pxe' emerge " +- 'sys-apps/calculate-install') +- self.runChroot("cl-install --install") ++ '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") ++ else: ++ self.runChroot("cl-install --install") + else: + self.printByResult(skip=True) + +@@ -913,6 +920,45 @@ class cl_assemble(color_print): + ":\n %s"%self._getCommand(chrootCommand.command)) + return chrootCommand + ++ def runCommand(self,command,raiseError=True,showProcess=False, ++ joinErr=False): ++ """Run command""" ++ chrootCommand = None ++ try: ++ if showProcess: ++ IOval = None ++ else: ++ IOval = PIPE ++ if joinErr: ++ ERRval = STDOUT ++ else: ++ ERRval = IOval ++ envdict = {} ++ envdict.update(os.environ) ++ needAsk = self.clVars.Get('cl_assemble_ask_set') == "on" ++ if "emerge " in command: ++ if showProcess and needAsk: ++ command = command.replace("emerge ","emerge -a ") ++ commandLine = ["/bin/bash","-c",command] ++ if showProcess and needAsk: ++ chrootCommand = process(*commandLine,stderr=ERRval, ++ stdin=None,stdout=IOval,envdict=envdict) ++ else: ++ chrootCommand = process(*commandLine,stderr=ERRval, ++ stdout=IOval,envdict=envdict) ++ DEBUG(self._getCommand(chrootCommand.command)) ++ if raiseError and chrootCommand.failed(): ++ raise AssembleError( ++ _("An error occurred when executing the command")+ ++ ":\n %s"%self._getCommand(chrootCommand.command)) ++ except KeyboardInterrupt: ++ chrootCommand.kill() ++ self.defaultPrint("\b\b") ++ raise AssembleError( ++ _("Interrupted when executing the command")+ ++ ":\n %s"%self._getCommand(chrootCommand.command)) ++ return chrootCommand ++ + def configureSystem(self,force,nounmount): + """Unpack stage or cls|css and prepare for assemble""" + self.msgOperationComplete = "" +@@ -1649,7 +1695,8 @@ class cl_assemble(color_print): + "emerge -f --quiet-build=n %s"% + drvVer, raiseError=False,joinErr=True) + rePackage = re.compile( +- "(?:^ \* (.*?) RMD160 SHA1|File.*is already locked)") ++ "(?:^ \* (.*?) (?:RMD160 SHA1|SHA256 SHA512)|" ++ "File.*is already locked)") + # get fetched files + fetchedFiles = \ + map(lambda x:x.groups()[0], diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest index 11d39db96..4c798d061 100644 --- a/sys-apps/calculate-utilities/Manifest +++ b/sys-apps/calculate-utilities/Manifest @@ -15,6 +15,7 @@ EBUILD calculate-utilities-2.2.29-r5.ebuild 786 RMD160 2062f6ce6bf59bcd6ab6cadfe EBUILD calculate-utilities-2.2.29-r6.ebuild 790 RMD160 714abe998d3ffe351b5133b7f820f618257ddda0 SHA1 94584f27d897e1a299d64169ea58f64aeef3c2b5 SHA256 634af01dd23fa578b5867b9939ec8c0b9db63d7c7a3a4be88a87e13f4ab16261 EBUILD calculate-utilities-2.2.29-r7.ebuild 797 RMD160 f48cc661076cc4dddc63162a12ee4475732925c1 SHA1 18665dfec05f3d896ac7ea4b9e796b812f781fad SHA256 b8a16cf97da0308486b52935c700204fd94d3ef73823a04e19346612a307db25 EBUILD calculate-utilities-2.2.29-r8.ebuild 800 RMD160 cde6ca4af645421cc3f0938d70d6e7a0b17ec9af SHA1 9a35de9c6a67ff9f61b3086d89a961e346d2558e SHA256 d6a02af5bdd7e58237f63a34a05000cdf98fa1e68c0bb9cb6c4ce9ce8c36adec +EBUILD calculate-utilities-2.2.29-r9.ebuild 800 RMD160 7728decc3f9de8144fa42fafce2b55a829739160 SHA1 e35475421873e6bc38131c28d1cdfb5f69da96aa SHA256 85ffc818906d92c7ed85e0697f55c067f274531a1abace92b4b5cf363c71dc1d EBUILD calculate-utilities-2.2.29.ebuild 777 RMD160 6fdff08ca0f396df7d47de35a31da4b7a1e7e8a7 SHA1 c029e2a5e88a2eb625604d50d7a1fc5b07a3fd0a SHA256 d4df15af0c92421568962faba7b1dcd99e44062a7dfa1a591fa47a7daa29cc88 EBUILD calculate-utilities-2.2.9999.ebuild 842 RMD160 f2c0fdc1068614b71a37f2226dcde4883ebd2876 SHA1 99f673a52934f552589baf6d12ed9bffc03b8ebd SHA256 56d97b7d2ce11d23b25d9036b4e2ee196b547ce1d11b0cc349a8205515b66bf1 EBUILD calculate-utilities-3.0.0_alpha5-r2.ebuild 573 RMD160 117b236c49975a49fd927b37088825c3c587f321 SHA1 8924f08f266157eb749821f70a97cb3d5bf8d73c SHA256 710d755d8fce836946b51df95f19afaa7e1ab9fa4d29df852069b77530adfe52 diff --git a/sys-apps/calculate-utilities/calculate-utilities-2.2.29-r9.ebuild b/sys-apps/calculate-utilities/calculate-utilities-2.2.29-r9.ebuild new file mode 100644 index 000000000..5e4211224 --- /dev/null +++ b/sys-apps/calculate-utilities/calculate-utilities-2.2.29-r9.ebuild @@ -0,0 +1,34 @@ +# 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_client +cl_desktop +cl_server +" + +RDEPEND="${RDEPEND} + !sys-apps/calculate-templates + !