Fix install --video nvidia

atratsevskiy
parent 17236a802b
commit ac07b66262

@ -1,10 +1,12 @@
AUX calculate-install-3.1.0_rootsize.patch 706 SHA256 ca1e8220dafcc5942406644a6bd99a08f54fb94c19b13feeb73c85d2991ea787 SHA512 de2fc9472d4677de1beb903ed70030b1f625842dc6c5b214977b30f2e98e06983f0972634ea57268a1f070f0fe1bde10b661ec7a7750d2c1a31e4a883894ed67 WHIRLPOOL 97e4a373ac13e73bcba520182f1a4fd959cea2757ce1bf0fce1809bd487c03adb67ac288c4f0dd159fa375ca4156fe7ac17e1326cecfcc54c50d789bc881da2e
AUX calculate-install-3.1.1_beta3-r2.patch 2978 SHA256 011577ee13f4144f60c75591958f4aa85e67e75fde425dcaa98f191bee7ed654 SHA512 e3ab2e6a09d2bef6dd07f39a63cf4cb2b7c8197a585591e5de638bfe3140d44f13e6526f1ec7090b5bcaeadad9eeacf0d2637d3bee0e5486ae13d1db7a9cff9b WHIRLPOOL 41cb390786281b17fdba5afcb04f3ce450d11b8c913a5698077422fc7fe55565b31e2950107a3770c55fbb8722396e1d2cfae74b06c958d044c8b5f97804693f
AUX calculate-install-3.1.1_beta3-r3.patch 500 SHA256 6554a78cfc39b13cb6446bb672ffdb27e688f4bdd20c8659012edef4be1a2b4e SHA512 0c43d157e91a31c9043f27b92371acbf514f4d4a8251996b47edadc246adcf46da155e0c9de8b055f312670d342a3d54a59169a904ec50e2845d262a7093bab1 WHIRLPOOL 4d125139685433dabed9b0ded00c766b9bc1ebd17574f2b2a6f56205a2ee35f5f5ca9268dd47aed60dbd3ba62f2df571fde26709f4d1e1895b09f75b78da79a9
DIST calculate-install-3.1.1.tar.bz2 74372 SHA256 d1d18e85c686b66bf3e4a2f66a43fa59ecaa53518110dafb3ee51de161032137 SHA512 dfb315511f9f358a6ae39f0fd211faa7a862787c347b758f48f6dd6b7f373e93bc8b9b1abfc7e84c170d35b4bb4d22053149cd9ef2875a6f89b7115e678b110e WHIRLPOOL dbe98f30ad64739c54e4735344f2e5842f383556d78dd47c682a20938263eaaa305708e3a5c37983df874731329e4d5dfa29f5130552478dfd91078524d8a33d
DIST calculate-install-3.1.1_beta3.tar.bz2 74351 SHA256 17fddc728727d1324fe1ece634d6987f55f54df7c520dded6ee20a631a9860c3 SHA512 524c25aec9e8b330e0fd9e4e0e3ce8a97994795dae336b391bc325a9ebd82c436886015d049ce515b7b2adb0c3dcded1370c45150e3c7d2d2acbb077b2ba4838 WHIRLPOOL 2b5633e4997625b31a3907dfca0caf5ba47e5f0522cb1a9fe4f22412b6abda7f6160d19ee290a277d494f0c60d36222fa792514cf4b27b72a9b4d914122f081c
EBUILD calculate-install-2.2.9999.ebuild 685 SHA256 5b6fe8d4f7c8109f9adcdfa6546bb253c9f04e1d10dc6b1aa6b1087c2486d096 SHA512 0b74f8bb94ba419869cc209963bc8f79cd98e4ffdd95b400f3e6c80d32da23ed314c3ec6bca6163f32e64c6dbdb1503a23e68d49c8f011c762a77b03bc94a326 WHIRLPOOL 5c9e1acddd461064c67e152429e98651298c54c8e4a7f5c9c419cda4045b6a1b5221a5bbfc3c95dd03b48f157d40e1a37e8f7e42e9aacff4575851150cbdb9a4
EBUILD calculate-install-3.1.1.ebuild 906 SHA256 aaaafe01b587aafacb6f495b6adf596a8be9e4c9c03b54f4142237810113cb1a SHA512 23499fb16a46927045c2b9647efe927ee3941c691825be4f1855d024c43e8039353a84dd6187e75d7e3e1b7433a31ef4408a9d148bab92fd80a28ee28e3af50a WHIRLPOOL c35e222f37e2b50e67f7e3c0fc6e1552a582afe188737f042900a5edd35ab528a4e45314a96292fbbfc7b93f87a78b45ed22a45d9d571846fd3e0e71345c9a38
EBUILD calculate-install-3.1.1_beta3-r2.ebuild 1055 SHA256 a9c434ddd6da2e452e5e3d728d4b2e4d7511862a6f15d2dd2d8cd94c21c15dcd SHA512 f8ba42b6cbaf863ffd7eb55610447693108f45fe7a6bcb7ed98b205b86d8fdc724ddb5c410d37475432fe1c0d17183f71764b3bf224ac38d12141a535b02754d WHIRLPOOL 58169f6227ae3423e62328b9b90054f8a5ff26fff1c788719168dfebd640336cbb344abfc730c8a73580507141d88b116c713ef76ca08253bf9e6314761a5f6b
EBUILD calculate-install-3.1.1_beta3-r3.ebuild 1119 SHA256 91973d20d044bb3c86130bbf34146fc7811ad0e3d47fa6ec73c2e89f1b556b59 SHA512 1e23a9a7944244819dedcf5fea19cbc4bb9191ba99ff3701f9d3e7d22db2b7157c9b6d7089f7dce6813d2c83bec4accaf7039f7ecdad590cbd2028bf025465e2 WHIRLPOOL 156ec963f18d51aa3e7c19697a3db0d525ba48557e76e35662bcd91579c92173cb998c16468c06e29e64c1e694595853cfa59a656a24838790875c02191efe1f
EBUILD calculate-install-3.1.9999.ebuild 683 SHA256 e97dd6f046d54a16eee281fa35790c92507b150bc940f3c2b36117e6f44f0a8d SHA512 c1179c500dcaa48506f6334e9e2ccc3cc70d712b2899d7e1d9265bc202f088ab71baa1aaea462deee56fdd5244bee4ab9b9a9da72f25ec511d4f2fa0c3c35f43 WHIRLPOOL 010d35b929fce496b5f16228688e23a95c9c87ebed0d290eeb454e5c1432b55b3b276dfb5786a27222543446a1090ce2f133d80373649fe72341b508d1e16a78
MISC ChangeLog 33978 SHA256 a1cc544f9763b08b3647d90fac1ec53748016bb23260181315896c8c02431443 SHA512 11a09ba60fbc727bd47b57653b4bb0937d98774eb9ca95680a5b55997c7e22db3976cbd0878d908fa0200e04b6cc9eb0ae9ac6f1623235490e2e46e54cc1f7f4 WHIRLPOOL 50352c2950f301cbb5116b8c9972e592767dcb03bd71d081c75de5e69b2a920331abec4756658faf64e291bf6f4f41df67b8d62946683629a2c99b48274eb2f3
MISC metadata.xml 464 SHA256 0e3ea52c58e77580b778f7efb9f476811c168febe02e656961c71a455e4f4d7d SHA512 dd79935fabf9b629ee0913eae0cec88b0d6e46fc58e9b430e07e2a60f2e0ce66e8c257a3da33e17663a778d2a18b3a12f96f18cbc6e009f071788ed9353e4a29 WHIRLPOOL 8f72663b95c36637d15d40e0c56e5fd9e7e06e073993d202d788df1704bb979e794cde966428675f158786e273ba5677151d15d8e40a4715f769172a8ebf3e1e

@ -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-core-3.1.1_beta3
!<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.1_beta3-r2.patch"
epatch "${FILESDIR}/calculate-install-3.1.1_beta3-r3.patch"
}

@ -0,0 +1,12 @@
diff --git a/install/cl_install.py b/install/cl_install.py
index 6cd63c5..d7f7d4c 100644
--- a/install/cl_install.py
+++ b/install/cl_install.py
@@ -557,7 +557,6 @@ class Install(color_print):
maskNvidia = self.clVars.Get('os_nvidia_mask')
if maskNvidia == curNvidiaMask:
return True
- self.printByResult(True)
self.startTask(_("Driver installation for %s")%
self.clVars.Get('hr_video'))
open(nvidiaMaskFile,'w').write(maskNvidia)

@ -11,5 +11,6 @@ EBUILD calculate-utilities-3.1.1-r2.ebuild 758 SHA256 1f8ad1e134ac71948505ad81a5
EBUILD calculate-utilities-3.1.1-r3.ebuild 761 SHA256 70e0fb66ae382253295eeb211bd9ead7cd0e9cb0308362f6d2eacf6e2d382c0f SHA512 2ac5b5accbd60460defc2d51c035834842c9088829e1876fa60c854f718406f41f20cd6351990d396328e7d56caa66b0751c597b357948a4db4ab6bc56f0ffec WHIRLPOOL ac28164c7b3811c9dc03418d11cb0f79c6fa71bf969f93d06f7dbf2435cf898f3f16da80032bc112785e0e7e71fa6ac8f8a1bb7e6731f4561603d7b5590b619d
EBUILD calculate-utilities-3.1.1.ebuild 749 SHA256 df6b6d875b18d091ddce2afcd0af74efc1a5c05ea0b80e3f312329cbe1656de4 SHA512 d57113ea24cbf233b7aeeb543103003c83573f4412fe35a19a9f2fdca4a244b0ce180c3f0c7bc6f17aef04239dee71222250f27ea8ef2810ace18ea7099ef590 WHIRLPOOL ec34fa0a52cdfd9eedf0c10bd8932f85328aa7000b1f78d185b81825e248f5affcac5e45886ef218565dff4c16a71b3b802d83ffa675039b96173cf24e1a9510
EBUILD calculate-utilities-3.1.1_beta3-r2.ebuild 812 SHA256 be02d0600b91b4cf83e4f4c2807197c51cd3829b4aeebdc1972aed946cc7063d SHA512 8e09bad010ec1e9a327b2100c925214038dd58287efd859562a29ed6a9d7a71c70a585acb9796f0b663e972dfdfc49c66d6198959d9170477f99f8fc99901231 WHIRLPOOL cea0d6e1415e36d8a4f8793700e22da96bb4465d7e7e15cee40bf3941368c034e8b0ef7f7f90967807059a256100eb681ce87c4b25d1e796fab53bbc3592f2e3
EBUILD calculate-utilities-3.1.1_beta3-r3.ebuild 812 SHA256 80766e058811a96e2398e79d7324798b75ab044033ac540b6e8881f37b480fa5 SHA512 645ca1ab5bc4a89e5f50927aabbf9bd398c5c7fe5e317dd149e9928c982208c4a9c9c6753f61bf2d1baa6c867420f6d2f40628dec9a1085acdd0d7504cc87704 WHIRLPOOL c384ce9c23ec9b47b6f1787e70e3011a9b8ab0a1c5c547a18c9d0ce890c453c83901223cb4e409f858c504a18bee075dcc797b1db2b299ef74a71c57d70c8648
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="amd64 x86"
IUSE="cl_consolegui cl_client cl_desktop cl_console"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-3.1.1_beta3-r3
=sys-apps/calculate-i18n-3.1.1_beta3-r1
=sys-apps/calculate-lib-3.1.1_beta3
=sys-apps/calculate-core-3.1.1_beta3-r1
=sys-apps/calculate-update-3.1.1_beta3
cl_client? ( =sys-apps/calculate-client-3.1.1_beta3 )
cl_desktop? ( =sys-apps/calculate-desktop-3.1.1_beta3 )
cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.1_beta3 )
cl_console? ( =sys-apps/calculate-console-3.1.1_beta3 )
"
Loading…
Cancel
Save