From 680085a22f153db822ed610c2e68976c15baa7bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Sat, 9 Feb 2013 13:59:45 +0400 Subject: [PATCH] Fix install --- sys-apps/calculate-install/Manifest | 2 + .../calculate-install-3.1.3_beta1-r1.ebuild | 45 +++++++++++++++++++ .../calculate-install-3.1.3_beta1-r1.patch | 13 ++++++ sys-apps/calculate-utilities/Manifest | 1 + .../calculate-utilities-3.1.3_beta1-r3.ebuild | 26 +++++++++++ 5 files changed, 87 insertions(+) create mode 100644 sys-apps/calculate-install/calculate-install-3.1.3_beta1-r1.ebuild create mode 100644 sys-apps/calculate-install/files/calculate-install-3.1.3_beta1-r1.patch create mode 100644 sys-apps/calculate-utilities/calculate-utilities-3.1.3_beta1-r3.ebuild diff --git a/sys-apps/calculate-install/Manifest b/sys-apps/calculate-install/Manifest index da218db6d..05dfaf821 100644 --- a/sys-apps/calculate-install/Manifest +++ b/sys-apps/calculate-install/Manifest @@ -1,6 +1,7 @@ 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 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 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 @@ -13,6 +14,7 @@ EBUILD calculate-install-3.1.3_alpha1.ebuild 904 SHA256 0a22dceffde505ccf1b24699 EBUILD calculate-install-3.1.3_alpha2-r1.ebuild 1048 SHA256 6ed11fccd5a2d185891b030140e303e85ae992343cfec98b5ae7517df5742822 SHA512 2ff20f0fba69890e8d3423bb84a80792f79a9bc7ff94a131a83cb81d1bb83837e854f1ab911c33431dfe07617c280de3b520a68e9e10c438b165b26af9b71630 WHIRLPOOL 86e41f0ea4638d01d81e51d4dbe9e8849634e9fe3cc02af517dd2aea69c0532f68c545dde40166fc3ce338f1586bc0b99ddb0139071efcfe8a2728f16cdbd06d EBUILD calculate-install-3.1.3_alpha2-r2.ebuild 1048 SHA256 d5fdcf68b660f988af2bb37839df11d61c14f6b8cbeadb3353bb2823bfb8cc1c SHA512 6a713450d2e00be419ad307407e20d04edf6e5a6f9a25cec4f9b952321a6d92c409cd264c9c1535ff456847715841b2ad6bd0768ba7cc2652531089fecf81743 WHIRLPOOL 667e6f637487cb83c27124acce64caada0d4ddb3ec2f70ee229a807979a3bc1c1e5e60fe5d9777107437692290ba6ae2f07d97e75e9afeb60aee36e9d7cd7c2b EBUILD calculate-install-3.1.3_alpha2.ebuild 904 SHA256 da5a5db565609278151bc872afbe913bc3211a35d0724858c005b2034d04491e SHA512 72d7188fdad6f4007fb27a92f261a9ce14eb8a8e745e43558a39e27d65b3020663ac53626915213c6cdc38d35241221f6676036e8330eef22232b6e69936af47 WHIRLPOOL 38fba08b9f081d041c876204e8d5a408fe2862b9cce55436a384f8402660b9496fc0476d5e743ec8530ccebe54a3fb818e980104afebcc6767a64ce5e91859c6 +EBUILD calculate-install-3.1.3_beta1-r1.ebuild 1074 SHA256 5e7fe04a038c9dbf491c25506c500a7391f4334376d40e8fcb61b3a40172e386 SHA512 1739f1dbfc4559b6a704a5bb8ec378ab23c89c70a1669e03d1a9e6b22ba302aa2c0fc7cd31cbb9845830711a2770b27d721645c77a2fb77383e6d770a6d58f3e WHIRLPOOL 30d92db6a48de5e254f729ccd9f11b3a78a3e3c99b9734acaab9fa4b0d8bb94d31e235823e70449945d08b2a6b6d405b9ae60c0d4cd304f0587bcff57b106404 EBUILD calculate-install-3.1.3_beta1.ebuild 931 SHA256 ae7db636351600ec437f5abe74535cc031df440f2b061ca614aaaa5e403e66db SHA512 3643905762e074db775aac2ab0f87a229bec491c1a024fe14b99528f90f6588c0d266abf7e1c14b306f8edfbdcc0f45bd3914aa1bf2f83841af99f68a4d04b9d WHIRLPOOL 671b9779921a896d653f78864f868ffd8dca0dfb55a8c803bcf634f1547d1fa691203292bb454fd66faa5d01214911aaccc1b6915873f0217988323abfe99b63 EBUILD calculate-install-3.1.9999.ebuild 683 SHA256 e97dd6f046d54a16eee281fa35790c92507b150bc940f3c2b36117e6f44f0a8d SHA512 c1179c500dcaa48506f6334e9e2ccc3cc70d712b2899d7e1d9265bc202f088ab71baa1aaea462deee56fdd5244bee4ab9b9a9da72f25ec511d4f2fa0c3c35f43 WHIRLPOOL 010d35b929fce496b5f16228688e23a95c9c87ebed0d290eeb454e5c1432b55b3b276dfb5786a27222543446a1090ce2f133d80373649fe72341b508d1e16a78 MISC ChangeLog 33978 SHA256 a1cc544f9763b08b3647d90fac1ec53748016bb23260181315896c8c02431443 SHA512 11a09ba60fbc727bd47b57653b4bb0937d98774eb9ca95680a5b55997c7e22db3976cbd0878d908fa0200e04b6cc9eb0ae9ac6f1623235490e2e46e54cc1f7f4 WHIRLPOOL 50352c2950f301cbb5116b8c9972e592767dcb03bd71d081c75de5e69b2a920331abec4756658faf64e291bf6f4f41df67b8d62946683629a2c99b48274eb2f3 diff --git a/sys-apps/calculate-install/calculate-install-3.1.3_beta1-r1.ebuild b/sys-apps/calculate-install/calculate-install-3.1.3_beta1-r1.ebuild new file mode 100644 index 000000000..7a6f1f398 --- /dev/null +++ b/sys-apps/calculate-install/calculate-install-3.1.3_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-core-3.1.3_beta1 + !=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.3_beta1-r1.patch" +} diff --git a/sys-apps/calculate-install/files/calculate-install-3.1.3_beta1-r1.patch b/sys-apps/calculate-install/files/calculate-install-3.1.3_beta1-r1.patch new file mode 100644 index 000000000..ff3e0466a --- /dev/null +++ b/sys-apps/calculate-install/files/calculate-install-3.1.3_beta1-r1.patch @@ -0,0 +1,13 @@ +diff --git install/variables/net.py install/variables/net.py +index 438745d..c8801c4 100644 +--- install/variables/net.py ++++ install/variables/net.py +@@ -263,7 +263,7 @@ class VariableOsInstallNetStatus(NetHelper,Variable): + if getOperState(iface) == 'down': + return "off" + else: +- "dhcp" ++ return "dhcp" + rootDevNfs = self.Get('os_root_dev') == '/dev/nfs' + return statusValue(getIp(iface),"on" \ + if rootDevNfs or isDhcpIp(iface) else "off") diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest index eb8c45549..4aae919bb 100644 --- a/sys-apps/calculate-utilities/Manifest +++ b/sys-apps/calculate-utilities/Manifest @@ -14,6 +14,7 @@ EBUILD calculate-utilities-3.1.3_alpha2-r3.ebuild 812 SHA256 46238607ec31e40f974 EBUILD calculate-utilities-3.1.3_alpha2.ebuild 803 SHA256 be01b87609bb1b287f82b5a48406ccfbb17906ace9d2144cb57fe40cdba73816 SHA512 fd81ae89c64096bf154fa332abbc3427c2e9c328e175cef0246c490f9429d55a208c16f7e81e36acb139c6d18d3914e9c602f2dc9339a13f4cbd70ac29f488cf WHIRLPOOL 002720d8a1da914617bb3a5103b6a304ccc838a8c2d6418539d9ea0fd9678a603f8080218a2902897ba4708f32c2780bba3379767fb4bc3096f419e42507eea2 EBUILD calculate-utilities-3.1.3_beta1-r1.ebuild 806 SHA256 ba655d79aa14ce24e6b221e1f62158fb0049e5c6d94a2eb2cc51c655a968dc20 SHA512 a37270621ed509b8fca0f7c0758e85495079dcdb2330ec24b34175931438114a3ae5eff2c45e0a109efe8d10decba18987f1f3e4651e9611626ea721f8dbb1e0 WHIRLPOOL 26f7be0f59aec9e56e64fb125c9306c6302eac57a17e05e7304304e6bf3157df3d5c015a81e1ed1f6c3cf21be1ad80d7c1ac46f53ce4f41f8116fadc9c660671 EBUILD calculate-utilities-3.1.3_beta1-r2.ebuild 809 SHA256 00dcf7db8c6efc7591905bcbd7523af25f04852d457fceabf3fc2c97ed6e057c SHA512 21114baf6b43e95ae00f242a7f630f34332a93f4ea547ed8d59c6220d2afeff92a65766773c62c93bb254ffedf248370cb6323ca76997eeada4b7d0c1bd324eb WHIRLPOOL 2f20c5ff8ed3e7537b9983647e948dd8c10d565f5e3cd248762f561894b4f3986b817f42a3aea4ed612c0604ec502e8bc83b44c88dbd9ab1a68a7a986979fa22 +EBUILD calculate-utilities-3.1.3_beta1-r3.ebuild 812 SHA256 e816f55a780aa59f8fd0b8e79a6ef948102e9092b2e40a2ca422766644925ef1 SHA512 1c9bda4bf37e2c7509d781727248ff335fdebcb40c54ab6f159cc9d7c6b06aa536274e42d5e9944fa511e9da49ee17d3a74d8de14553257136cddd4f0b40622c WHIRLPOOL abb37ae6a65aeadbe921ad0c477162e7f5476a4b3b3c4586717db4622f283b43482ca5d3d70a2778bce3042d0cf61f8b4ef508f8a4550cc75b253d2befe294f8 EBUILD calculate-utilities-3.1.3_beta1.ebuild 803 SHA256 01fe721fa13a5f482817adfcc1acda6d875c3e89bbe5e7b040678eb2dcaca955 SHA512 514968f56a539337f960abb8d0e3667cfaf28832c3b6dd301f100be03419e6edb9b8bfa134eb2613b192d2ca657cfe0a78c06e2d33c939f20ec1a9b936290fd5 WHIRLPOOL 57cab0053e5e467282758747c1a967eb27b936a3bedc47a58c6f9a40baf1964a9419dcc96beaa022fd91ba66906eabed29fed29e9f9217a2536d2afb135db693 EBUILD calculate-utilities-3.1.9999.ebuild 800 SHA256 9de4807341cb552ef8d4f702e9c4a0ca10c52c9d532cc2eb741cea29b92f09b5 SHA512 b35ed4d49c4943a5ad375e646bece419271900c50301153408b30dede0fe834e098baaa42a21c130730c0bc32ba09decc588277da6782d2010c18c9d8df679ae WHIRLPOOL 78e2c5ee8ef8356c4fc0275f920177778925278cad78585ed37c08048241f775030e59a0ced0696fba6379741fe865dc339d190c46b5f2173097328a73c64a24 MISC ChangeLog 38731 SHA256 7e70a0bc1f3b34c0011f3874773a698a4bb96eb6d3dad10903575156bb8578bc SHA512 2de466ea990b9eac702b81fd097c3f5d06d1f4db1a4bd1d1b7380b45e551f6fd62c16564ecfc810246157d3ef1113ae373041580e70981d44752e50ed6134bc0 WHIRLPOOL 5ca0cee1ad0e9419f91ec11a9629b9a29db9fcbed4f5ae0aef1f8a2170ff58112c8580d61884c56ee410a0abc201fa8f4419cea35077fc8bb84e733f6fa6f4db diff --git a/sys-apps/calculate-utilities/calculate-utilities-3.1.3_beta1-r3.ebuild b/sys-apps/calculate-utilities/calculate-utilities-3.1.3_beta1-r3.ebuild new file mode 100644 index 000000000..08f506ba2 --- /dev/null +++ b/sys-apps/calculate-utilities/calculate-utilities-3.1.3_beta1-r3.ebuild @@ -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.3_beta1-r1 + =sys-apps/calculate-i18n-3.1.3_beta1 + =sys-apps/calculate-lib-3.1.3_beta1-r1 + =sys-apps/calculate-core-3.1.3_beta1-r1 + =sys-apps/calculate-update-3.1.3_beta1 + cl_client? ( =sys-apps/calculate-client-3.1.3_beta1 ) + cl_desktop? ( =sys-apps/calculate-desktop-3.1.3_beta1 ) + cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.3_beta1 ) + cl_console? ( =sys-apps/calculate-console-3.1.3_beta1 ) +"