parent
15174f831a
commit
bdad449eb7
@ -1,8 +1,10 @@
|
||||
AUX calculate-assemble-2.2.31-discard_clt.patch 703 SHA256 6f1b5208fc3e8f5aefeea41404cceee9e9e3e58b066ceedda5f1610a7bdafa51 SHA512 4da899d61d4fe629c9cb4e3a8af734f4eab419967acf3e25c0de7e3f9cd4558f43691099444f0034a2faec97d4f021627ee392138838188966bcda5082fc2dec WHIRLPOOL 33192a8a22d3d6cb3fffdcbd72a24ca31b83f3f31e8a1ea519bdd43ba72cf002c185654ebb77fffaa156e2d3adfe1a2bf4fb7b30f149b0d208c9c481ff759560
|
||||
AUX calculate-assemble-2.2.31-force_checkout.patch 1793 SHA256 2103992660ed97040ae4ab54ebb7ecee56d4dd7e0791a1cb5deff613474114e4 SHA512 f7f027667f738fb955dd9a11e4f896d4713a1eff321c7cc095b9752a4efb1e31e5a8eaecf51a7c5b08cbbd54ab54dcd6d968b4b5ac338a1ce3952e0712effeea WHIRLPOOL 0217c51dd984001cd49e3972734b87a0aca8cdfc92aea2db212e057459ccd2bee1824e14c0af3fd1512cf9064ac32231a80eb8bbee4b1cc262d708bdb707e892
|
||||
AUX calculate-assemble-2.2.31-video_script.patch 1148 SHA256 629fb65eba9bff6f5e47b357cdbca14ca945b9848221caf8d13c2dafe504f53f SHA512 64d4b6ca7b119e1ee5a0b4c75b2cfebb6d738c5616018f9d09de43694ddeea2182a77aab85646b6096d6d92ae24f61d4368a3fac4eb76b6ab4ef02a186d32d96 WHIRLPOOL d1b47d83ea170aebdc1f1b19c8dc85ddb5b6047d5bf057c87c0864bd0836b5bce12fc36eb882d10207b5b92a349f3ec3af93449867607f43e6a24c4041e331ef
|
||||
AUX calculate-assemble-2.2.31-video_script2.patch 825 SHA256 b44dc9d7fc9e0550ae01857322313e5e0e558a0c050b6393072f5ff1da966194 SHA512 c2657c5afca7887440dc337bdfa94392e39fd90c3aa4d011b44c0ea5427c3a63d98df3f9324f3266777c24228c01fe1623ca6bb24f7c73871674ff16cde482a8 WHIRLPOOL bd18de7a17d33c2434854b4e79c0c579ac2619d6ba9b43f3524403fc7596b351f0e938180742e2db9562305a68c0edb15ba5504835fd463c0dd2f5aa3dc6a639
|
||||
DIST calculate-assemble-2.2.31.tar.bz2 28977 SHA256 8488de0b12ee9a9c30d0dd8d5f16f8da11b8b135147ffa29856c91a757afaad8 SHA512 50f9c0cd8442630c882a23a41e73b29355758cd91d4f9911f01c27d2dd7bf0c4b5bc90226075d4cb01ee05829652ed134ae80f89e1795beef5089989e142c223 WHIRLPOOL c3317c2843dc82b77abcecdc3120bbc1df7a31b4cb3dd33de623b2cb30ac9ec40e4cf2662f898eccb41d5a3cc2e75a9e3cbe34f4d989cb6463c3f5524aa43df7
|
||||
EBUILD calculate-assemble-2.2.31-r3.ebuild 847 SHA256 78e5114b19d654b011d32705dc711fe846cf95a393bebe1081caa1cbcc7b8a15 SHA512 5412cfc700f6703d59e9274ba0f7efdd30a9d9ae2da71f5b505544a19fb5beb431b4ab6f134e9da878e57c28c3ec775eeef00aeb7ea928026928edc37a1c2c24 WHIRLPOOL ffd9030202ed9249d572cfac9ff26b26ef6b4c90e519b0eb657ff0d7061a330e55e77eccf4b888446f89559c158e2744e6722a1f3713dc29d355291c46d3bef2
|
||||
EBUILD calculate-assemble-2.2.31-r4.ebuild 943 SHA256 e443048fe781b050f903bc25e1aa464afebf5c27c0d8ce27f8dea1b77937a278 SHA512 98b33c196db0c7c7ac35a26b8c1aff31251200f597a4efd29b3dc673cabd90482cbb37469b509c2dcd64f679fc94afbc3f733ad80769ff5af3a322a593da9886 WHIRLPOOL b848ee90585edc43496066f1949c757c9d2433d2b1780608f1320db6f16f7fb30a123c4788208d5330d6e8d2ee82576c3e438a5cfb16293268aabbc051a7d542
|
||||
EBUILD calculate-assemble-2.2.9999.ebuild 572 SHA256 5bc8194c32bc4677cf79eaf6ae5f2112cafa51ae900dc3ebb6e879d9414858ea SHA512 62a111e959134709ef7529bfe87ccdfb20b103efc5305bf497ee9f427b3f956f180cd5c612641e557607606de9dbae3326c7881cc16afd9372b752ef65d63c93 WHIRLPOOL 8340a2b45b9941a61473ec4d66d944524dcf6f973ad9a03b9b92471cf5c92199949b2d707e7f738d86bbc9774eebac561df52891385e57d75aa811f47b4c5821
|
||||
MISC ChangeLog 16686 SHA256 759d02ea5f6029eab950ac93cf54a1c43dcc007a82be8e42cb82eac38369e979 SHA512 d4927fc6204a0a496248edbf3daf5b9259f0fc519a759c1dc8a6d6c2abab33074e75cd29e1696af3debaaac23548d0dc021e8d28c21d5c38cb8b2f06a973be0d WHIRLPOOL 7bd8bf84215ef77ec4035419f79d3226f3db13d6fb417e2b882bd4899bc240764ccc5a32154d8469153dc1c052936aad886a69916148bbf2bffa8d782b343401
|
||||
MISC metadata.xml 273 SHA256 4e25d45ba43b2ab7f7ae8ab4cfc05c406566cfb143a87166de77fbd8d9f8a943 SHA512 98b0d7d37e851ea86b498b2c0675bf505c75cb00d13932720475cda8a485db2325e2551954af3c534b2f9ef213f372c563d739d25d04a3da681a661c9ade6e91 WHIRLPOOL 44babe185c821b525b0dc317acb29e01223eacd5862804a64e0884502c25a541f53d322f1e63649c90285e93834b802beb21e4b34bd27be4b8d66ae6ac882c96
|
||||
|
||||
@ -0,0 +1,35 @@
|
||||
# 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.31"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# fix video script
|
||||
epatch "${FILESDIR}/calculate-assemble-2.2.31-video_script.patch"
|
||||
epatch "${FILESDIR}/calculate-assemble-2.2.31-video_script2.patch"
|
||||
# discard clt
|
||||
epatch "${FILESDIR}/calculate-assemble-2.2.31-discard_clt.patch"
|
||||
# force checkout branches
|
||||
epatch "${FILESDIR}/calculate-assemble-2.2.31-force_checkout.patch"
|
||||
}
|
||||
@ -0,0 +1,37 @@
|
||||
commit 2db660f23178b780cc4d1c83aa85d085adad11af
|
||||
Author: Хирецкий Михаил <mh@calculate.ru>
|
||||
Date: Tue Apr 16 09:51:54 2013 +0400
|
||||
|
||||
Force checkout branches on assemble
|
||||
|
||||
diff --git pym/cl_assemble.py pym/cl_assemble.py
|
||||
index 55cd748..6456d80 100644
|
||||
--- pym/cl_assemble.py
|
||||
+++ pym/cl_assemble.py
|
||||
@@ -567,7 +567,7 @@ class cl_assemble(color_print):
|
||||
gitrep=self.clVars.Get('cl_assemble_sync'),
|
||||
portage=portagePath)
|
||||
self.runCommand(getPortage)
|
||||
- updateBranch= "cd {portage};git checkout {branch}".format(
|
||||
+ updateBranch= "cd {portage};git checkout {branch} -f".format(
|
||||
portage=portagePath,
|
||||
branch=self.clVars.Get('cl_assemble_branch'))
|
||||
self.runCommand(updateBranch)
|
||||
@@ -608,7 +608,7 @@ class cl_assemble(color_print):
|
||||
if path.exists(pathOverlay):
|
||||
updateBranch= \
|
||||
"cd {portage};git pull;" \
|
||||
- "git checkout {branch}".format(
|
||||
+ "git checkout {branch} -f".format(
|
||||
portage=pathOverlay,
|
||||
branch=self.clVars.Get('cl_assemble_branch'))
|
||||
self.runCommand(updateBranch)
|
||||
@@ -646,7 +646,7 @@ class cl_assemble(color_print):
|
||||
self.runChroot("layman -L")
|
||||
self.runChroot("layman -a calculate")
|
||||
if self.clVars.Get('cl_assemble_branch') in ('master','update'):
|
||||
- updateBranch= "cd {portage};git checkout {branch}".format(
|
||||
+ updateBranch= "cd {portage};git checkout {branch} -f".format(
|
||||
portage='/var/lib/layman/calculate',
|
||||
branch=self.clVars.Get('cl_assemble_branch'))
|
||||
self.runChroot(updateBranch)
|
||||
@ -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="amd64 x86"
|
||||
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.31-r2
|
||||
=sys-apps/calculate-i18n-2.2.31
|
||||
|
||||
cl_assemble? ( =sys-apps/calculate-assemble-2.2.31-r4 )
|
||||
cl_builder? ( =sys-apps/calculate-builder-2.2.31-r10 )
|
||||
|
||||
cl_server? ( =sys-apps/calculate-server-2.1.16-r8 )
|
||||
"
|
||||
Loading…
Reference in new issue