Update calculate-install

sys-apps/calculate-install/Manifest

@@ -7,6 +7,7 @@ AUX calculate-install-3.0.0_fix_set_active_partition.patch 2970 SHA256 a7609de29
 AUX calculate-install-3.0.1-fix_ntfs_pxe.patch 4851 SHA256 65d3ca4a1ae999e8ced80e29187fdfb3ebcfc74d996af5608e94f119e69840b7 SHA512 2f82f09f19b09fc464e1239a371ad3039cea036d91363c410c0d9aaf10c51930de6e1ae35cda5604d2de411b2578566927d42af220c00f3ede9c8fd9aef2c6f8 WHIRLPOOL 4cd63015c7a545b3651c36e96685d49692ae7ed73efbf68c334b9ac6ec5fe6bd41e58c1c760272fbec9b308b0e7cfbe5c932380351836c196f982023c9724b14
 AUX calculate-install-3.0.1-fix_pxe_loading.patch 469 SHA256 9548a22ef53e4368152b9365571d96633aafc1700b6e56abe6bf67899b7a6901 SHA512 b18b2d274ffe911e29ff1ea9f85f9c20edbec22c1f568829097688de8989ab08ebe374790232a6007cc12367ed59c915a9bac97c5becbd5721b985b3e1ea3d2b WHIRLPOOL 79e7aac1f7cec01812e40f8e1d440559080433b1816e095871eb87e61081420675ee38796cf2b40d0c29a46723683f3ca6d76cbdb0b79c69b1dc646bfcd57602
 AUX calculate-install-3.0.1-video_install.patch 1051 SHA256 f8de9ea137b44f8fc80dca5d3ae0957b082d433bf936f1923eaa24fb4c8122e4 SHA512 76986cc5648382b35180ad193ae6667252be1983655576dde80b9b3110fa5ba65fe8d17740baacf41b96d6c589fb6e62841e636fdad7d3df567b8c140fc97c5c WHIRLPOOL b91bc6a58b8af082fb7dce6c80dd9d483b4f38ffe0832f921d0e0e69f44d12ad45e73d073a867681e456ec5b28b63be75f437d85e6a1e2960ce5c26670700971
+AUX calculate-install-3.1.0_rootsize.patch 707 SHA256 3540351c1f75acca62a955338f1ab91883624b7ac7d4fe8efcb1478385210dbc SHA512 529554babdcbf6259b9b56eecdc896f86a6504d00a60e7d7d3cbb760afb0e60c022a6968d24f591ed682ca81643f6d54e6687cf47383fe88617767e61db8611b WHIRLPOOL a5cd58cb3f416d5a0ea89301eef2072a98eb3c30fb6407782d4fcfcaf01b6c7cea7f8438ff113beb461bbaff7fa4f8c3064c0f2cb6cc116d9c065b531b16577e
 AUX calculate-install-3.1.1_alpha1-r1.patch 8478 SHA256 a18dbd8963e9ec8a7adafed4fddb0b813c8133cc2cb265f744cabd5a9f432293 SHA512 c684ed60c0e1dbfac8f36f4d3340958ab41a8352af24f478b14901bb5f169cf3c8380145f592e8424e3df6a6d85929cdfa4de343245549884a53bdd8b61461f6 WHIRLPOOL c9f83be3507b6209d4ad23716c3cc1389938bcfcab02b5d38452ce7599bfafdb6c98f25271cdb054a0297217104a0deba1dd8a3a3acf739409af3e9a32b2f5ac
 AUX calculate-install-3.1.1_alpha1-r2.patch 10335 SHA256 0dd9bd90a2d775f7af48225bc0722b1e32f4958018a310605cdfe7369ef4224e SHA512 1ff1bb76242da55786e27047e1a05ace2fd57b59db5c135279b92aee8ce7c97875de380c9160e170535f4aeddc369b34374417f78a34ece5944e2951797e1974 WHIRLPOOL e23376bfd9eae823a0b41714d0125647ea588d8033a636f44b80dd2726f79c884b28220a8eaf66bda9d419cbb17369209fb32ac4ce228c96e337c60701a19ffd
 DIST calculate-install-2.2.29.tar.bz2 82398 SHA256 0d1b5fcca2711f31fbd5680dea652fa7765ad781529ba80c5fa92cf736d73d10 SHA512 f9623ec564cce283a3813a2a308347b64d5368c06b0665de5223c9c2d75dcfb00348def034e958718ba9e9fa8a7ea2fa76b90fd0b4dc4e41bebf6222ee4a5da9 WHIRLPOOL 57361d7f5270cc2782d32635b02b1150a506f8e517ee916d66bc6df0c8c037193ad6fa33cef1c7b5fec6867204ea06c2778983a4bfd722b41af3c9d1c172270a
@@ -44,6 +45,7 @@ EBUILD calculate-install-3.1.0_alpha4.ebuild 903 SHA256 a0c81faeda0cde14a40592d4
 EBUILD calculate-install-3.1.0_alpha5.ebuild 903 SHA256 17a3f8ff40b2f2cb8b91c91d591a180314a1642b16852a294bc1217975e5a497 SHA512 c4b120ade1e2b71865871adcd6250dfdc78a78270ed2a91344e70ba57eea0320f47a329c30e2d318b98a85944f2462bdbd62e4a236fd3b7732764f264e2e9beb WHIRLPOOL c6954e714d371771859eafe627ada00e52a4b98b6cfeccb754fead6cf02472d5a26fbeefd28190af23e663f84eca317b6c2a5798553073f77f8bc7dfd2444412
 EBUILD calculate-install-3.1.0_alpha7.ebuild 903 SHA256 527c9ad52b9565e8715214c37ae84c61e016467a03b06db7ea9fe92e4f6b6adb SHA512 251bd48ed29fdc2d802fec65a1c4510df45549b423b4f85750ddff2ba951fdecb695139db22afc3531b5a8414586ac70b93c123cc538ae526e7628c8cb439e87 WHIRLPOOL 84fa656d75ce17d442a6221ec04fe3a2ab39e5cf6828778ab469c10f9de5f0daa0479c5f8737d82915426f08eb53bca35ca957d50d07e1e2eff536c297e67b2b
 EBUILD calculate-install-3.1.0_alpha8.ebuild 903 SHA256 f1645c97938bf1184b6cb5042170094e085e6369a9242b0d15c2fd8fa3e15d80 SHA512 7cb7b1c6f8b4ec4d0758a9ce575ba6fbb2fd2baa34b6f591605c2ee74abfdb3988fb8f03603d4d2d3000c5c682873a7af5faa63dca1d64d913bdd1cfc68f029a WHIRLPOOL 22f45cd404c74bff1b40f0063eaaaf93628256c0cc691738d7385c7bd1966329120f43647a182a4e90b488531fb39b7ee0364ef0427a9c18ccb565f214c25624
+EBUILD calculate-install-3.1.0_beta1-r1.ebuild 1070 SHA256 cb3627e42b0792c5124eb1ae902ae51ad75735607a4795a97890382c9fd44672 SHA512 0cdb16c45906d47aff34cdb295e9a700131b077e7df66aa59a4cd5ef3e34d6d172384881d09c77c0ec0620b2e26b09fc43c5eeeb380c9ec59ce72b4e8b7afe9f WHIRLPOOL 105f43fc91c14056f701e21cc850f59f0f178fe8aa4b1d787f9b854c500661ba3823315fc4797165e3f367c22504666a2bc2b0fa7961cce344385565f487997f
 EBUILD calculate-install-3.1.0_beta1.ebuild 913 SHA256 162c66a51cde79208fa6f6513f81d702d1719de1f66b1b538b9dde8a0d8bf6e0 SHA512 552e305e23e9ddfbe57862fb81b907c64351ff1e94e69ed5cda3323efed7fd2fc03fc85106e9387b29e160d96f48b8e0b7de0e470a62cf375902a78729c243a8 WHIRLPOOL 2ec4a2f2f56a9c48bd5898d4415ff21a46bd040a9fd8475c6a5c8307db5d02cf005ef13d3ea81d49334722db9940b5d2dc603b833eb44e85d83a59af5a505bc3
 EBUILD calculate-install-3.1.1_alpha1-r1.ebuild 1048 SHA256 50d12d7b3034447a4aa2eeb33519f88a7497557907e6bf7a79920a6cef73d945 SHA512 79aca35223d73a217e7e4126e39772830078acc48a97eb16bbcb031b6c583316974943a58478b09e082f7829ad87830d93e2aa5ab0fbcfa37a892bea4f17ea0a WHIRLPOOL 3230df92bbf0a3ac22b0099fa44a72350edb044ef2b032729665ad64e8b0779640b9aa524d92b784275868ce09d556efa85d88cb13a110de2b819e69e10b397c
 EBUILD calculate-install-3.1.1_alpha1-r2.ebuild 1048 SHA256 0b031334a03b79c03ca9e7232fdc06b4f73f097f29dd1729cce7b63d4f1d75a3 SHA512 0ef4694f63c2d5aa7e8bc08df6f0556e9a6b0819af15225ccfc6efd62baefe7772530788341622e963872f6b06da9b9d7da1ea50883e15fffa04f94299410614 WHIRLPOOL 4e253f55d58d83d3b3f298838a6e6ffea69d05c5ac43e80cc4b949c63365f141f9f417f7b0512f670426c59326e6f426b991eb237232392f08a82f27427eb985

sys-apps/calculate-install/calculate-install-3.1.0_beta1-r1.ebuild

@@ -0,0 +1,45 @@
+# 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-lib-3.1.0_beta1
+	!<sys-apps/calculate-install-2.2.29
+	app-portage/layman
+	!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 )"
+
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+    unpack "${A}"
+    cd "${S}"
+
+    # fix check root size with /usr using
+    epatch "${FILESDIR}/calculate-install-3.1.0_rootsize.patch"
+}

sys-apps/calculate-install/files/calculate-install-3.1.0_rootsize.patch

@@ -0,0 +1,14 @@
+diff --git a/install/variables/disk.py b/install/variables/disk.py
+index 6aa1b02..9856204 100644
+--- a/install/variables/disk.py
++++ b/install/variables/disk.py
+@@ -782,7 +782,8 @@ class VariableOsLocationDest(LocationHelper,Variable):
+         ################################
+         # check size for root device
+         ################################
+-        if self.Get('os_install_root_type') != "flash":
++        if self.Get('os_install_root_type') != "flash" and \
++            not "/usr" in values:
+             for mp,size in filter(lambda x:x[0]=='/' and x[1].isdigit() and \
+                                            int(x[1])<7*1024*1024*1024,
+                                izip(value,