parent
053b4453b2
commit
9648057369
@ -0,0 +1,33 @@
|
||||
# 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/calculate3/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="The program of update Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="~sys-apps/calculate-core-3.2.0_alpha3
|
||||
~sys-apps/calculate-install-3.2.0_alpha3
|
||||
dev-python/pexpect"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-update-3.2.0_alpha3-r2.patch"
|
||||
}
|
@ -0,0 +1,40 @@
|
||||
diff --git update/emerge_parser.py update/emerge_parser.py
|
||||
index c19450f..21b12b6 100644
|
||||
--- update/emerge_parser.py
|
||||
+++ update/emerge_parser.py
|
||||
@@ -550,8 +550,7 @@ class EmergeCache(object):
|
||||
# список файлов проверяемый по mtime на изменения
|
||||
check_list = [MtimeCheckvalue('/etc/make.conf',
|
||||
'/etc/portage',
|
||||
- '/etc/make.profile',
|
||||
- '/var/cache/edb/binhost')]
|
||||
+ '/etc/make.profile')]
|
||||
|
||||
def __init__(self):
|
||||
self.files_control_values = {}
|
||||
diff --git update/update.py update/update.py
|
||||
index fbb6782..9a7cedb 100644
|
||||
--- update/update.py
|
||||
+++ update/update.py
|
||||
@@ -384,7 +384,7 @@ class Update:
|
||||
raise EmergeError(_("File %s not found" % filename))
|
||||
return self.child
|
||||
|
||||
- param, packages = self.getCacheOnWorld(param, packages)
|
||||
+ param, packages = self.getCacheOnWorld(param, packages, check=True)
|
||||
param = [param, "-pv"]
|
||||
#print "PREMERGE",packages,param
|
||||
|
||||
@@ -438,9 +438,11 @@ class Update:
|
||||
raise EmergeError(_("File %s not found" % filename))
|
||||
return self.child
|
||||
|
||||
- param, packages = self.getCacheOnWorld(param, packages, check=True)
|
||||
+ param, packages = self.getCacheOnWorld(param, packages)
|
||||
#print "EMERGE",packages,param
|
||||
ask_emerge = self.clVars.Get('cl_update_precheck_set') == 'off'
|
||||
+ if not packages:
|
||||
+ return True
|
||||
with EmergeParser(EmergeCommand(list(packages),
|
||||
extra_params=[param])) as emerge:
|
||||
try:
|
@ -0,0 +1,26 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=4
|
||||
|
||||
DESCRIPTION="Calculate Utilities meta package"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
SRC_URI=""
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="cl_consolegui cl_client cl_desktop cl_console"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
=sys-apps/calculate-install-3.2.0_alpha3
|
||||
=sys-apps/calculate-i18n-3.2.0_alpha3
|
||||
=sys-apps/calculate-lib-3.2.0_alpha3
|
||||
=sys-apps/calculate-core-3.2.0_alpha3
|
||||
=sys-apps/calculate-update-3.2.0_alpha3-r2
|
||||
cl_client? ( =sys-apps/calculate-client-3.2.0_alpha3 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-3.2.0_alpha3 )
|
||||
cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.0_alpha3 )
|
||||
cl_console? ( =sys-apps/calculate-console-3.2.0_alpha3 )
|
||||
"
|
Loading…
Reference in new issue