Update install for grub2.0

atratsevskiy
parent 1c7b4b579a
commit d4f85549f9

@ -7,6 +7,7 @@ AUX calculate-install-3.1.3_alpha2-r1.patch 502 SHA256 3ad513c22ac2859a9e126a169
AUX calculate-install-3.1.3_alpha2-r2.patch 1505 SHA256 2005127190dce58002efbd4d553cb5558942f365b99984f0073a32509a2020d9 SHA512 cfaec4e3cc83f3f0faa1848630bd269de82a3644117d144baae15ad53c2748ba9d2fe3d461a94d618dc960b2ac16f967c47904fb6ec14b41ead9d3087d3a9ff8 WHIRLPOOL 24b8095ba592689fd1f831106c2c4d46c2637b0f93ec568043906f470b5dde9cbebee71ed4c008027f5a5405e7ba28e7cb6e33be4e1a77db1f661b9fcdfd5f3d
AUX calculate-install-3.1.3_beta1-r1.patch 575 SHA256 7ac5305f35ce5673757b893dfc951ea388a9fcbac8a0323faea36c73bcb5c0a8 SHA512 91e84e3ef5792b503eec3630d259a92c0c68da564c7f67b33f5945eca0c0489565dc6d0e3b6f2ac1e55c21ec2c88bbb38eda1cea5969d716f8b397dcfd60eed1 WHIRLPOOL 178e381179d17a800eaee930efaedbca43a0eba2b7ed7787d9eb34d552ca6c68caee7318fe1a704882978e9af41c3af919d17ee1004bab432e82c2eba3c76a88
AUX calculate-install-3.1.3_beta1-r2.patch 1934 SHA256 7c3f34fbb480e507d85110892175b607cd6a65f1b16fb3f03eb08d613870be23 SHA512 cd3b6be8114eaa1acca198f4dd7399c3e7059fef7b4f9606cb59df203f539e29f0b6aa37a201060731dd598723f6eb0c2239f3502dee6c71b890023b2b132e6f WHIRLPOOL 8616e91cb05f8baaa5d31203c9ba34e72725c772caf6c5efb18f26d48e84ca012ebcf1b3e897eb056924a98fc4ba439f3b81ffeff9ebe78ccf09b4e4570b4172
AUX calculate-install-3.1.4_beta1-r1.patch 893 SHA256 2446e5cc58eb8526c552916aa1d2559f046f116f5c6fb7ac625287d8d40ca876 SHA512 81b16fcaed1ced91cf041c4d97ee544710976cad2409f53cbc93e3c9c407bc705ca8677a67200dd5ee749cfd50529d724a03dce146759933470a57c09fa25b5f WHIRLPOOL 122b0818af663be1dd44b0e4070b1d2dd70dde83ea227a15b8bbfe18cb1ec1cad5894f065416927bc17b655cf8c1572dbc4f8424bdd32ff741b9f7300f827e6e
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.tar.bz2 75004 SHA256 218d13ff06059ff85e5f473af55a46959cf0a21705f0cf1a4be833075e0b93c9 SHA512 6ea8ce4e78cde0031544628ae225d35ae1abc91d3fee99a14089c83669b3cf3b246e19c702437dbd823f18e37e43284d97a3196fc8296e4362b1800ba7093a00 WHIRLPOOL 3130479118e1314c17488c8c4bb04328726dfffc85e941e2447910795cc47e00a38b683b61a55eed2cdfe54b502826ea813c195e17caf5687855cafd62ebc148
@ -29,6 +30,7 @@ EBUILD calculate-install-3.1.3_alpha2.ebuild 904 SHA256 da5a5db565609278151bc872
EBUILD calculate-install-3.1.3_beta1-r1.ebuild 1074 SHA256 5e7fe04a038c9dbf491c25506c500a7391f4334376d40e8fcb61b3a40172e386 SHA512 1739f1dbfc4559b6a704a5bb8ec378ab23c89c70a1669e03d1a9e6b22ba302aa2c0fc7cd31cbb9845830711a2770b27d721645c77a2fb77383e6d770a6d58f3e WHIRLPOOL 30d92db6a48de5e254f729ccd9f11b3a78a3e3c99b9734acaab9fa4b0d8bb94d31e235823e70449945d08b2a6b6d405b9ae60c0d4cd304f0587bcff57b106404
EBUILD calculate-install-3.1.3_beta1-r2.ebuild 1074 SHA256 8a66e647f37974b89f978d1c66798e57941937a23fabea2c5b9ea8928bad5265 SHA512 3c54db209265e801f0b2a94ca16b417df7f29ffbbee72612ba0285d5a548d1dcd29474ab2ea88b9612711817d2c2ce3d51200ee66baae31d3cc6c695c673bc4e WHIRLPOOL 97105fb9d8144276a1ff2772a0155c9cb1e10f5bff68f0cadd9a212c2436fe25912a69991a6e5c1e15bdb88762a57f3502ec9a5b1d416152ed974e359b38038e
EBUILD calculate-install-3.1.3_beta1.ebuild 931 SHA256 ae7db636351600ec437f5abe74535cc031df440f2b061ca614aaaa5e403e66db SHA512 3643905762e074db775aac2ab0f87a229bec491c1a024fe14b99528f90f6588c0d266abf7e1c14b306f8edfbdcc0f45bd3914aa1bf2f83841af99f68a4d04b9d WHIRLPOOL 671b9779921a896d653f78864f868ffd8dca0dfb55a8c803bcf634f1547d1fa691203292bb454fd66faa5d01214911aaccc1b6915873f0217988323abfe99b63
EBUILD calculate-install-3.1.4_beta1-r1.ebuild 1074 SHA256 6a28d2bd073d813601111f601eb097c705da173cfe03e11c64b2266ea7e80f27 SHA512 60d3cca3705ce8a02168f2a887f6543aee902f74144a002c8b6aa1e5684185e7ba74d9b8de94b409dd9f5f9bb02b0ee54617bb9cef0ce00c73d09c3e09826821 WHIRLPOOL bf2690d296563fe81fea9fd18dc0b79febd97e571d5ecec453cf900a7aa52ba32c6d4fad4204c23635afef510eff588b3ca2d38da4c0bafc2acf99c7ce846a4e
EBUILD calculate-install-3.1.4_beta1.ebuild 931 SHA256 0c74e634e7eac86de571ec0a79ba72f3e0b8f1e513ac093d85c52a6f2c65cf39 SHA512 bba2d5a17649e7a5648b18b6fe8a34155cb4a8424c34487390c5c72f6126f4b51203cf7ccfa1a95a3078f2eedb3bbc240ce08d0724485a78721264725f3e59fb WHIRLPOOL 6f1793b28e57fa51dc690eea6059d37bb0efc13eb227ce03fc3745bd8e21f7ce2005ffa0c57ed61c3915049362a45bddfa96d8845fa806a2a4f95be64f5dcba4
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,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.4_beta1
!<sys-apps/calculate-install-2.2.29
app-portage/layman
>=sys-fs/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 )"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-install-3.1.4_beta1-r1.patch"
}

@ -0,0 +1,20 @@
diff --git install/variables/system.py install/variables/system.py
index 04d6455..088169b 100644
--- install/variables/system.py
+++ install/variables/system.py
@@ -490,12 +490,12 @@ class VariableOsGrub2Path(Variable):
"""
def get(self):
# find grub2-install
- grubInstall = getProgPath('/sbin/grub2-install')
+ grubInstall = getProgPath('/usr/sbin/grub2-install')
if grubInstall:
return grubInstall
# find grub-install and check, that this is grub2-install (ver 1.99)
- grubInstall = self.getProgPath('/sbin/grub-install')
- if grubInstall and filter(lambda x:"1.99" in x,
+ grubInstall = getProgPath('/usr/sbin/grub-install')
+ if grubInstall and filter(lambda x:"1.99" in x or "2.00" in x,
process(grubInstall,'-v')):
return grubInstall
return ""

@ -35,6 +35,7 @@ EBUILD calculate-utilities-3.1.4_beta1-r2.ebuild 809 SHA256 e5cb63571d5d7937cb3a
EBUILD calculate-utilities-3.1.4_beta1-r3.ebuild 809 SHA256 98290aaaf369a9c37b2059fe78633246d774f50d208a007a5c92de4f9738e1f1 SHA512 e928ca239d9c58a789dc886e285b9d6ca1fe06302a8e52beebe2d0a8388157bde94a41988000d8774202f9edea854a7756eec0f70ec56014921b78e3b2189c8c WHIRLPOOL ec71fb03de6d4839cf4cc76b9595215506c354d69ae657fc5e84dcba64b3c673974b6b0ef6810f938936f3d674dc40749013daec29aee5b2357242e419ccb490
EBUILD calculate-utilities-3.1.4_beta1-r4.ebuild 812 SHA256 09e59fabdb74a19e584a1ca65b94e71905a28bddf2545f00bd581b5d005b7187 SHA512 6818d08096f618e970ce0a7634c2806c7c649955590a16569813fd4ea0572effbb77e78b5c524aa3863916038543ec8256a60265c53780fb3291f3fc4484f495 WHIRLPOOL 2cfdc5bb6437b795ac5a375ceed3376676959d80188ce917dc30448fb742453b5a0e890b90b4838b73c2ec212d6ee4d354c16b9506ca15fbfc2ca14076b6007d
EBUILD calculate-utilities-3.1.4_beta1-r5.ebuild 812 SHA256 a417dae9e0b68c9a4e367ac01898954025bb2777af529566928528af3ccba30f SHA512 6321482c545947048ba2ea35e032bab3655e586df60139d38626a67df0edf99b02a3ed4902b4d0284bab78bfa26fc5cd5cdc463265c38fa66bd0e584d3ed33fa WHIRLPOOL 209370c2790d09c7384093427001e04a1652d1d2ee6195976a108a1c35f99f47c62c055dc70a9d09cb2986b1c0aac7df56676528bddd93ac966a09e93a06b274
EBUILD calculate-utilities-3.1.4_beta1-r6.ebuild 815 SHA256 dab992b1902ee151629d96a3db25443babd9eb296a6df1734d16cbd10bfe0c20 SHA512 d551077228870dc320d56b0e73ef525642161d80cf4808fc080eca6c953440299400cd8f8960438c6ed5624a649b416a374b9f241fbd9bc8e8b4211e5de977fa WHIRLPOOL 8b1759343c04db252022c2899a40c92adc5d520cb040d581e002331fe86b8d98f8a9986b4af53a73a6c06d7b09f7c0065cdb79126f3a79967f70c3a0e8dc0090
EBUILD calculate-utilities-3.1.4_beta1.ebuild 803 SHA256 c2c52a9e05c240e687dec688c27d3073ded2682c6cb2ad6825b20aea16d34761 SHA512 f7604ab68017bd116850dc627a3e7ed4aa23a8a99eaa2a95229cde553ce1394629489cf1e59f69de084ccc69cb7241e06978da73f3e4ce7205cd014da3a5b0eb WHIRLPOOL 100bfaf16ad6575c8c14ff8a222bc2641620dfff2bafebdef03949ade4c352b1437838d8b13293c71866ca0db62e08c581b2c1a99a8fa1a466a718fca1494302
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.4_beta1-r1
=sys-apps/calculate-i18n-3.1.4_beta1
=sys-apps/calculate-lib-3.1.4_beta1-r2
=sys-apps/calculate-core-3.1.4_beta1-r3
=sys-apps/calculate-update-3.1.4_beta1
cl_client? ( =sys-apps/calculate-client-3.1.4_beta1 )
cl_desktop? ( =sys-apps/calculate-desktop-3.1.4_beta1-r1 )
cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.4_beta1 )
cl_console? ( =sys-apps/calculate-console-3.1.4_beta1 )
"
Loading…
Cancel
Save