calculate
/
calculate-overlay
5
2
Fork 4
Code Issues 12 Pull Requests 1 Releases Wiki Activity

Fix assemble

Browse Source
atratsevskiy
Хирецкий Михаил 12 years ago
parent 6ca400bbcd
commit b6462c78bc
5 changed files with 96 additions and 2 deletions
Show Stats Download Patch File Download Diff File

3
sys-apps/calculate-assemble/Manifest
Unescape View File

@ -2,7 +2,7 @@ AUX calculate-assemble-2.2.29-clean.patch 8571 SHA256 833f638d660cffadb6fb1ecdf2
AUX calculate-assemble-2.2.29-fix_install_git.patch 749 SHA256 168f3070b5731070760667a007509a8f4060cf469d2ad8d35a2b03964e4aaeb4 SHA512 ba09f2b2663a54387ca646a2f1189138778b2ffaab34227e8cc7173590f03124c16baab29294260aedfb4d69a09c3cd166faf7967fb15704305025bae590159c WHIRLPOOL 1b76bbf05bfd481259cc5740685de9c7cf55101690b11216b34657dec9aa34d646dd35614fff2d0197e6fe7a3d032f69fb24b2e9b2903ed9ba923d0a9532fbbe
AUX calculate-assemble-2.2.29-fix_novideo.patch 746 SHA256 99573869caa50f671bf8824ee34df6208c0f53123ae30d25aac52d88fdf75f65 SHA512 fc949fe5262721c40732eaa7afdd3c871abef52133e1105fabbb5efa3cc62b00510782a36f425e4f8ff0617b77b0dfbcc61d138f6e3146f4c4bd4b112d07c2a8 WHIRLPOOL c6347031df766e00a33a731b24d2752d324333f66d33804db31eb97e269dcfc9281f82287218d2561dd9aa78b06bb5fadf17f6c73bbb2fb5a7516a90d305e99a
AUX calculate-assemble-2.2.29-fix_repeat_fetch.patch 749 SHA256 f683db10ed497cd88a60e1b9f204202119592b2afbb7572a68783abe1ac1231e SHA512 bbca9c021b29aed327c2d9b61aa9bcbbc0c39f8851557497761d27e9d51e53c806b2a15eb4858baa9a0adb290f46c0f7adb220fff4beec2be2d13cebcadb8b90 WHIRLPOOL 9b8f003fc2d17d34a3033a8abb842ff37290c7afbc314aa3f52fd1d49022640402d6da158981cfcae1c35769b900c6d4e339e32f501da6fdf9cedec6e4ecc879
AUX calculate-assemble-2.2.29-fix_update.patch 747 SHA256 c858385166de41f4970b65e2b3176e3848d971642df800bd45450c51a4addc39 SHA512 3239a1475fea7315f80db0b30b1aa1ccdffd31d7ac50481a853c547919d36b70b19df22678a24a238e7af556a02438cdd456145f19d80bb7ec61e21c0b0069ec WHIRLPOOL 7547bcadab25a634c7dd2d87f182ed1668ae910e844c04f996fb70e7bc88f5b49dd5c5f3205f63fc48ad25c4af2ddace7e56ad4bcaea899f05de0093c3bb0cc5
AUX calculate-assemble-2.2.29-fix_update.patch 1311 SHA256 ff58c0d09cf42fd369c14c24d3abccd8d6023609f99a29eb3b11be7958bb7f32 SHA512 750ce9870302005c9dc358b95d47dd5f85c13d9d09cde6062a81486c4108c0191da03cb89a21ec9128c774266821b20c4762b7ebfa5196a14b86bbcc5b811545 WHIRLPOOL c672f7af3a4f45810ab9570d0c99adc6e00c848f533bb60a07541508838a847c92d77b120311e70cb9bd170e0ad789488e2cc7b01baa78f9982e44a1abbe1de0
AUX calculate-assemble-2.2.29-fix_work_with_3.0.patch 7024 SHA256 95945f1f914d5941f8da2a277d3feb7b32d707656dc2bc4e69a9eb8e9c701f5f SHA512 4551580e07eba2ecb48073d3fe4273582846ef3352e9ac41948ba58fc9a760f48fcbe326819bdde5ad9cf77177cd25a6cb1b618cf8e93bf0c52aff405b605835 WHIRLPOOL 40d3078c2ee052ff8e807ff8c6cca3e25747e82c3f39502089355644cf3b84b783cfa1e074de132c7b679da978fac581bef506f6dc12d3c012a9ba58fc8e7ec6
AUX calculate-assemble-2.2.29-resolve_install_deps.patch 6080 SHA256 9b3d598804ec5cd5725132b827ef09ba6ded8e2c9adc81bf42d5ab44e78bcc85 SHA512 ac20a4ec3bd1f038cefa1b45c707d47220aead9ab3813f694a00d3855fce7b734768b54d5acc45087436e6e3b8efb2578c103e722b450889fb6cc6cdd97c84bf WHIRLPOOL ea55e513a82f0a302867e50202aec4f500e4606ebde7d88c18d93c5cf63e352d91cc7600e00b0cb49599e8ec9c4de553697ced9821f371cfa38837be4f375e2d
DIST calculate-assemble-2.2.29.tar.bz2 26801 SHA256 667ea38456ed7b66d3b20e01bc1390372c8c4e4e32c3c8b19ae6329a56f3da80 SHA512 2b61b0f8b7266657687eca63fdcf5a0e3d072bcf9edf414328850f87a9aeba86b08da7b8c4057f2330379db5f744f455c21a39c7f1ab97b269ecc11e3803cb36 WHIRLPOOL 7dde2541ab0ed8311f8791da7db608059d2ee5b39451460df02214974d1394519a4287bc1fb2807a3a1efad1f6b05d45fa6dc9baf5d4edf1fcaabc45d8bf911c
@ -12,6 +12,7 @@ EBUILD calculate-assemble-2.2.29-r4.ebuild 1004 SHA256 cacbe0ded7daa2850f4646cbf
EBUILD calculate-assemble-2.2.29-r5.ebuild 1090 SHA256 4a3c9fc96b66db2ee889a95b8fcdb1abf941202bf570ebb143d96756e93e3a42 SHA512 0c8496d7d18b17d81881bf75af35fc36a1b9b372b3257af20fd6e34d803f88d0a97693f3a69ab49419041a424a7775d1685a062d097024d0ddd34f4439377333 WHIRLPOOL 2cd9a58705e86f8befd8ec9035be6d3ef55e252ba299a46393d3542d9e47689e1f29c48b582da887b6d4119da201940f9de17d5616c751b22416236c17d9bb6f
EBUILD calculate-assemble-2.2.29-r6.ebuild 1189 SHA256 7889f6bef62e4859dc7678a73e2a82949fa1cf385783384059b1965ef2881482 SHA512 2fe0b2a14afdd90d10f21583f769e50a70e4b596e9181dc626222cc681665b425208711dd495c33bbc9463ea5ee21e620accffd0052d837a9d2756e9441807f5 WHIRLPOOL d3570f86c86fb85435115b8f24a6d24a0f7edd7898395c0302831ea69afde3fc6af657323a9abbf97bb63736d421043160c2838e1d2c6ce03adc67c1d2f7c99d
EBUILD calculate-assemble-2.2.29-r7.ebuild 1277 SHA256 20405259e61050b3c92a0a4e57b47d3037491a2d704db9f25c5783c89195a9e1 SHA512 8fb06254ec1569bd03b9efcbbb7c4c2c7b6865ef3c3b9635d687d52721c798703368f8951d90b15d2d8d0c734d45e38b751a157a29862a3812f69ffc20d5f7a8 WHIRLPOOL 6480015d2da5a7ee68ce5bba3f6575bcaaea37196e727559499f20ab4a7061ef3283199522b73afbd8b0ff714ca3d814eca240d62b8df1077bc7421a3de54ce8
EBUILD calculate-assemble-2.2.29-r8.ebuild 1277 SHA256 20405259e61050b3c92a0a4e57b47d3037491a2d704db9f25c5783c89195a9e1 SHA512 8fb06254ec1569bd03b9efcbbb7c4c2c7b6865ef3c3b9635d687d52721c798703368f8951d90b15d2d8d0c734d45e38b751a157a29862a3812f69ffc20d5f7a8 WHIRLPOOL 6480015d2da5a7ee68ce5bba3f6575bcaaea37196e727559499f20ab4a7061ef3283199522b73afbd8b0ff714ca3d814eca240d62b8df1077bc7421a3de54ce8
EBUILD calculate-assemble-2.2.9999.ebuild 583 SHA256 25fcb8d4bef81359d6d42bd79d9e2778cdbb614211d1c394175265aad64ac734 SHA512 5049e37158bdf3445769ee529a22227e59dd262ac4411ddea69984760820cd1ddcee8949a310c21286c5f22e0a9689355258f883cea7697708769f9406d313c5 WHIRLPOOL b2fe741e40b0e0edf15fc4b8ce15ee9bd23130ed98f33f0c9c7e9f6c542408960ba223ac1ba0f012288622748351fd6719c3fd20c9abeb30f6fbd8b22030ba30
MISC ChangeLog 16531 SHA256 1030550948678eea2ed6b524372f6673ecaf508f89057b3a0419a3f2a1c986f0 SHA512 2abd532cdf699e4f6c5ed77ac5589a5d4c4ebc8995621071550713a93bd7ab07548dc7b7926abfe108cf4457da7346e0a7e15a626a40e4d88ed320de6f293a81 WHIRLPOOL e69ad6652d5a56f1d6ddd034fbf816c2204979e74df092cf4d60a9c1a58fa26a075ddb11b5b8df00406031082c62c8055ead063357659a480f14b7be838a2e5d
MISC metadata.xml 273 SHA256 4e25d45ba43b2ab7f7ae8ab4cfc05c406566cfb143a87166de77fbd8d9f8a943 SHA512 98b0d7d37e851ea86b498b2c0675bf505c75cb00d13932720475cda8a485db2325e2551954af3c534b2f9ef213f372c563d739d25d04a3da681a661c9ade6e91 WHIRLPOOL 44babe185c821b525b0dc317acb29e01223eacd5862804a64e0884502c25a541f53d322f1e63649c90285e93834b802beb21e4b34bd27be4b8d66ae6ac882c96

48
sys-apps/calculate-assemble/calculate-assemble-2.2.29-r8.ebuild
Unescape View File

@ -0,0 +1,48 @@
# 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="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"
# fix install git in new stage3
epatch "${FILESDIR}/calculate-assemble-2.2.29-fix_install_git.patch"
# add clean portages
epatch "${FILESDIR}/calculate-assemble-2.2.29-clean.patch"
# fix fetch video
epatch "${FILESDIR}/calculate-assemble-2.2.29-fix_novideo.patch"
# fix repeat fetch video
epatch "${FILESDIR}/calculate-assemble-2.2.29-fix_repeat_fetch.patch"
# fix update command
epatch "${FILESDIR}/calculate-assemble-2.2.29-fix_update.patch"
}

12
sys-apps/calculate-assemble/files/calculate-assemble-2.2.29-fix_update.patch
Unescape View File

@ -1,5 +1,5 @@
diff --git pym/cl_assemble.py pym/cl_assemble.py
index cc6942c..d725769 100644
index cc6942c..4d24f4c 100644
--- pym/cl_assemble.py
+++ pym/cl_assemble.py
@@ -568,6 +568,10 @@ class cl_assemble(color_print):
@ -13,3 +13,13 @@ index cc6942c..d725769 100644
updateBranch= "cd {portage};git checkout {branch}".format(
portage=portagePath,
branch=self.clVars.Get('cl_assemble_branch'))
@@ -608,7 +612,8 @@ class cl_assemble(color_print):
pathOverlay = pathJoin(self.assemblePath,'var/lib/layman/calculate')
if path.exists(pathOverlay):
updateBranch= \
- "cd {portage};git pull;git checkout {branch}".format(
+ "cd {portage};git pull;git checkout .;" \
+ "git checkout {branch}".format(
portage=pathOverlay,
branch=self.clVars.Get('cl_assemble_branch'))
self.runCommand(updateBranch)

1
sys-apps/calculate-utilities/Manifest
Unescape View File

@ -9,6 +9,7 @@ EBUILD calculate-utilities-2.2.29-r17.ebuild 803 SHA256 d17a49d022175fbde6bbc31f
EBUILD calculate-utilities-2.2.29-r18.ebuild 803 SHA256 ace140679fe8fdcfebc42224e58c04e2795990d4d70cc83969df54da5e17df63 SHA512 9b932de5dfa3dfb28e2ba948ba96169f5d5798632b7b6ef6ffe6cff6b1c2cc585320291d8360c3b133ba3e0a0903ddab7e95cec5522a1104f64026cf5e47f989 WHIRLPOOL a34d2b0cd7f2a63ecb6e609b1af4812ead5d7a0212b2b2bd1c750684a2dd5939e8e7ce867d723446d6999891dc24535be9eb4063bbd2268b1dd7db6dff5fb64c
EBUILD calculate-utilities-2.2.29-r19.ebuild 803 SHA256 32aab15b585cd1f0f2665d171b63eb7094ed51ae2df542f44e60f5d7d7c1618a SHA512 30967fbc7c5402e53d6a242abf6a1cec6fb907646b5f361e6fd8df45a86a467de34f876a64586f831415abcf63ccde05ed451380068c0ee0778f6f2f46a4874a WHIRLPOOL 521147470bc9f38165e5b7a688a03c97575ca7aa3c6d571a242abf72a6c65bcb614140a8659b71799ee5edf971b904471dab17fe2756c5ef6aa22d694c434cf9
EBUILD calculate-utilities-2.2.29-r20.ebuild 803 SHA256 a61b06eb63b5362524ae30a1a7faa8fbdd3a22b819baaf8749b95eaa0b619758 SHA512 118edcd839acca78e113ce95fd085dcaff45a523f2f36070db0efeec8aa435c8aefefd7577be308b06ba3867f89b2431ec78af1d16a86e1062589dd13e40d548 WHIRLPOOL 2a666743b6a401e7b77673a628fc7cfee447cea3a2a057f4c4f2f02997093b380c195db7fc8e1e122476de58fe76582300579c57416e1c22a19184e3d7af3b9b
EBUILD calculate-utilities-2.2.29-r21.ebuild 803 SHA256 9f63056064c9669a3f2f2c9ca95dcceeab3962edec0fdaea32771c26cc781618 SHA512 939479901e59a7a0bf6ef90baf9146ac771cb70a2f5701b1995950ff0f49896d3274947b7eb57c608f037642b8ea643e3f7fdd67280f0c31ff5b7cafafad3050 WHIRLPOOL 81ed0d9315aca99422444b9290a1bb3e049f522b499f0bdaebcc5438e2e1280a7a913415932b559929e0a39cb7b84002cd7d946e7c24b17b6f786de6290c0ac2
EBUILD calculate-utilities-2.2.9999.ebuild 842 SHA256 56d97b7d2ce11d23b25d9036b4e2ee196b547ce1d11b0cc349a8205515b66bf1 SHA512 fc7802b92ade52210fa7381b55c48638da6d9adee6d2f03f18d6bdd0050756089b3ca8de944f4e865517554523b40737abe9f22587ecae74079eec563f80868b WHIRLPOOL f1382f0629a8dae37aaecf40cb8cbc3682bde3b43e92c9c6a84cda75897dc5d5de043233fb7a3f929749520b05fe3af94187c7a3ccdae4e252e83699d871f225
EBUILD calculate-utilities-3.0.0-r1.ebuild 598 SHA256 c5ccfe1a28e2643314c97023570a0afae156438a372d138ac12bedbaf96c25ed SHA512 d4c5f005a8970f66bbfb1755d0cbcdb400b312be72aa5ba9400969b2103b351ff8f918c487caf0e4fb36498c86dcbc42e182ecfb96f1ade967cb0677065b8ba8 WHIRLPOOL e1f0eefa6ea7d0e8b74b9663a304d42d0485e3353df483c47e92ab9b85989f783cb2e784af3444989065ae31e56d5a0cdfcdac823d2919e6eaa6ffc30678a93a
EBUILD calculate-utilities-3.0.0-r2.ebuild 598 SHA256 5885b070bc83cf7ecdd192a861533c2a6e50ad066276b42e88f0b9dd0319bcdc SHA512 392d0eee04013ac933145650bf7d83a07ca8bc604f42a29261909770749aa29c35c828e36f2a55a3043cc6b16ddba2e1f3a694f1494db2843b9c94d4e257e0ba WHIRLPOOL 393db82fef6e76dd087e304832aa4220ef639749c8030e883f06726c750251694aa9399ae7c3c6627a5d8bcd81b9257c7d7114ccff755bfc076f610614e7351d

34
sys-apps/calculate-utilities/calculate-utilities-2.2.29-r21.ebuild
Unescape View File

@ -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
!<sys-apps/calculate-install-3.0.0_alpha1
=sys-apps/calculate-lib-2.2.29-r4
=sys-apps/calculate-i18n-2.2.29
cl_assemble? ( =sys-apps/calculate-assemble-2.2.29-r8 )
cl_builder? ( =sys-apps/calculate-builder-2.2.29-r8 )
cl_client? ( =sys-apps/calculate-client-2.2.29-r1 )
cl_desktop? ( =sys-apps/calculate-desktop-2.2.29-r1 )
cl_server? ( =sys-apps/calculate-server-2.1.15-r7 )
"
Write Preview
Loading…
Cancel
Save