Исправление install-3.1.7

atratsevskiy
Mike khiretskiy 11 years ago
parent f140da0549
commit 6c8fdb063c

@ -19,6 +19,7 @@ AUX calculate-install-3.1.5_beta1-r4.patch 5229 SHA256 a23ca6d36ccab6ad32aea17d3
AUX calculate-install-3.1.6-r1.patch 1089 SHA256 fb814ea558064af3efa77cc0d75626f4f8acc16736bcb2e74fa5405ff81e1936 SHA512 9c703d483c58bfea3eed0dcc9ca365dc5e1de7442e0b9b0e9ad31bedbe67f4a6e9c688a6a2a181de540dbad8cdd763ef80d6e5b00f20e1d0c7870cd7baaa5daa WHIRLPOOL 64ff24c21a0357d38315974005bb851cb9df78983fe4e45ef6affafec2024ac6aef5b3f7560577141df7064817a7ee4f89c55a14dc059744752c610dc9a137e6
AUX calculate-install-3.1.6-r2.patch 1147 SHA256 e60325c5ec8c726006a182e9183d84728f1c960dab07f169a273b9a1adee9fd6 SHA512 297d719522142924f5b348b054ced3a2a8ad8d856fc7201f649f361d8935205c5bb28f049d02241d1ee58f6f49b1bc06897e5ae57fde4fe215b1af84bb0d3f47 WHIRLPOOL 674e6dec3aa345558dbd5b82e566b9f966ed3496969a9b71310fe6a64ae84b4121d99667e15fbfe5b2c6d76a5f0ecfa621167cc3c7cbb684c38d465ccf07687c
AUX calculate-install-3.1.6-r3.patch 7194 SHA256 2e4d5e73bb4d18dbe25f508e0586c4dcfc409d9c0102223ee42ed66d90106c70 SHA512 74dc94b0614882923d104b19392e32925d7283e66f6d8e842e55cc1973ecadd6fba1d8a98c7e30d93ae577a1d2974fbe8c8cb54a20cb5fa05769743dbf65c1ab WHIRLPOOL 5147637209a4019b216a420b8a36365a849d17d809f163f83bec9bddd0ba8182be146a815d9ed5547e9ba0c19de17d70cfac0191eac148b1c23f6851cb6d4fd3
AUX calculate-install-3.1.7-r1.patch 520 SHA256 8f8e8652715f83fe252caa3bd06dc30775e7ed7b87c150b806b117c2dad7b9bd SHA512 5572acf3aaacd1dc6d52abf33b45a5bde1a3066dbd706f66a4c3007367673d91af4c00fa1b5bed704396207a03649401c6d22c4000cfca59f77a67584df6739c WHIRLPOOL aae66e716ddee14f986639b2111016aeb548bd338393d5a59fd05e127949515fa92c5eb1c08b9a11016e42782981460eba10084c514fcc722aa74c7611e46f87
DIST calculate-install-3.1.5.tar.bz2 77476 SHA256 e423d2728cf7d6a7d1a3819adcb970da3f4af8b1c380bc81e92f94754d64115f SHA512 bd8b25799d0f6881691123dc04d2ce78c244d666e9da006b1f9d0ac37581f46d0b5bd4d0e671af650bdcd1018b8c463d4fcb0032d5da0ed24cc5e0df48030af6 WHIRLPOOL 5b1ea10254689614722aeeac398169ffb23d9302ad3e2800e558ae5beeeb4f24644fdaf74260134e89896ebc11cb527b4d66b80424500565a9036237808086b8
DIST calculate-install-3.1.6.tar.bz2 77530 SHA256 799a353e4ca01318508183d5e8a1eb205eba071dc60da00788dfc20449fdffbc SHA512 cd824bf699c63aeec3527fb51fa01737d44d5b41d50126b5553ed6d175a2ce8d46fedbbaf0b69a973f951bee559cce38c974c803c171493f0a9a4c76cd174ed4 WHIRLPOOL db65b051b7c354c35484d957d1c5f25ec04dd8be8246d6ee8551bc8c3fee8cfab98cacb8ca3ac653641d81318d17895edfc155aa45b522460be5f538bb357062
DIST calculate-install-3.1.7.tar.bz2 76300 SHA256 d8c7e4fa93bb7e039b35af18f4febe3f12c7286265adde7e3de6c46591227858 SHA512 06374b95631061e16d98315921b98cd6e5902154ec2ec7a30a8382782a0ffbb54b49a1a32cca4000dfaf9f9f10121df0869fc00520c176f348220b8d6a952026 WHIRLPOOL 3cd6a87766e61c158aa4d75da86bc7761c2309cffaf49c4a0e11fbcfa3e70a39a46bf5640758e2f6e8a260b1e5244a45d72263199e8507068a54e9abdd93c9ce
@ -28,6 +29,7 @@ EBUILD calculate-install-3.1.6-r1.ebuild 1042 SHA256 8426818f57091c99d22e61f6fdc
EBUILD calculate-install-3.1.6-r2.ebuild 1042 SHA256 c10827c0ba5688daf200277c4ffa08cacbec4e01ddc021ec0f759220019c1760 SHA512 d90a0ca89b891b081d54398ef271b8ad90f4f16f5a3c9d610c1c3e2965ecd9044c7e0dc555bbcd536a6cf75161ea5c4283f7b35172483f88ac9564e6ff0074cf WHIRLPOOL 5cef5e2b3c2d40c79d37869fe84aff63ae368164bc1fe18ac6c3452517256974820a35773e71bef5270721578d5682825c289d03c370505e7239b785888ef225
EBUILD calculate-install-3.1.6-r3.ebuild 1042 SHA256 474f803954d18922a224ae9d754dcbd8dbba56be471e30f93db73b243fed5bb9 SHA512 0631ca0a9452835cae1d782385dd624464a06342f6332f6b8e85ccc4d53a9caf5b7cb066f9df2d31db42df7686484bd39d383969912247d7d7853e5e84876889 WHIRLPOOL 2f9f501c0ca24a94197ff354ab96aa08e26ffd12e5ce5c8261b2936178f33f3801fa100150c3d34ef7f2fa73a35b14f51b409c090a56c1021a6aaee38f1b9e70
EBUILD calculate-install-3.1.6.ebuild 907 SHA256 33527703fef3598925222ffdfb68e904a430663bc7b69ea457afd0466d09e5aa SHA512 fac7cfda71f39df8c10bd1dde70f0fdb54b877a84abf16931c044eaf32e2f32061e808aecf6c9d1484671f778b46d95183ae0661b5f7959f0fc68839642f76af WHIRLPOOL c848eb10ff81bafc8b044203a60c1f086d5eda505e5eb5356264bdb18d27d6ab6aa00fc6f735962c0b28e509a2703791f1c2da7f379332b9bd4d5503bf402635
EBUILD calculate-install-3.1.7-r1.ebuild 1043 SHA256 669aeedb9156306211aee21c6ece5883782ba506e5d9ea9ee28086515fb2a300 SHA512 2370e32ae9cd82d0d96b1bdfe716cfc7fbba6ed4a1abd46e97c6d832e82130c63e8bf930fce33782596e841993c3267e354124bb0cd56e43b1de70cd3034b644 WHIRLPOOL f2b1e9a2c0279fafa1f8814e9a5f180da4fd85f740fe46f35e36cc2c0f69e01e5a10c6e0b926e0e91480e7d18088cd1d1e219f75791d66ec7d5c92955343ae5b
EBUILD calculate-install-3.1.7.ebuild 905 SHA256 0b2c216b63a22a08c992c79f29716bb30c707dd16ef1fb6ad4d96b7f8dee4e12 SHA512 197e6a774b11b3bc132406b9f8ea6db0d75a65705b2f49eaabd639c20268ade04693e237b1f7aad394a58d4435c67fb5a7d69f4a4d8b9eaff0258a4cfc7c0b96 WHIRLPOOL f699d1dd054775dd99a0d887b6e1dbad75a930f40d43f17be1923bd6757fddb69872733eebc6dddbbc97fac316d43183da5bf9788c5300c7df48b72c94a34077
EBUILD calculate-install-3.1.7_alpha3.ebuild 903 SHA256 f46a82b8ce98a91fb985b89842c4dc9fdf9df9270cccb0f29a20356461926526 SHA512 4a773306fb813922ca15f988659db910ab5abf923d73b9393851410afaffc7623f6d5f7d6f8e89e6add737b04d0a9444a32465815a26b4a3c808f0c523fba7f0 WHIRLPOOL 57680c7304dab947405672dd3ddd15459a49b41b71e8f6496c4e004820c66b9aeaf4b4af3032603338c33af28a1863dcf9fec9d0c57608500bd9352b781070a3
EBUILD calculate-install-3.1.9999.ebuild 683 SHA256 e97dd6f046d54a16eee281fa35790c92507b150bc940f3c2b36117e6f44f0a8d SHA512 c1179c500dcaa48506f6334e9e2ccc3cc70d712b2899d7e1d9265bc202f088ab71baa1aaea462deee56fdd5244bee4ab9b9a9da72f25ec511d4f2fa0c3c35f43 WHIRLPOOL 010d35b929fce496b5f16228688e23a95c9c87ebed0d290eeb454e5c1432b55b3b276dfb5786a27222543446a1090ce2f133d80373649fe72341b508d1e16a78

@ -0,0 +1,44 @@
# 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 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-core-3.1.7
!<sys-apps/calculate-install-2.2.29
app-portage/layman
>=virtual/udev-197
!app-misc/livecd-tools
sys-apps/iproute2[-minimal]
!minimal? ( sys-boot/grub
sys-apps/gptfdisk
>=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 )"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-install-3.1.7-r1.patch"
}

@ -0,0 +1,13 @@
diff --git install/install.py install/install.py
index 9456d36..3ae3eb9 100644
--- install/install.py
+++ install/install.py
@@ -400,7 +400,7 @@ class Install:
'lvm_vgname' название группы томов LVM, bios_grub - создавать
bios_grub раздел
"""
- ap = Autopartition()
+ ap = AutoPartition()
ap.clearLvm(devices,self.clVars)
ap.clearRaid(devices,self.clVars)
ap.recreateSpace(table,devices,data,lvm,lvm_vgname,bios_grub)

@ -17,6 +17,7 @@ EBUILD calculate-utilities-3.1.6-r7.ebuild 770 SHA256 95ec2690ba5c66cb80ea8d4d23
EBUILD calculate-utilities-3.1.6-r8.ebuild 770 SHA256 9deaec7921886d3bd8ea7311d670a539a924fe476d78c20d3eaa0a6c6593bf87 SHA512 d14635f419ae2ffe4475bd331908658c6d39de9fe819d3e7662260ee1f611d671e20629620ee272ceac20166d1a5a388e11f24578f07b8569c81451897591a96 WHIRLPOOL cd6509c1c2b2bfa7bb5556e158aadbba30579b60084563232c2cb86235c9947986039701f9b07672a95b9d9b91dec4db32189566db698767797f6ca6eb9bb33b
EBUILD calculate-utilities-3.1.6-r9.ebuild 770 SHA256 6e7549041c73f70faaf165cd312de879df143f96420b020962d45281eb076c59 SHA512 45fc1fd1235409ed899884292f6afc3eef77f32bc0684f9882fc4115e97d462076186bfe2bcb04053476aa1117a9db6794b5a6bd22455308c6c9a180b809d0ca WHIRLPOOL e44ca1a30cfdbcda959d6e8f049b627e6e355ebd5b7c3bab1af003bc5e02580022d131fae342b64cf888d5abff595aede67411a1c12d7f96a91b035875ef96ad
EBUILD calculate-utilities-3.1.6.ebuild 751 SHA256 2d16a50709c95db821dfd8ab018ba3091cadc598beddb4ae5e11a22d00ce369f SHA512 f420988a061c8a424b69a8cc890690d44052497b317082d5c8f7bada302caf3bcb38cf59e5f7ab4a2ba35b9f44c84917ca3b6fa6faf3899920bbed7be53611bd WHIRLPOOL b03385eaaa7b8b54ad3a1cb4761a20e16913526f6fb1005498c2de1260ac067ad178085fb9efa73b77617dc94fe1dcc884670a45d6664ccd48e89b527e78b21c
EBUILD calculate-utilities-3.1.7-r1.ebuild 752 SHA256 506f1d908e8c5bce6fae29056c68c1d272d2f79be5ebf1374d964dbc7f8a5adf SHA512 b33d779d2194092436839443d90b125ce8152a49a12ff1f214ea608c14145a74714b927c25ab264a06ddb0239c981f7ff75acd25a6f6d904f09de225f577124f WHIRLPOOL cb93847cfddc36722adc7018f436c84cffb4f9a8831cce7ba55acfe52989dea177060d964098a979f0d7ce54db8505081f2196e20fc91c8475323215f6c9988a
EBUILD calculate-utilities-3.1.7.ebuild 749 SHA256 5e3c2801a4d882899a36d2725df07a92ff46036f2ac4b6cde93d31e0748f4bed SHA512 a833efd2b4426e09fba7759ed77aa85785302aa57d0d03d2c8e40a418ebdf7b2ea239d0b9ea3d8cb5ea6e6476e0681838d71cb056bfd69c9cefb274044964f13 WHIRLPOOL 54708a1515b3c3ce30a6c65fe7714a61577220f2d05a3292f1cc5e016c6e9b5a74dc6e11b1649e37cc3b8d7994a594148d63d7d9525c6a6459d879aa76e3e567
EBUILD calculate-utilities-3.1.7_alpha3.ebuild 803 SHA256 7c2196a6173f4e8fc50692ab1eaa869e78bceff0ff4eccc71b60f9c4474bced9 SHA512 07fd6dc5f71c83416e36305b0d547e93253df1f1d9588e3d7ae97f017df7198ab83520b6cd631fdb6d5124c16d1ef8ff1b7e1d61949eeca294527e83eb99d22b WHIRLPOOL d140f0a494b8c4b9c12aadd855ce550e1ec7d1e90025182117296c869be255eb077d266c6253ecd5f7af0fd25d0a307909af6bda6003c69268c74141c9c92e8c
EBUILD calculate-utilities-3.1.9999.ebuild 800 SHA256 9de4807341cb552ef8d4f702e9c4a0ca10c52c9d532cc2eb741cea29b92f09b5 SHA512 b35ed4d49c4943a5ad375e646bece419271900c50301153408b30dede0fe834e098baaa42a21c130730c0bc32ba09decc588277da6782d2010c18c9d8df679ae WHIRLPOOL 78e2c5ee8ef8356c4fc0275f920177778925278cad78585ed37c08048241f775030e59a0ced0696fba6379741fe865dc339d190c46b5f2173097328a73c64a24

@ -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.1.7-r1
=sys-apps/calculate-i18n-3.1.7
=sys-apps/calculate-lib-3.1.7
=sys-apps/calculate-core-3.1.7
=sys-apps/calculate-update-3.1.7
cl_client? ( =sys-apps/calculate-client-3.1.7 )
cl_desktop? ( =sys-apps/calculate-desktop-3.1.7 )
cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.7 )
cl_console? ( =sys-apps/calculate-console-3.1.7 )
"
Loading…
Cancel
Save