From 7daf4d8009461a372c7650a47cad55815b95441e 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: Mon, 30 Jul 2012 11:12:21 +0400 Subject: [PATCH] Fix install --- sys-apps/calculate-install/Manifest | 2 + .../calculate-install-3.0.0-r1.ebuild | 48 +++++++++++++++++++ .../calculate-install-3.0.0_fix_migrate.patch | 19 ++++++++ sys-apps/calculate-utilities/Manifest | 1 + .../calculate-utilities-3.0.0-r1.ebuild | 24 ++++++++++ 5 files changed, 94 insertions(+) create mode 100644 sys-apps/calculate-install/calculate-install-3.0.0-r1.ebuild create mode 100644 sys-apps/calculate-install/files/calculate-install-3.0.0_fix_migrate.patch create mode 100644 sys-apps/calculate-utilities/calculate-utilities-3.0.0-r1.ebuild diff --git a/sys-apps/calculate-install/Manifest b/sys-apps/calculate-install/Manifest index a553c02cc..ad0fa047c 100644 --- a/sys-apps/calculate-install/Manifest +++ b/sys-apps/calculate-install/Manifest @@ -17,6 +17,7 @@ AUX calculate-install-3.0.0_beta3-r8.patch 10731 SHA256 3c3b9fcfdc8027b3e3c67c8f AUX calculate-install-3.0.0_beta3-r9.patch 11115 SHA256 a712e349f4f768c56413844627628d0c2937022fb0e45c759d092d2b6a0e5b1c SHA512 d25a5ecc9670ab5f8cd4bc38c868692662d75873a314164d2214e56150d28dbcd3e5c267c798d9d81cf31232bccded2052172b5d99c24cfaa05d3adb8999fe15 WHIRLPOOL e20361162a7c8225230504a4a78b8e7b49afb4e92b2ca001a71d8b7985239659df69524c4d4a8aefe95ab3bbef5067a686b8ce7d369d561d39f8b36fd79ae26a AUX calculate-install-3.0.0_beta4-r1.patch 1758 SHA256 fa320c6009096f4805b0889a09c405e3d599338c884160847ba76ad7e6e345a3 SHA512 9739ea880b10e4a6d0a99f61cb5ac06ffb7a978eebe743ba45ff611e1797e2bc155107f7f43a5fe46f2e863e6b66dbd69378bab13d1a0d9a422b1832dffa8ab3 WHIRLPOOL 990b288fce635358e3452ef20ddd3b3e8f535943730c6b2bad958906599e44e60395763e832eec1802d6c8a0717fb2f7af1c24c3f6a559bcbcd1ad26fa6fd1d3 AUX calculate-install-3.0.0_beta4-r2.patch 2457 SHA256 b82a8a6cbb77ad167a9f5d116a2a3a2216283d774220d19be3f7405b5d9e75c5 SHA512 a8a5335d9e74e42a75dc9a998a2c4697d54a5b40cb137f5e1f1bcdeaff70b662416eb69aba2bbce897706d1c74b067815fe6b478fe7031ae59777a8e6d54a3d6 WHIRLPOOL e6f46422d882c879495c6e11abe58e1e4bf2d784234747cf3d7d32471548ce270918f7fce4c031e4bd1ca77b2e3b205393692e665afc89bc748600fd356d498f +AUX calculate-install-3.0.0_fix_migrate.patch 711 SHA256 47a49e82745e6fb387c6cc0964176bc9c6296c7fe1897ad16125657768db935e SHA512 63a9899b0efac3128a140b48ae3073a3bc7b585a6f4f6de9fdb880ed7071184bf8bc5feb7c99b06ae1b03c38efdc9ac21bdf072500ac713987000604f26f8290 WHIRLPOOL 62193d7898a6239aa02060a24106a81b018dc7da651683735293aba137a3ef05a385b54892d5106b73a459c5511288b48d9b0413157a151344f335156293f939 DIST calculate-install-2.2.28.tar.bz2 82743 SHA256 19f858d831c069e820463543d6f89a17ee4c1c185079ecff4c301594ee41107f SHA512 83998cfaebcaa74e01ccaf847bfbc952ae816a4ecc72cf62bb328d885ee0ccddac8ce4551a0519d4d9e0f2c5e1d69ee92d8ebd6a18d4756233d18750769bd36c WHIRLPOOL a69da1180bceae6b3df31a0bc8f4adf468e51f0d0bc843f05fe4089d2f9c01201abbe396da139674204ffc4b352b9237705ed51730c8507afa15fdfe58331e19 DIST calculate-install-2.2.29.tar.bz2 82398 SHA256 0d1b5fcca2711f31fbd5680dea652fa7765ad781529ba80c5fa92cf736d73d10 SHA512 f9623ec564cce283a3813a2a308347b64d5368c06b0665de5223c9c2d75dcfb00348def034e958718ba9e9fa8a7ea2fa76b90fd0b4dc4e41bebf6222ee4a5da9 WHIRLPOOL 57361d7f5270cc2782d32635b02b1150a506f8e517ee916d66bc6df0c8c037193ad6fa33cef1c7b5fec6867204ea06c2778983a4bfd722b41af3c9d1c172270a DIST calculate-install-3.0.0.tar.bz2 75771 SHA256 8423554b46a87781d223b8b6378fb71f2474eb049897b20f328363f66f566f88 SHA512 934fac15a2b34357d20161a9804e05de68491a8069b1b6008f016e9fbbccb403e8805ef395598934faafe8db2deca0c040d3d690d8f49cfe2adca453e10e4752 WHIRLPOOL 2448066fb70de8db95ff8edfa94f894047a18e402a84dc3e27e2efcc8a1cc7b05996209acaef44bc59366507865bb76b457ae75e5dfb0c4f478c397ef9497ac9 @@ -29,6 +30,7 @@ DIST calculate-install-3.0.0_beta4.tar.bz2 75800 SHA256 3719020c7b8d3c125377cfe4 EBUILD calculate-install-2.2.28-r1.ebuild 1035 SHA256 3d07209efbcf675dcfd3d9ac9b872541ead76b926093a1744dc2d002a290a4f5 SHA512 9f35f968ec66d8be064206f37056e3855d00cfddefff5ce41a125a59ff62eda5f4a519ac47751d836cb991d28951d2d141d7969113305297134d05f00302db8a WHIRLPOOL 572b95d68dfdf3f70ee5788eecc36737d47afa705226991fe7b9b63b1c17e4ef0e15e89ea2cf3f229f4046d91efc11a73d5a987bacf4410921b547f7d7cc95e6 EBUILD calculate-install-2.2.29.ebuild 886 SHA256 718588e39966f2ad266697f204b203d46398e455233527b4aafadaa81217cea3 SHA512 f3df4bd813b3d6a6685edb67e0735dd9e576f88f56dfd9af69a43d2c1a364900b4c64a524fb73f8e18523694bd6c295c6538b001fddee774392047322d2c5a16 WHIRLPOOL daaf58f351ffcdb4ac0224a65486f7773b9e93f4efbc562319ab4b78f951f0f517120bba0b044a10169907c5ed73602956b15df23499b288ff2cd419a27e8ada EBUILD calculate-install-2.2.9999.ebuild 611 SHA256 ab95c392853331769aabe6b26089f95238a1dd5a7d027c46483e5855d97d0c20 SHA512 b26470f6f4745d942c7287c85bc9dd63ee5dfa6675f20131efd487899fb32c5468c1a39ad8c75881b52926cbbff3ed2982531ab5f108216ff8cd0bd545321071 WHIRLPOOL 4426515dd2840354f770f7a2189eddd5f276b69279096c11243c2c9f9638121b9bd3f2aa733eb8758c71974cfb9ed8fa44afc74f0b0f271e9a86bb86ff704708 +EBUILD calculate-install-3.0.0-r1.ebuild 1149 SHA256 50206c196aec8cc9127b91d76174fdd491a21592437e951d1e8fcb4e1156b89e SHA512 b1e87b1c716bd8b041eafd054cdbb9925b57bc6ece81682e46217f94875f244d40cf356e35237425037b32f66b5e02122f01aa2d0e0ecd94e6cc98e0c1ed6513 WHIRLPOOL 8b9c1fe96968a67836fb6c329fe44cf3abcff171ca01b227f3aeda8f2f4891316ce3de1f9ed9ffe89fa100b097aee09600933e7dd8e9010a87e305a0b6125472 EBUILD calculate-install-3.0.0.ebuild 1025 SHA256 ad943c84f08b9e05503617037360f3f85359e118238267a11746f2092bcd5be8 SHA512 9efda491309fb795103411196ebfe311d1af119bc5fb0ab5b641c862b5592534ac5f21b76971aae8af69f996dad958c292f04baa372768c8b12bb05e35a69157 WHIRLPOOL c9c2ede67009078fe1aca188753fbae94c6948d9f3a2182dc3506f641a5bf57d6f4d0c3c90a48d63b0279b53c735d8a2b82ec7b34c44ba12dfee548c7b9752c5 EBUILD calculate-install-3.0.0_alpha5.ebuild 840 SHA256 3c68d42a2485d530c9b462a5b787d4ad4cd6ea85aa8c02fe321e3308f0b616a2 SHA512 bc6beb13ea7bfb85532584691270d156fefee1e9655f1f38d73af0c4d9f5335b41d350461209042dc10c174d02df5e3b3b6c1582878702d63f8b028e308304be WHIRLPOOL c689d7ac7d3950cf4aca94a22e6356164ab5ff7104f86fd5fe88166094ea032d76768373533e7e4cae8c2a848b662f15b93284a3710dc23e2fd38368318caba7 EBUILD calculate-install-3.0.0_alpha6.ebuild 840 SHA256 00e85481cb7ab34442fd61cdb64b31a649a067538eef6ba181d47971c59bf89c SHA512 f510c8d246d097b7bfc418fdc1bd5401a025b1af1f273e1966e1dd774668b18d0eb8e2f530e4b980564de5fc4d4bce4c445aa09250f656e6a062f3cbb279a251 WHIRLPOOL 3f7f9a1d9939e760b4b09a2d5c2043970ca77e5274010c270430f339da7e99d9b6d823db800db0dd10b856343b77277206c099ee760fb3dc9644eff206c11c15 diff --git a/sys-apps/calculate-install/calculate-install-3.0.0-r1.ebuild b/sys-apps/calculate-install/calculate-install-3.0.0-r1.ebuild new file mode 100644 index 000000000..458632aad --- /dev/null +++ b/sys-apps/calculate-install/calculate-install-3.0.0-r1.ebuild @@ -0,0 +1,48 @@ +# 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/calculate3/${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="3" +KEYWORDS="amd64 x86" +IUSE="pxe minimal" + +DEPEND="~sys-apps/calculate-lib-3.0.0 + !=sys-apps/util-linux-2.19.1 + sys-fs/dosfstools + sys-fs/squashfs-tools + sys-block/parted ) + pxe? ( sys-apps/calculate-server + net-ftp/tftp-hpa + net-misc/dhcp + net-fs/nfs-utils )" + +RDEPEND="${DEPEND}" + +src_unpack() { + unpack "${A}" + cd "${S}" + + # fix migrate + epatch "${FILESDIR}/calculate-install-3.0.0_fix_migrate.patch" +} + +pkg_postinst() { + einfo "For install wsdl for calculate-install perform:" + einfo " cl-core --append-variable cl_wsdl=calculate-install" + einfo " cl-core --append-variable cl_merges=calculate-install" +} diff --git a/sys-apps/calculate-install/files/calculate-install-3.0.0_fix_migrate.patch b/sys-apps/calculate-install/files/calculate-install-3.0.0_fix_migrate.patch new file mode 100644 index 000000000..c01c52378 --- /dev/null +++ b/sys-apps/calculate-install/files/calculate-install-3.0.0_fix_migrate.patch @@ -0,0 +1,19 @@ +commit 26a4bb866ca188b477ab05d150216a2dde98f4a4 +Author: Mike Hiretsky +Date: Mon Jul 30 11:09:52 2012 +0400 + + Fix migrate users + +diff --git a/install/cl_migrate_users.py b/install/cl_migrate_users.py +index fc7f7a2..f7332fb 100644 +--- a/install/cl_migrate_users.py ++++ b/install/cl_migrate_users.py +@@ -472,6 +472,8 @@ class migrate(color_print): + """Migrate users ang groups to new system""" + if not self.checkPermFiles(): + return False ++ if not any(addUsersList): ++ addUsersList = [] + migrateUsers = ["root"]+\ + map(lambda x: x[0], addUsersList + pwdUsersList) + for existMigrUser in existsMigrateUsers: diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest index 77e8d7cce..24c995ce3 100644 --- a/sys-apps/calculate-utilities/Manifest +++ b/sys-apps/calculate-utilities/Manifest @@ -19,6 +19,7 @@ EBUILD calculate-utilities-2.2.29-r8.ebuild 800 SHA256 d6a02af5bdd7e58237f63a34a EBUILD calculate-utilities-2.2.29-r9.ebuild 800 SHA256 85ffc818906d92c7ed85e0697f55c067f274531a1abace92b4b5cf363c71dc1d SHA512 a47193ce66fedf6d044ba9450e283a0bfc50b0c28f16798aea50ed246e894d716fb0db0150fba1ce1c610c4cab79890e2e9741581d5366c2811e0b49b4df6b3c WHIRLPOOL 515eea67ddc3d716c5e52fb33b492dadcb97fe4c04ca3228eb3d3309983680be52d50c4d072146b1a494b0a5b44153bd055184f58485af6a0b8c171ea51494a4 EBUILD calculate-utilities-2.2.29.ebuild 777 SHA256 d4df15af0c92421568962faba7b1dcd99e44062a7dfa1a591fa47a7daa29cc88 SHA512 5c894889bbbac5cc4e0b5cfe938d1b47b8f4ded3884feb5da466dc44fa6414a865c0c7d599a446e21819a41c6e431a3f0d3bb0e8e98299071b9a20b818fb94a3 WHIRLPOOL d1294e1941d5b5e6f77a9cd0aee9b63ea30822a4b46c5ba35d166c6a523f67c891d1f3c1e130ef54cc5859c5cf8fc79ad60e1d92cde9ce4ed12734da7bed2650 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.ebuild 595 SHA256 0b9aeeb84105488a72bf2ed1f8874ada0524e5be004f7fd197cda5158b99da1c SHA512 b89198e5290ac66a4a18d344f77ebc773ae4af977005dd96cd2eb22f125d6035970d698957cfb848d56734e1cc8a2d8ecd5e65b501421ab7153481a501f473a8 WHIRLPOOL 99579fc6b3170695e0db58d432a932ea117c35a9fd2b0896d5018f6b5ab8c25c270e039a343d877214897c546ab891c6f862422d5c170d6f7282841abcd947f6 EBUILD calculate-utilities-3.0.0_alpha5-r2.ebuild 573 SHA256 710d755d8fce836946b51df95f19afaa7e1ab9fa4d29df852069b77530adfe52 SHA512 6457e4e50d9572ef8b22383d40ffd6f785da38d695068f06d39990d6d5ee18903484f4f6bc16f57b97ae67fc7ba68acedfe5efeae9349c8614f98212bfa46f0f WHIRLPOOL 356c78654abf2293f9c4d91f29e41aeeb11b85fcbeba0ee5de06217196b079cc92e2e13cb81b31ee49f5b4447a58da6383cd98ed7b5535ab24dcafa8af960125 EBUILD calculate-utilities-3.0.0_alpha6-r1.ebuild 639 SHA256 0ce4cd722f54f34b39516137e5bdf2f92adf77c0afb9342981cbe05e385171c5 SHA512 14609298312ccbfc484f39faeedad7d4cf5359e73a0b587850818babe46fd520b37ae2181a3877d2471dfb5cf8abc87f17afe817f847070ab115c44be90f3142 WHIRLPOOL 5ea5742c7e6c0d030f4be197ba6fc8d7b39f8e8b81370ebe3ea7fc4aa40682810cfbf7a506aebaf66856b852dad53f82a9457decd87a70a74b537f0731bf395b diff --git a/sys-apps/calculate-utilities/calculate-utilities-3.0.0-r1.ebuild b/sys-apps/calculate-utilities/calculate-utilities-3.0.0-r1.ebuild new file mode 100644 index 000000000..113dba530 --- /dev/null +++ b/sys-apps/calculate-utilities/calculate-utilities-3.0.0-r1.ebuild @@ -0,0 +1,24 @@ +# 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_console" + +RDEPEND="${RDEPEND} + =sys-apps/calculate-install-3.0.0-r1 + =sys-apps/calculate-i18n-3.0.0 + =sys-apps/calculate-lib-3.0.0 + =sys-apps/calculate-core-3.0.0 + cl_consolegui? ( =sys-apps/calculate-console-gui-3.0.0 ) + cl_console? ( =sys-apps/calculate-console-3.0.0 ) +" +