Update calculate-assemble and calculate-install.

atratsevskiy
Mike Hiretsky 13 years ago
parent 110243b772
commit 4189480297

@ -2,6 +2,13 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-assemble-2.2.14-r1 (10 May 2011)
10 May 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+calculate-assemble-2.2.14-r1.ebuild,
+files/calculate-assemble-2.2.14-add_preserved_rebuild.patch:
Update for preserved-rebuild.
*calculate-assemble-2.2.14 (20 Apr 2011)
20 Apr 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

@ -1,7 +1,9 @@
AUX calculate-assemble-2.2.14-add_preserved_rebuild.patch 789 RMD160 552f3416098f185cbe83e71b0452aabbf9a340f0 SHA1 56b02fde94e269d8084f88c65157d8d9a50353da SHA256 e23c87a21509d979219f2bc7148a2db34934cf7e2d38c3baaeb5dfbc432687e5
DIST calculate-assemble-2.2.13.tar.bz2 30142 RMD160 04640b2d1cf0dc51d9db8d40a481e13b8e808015 SHA1 498760746c26209e2e0cff83663f9c2acdb1ce4a SHA256 33a1a6ec4839da971fb42680e76aa5e8d6fa41317723e32ab09988ae1c3b39ac
DIST calculate-assemble-2.2.14.tar.bz2 30190 RMD160 277197aba71bb69944aa209e27ac40b595ea3db6 SHA1 385bd77d44a46a489041106be0d0719a1f74dd4e SHA256 1521338b599ff7b1b13be6e89dd5e0f0db021c722d78c334d872e12f01f79135
EBUILD calculate-assemble-2.2.13.ebuild 481 RMD160 a9046fdd8118d9af8be0eb36604093261e0e294c SHA1 f1dcadd6b03d7d25031cbf375822c530c9400fd9 SHA256 9a55ff3e216543db162c9f694256689c5f7ce6f5e9c4861080bf4e8bccceff81
EBUILD calculate-assemble-2.2.14-r1.ebuild 627 RMD160 c5e6b34bd9b030802a2ea76b4d57fbb74947feb2 SHA1 b8ceda3d794684ecbe3d1075daa8ae96ded9ccd2 SHA256 5fcd58bae5821be89942c4330a6f666ae6d22a6738cfbe56270185af56ca610b
EBUILD calculate-assemble-2.2.14.ebuild 481 RMD160 1bc98c434916759112ea0250b8924d3d9bc40957 SHA1 6e6a56b6f90143a16e669386921fd92acd820c99 SHA256 3c212ddc0c235e73f4dab2d0b11931edaf077e0f100e6bab5f5b999c53bd9f30
EBUILD calculate-assemble-2.2.9999.ebuild 482 RMD160 a8dd82b9ec70dd999e13c509f0f11f303bdbf5c7 SHA1 a5218cd678aa8d213ee8455874e7ea0b07246ebc SHA256 2c0fed30ccde6401d214a6de67dc63a0c91fd025508efb3519db9b2cda800ec9
MISC ChangeLog 9383 RMD160 914b4a7a714f7267708d087be677c67539730259 SHA1 393017ac080328d505e03fc462b428f4324789e3 SHA256 1e265f54a49cf8cef8e5ffa17f8e77e03f274da2add76368c0aa64ac4fbee75c
MISC ChangeLog 9625 RMD160 d4a6d4c6bcf1b0b12a089cd28d297fd1bca61693 SHA1 f67f1188ef78e9072d4444751b1abb9af166561e SHA256 97cf1fecb3d785f77dc8c75180b77769dbd5b44931f4dea45dfcc2b2b2bc3f2c
MISC metadata.xml 273 RMD160 7d99331acd3ba20fc7ae361cb845f33f73d994ee SHA1 92e19e1e4c24527654168ac0cf9fe58ba78aeb4d SHA256 4e25d45ba43b2ab7f7ae8ab4cfc05c406566cfb143a87166de77fbd8d9f8a943

@ -0,0 +1,27 @@
# Copyright 1999-2011 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.14"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# add preserved-rebuild
epatch "${FILESDIR}/calculate-assemble-2.2.14-add_preserved_rebuild.patch"
}

@ -0,0 +1,22 @@
commit 7f3a787f8cadb56540e640f04f9ca679a7f3d328
Author: Mike Hiretsky <mh@calculate.ru>
Date: Tue May 10 16:11:37 2011 +0400
Add preserved-rebuild after revdep.
diff --git a/pym/cl_assemble.py b/pym/cl_assemble.py
index 19583bf..e713b72 100644
--- a/pym/cl_assemble.py
+++ b/pym/cl_assemble.py
@@ -161,6 +161,11 @@ class cl_assemble(color_print):
'condition':'.',
'message':_("Execute '%s'")%'revdep-rebuild -i',
'progname':'revdep-rebuild'},
+ # emerge @preserved-rebuild
+ {'command':'emerge @preserved-rebuild',
+ 'step':'presrebuild',
+ 'condition':'.'
+ },
# prelink all packages
{'command':'prelink -afmR',
'step':'prelink',

@ -2,6 +2,13 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-install-2.2.14-r4 (10 May 2011)
10 May 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+calculate-install-2.2.14-r4.ebuild,
+files/calculate-install-2.2.14-fix_emerge_info_bug.patch:
Update for bugfix.
*calculate-install-2.2.14-r3 (05 May 2011)
05 May 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

@ -1,4 +1,5 @@
AUX calculate-install-2.2.14-backport.patch 7695 RMD160 02cb1659b610d59c1a31fb0d31430e47b17b2bb3 SHA1 070ec968dc6d3fb2c0087fc3a6c90d49a58bc6eb SHA256 c84ddda8c4366c1466a2b45409af78ce89afd420232138491e5bbe69247cc8c5
AUX calculate-install-2.2.14-fix_emerge_info_bug.patch 827 RMD160 fff36b9ada1705e52232dd4554d7417f6b636e80 SHA1 7153a43e9472b1426ec924a185f0592fddaeee1d SHA256 c7b0c6377f44f922b3775799f6b2a09eeca03779ac07550f4e74a9d1b9165767
AUX calculate-install-2.2.14-fix_syntax_error.patch 853 RMD160 071bf929a8086abac474c6434528be165151e492 SHA1 27ceb1f8785466f80284a0bab8f2dbc4b5b408a3 SHA256 2b41b52b000bbfc85c357a6f1a9856e2321623333db533a8cc54b2adc932a213
AUX calculate-install-2.2.14-radeon_composite.patch 757 RMD160 b297d3b5219487c34f6039886584c33be6885375 SHA1 32203607f3608b093dd3086f1c7f3cb3de1c220d SHA256 61c70287dd07c7022b972f0f75efb25d944b410b100355b43eecf0a36ea0f6f5
DIST calculate-install-2.2.13.tar.bz2 65828 RMD160 0b50979db3186197dd69e1ddfdf966dc5e8fcb30 SHA1 f45a6ca338d3b5f2182afb201b07b19745a781c2 SHA256 f7598a4b96cc2dc0ffa8048b8c1a3e1989519fce4d2c9aaf66b58bd74a28ff5f
@ -7,7 +8,8 @@ EBUILD calculate-install-2.2.13.ebuild 718 RMD160 662a5b741beb15638712cc93ae0802
EBUILD calculate-install-2.2.14-r1.ebuild 868 RMD160 a3d16d797646684c4476865222df75f38a89f185 SHA1 1153cda0d034948604845139d9a9267c82bf7c8f SHA256 067b62c778e7c63f6045689528de825826a57cd14556597a804c0543e19cf135
EBUILD calculate-install-2.2.14-r2.ebuild 837 RMD160 cd58c2316ca689d41fa6b9a37d75d5b64b601544 SHA1 6073c4f1c921ab29ac4a1dd4dc150882f83cb35e SHA256 992dad0513e2745b5dcdf88faaa6b73d75ce77c53f9dd380d8404953ab315e6d
EBUILD calculate-install-2.2.14-r3.ebuild 928 RMD160 ff28aa64b78be480a1a1a280e380b8d8492ebe32 SHA1 4692bc6d1e58a80500b87c0aa02507b3610dfd67 SHA256 a699eafc5e9ab1ea9d304bff5d85935de8e533f913a975ed4f4fadbb996cf8a2
EBUILD calculate-install-2.2.14-r4.ebuild 1034 RMD160 c8928450f47e599931b1971d03f9a0c89edbf840 SHA1 f48b778e1f54cd1c07e7d330dc3e7a8d95372115 SHA256 1c7a0d82b49f78e442ab807ff32678a0f5a7fe3705945d6c83d46f868618c22f
EBUILD calculate-install-2.2.14.ebuild 718 RMD160 b73a1880d3bf4ce1714f3b688d9bbe4996c1d219 SHA1 444e79db083b8e5216482ac89176f1de73e5523f SHA256 fb7bf36afe643ba61d0fe13bfac95bb8ecac6445dd4567e870f5a24527dfc297
EBUILD calculate-install-2.2.9999.ebuild 595 RMD160 8f9b9a14fed39ded9c2a9d9343aa4e892d620172 SHA1 09aff28bdaa486868e2caddc7911732a905336ee SHA256 534e6c6e465177e269ce7beed96dab08a124878591088c1bf38095e855ca1180
MISC ChangeLog 20935 RMD160 0098b5413e89febd78fb137f83e916a2ad6b2f89 SHA1 5443ea3bc09006531e18454bac8a54268b7e8b6b SHA256 1cbab3997b0c67580affe1da2798a9d676e6ea13beb3098f4ceea87c968ac69a
MISC ChangeLog 21161 RMD160 13415cda46c7704ce8e194ff7b09b9a3e92cc857 SHA1 accceb3fb6c6192ad614fe52727243772859cf01 SHA256 93ee2f9c3d6b922c3976878c3983e814be3ec14e74730c8ebf6e24d2c5333e30
MISC metadata.xml 310 RMD160 769e4f17a9354da6b168b72a5d65d978f65bf6dd SHA1 83aaae376052d69c7327e880cf028ebc0dea608b SHA256 c29d3efc676d8308872920db5223c78469db86ac236b5d45c3ee98ceb8fca846

@ -0,0 +1,45 @@
# Copyright 1999-2011 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 program of installation Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="~sys-apps/calculate-templates-2.2.14
app-portage/layman
!minimal? ( sys-boot/grub
sys-apps/gptfdisk
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# backport
epatch "${FILESDIR}/calculate-install-2.2.14-backport.patch"
# fix syntax error
epatch "${FILESDIR}/calculate-install-2.2.14-fix_syntax_error.patch"
# fix emerge --info error code
epatch "${FILESDIR}/calculate-install-2.2.14-fix_emerge_info_bug.patch"
}
pkg_postinst() {
einfo "For configure calculate-install perform:"
einfo " cl-install --install"
}

@ -0,0 +1,19 @@
commit 153a2716e78e1f467c83d61797df950bc2ab59c5
Author: Mike Hiretsky <mh@calculate.ru>
Date: Fri May 6 17:32:25 2011 +0400
Fix cl-install -v for emerge --info ERROR RET.
diff --git a/pym/cl_fill_install.py b/pym/cl_fill_install.py
index fbb071f..f602f23 100644
--- a/pym/cl_fill_install.py
+++ b/pym/cl_fill_install.py
@@ -906,7 +906,7 @@ class fillVars(object, glob_attr):
curlanguage = self.Get('os_install_locale_language')
return get_linguas(open(makeconf,'r')) or \
" ".join(filter(lambda x:x=="en" or x==curlanguage,
- get_linguas(self._runos(infocommand)).split())) or \
+ get_linguas(self._runos(infocommand) or []).split())) or \
"bg en de es fr it pl pt_BR ru uk"
def get_os_install_locale_consolefont(self):

@ -2,6 +2,12 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-utilities-2.2.14-r8 (10 May 2011)
10 May 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+calculate-utilities-2.2.14-r8.ebuild:
Update for calculate-assemble and calculate-install.
*calculate-utilities-2.2.14-r7 (05 May 2011)
05 May 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

@ -7,6 +7,7 @@ EBUILD calculate-utilities-2.2.14-r4.ebuild 840 RMD160 2485ad3ef4ac93a6787851fcd
EBUILD calculate-utilities-2.2.14-r5.ebuild 840 RMD160 8e65da0cc97d58ff745d96f0d9f4c11534c947c3 SHA1 6f93d1aafcea6d983ac2d9ae1f27f8613deb2905 SHA256 9183f6252c96e225bd38edbebe79b85d3c3d5fb2cefa8dd0dbe96d68c7dd5482
EBUILD calculate-utilities-2.2.14-r6.ebuild 840 RMD160 57fa4d2c9f584231b0cc0de80a8c042bb1558be4 SHA1 13ac883058bcbaa93818bd66284f1858dd2f17ed SHA256 443fae617e813cf8e60ac4a9768af28c8ece1ad37ee9ce0f4a0fd3246f679002
EBUILD calculate-utilities-2.2.14-r7.ebuild 840 RMD160 458ccc8bdbbfa8dab41deeb4b77b85c31b36ac98 SHA1 594a5c6e10132eb0366ec6ebd8866e04d9b6436f SHA256 7c884c712de0c269284e834f50cf2501c42d490bd41a90513770ef24f909b496
EBUILD calculate-utilities-2.2.14-r8.ebuild 843 RMD160 10e072d6179f4bb6cf59a7e532fb4585b914ba0f SHA1 c8db0270a9efec7a4e25beccc1abaa853f9cdc6c SHA256 97e5ed30d29895e4112556828ab7c9589d20fcbc68f204f8aabaf91785099aaa
EBUILD calculate-utilities-2.2.14.ebuild 829 RMD160 ca16f926dbac23f8a83595b70723e07b362a3c06 SHA1 e952c7e4909082540bbf3ca1bc745a223880116a SHA256 8ce1c42a0a19e39d7db7b4e944f59b867d9f3c44c71df6ea3573dae9de83a7d5
EBUILD calculate-utilities-2.2.9999.ebuild 840 RMD160 0c7324a9ed480118ac19f62b162c9ee62c25f964 SHA1 7dadab1430ed147334ed7e9b4fcc86dc99e25d56 SHA256 f3ee28f9f765e7302c83eb4a15a09bdf066f09e6b40e34f6d52157a946df5e66
MISC ChangeLog 7855 RMD160 b05ce5326525a27d9eb32527e9e57af425245dd7 SHA1 c9d015b2d129b72c73bcf7b3b01dc6a202052188 SHA256 14f01b380568facbb1da48d580a35f64e06a925b29a8d27b3ce9b23c6f6cb8e6
MISC ChangeLog 8058 RMD160 db7f1d4020ef6e02d16f36e57202dd6948aa371c SHA1 3403de2e8cf7fe095ab4c6f9b405a76ce76f872c SHA256 9d4364d8648751d4bb17aaaad1cf026413626c641f6c8df857e2c084ccfa5165

@ -0,0 +1,35 @@
# Copyright 1999-2011 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_installgui
cl_server
"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-2.2.14-r4
=sys-apps/calculate-templates-2.2.14-r3
=sys-apps/calculate-lib-2.2.14-r1
cl_assemble? ( =sys-apps/calculate-assemble-2.2.14-r1 )
cl_builder? ( =sys-apps/calculate-builder-2.2.14-r3 )
cl_client? ( =sys-apps/calculate-client-2.2.14 )
cl_desktop? ( =sys-apps/calculate-desktop-2.2.14 )
cl_installgui? ( =app-misc/calculate-install-gui-2.2.14 )
cl_server? ( =sys-apps/calculate-server-2.1.13-r1 )
"
Loading…
Cancel
Save