Fix install

atratsevskiy
parent 78970da5c0
commit b48e51dba6

@ -1,4 +1,5 @@
AUX calculate-install-3.1.3_alpha1-r1.patch 4307 SHA256 eb870bc9f54ff5aba3cbd742bdb36cb22152b8cbb19a61d714d0ce1603934440 SHA512 7a5e77718a76a43e4c35324cbd00d72649ddfc97b4937a20a2cd988282e7433f783677de6b2dab1a1c579d547f3daee9ca50738466f2011118239f6a3d93459e WHIRLPOOL 51892e67f3588f7d5ab5b3b5bf9faa2fe2095a1bbae5f11368f65fe89a43fc5a9d83b1fb25b8a94952f13978d36e536fea47750fc2df396d065c482abbdc5a02
AUX calculate-install-3.1.3_alpha2-r1.patch 502 SHA256 3ad513c22ac2859a9e126a1694111a664f7c0d6fe0016c90a480fcfea6b13ae3 SHA512 66e41146c26b6974c67c9982900355bc6881417f98234f404a2d881fbc2e2b556eb29fccbc8b1806af3c3a8f4de502308d2b574c106419d760aebd493e46e362 WHIRLPOOL e63c0f582df739fa04dc7f5240838d3a8b4c9e25bfccf3253620c8fcab236a9b87ce2efabf6146dc9de563fd040a4e3f9c0405273b990ae806bf0f63d12a5321
DIST calculate-install-3.1.1.tar.bz2 74372 SHA256 d1d18e85c686b66bf3e4a2f66a43fa59ecaa53518110dafb3ee51de161032137 SHA512 dfb315511f9f358a6ae39f0fd211faa7a862787c347b758f48f6dd6b7f373e93bc8b9b1abfc7e84c170d35b4bb4d22053149cd9ef2875a6f89b7115e678b110e WHIRLPOOL dbe98f30ad64739c54e4735344f2e5842f383556d78dd47c682a20938263eaaa305708e3a5c37983df874731329e4d5dfa29f5130552478dfd91078524d8a33d
DIST calculate-install-3.1.2.tar.bz2 74810 SHA256 04198079715e86aeb505c33583c4556eff2981f36cc85b6d09260f4e6b49ea72 SHA512 49611ae979ba894ccbf1306a185c0d9b7221389793d8fe4ce87d6da3d29e3a98f0be79440660970496f77f9cba5c6dc90832d5abc60c630d269fc9c66083709d WHIRLPOOL 7bcaffb6cdb38d734a03616e8107cc0e087ffad1de0de0ddb4783d239b08438bb56e2e043971c4ebde6c734770f552056ad343589c1acccf7bb38b396f162608
DIST calculate-install-3.1.3_alpha1.tar.bz2 74697 SHA256 183fc8e5575ca2f4275061bab13b4edae2b7352a61f8828d5703eb285135544e SHA512 df83b3142f6d66ff5d73af3017dfcddd0482f72037f6cb49f48616e6690aebd7be78d866250709a4144ae0ce8bfc468718ce8833dd8d78417bdf58a648128c9f WHIRLPOOL def3338e2bf68614b2246d09f6ef0eef15c420447782f46657ed7bd83be111d5f0e44b0ecc2ee2f3cfbcd0df7907b04df4aa091c941c43e50dcf133b1a6b7c5b
@ -7,6 +8,7 @@ EBUILD calculate-install-3.1.1.ebuild 906 SHA256 aaaafe01b587aafacb6f495b6adf596
EBUILD calculate-install-3.1.2.ebuild 906 SHA256 ea08e9f4d8c27ef8cda30320ad3c3d7ea99d63fb3aaf3dd762d24449a1bab269 SHA512 25f4302cff9f848e945ae51eca6a396fe448bfbb298e31ba285fa3c0a1d99735aab81f5f08fde0d84a2c76b582b85e0e261561f216375c17cbc1aee6a124e97c WHIRLPOOL d31d28271d1faf838519bc380d0b5d2fbb5d241491fd20f4eac52557f40849aa1463e074d70e7de5101266936f200db0bfaeb481180b6f86303824f0b2725250
EBUILD calculate-install-3.1.3_alpha1-r1.ebuild 1048 SHA256 3fa9bbb64ea988df0b66b8086758624c3d7ff984e95c8a3529a1d9260d998c34 SHA512 cfe85b006cd5590f8161f236fd15a05000a4bbc77c43adee897949d6e467835bed3f573d1d98f90d247235ebe3107395409fc7460f1184a278e3d3c9af1d1fb4 WHIRLPOOL 2d78f4f17fd24de740e4e7118e97862b8c392bf03eccd0abdcab67281f0b62ababdb8d5f2b720dbd5ff05eaab27c43917416aac1d2a5b1199fb35d4b07ea4fce
EBUILD calculate-install-3.1.3_alpha1.ebuild 904 SHA256 0a22dceffde505ccf1b2469986581a3672e934e44fdae8ef45da80a00377a513 SHA512 c2c4aebd72d2a028552db5a84e6ec37b7d9dddd172e74351f7fcee633be4a69af3002552c55066d515d53a09d26549180264f7989ea6a9da46b0d5b9f6233d25 WHIRLPOOL ff5568134b57666f07a703f37e23b3c839790e1f32aa3560fc5d4971284bc63ab91bbd8a22d95e7877413b9e2cd762f2763f702c7f34312aaa2e6baddf4dbf1f
EBUILD calculate-install-3.1.3_alpha2-r1.ebuild 1048 SHA256 6ed11fccd5a2d185891b030140e303e85ae992343cfec98b5ae7517df5742822 SHA512 2ff20f0fba69890e8d3423bb84a80792f79a9bc7ff94a131a83cb81d1bb83837e854f1ab911c33431dfe07617c280de3b520a68e9e10c438b165b26af9b71630 WHIRLPOOL 86e41f0ea4638d01d81e51d4dbe9e8849634e9fe3cc02af517dd2aea69c0532f68c545dde40166fc3ce338f1586bc0b99ddb0139071efcfe8a2728f16cdbd06d
EBUILD calculate-install-3.1.3_alpha2.ebuild 904 SHA256 da5a5db565609278151bc872afbe913bc3211a35d0724858c005b2034d04491e SHA512 72d7188fdad6f4007fb27a92f261a9ce14eb8a8e745e43558a39e27d65b3020663ac53626915213c6cdc38d35241221f6676036e8330eef22232b6e69936af47 WHIRLPOOL 38fba08b9f081d041c876204e8d5a408fe2862b9cce55436a384f8402660b9496fc0476d5e743ec8530ccebe54a3fb818e980104afebcc6767a64ce5e91859c6
EBUILD calculate-install-3.1.9999.ebuild 683 SHA256 e97dd6f046d54a16eee281fa35790c92507b150bc940f3c2b36117e6f44f0a8d SHA512 c1179c500dcaa48506f6334e9e2ccc3cc70d712b2899d7e1d9265bc202f088ab71baa1aaea462deee56fdd5244bee4ab9b9a9da72f25ec511d4f2fa0c3c35f43 WHIRLPOOL 010d35b929fce496b5f16228688e23a95c9c87ebed0d290eeb454e5c1432b55b3b276dfb5786a27222543446a1090ce2f133d80373649fe72341b508d1e16a78
MISC ChangeLog 33978 SHA256 a1cc544f9763b08b3647d90fac1ec53748016bb23260181315896c8c02431443 SHA512 11a09ba60fbc727bd47b57653b4bb0937d98774eb9ca95680a5b55997c7e22db3976cbd0878d908fa0200e04b6cc9eb0ae9ac6f1623235490e2e46e54cc1f7f4 WHIRLPOOL 50352c2950f301cbb5116b8c9972e592767dcb03bd71d081c75de5e69b2a920331abec4756658faf64e291bf6f4f41df67b8d62946683629a2c99b48274eb2f3

@ -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=""
IUSE="pxe minimal"
DEPEND="~sys-apps/calculate-core-3.1.3_alpha2
!<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}"
# apply revision changes
epatch "${FILESDIR}/calculate-install-3.1.3_alpha2-r1.patch"
}

@ -0,0 +1,13 @@
diff --git install/variables/net.py install/variables/net.py
index 6485769..297d736 100644
--- install/variables/net.py
+++ install/variables/net.py
@@ -332,7 +332,7 @@ class VariableOsInstallNetCidr(NetHelper,ReadonlyVariable):
"""
Get CIDR of ip,net (Example: 24)
"""
- return map(lambda x:maskToCidr(x),
+ return map(lambda x:maskToCidr(x) if x else '',
self.Get('os_install_net_mask'))
class VariableOsInstallNetMask(NetHelper,Variable):

@ -7,6 +7,7 @@ EBUILD calculate-utilities-3.1.2.ebuild 749 SHA256 23558c58cc6efdda2a0b7321557d0
EBUILD calculate-utilities-3.1.3_alpha1-r1.ebuild 818 SHA256 9381052d8609547b849322555d695c96661792a6e8106a9cbf17e69b158ec1a0 SHA512 ad74b7a70bfea421b5d28a50b30c2367e77bc42de55a1375cd9776f1a3f19c0a324e715c759ccf3509eb3634e95e1bbce40aabcf2791fb872adb3cecae4eed4f WHIRLPOOL 357adffc40512951f5a9a50ee4a47544a8e0ba622dbfd528332004e8c4f8999e4fd50c68de0bf5c42a6af54af688a24f94cb09510b8cea3a35b8245efbb0e579
EBUILD calculate-utilities-3.1.3_alpha1.ebuild 803 SHA256 7ef89ba267b68943d2f00e4b36d58aa43bacdbd2c41c46199fd29a7781ba4ff7 SHA512 afebbd3b0f55d94c941586309a325909e256f331e86b8f71698a97d3dc956d3354a81d0e09ae0f794c06078164bf1a89640dc50192560459b412952c8366d1b8 WHIRLPOOL dad73afc7addffd0bd6dc63fd85be1efd23ec41b31ff98e3bd60d9d58a1a6cd522ee9c0c8ebdcfea8e54b63b0696a7e80c62365208328900c3946661233d1373
EBUILD calculate-utilities-3.1.3_alpha2-r1.ebuild 806 SHA256 6ca1850d59edee024f90e0e74c168d30f4c2267d5fcc72cb8a01e7b22e7d07ba SHA512 6f153b7f880b14a570800ccef25c1053f76910f9a56d1f62c2525aaf5698f51fd55292a6e16dbc06be0b69486892cb5be66c6f794df4ec2ad2bbe52b008c030f WHIRLPOOL e8e1dd16412d55be755ceda73853b5d35a554272e4f4bda34cedfd00e41f56c9cc1e2a88c856c482724f8b0440aa09458cccab7dd90e526735cfa9f9212d98e9
EBUILD calculate-utilities-3.1.3_alpha2-r2.ebuild 809 SHA256 be22ba06b42fa9cf14707d6caac0e371a6437fe029b0d96d0655c7bd76c84f9d SHA512 72be0a6acccddcd52b468fbe578cbe767966ad2e088889b7dca7c89a55d3cb64795433b21d6f3c4167dfd22d5a177ae3e01ffca04ac46a8ffe9c0aa36e559319 WHIRLPOOL 0c18a70a2ee11a398d854d295cd5cab59a00f4f2217d17d203b2265fbcee2852ea36671b8742ff58f8e36c52843b6279716927e5da109d9463669c91a25b5be2
EBUILD calculate-utilities-3.1.3_alpha2.ebuild 803 SHA256 be01b87609bb1b287f82b5a48406ccfbb17906ace9d2144cb57fe40cdba73816 SHA512 fd81ae89c64096bf154fa332abbc3427c2e9c328e175cef0246c490f9429d55a208c16f7e81e36acb139c6d18d3914e9c602f2dc9339a13f4cbd70ac29f488cf WHIRLPOOL 002720d8a1da914617bb3a5103b6a304ccc838a8c2d6418539d9ea0fd9678a603f8080218a2902897ba4708f32c2780bba3379767fb4bc3096f419e42507eea2
EBUILD calculate-utilities-3.1.9999.ebuild 800 SHA256 9de4807341cb552ef8d4f702e9c4a0ca10c52c9d532cc2eb741cea29b92f09b5 SHA512 b35ed4d49c4943a5ad375e646bece419271900c50301153408b30dede0fe834e098baaa42a21c130730c0bc32ba09decc588277da6782d2010c18c9d8df679ae WHIRLPOOL 78e2c5ee8ef8356c4fc0275f920177778925278cad78585ed37c08048241f775030e59a0ced0696fba6379741fe865dc339d190c46b5f2173097328a73c64a24
MISC ChangeLog 38731 SHA256 7e70a0bc1f3b34c0011f3874773a698a4bb96eb6d3dad10903575156bb8578bc SHA512 2de466ea990b9eac702b81fd097c3f5d06d1f4db1a4bd1d1b7380b45e551f6fd62c16564ecfc810246157d3ef1113ae373041580e70981d44752e50ed6134bc0 WHIRLPOOL 5ca0cee1ad0e9419f91ec11a9629b9a29db9fcbed4f5ae0aef1f8a2170ff58112c8580d61884c56ee410a0abc201fa8f4419cea35077fc8bb84e733f6fa6f4db

@ -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=""
IUSE="cl_consolegui cl_client cl_desktop cl_console"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-3.1.3_alpha2-r1
=sys-apps/calculate-i18n-3.1.3_alpha2
=sys-apps/calculate-lib-3.1.3_alpha2
=sys-apps/calculate-core-3.1.3_alpha2-r1
=sys-apps/calculate-update-3.1.3_alpha2
cl_client? ( =sys-apps/calculate-client-3.1.3_alpha2 )
cl_desktop? ( =sys-apps/calculate-desktop-3.1.3_alpha2 )
cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.3_alpha2 )
cl_console? ( =sys-apps/calculate-console-3.1.3_alpha2 )
"
Loading…
Cancel
Save