From a09dc8c51af3ed7b39e31f3dc0740f2dd45dd705 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Fri, 15 Jun 2012 12:46:07 +0400 Subject: [PATCH] Update lib for pkgFunc --- sys-apps/calculate-lib/Manifest | 2 + .../calculate-lib-2.2.28-r9.ebuild | 51 +++++++++++++++++++ .../calculate-lib-2.2.28-fix_funcPkg.patch | 28 ++++++++++ sys-apps/calculate-utilities/Manifest | 1 + .../calculate-utilities-2.2.28-r27.ebuild | 36 +++++++++++++ 5 files changed, 118 insertions(+) create mode 100644 sys-apps/calculate-lib/calculate-lib-2.2.28-r9.ebuild create mode 100644 sys-apps/calculate-lib/files/calculate-lib-2.2.28-fix_funcPkg.patch create mode 100644 sys-apps/calculate-utilities/calculate-utilities-2.2.28-r27.ebuild diff --git a/sys-apps/calculate-lib/Manifest b/sys-apps/calculate-lib/Manifest index 014e84c59..25c0ef204 100644 --- a/sys-apps/calculate-lib/Manifest +++ b/sys-apps/calculate-lib/Manifest @@ -5,6 +5,7 @@ AUX calculate-lib-2.2.28-fix_ati_detect.patch 1038 RMD160 3b38cd495ed4732de3e9b0 AUX calculate-lib-2.2.28-fix_ati_name.patch 805 RMD160 7364279eb1658dc4f169a0011c4882457d50161a SHA1 bb46ab934109a475dd266c5c8b8a4469f0d85d8d SHA256 349ad24afbe96025a37b9d6e11896c7cf9223822cbae003e2ff7b58c21a1bc11 AUX calculate-lib-2.2.28-fix_detect_compress.patch 798 RMD160 90ad3d33b0c6bc8490c43d128989f0d59e1359d5 SHA1 dc6345b91b4902dc3e548a88c9987e72f766d3f8 SHA256 5e86ecd310af0de60d86598b6b2ddfe16591f785c4bf643b355a92c9ca7d41ce AUX calculate-lib-2.2.28-fix_detect_video.patch 889 RMD160 1608727a200a0988dbab8313a4239eebe632de40 SHA1 8bb38bd85e430533efe5d85aa97a677e3780488e SHA256 33712cbd680548d22a79f0e4c3f1aa407d2e77fbcc68b5a4a8828c0e82068840 +AUX calculate-lib-2.2.28-fix_funcPkg.patch 1297 RMD160 9e7e09c760f63b3ff532b7d740601e5889251236 SHA1 15b5d1ed094982e249d31b7067bb390bb8a4ef30 SHA256 35d51beed933fa63aa74824a0cbdd61215d65ab77fc75810caf77fec9bd39a95 AUX calculate-lib-2.2.28-fix_ifconfig.patch 2152 RMD160 b98f69e18417bf24af922bf0372943b5fc871f97 SHA1 3c3f955430969625914fd464d8f1331922966f9a SHA256 0c40e749e111493b5d55e9c316baef4ca29df945dd5357ef3f5da5a380be50c4 AUX calculate-lib-2.2.28-fix_update.patch 1070 RMD160 95a469e9597db6ffdeda77f63faf559eed34f9b5 SHA1 c312cb14376806e378ef7f0b034ba72141423ee4 SHA256 97956b3af799478fa18d3a5025b25ac176188aa0c3325744d519910ad0fc7c8d AUX calculate-lib-2.2.28-fix_work_with_python2_7_3.patch 494 RMD160 cfe3092da1c824bcafcbb2e46cadeffe81ce9eab SHA1 2d4c4bd3d8b4148cd34edefd3a5558acfceb70e9 SHA256 3eb6c49760d0bebfd7c92d949ebae756f7bc7fa8a286957af98ac3daa066aad3 @@ -16,6 +17,7 @@ DIST calculate-lib-3.0.0_alpha6.tar.bz2 114165 RMD160 3a8bd6cf13a9360187c19d82a7 EBUILD calculate-lib-2.1.11-r2.ebuild 808 RMD160 8ff17c75b566a9182dcc73ad722b2409d798f59f SHA1 686ad0a1893efc8d3134f96a2f66f96ebed123e7 SHA256 e6d751948c434cae800ace9787ee2e194b34baa644aceb0426ea677bcb419d35 EBUILD calculate-lib-2.1.9999.ebuild 481 RMD160 7a38a4d9bae891390473cf03d6bd559fe4eb0128 SHA1 1d7ff49c4dc52e6f5c01f08e9f1c78c22470740e SHA256 7115ae3b0e37f82195f2506151baa81179c5d08ae5071982ad2afd3e576b7fd9 EBUILD calculate-lib-2.2.28-r8.ebuild 1541 RMD160 01c0de6a3b779af93663f2086614edf9e7062ad1 SHA1 ae2c7e58926a9ccebf41ffcbf97c34e23ce813b8 SHA256 f05ed411ecfa59e5a805aeb4ae0bc7ced22b6f35cb4b7c7cf0934989786f908c +EBUILD calculate-lib-2.2.28-r9.ebuild 1617 RMD160 27edaa0591c67d706e94c2cfff11d486be724775 SHA1 23266328c58dce3502320fc48a255dafd92c5c67 SHA256 49b22eaab235902473a53d10dd77884d9853a273cc4a96782c484d6593d27cb0 EBUILD calculate-lib-2.2.9999.ebuild 656 RMD160 85058ff3964a829330b506998b134bd0993e92e8 SHA1 6d6f0e7c00e2f467ee4a8fe0a587bfd45e488b79 SHA256 35451656788914b0890f8d5238f2cab70d858718eb43e38b162cd975eb89e8ca EBUILD calculate-lib-3.0.0_alpha5.ebuild 607 RMD160 36d16798f2933f778669f9de06eb7c84f55cc098 SHA1 1e5c88d1f7c87d62dabe4d3ba890ac759ac2467b SHA256 e43c1f47fcb1b4e19c2363511f89ee1b0f3197330c427a3603e9b6cd9e9023c6 EBUILD calculate-lib-3.0.0_alpha6.ebuild 607 RMD160 36d16798f2933f778669f9de06eb7c84f55cc098 SHA1 1e5c88d1f7c87d62dabe4d3ba890ac759ac2467b SHA256 e43c1f47fcb1b4e19c2363511f89ee1b0f3197330c427a3603e9b6cd9e9023c6 diff --git a/sys-apps/calculate-lib/calculate-lib-2.2.28-r9.ebuild b/sys-apps/calculate-lib/calculate-lib-2.2.28-r9.ebuild new file mode 100644 index 000000000..c145d96ff --- /dev/null +++ b/sys-apps/calculate-lib/calculate-lib-2.2.28-r9.ebuild @@ -0,0 +1,51 @@ +# 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 library for Calculate 2" +HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" +LICENSE="Apache-2.0" +SLOT="2.2" +KEYWORDS="amd64 x86" +IUSE="minimal" +DEPEND="!=dev-python/pyxml-0.8 + sys-apps/iproute2 + sys-apps/pciutils + sys-fs/lvm2 + sys-fs/mdadm + sys-apps/file[python]" +RDEPEND="${DEPEND}" + +src_unpack() { + unpack "${A}" + cd "${S}" + + # fix autoupdate user profile + epatch "${FILESDIR}/calculate-lib-2.2.28-fix_update.patch" + # fix ati name + epatch "${FILESDIR}/calculate-lib-2.2.28-fix_ati_name.patch" + # fix detect video by /etc/X11/xorg.conf + epatch "${FILESDIR}/calculate-lib-2.2.28-fix_detect_video.patch" + # fix detect ability gzip for squashfs-tools + epatch "${FILESDIR}/calculate-lib-2.2.28-fix_detect_compress.patch" + # fix detect util path and ifconfig + epatch "${FILESDIR}/calculate-lib-2.2.28-fix_ifconfig.patch" + # fix work with python 2.7.3 and pyxml + epatch "${FILESDIR}/calculate-lib-2.2.28-fix_work_with_python2_7_3.patch" + # add countFiles and os_linux_filesnum + epatch "${FILESDIR}/calculate-lib-2.2.28-add_os_linux_filesnum.patch" + # fix detect ATI video cards + epatch "${FILESDIR}/calculate-lib-2.2.28-fix_ati_detect.patch" + # fix funcPkg + epatch "${FILESDIR}/calculate-lib-2.2.28-fix_funcPkg.patch" +} diff --git a/sys-apps/calculate-lib/files/calculate-lib-2.2.28-fix_funcPkg.patch b/sys-apps/calculate-lib/files/calculate-lib-2.2.28-fix_funcPkg.patch new file mode 100644 index 000000000..b04e39a84 --- /dev/null +++ b/sys-apps/calculate-lib/files/calculate-lib-2.2.28-fix_funcPkg.patch @@ -0,0 +1,28 @@ +commit 32f3dcef353da53bfbe301be90b21ecb05e561a5 +Author: Mike Hiretsky +Date: Fri Jun 15 12:44:09 2012 +0400 + + Fix pkg function on update_config + +diff --git a/pym/cl_template.py b/pym/cl_template.py +index 8c6f7b9..5a1210f 100644 +--- a/pym/cl_template.py ++++ b/pym/cl_template.py +@@ -2785,11 +2785,17 @@ class templateFunction(_error, _shareTemplate, _shareTermsFunction): + pkgs) + installProg = self.sharePkg(pkgs) + replace = self.pkg(nameProg, installProg) ++ oldInstallProg = self.installProg ++ self.installProg = {} + self.installProg.update(installProg) ++ self.installProg.update(oldInstallProg) + else: + if not self.flagAllPkgScan: + installProg = self.getInstallPkgGentoo() ++ oldInstallProg = self.installProg ++ self.installProg = {} + self.installProg.update(installProg) ++ self.installProg.update(oldInstallProg) + templateFunction.flagAllPkgScan = True + replace = self.pkg(nameProg, self.installProg) + textTemplateTmp = textTemplateTmp[:resS.start()] + replace +\ diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest index daa4fa4f9..1914122c4 100644 --- a/sys-apps/calculate-utilities/Manifest +++ b/sys-apps/calculate-utilities/Manifest @@ -3,6 +3,7 @@ EBUILD calculate-utilities-2.2.28-r23.ebuild 869 RMD160 d94ecd34b5e2886cb4e35951 EBUILD calculate-utilities-2.2.28-r24.ebuild 872 RMD160 f2298e48fb972a1ec36d6d240d097a7a23a24f69 SHA1 ed5e8c0826e297975856bed33e1eacacf113f266 SHA256 bc5095d9b7c33a8b7e8df91c271492a6045a5cb9df8073851cd7b5838649c759 EBUILD calculate-utilities-2.2.28-r25.ebuild 872 RMD160 32d0c96e4add172ceeff97c464c71b084fbfe382 SHA1 af2fe0e8202ca03b99fa18c7ee93e6929d5d360b SHA256 940b4a0c8d2427e6d286cd3c8192d066aedcca14113eec5478d9130281bfe2b1 EBUILD calculate-utilities-2.2.28-r26.ebuild 872 RMD160 e727a0aba6c7f10faaceb3510906e4ce11b8d02c SHA1 5dddfeb578c4962db7d2f583b736ffee12d5d3a6 SHA256 f67753d95f2abcab03d5a77992864806517646eb962d2183a51f49cfd5eb3f47 +EBUILD calculate-utilities-2.2.28-r27.ebuild 872 RMD160 8d4e068fc5e0ec4ca29a8136a10600064f2f86b6 SHA1 dfa9d47bb2471a1a0fb250f27c5d1ba8bd4d81c9 SHA256 50862e2fc1e69b381a645f426a9c413f98ae043ce2877db752e858264cd3c70d 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 EBUILD calculate-utilities-3.0.0_alpha6-r1.ebuild 639 RMD160 ab9bb7cad4eece79d51abfc70a9003dae678a4d4 SHA1 c7766af150873b08cd38421ecb8b987d2b6fbbe8 SHA256 0ce4cd722f54f34b39516137e5bdf2f92adf77c0afb9342981cbe05e385171c5 diff --git a/sys-apps/calculate-utilities/calculate-utilities-2.2.28-r27.ebuild b/sys-apps/calculate-utilities/calculate-utilities-2.2.28-r27.ebuild new file mode 100644 index 000000000..7d81aa43e --- /dev/null +++ b/sys-apps/calculate-utilities/calculate-utilities-2.2.28-r27.ebuild @@ -0,0 +1,36 @@ +# 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_installgui +cl_server +" + +RDEPEND="${RDEPEND} + !sys-apps/calculate-templates + =sys-apps/calculate-install-2.2.28-r1 + =sys-apps/calculate-lib-2.2.28-r9 + =sys-apps/calculate-i18n-2.2.28 + + cl_assemble? ( =sys-apps/calculate-assemble-2.2.28-r5 ) + cl_builder? ( =sys-apps/calculate-builder-2.2.28-r7 ) + cl_client? ( =sys-apps/calculate-client-2.2.28-r1 ) + cl_desktop? ( =sys-apps/calculate-desktop-2.2.28-r2 ) + cl_installgui? ( =app-misc/calculate-install-gui-2.2.28 ) + + cl_server? ( =sys-apps/calculate-server-2.1.15-r6 ) +"