From a5798964ca14e913b6adecfbf4411936f06e30b7 Mon Sep 17 00:00:00 2001 From: Mike khiretskiy Date: Mon, 14 Apr 2014 09:59:41 +0400 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=B4=D0=BB=D1=8F=20=D1=81=D0=B5=D1=82?= =?UTF-8?q?=D0=B5=D0=B2=D0=BE=D0=B9=20=D0=BA=D0=BE=D0=BD=D1=81=D0=BE=D0=BB?= =?UTF-8?q?=D0=B8=20=D0=B8=20install?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sys-apps/calculate-console/Manifest | 2 + .../calculate-console-3.2.0_alpha4-r1.ebuild | 29 ++++ .../calculate-console-3.2.0_alpha4-r1.patch | 152 ++++++++++++++++++ sys-apps/calculate-install/Manifest | 2 + .../calculate-install-3.2.0_alpha4-r1.ebuild | 44 +++++ .../calculate-install-3.2.0_alpha4-r1.patch | 12 ++ sys-apps/calculate-utilities/Manifest | 1 + ...calculate-utilities-3.2.0_alpha4-r2.ebuild | 26 +++ 8 files changed, 268 insertions(+) create mode 100644 sys-apps/calculate-console/calculate-console-3.2.0_alpha4-r1.ebuild create mode 100644 sys-apps/calculate-console/files/calculate-console-3.2.0_alpha4-r1.patch create mode 100644 sys-apps/calculate-install/calculate-install-3.2.0_alpha4-r1.ebuild create mode 100644 sys-apps/calculate-install/files/calculate-install-3.2.0_alpha4-r1.patch create mode 100644 sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha4-r2.ebuild diff --git a/sys-apps/calculate-console/Manifest b/sys-apps/calculate-console/Manifest index 63e8f51..c824854 100644 --- a/sys-apps/calculate-console/Manifest +++ b/sys-apps/calculate-console/Manifest @@ -1,3 +1,4 @@ +AUX calculate-console-3.2.0_alpha4-r1.patch 6417 SHA256 3350c0dc40cde2fabdd6144825f98185d47f8a7ae4c68c68063b9fafe651aade SHA512 8ef91403e053f7dda2ec4fc04d222f8aedaf0d2dca5d8524c21bb19070196a2b4cc48ee72acc0f9a6010796a1555d3bb8a4cf24faa8ea1be4383f5ee03a37630 WHIRLPOOL 8746a2d272fec180b6bf79c0fd41fd18fff56551ff3160862ee019e3a1f88ac80bb6b7d6d0af17120a0164eac189fb990a868326b05c1c83a3df5dc8e93465fe DIST calculate-console-3.2.0_alpha1.tar.bz2 26068 SHA256 7d100a5091b68363c326ea002bd16ad77453c1ab9146350bde0a2d31394f1a42 SHA512 1d03db28fef82ba45547e1a5ffeed8a588f7e6cc0121edc4d85140332899526f50eeae347d8ba10406929b1c71a6760d2d9152ef70e8b29335b9085d2b8c3006 WHIRLPOOL 762eca57fc707d9234f10ce8f2e4f709bd6f0be0c01299aafd1b7b16233166fb13d26a3503be77482e8cbf3c9269a3b62240e538e00a0984f782fa2cb2d59461 DIST calculate-console-3.2.0_alpha2.tar.bz2 26006 SHA256 e05f817beca947e67aa64e42bcf0f370dc4ce1a87306fee3d9b9b83fe93fd7e6 SHA512 962e2e9947326a54cc409cbd3a1e52504338be3634267ca6db48177bdf4d680673fa0b40623ebd67ac22c7e5f324bede8a0c7ef1360b3b280e0e719106d21f2d WHIRLPOOL 80bf07a3f0ae0aab276c0b42a4aff5b0df9dec416eb7e1bec9f2efba5038c89773211251f6d873ccb3d481989d64ffb37e7a0895265283f40598b06fe4d8505c DIST calculate-console-3.2.0_alpha3.tar.bz2 25996 SHA256 7918c472b42aadfb0ef133fa6d56c45f9bb2a5706a4b86937cfea6342b7c084b SHA512 a6c673054458902a188a0053c2d36d609298ee878010bed5422e32c2a7ea4b60050d68485b39ab8ee10d4c8541c92ba557fd801bbe00e4edf09b0879ed568f21 WHIRLPOOL 5704f4f831510873a3eaa74d86f7f4262aef5989deeeee2d094b2bf91c26cd6fd90fa233d215072419a58dd198d0cddb5c377f9187958a1c668fa80e7680932f @@ -5,5 +6,6 @@ DIST calculate-console-3.2.0_alpha4.tar.bz2 26040 SHA256 1ef37adee2c88a6808df171 EBUILD calculate-console-3.2.0_alpha1.ebuild 552 SHA256 29bf3331ba8217017f5575a34b1166b40c736d7cd354ef1a30b0df8338de6944 SHA512 eaed9de8ebfedcaf29ec1ea63a3650a4540abab5b4a10cf384f272b5ae1b8bba193c0dca5819094749eb7e0c36c1bd60e9322da7010ea1392fae9deb1c57a25d WHIRLPOOL 4b1998a3d117ec2fa46326840073fb95d3c81367bfd721de5e072c2e742335a25ea23f4d32afcab6db9f7c112aef6b552281eff162444aa22a1506d9ef25b0fb EBUILD calculate-console-3.2.0_alpha2.ebuild 550 SHA256 9da1f0724e74c97e5fc5ceec8d0daff9de1dab2e102510f5d889ae970d893471 SHA512 37c384750b21b9d63235c1c008b12e28a45735ad1e2ea13f66ed45f410fde9916d150c57af3b8eccf40c7d3642c665f1bc7130bf43d62117e35de68c286a6280 WHIRLPOOL 27fa2e91ac42839a367e7de64b0413f94167d0bbd72bcb7e2708cd2eedcc03d8cd02306b60c65910d60f1b9296db9875ea7a8664f4efdb4339b10e26023b31e8 EBUILD calculate-console-3.2.0_alpha3.ebuild 550 SHA256 23321b8858f599f1eb190e1a055e96f727517409903af9735b998261a12be013 SHA512 fd1cc9c82a8dfaf641edb4482f2728c14bc8a0d62bcaba0617b96b05f814035994551749613e501da27c8f998f0568de6ec93c64bc529c5df80a835442933591 WHIRLPOOL 7bf34019ac1d9a5202a088b8b01e904df67c59f144eb33ee46db1348b2349f47df5fe8aff89083d69c8b279ba1ecb619decc3dacd9b3ad4c80a54f186e23fe3b +EBUILD calculate-console-3.2.0_alpha4-r1.ebuild 695 SHA256 5a368747e46ffe05fb1d41021cecd4f9d469130e0ca5a11dca5d6f7d5e9b6b6f SHA512 362fc9190dbc36135549ff35095720157e26c1d8259a1b2d8817dc0a6bd24b53d7603f794064e67aa945a6dc3b4e97c9db2b6cb5571b7ff443ae4084886ad017 WHIRLPOOL a229306a0f5b0df519456d2dc886b63c1c0401d17f8097aeb9d0645165d70525f460971600df048f027bf0992770745a9af2a277a3200f451dd9c091caa92a00 EBUILD calculate-console-3.2.0_alpha4.ebuild 550 SHA256 ed516e8802681282bb2267ecb4bd005cd4e1099892da0166d66b75605ddd02e0 SHA512 8b550b5018e4398eac1061b80bc106700f619b52eabed76fd2f3d3190e064f9965545bde7b6ccd46d340a5ce674751a59a8c0ec5bd0cac40d82d84e7fe2f0426 WHIRLPOOL 1a22ee90e0e53565e07cabad866666f91dc6251f1544ed266d627f3424526bde9c6e885d43e4e0b2bccd220219287e85806ab57103329ec3fd3c95183079d865 EBUILD calculate-console-3.2.9999.ebuild 574 SHA256 590be3319c98cc65e32e30bba9ef0291aab808fccfb40f872e49d02d6ea14f6a SHA512 f704b0b010d4151483d9455baa7dcd779bb535ef02c48f98761194a330fd6af084f912766291e42341f1243b3f2d82eafcaebcd9b797eaae04cfe3d9709acad9 WHIRLPOOL 7935f5935f36c5ce28d14b09b2b5366147f3ba68d569a6940095d1ebf0eaf17c81421ae3a764dd2c01a17abdcbcff30ea45c1c592223b951d38edadcdfa731aa diff --git a/sys-apps/calculate-console/calculate-console-3.2.0_alpha4-r1.ebuild b/sys-apps/calculate-console/calculate-console-3.2.0_alpha4-r1.ebuild new file mode 100644 index 0000000..5cc053c --- /dev/null +++ b/sys-apps/calculate-console/calculate-console-3.2.0_alpha4-r1.ebuild @@ -0,0 +1,29 @@ +# 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="Console client for WSDL Calculate 3" +HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" +LICENSE="Apache-2.0" +SLOT="3" +KEYWORDS="amd64 x86" + +DEPEND="~sys-apps/calculate-core-3.2.0_alpha4" +RDEPEND="${DEPEND}" + +src_unpack() { + unpack "${A}" + cd "${S}" + + # apply revision changes + epatch "${FILESDIR}/calculate-console-3.2.0_alpha4-r1.patch" +} diff --git a/sys-apps/calculate-console/files/calculate-console-3.2.0_alpha4-r1.patch b/sys-apps/calculate-console/files/calculate-console-3.2.0_alpha4-r1.patch new file mode 100644 index 0000000..f05b1f8 --- /dev/null +++ b/sys-apps/calculate-console/files/calculate-console-3.2.0_alpha4-r1.patch @@ -0,0 +1,152 @@ +diff --git console/application/function.py console/application/function.py +index 0e6f548..77968b5 100644 +--- console/application/function.py ++++ console/application/function.py +@@ -21,10 +21,12 @@ import termios + import subprocess + from OpenSSL import crypto + import shlex ++from calculate.core.server.func import shortTraceback + from calculate.lib.utils.colortext import get_terminal_print + from sudsds import MethodNotFound + from calculate.core.server.cert_cmd import getHwAddr, getIpLocal +-from calculate.core.server.replace_class import printTable,Methods ++from calculate.core.server.replace_class import (printTable, Methods, ++ print_brief_group) + + from calculate.core.client.progressbar import Bar,Percentage,ETA,ProgressBar + from calculate.lib.cl_lang import setLocalTranslate +@@ -97,133 +99,6 @@ def get_ip_mac_type(client_type = None): + results.append ('console') + return results + +-def print_brief_group(Fields, group_name): +- print_group_flag = False +-# if group_name: +-# _print ('\b'+group_name) +- uncompatible_count = 0 +- for field in Fields: +- if field.uncompatible: +- uncompatible_count += 1 +- continue +- if field.element in ['input', 'openfile']: +- value = field.value if field.value else '' +- if not print_group_flag: +- _print ('\b'+group_name) +- print_group_flag = True +- colorPrint._printSUCCESS('%s: %s' %(field.label, value)) +- +- elif field.element in ['combo', 'comboEdit', 'radio', 'file']: +- if hasattr (field.comments, 'string') and field.value in \ +- field.choice.string: +- value = map(lambda x: field.comments.string[x] \ +- if len(field.comments.string) > x \ +- else field.choice.string[x], +- map(lambda x: field.choice.string.index(x), \ +- [field.value])) +- value = ', '.join(value) +- else: +- value = field.value if field.value else '' +- if not print_group_flag: +- _print ('\b'+group_name) +- print_group_flag = True +- colorPrint._printSUCCESS('%s: %s' %(field.label, value)) +- +- elif field.element in ['multichoice', 'multichoice_add',\ +- 'selecttable', 'selecttable_add']: +- if hasattr (field.comments, 'string') and \ +- hasattr (field.listvalue, 'string'): +- value = map(lambda x: field.comments.string[x] \ +- if len(field.comments.string) > x \ +- else field.choice.string[x], +- map(lambda x: field.choice.string.index(x), \ +- field.listvalue.string)) +- value = ', '.join(value) +- elif hasattr (field.listvalue, 'string'): +- value = ', '.join(field.listvalue.string) +- else: +- value = field.value if field.value else '' +- if not print_group_flag: +- _print ('\b'+group_name) +- print_group_flag = True +- colorPrint._printSUCCESS('%s: %s' %(field.label, value)) +- +-# elif field.element == 'label': +-# print field.label +- +- elif field.element == 'error': +- if not print_group_flag: +- _print ('\b'+group_name) +- print_group_flag = True +- colorPrint.printERROR(field.label) +- +- elif field.element in ['check', 'check_tristate']: +- if field.value == 'on': +- value = _('yes') +- elif field.value == 'off': +- value = _('no') +- elif field.value == 'auto': +- value = _('auto') +- else: +- value = field.value +- if not print_group_flag: +- _print ('\b'+group_name) +- print_group_flag = True +- colorPrint._printSUCCESS('%s: %s' %(field.label, value)) +- +- elif field.element == 'table' and field.type != 'steps': +- if hasattr (field.tablevalue.head, 'string'): +- head = field.tablevalue.head.string +- else: head = None +- +- body = [] +- if hasattr (field.tablevalue.body, 'stringArray'): +- for row in field.tablevalue.body.stringArray: +- if hasattr(row, 'string'): +- body.append(row.string) +- else: body = [[]] +- +- # if empty table +- if not filter (None, map(lambda x: x, body)): +- body = [['']*len(head)] +- res = printTable(body, head) +- sys.stdout.flush() +- sys.stdout.write(res) +- continue +- +- ChoiceValue = field.tablevalue.values.ChoiceValue +- for row in xrange(len(ChoiceValue)): +- if ChoiceValue[row].typefield in ['check', 'check_tristate']: +- for i in xrange(len(body)): +- if body[i][row] == 'on': +- body[i][row] = _('yes') +- if body[i][row] == 'off': +- body[i][row] = _('no') +- if body[i][row] == 'auto': +- body[i][row] = _('auto') +- if ChoiceValue[row].typefield == 'password': +- for i in xrange(len(body)): +- if body[i][row]: +- body[i][row] = '***' +- +- data = [] +- for body_row in body: +- data.append(map(lambda x: x if x else '', body_row)) +- +- if not print_group_flag: +- _print ('\b'+group_name) +- print_group_flag = True +- colorPrint._printSUCCESS('%s: ' %(field.label)) +- res = printTable(data, head) +- sys.stdout.write(res+"\n") +- sys.stdout.flush() +- +- else: +- uncompatible_count += 1 +- +-# if uncompatible_count == len (Fields) and group_name: +-# colorPrint._printSUCCESS(_('Not used')) +- + def print_brief(view, brief_label): + for Group in view.groups.GroupField: + if Group.name: diff --git a/sys-apps/calculate-install/Manifest b/sys-apps/calculate-install/Manifest index b7d838a..7e69c6d 100644 --- a/sys-apps/calculate-install/Manifest +++ b/sys-apps/calculate-install/Manifest @@ -1,3 +1,4 @@ +AUX calculate-install-3.2.0_alpha4-r1.patch 542 SHA256 e65e98c21728e29093ef210b38b28bd9c5ed77d9dad23e0b58f47b7a1a5138de SHA512 a2708507707ae6c1742b79f690f57316cac5b59881a0914ab38c507406c48e3fc53438ea4f62da3bb163d6399480a7240862eb315c7706ea145a75f05968c1e2 WHIRLPOOL 1fb0e494376f91a75a29fecffaeb38bb95b0098798d3d574bddd7aca6c49c3373a25cd7bb22b8cb0437bf53c3c4905b61b9824528a2fdf36db301dc3391009bc DIST calculate-install-3.2.0_alpha1.tar.bz2 77373 SHA256 d636ddbfe3fa2990e5a490b6fd23cee7c1f9d2d69fcb975d62ef2cf94b78a033 SHA512 f2e1089828811d0dac18ed3d3e864dc1a543f198edf8b18a23b267b16f2583d75c4f3650ce92d7fd54de489da8b825c77b4d3fe5d788d210810f9909dca48266 WHIRLPOOL ef0d8766eb20eb8076ebcceaaa869d887ea02ccc565a149840ee645e43366de236f8f1250d9a1052e8146c6401f4562b5457cb071bf9ad49db9800ce53c99f4d DIST calculate-install-3.2.0_alpha2.tar.bz2 77181 SHA256 abc155fae93afef3d7aa5d8281e5445e002e0686e86268e850419870aadb3c2b SHA512 0c9554fe492bdbd01f5dba35af0690b621a9f9df48df13404a7d9b65aadc785afd4060fb891e993a8ee0cc22aea707815969e1092727f26568d5d8bb83d2731c WHIRLPOOL 0ae8fe06302a94f450db857fa6f24d40f07193a56ec4834f3de82a707fc5616fb2a3aca3e034e5fdf890c6aa4e61cd7ce94fdab21ecd7d2117f0341803dcc8af DIST calculate-install-3.2.0_alpha3.tar.bz2 77190 SHA256 507730948b2beca15bdf70bb0af8c319766229d41e7b59b13930d3706034bc8c SHA512 b786dcd699707e58487136fc9a60b18912c8db65f9c843bffd6c7c701c6d3ce083dd0e5a7a93f89b3fa8da95c1e10bcb3d891047f78826b8b6ed15d55287ef31 WHIRLPOOL a0666f19decb779cfde4a808e7395b79dbc0b25a5fdf396172b4728711ad76a4de42b73a13f05513727d8dc78a2a5e14fd986c41b08c124fd35d6ee66eac50d5 @@ -5,5 +6,6 @@ DIST calculate-install-3.2.0_alpha4.tar.bz2 77196 SHA256 69d5b92b5e3df781a4581b4 EBUILD calculate-install-3.2.0_alpha1.ebuild 914 SHA256 2ef6cf6b62c46fb65466a7dab039e72178fc98f77ea56104b4f327b2596cbbd4 SHA512 f0853f5ddc2c71754e5249df9c332a04accc390d7514347651a24ce4ace8e93e4ac1a763aadec5fe4de4ffe7277d6c7e477985fda9c3a9c8957afea52b7bcb74 WHIRLPOOL e443c38a254512205f1d141c3d409a44329c22ff56281da462bef683cab2bb3dc2cff416d39ed30fde512c69551005bb099ffb22e90e89f25b1de3e01afe9271 EBUILD calculate-install-3.2.0_alpha2.ebuild 912 SHA256 51833fff84c97b49c86408f08c8d0eb4f6e56edf10be7239c114f751ebd7c30a SHA512 1e6d379cf8949a2c12226042ade00605c6aa8987a8d3213396ed15584da0bbad50fa8ba20e74c145e6658e914a18112afd890d3828c542765b098dbcf1932a18 WHIRLPOOL 460574e3ca234a13f49d0f4edf56e93a76f536f2b46d4693f478bcfc3b0a940610c5c1b32f02d37e5f4ba28cdbed3a79f76f0c094e852f3e5cf12f793cfd141c EBUILD calculate-install-3.2.0_alpha3.ebuild 912 SHA256 219ca7b8fffc380861aea9e5e48d8ca5eb4747f36ba4656e32f8bd3841fe71d7 SHA512 b2c5bf3fe10e622f8293635d577cb1eb07ee4fce584aa7010f8fe3469bb308c92479eb3531480ef1c3aee29d9c9fb7feed3f5d037bfc9972a7ff18f86729e784 WHIRLPOOL fe30a249f0b87e5d1c0bde27600fee673943de5046609f1d282a6f415f4e6d263c75c9258d48eb6d6b5ed546f98ee7228233aca75340032f6fe902163d5ef65a +EBUILD calculate-install-3.2.0_alpha4-r1.ebuild 1057 SHA256 0c3b03eda9902977d17953f45a190e09b86311e62155e4a4b35e5675605d4fe7 SHA512 84a3421cffda225d6ea2afcd43701dd59b245fa25efe0a7eab3c4cbe501490efa553a7c28a18a69de37d24a9def44d46e30e387d1da654d918bb6291fc279ff4 WHIRLPOOL 887cf49f6aacec909e45e464236bde2be7de920d67dc1d92f80282f3e1860d1e217ab07113e8d1c3cb1855150c36cf98202907c7341420441f3e06d18b233816 EBUILD calculate-install-3.2.0_alpha4.ebuild 912 SHA256 551346a50d995d60b6ea747c6b13eead110648da9a354085236720c31b4d17eb SHA512 7cd67aaaa9cca4613c6a660dc8258fe82399829e48411fde8de0c5f36a2b905baa8d14a16392cceb14d81194f5a5b09de6f3792b7d4bd0d8c113c3cfc5570008 WHIRLPOOL 0aa1bbaeb375fbf54a6ee76e1c8156e7bb927d73c3dcf0d0a62ea861731e52d1077ec71013c01ca66673f5d1d97574e76b3f90a59a167196776c62a0361bb4be EBUILD calculate-install-3.2.9999.ebuild 683 SHA256 e355d430ae0b2a2103d5c959adf7fa57a23d4bfa17d77c2bd698114fe6c471ce SHA512 de416bd2be0d4928fc2934724abcd3fd168ba8a945bd680a61b990d01805f3dd22c1955bb819f271357fd12bccd91c25daa058b3c667deeceb255c5d713ff0c6 WHIRLPOOL dcfb7e979a63dad506743834f09b8192fbb5ddd637fde5a6890fa7412b453fa99b7d94f3229149061469ce1a541a1560f97de875aa61a9aa301d5fe97408876c diff --git a/sys-apps/calculate-install/calculate-install-3.2.0_alpha4-r1.ebuild b/sys-apps/calculate-install/calculate-install-3.2.0_alpha4-r1.ebuild new file mode 100644 index 0000000..8611cc3 --- /dev/null +++ b/sys-apps/calculate-install/calculate-install-3.2.0_alpha4-r1.ebuild @@ -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="amd64 x86" +IUSE="pxe minimal" + +DEPEND="~sys-apps/calculate-core-3.2.0_alpha4 + !=virtual/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 )" + +src_unpack() { + unpack "${A}" + cd "${S}" + + # apply revision changes + epatch "${FILESDIR}/calculate-install-3.2.0_alpha4-r1.patch" +} diff --git a/sys-apps/calculate-install/files/calculate-install-3.2.0_alpha4-r1.patch b/sys-apps/calculate-install/files/calculate-install-3.2.0_alpha4-r1.patch new file mode 100644 index 0000000..b011173 --- /dev/null +++ b/sys-apps/calculate-install/files/calculate-install-3.2.0_alpha4-r1.patch @@ -0,0 +1,12 @@ +diff --git install/variables/distr.py install/variables/distr.py +index 5c23c17..001b5cd 100644 +--- install/variables/distr.py ++++ install/variables/distr.py +@@ -143,6 +143,7 @@ class DistroRepository(Linux): + + def listdistr(pathname): + if path.exists(path.join(pathname,'etc/make.profile')) or \ ++ path.exists(path.join(pathname,'etc/portage/make.profile')) or \ + path.exists(path.join(pathname,'livecd')) or \ + pathname.startswith('/dev/'): + return [pathname] diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest index 178af09..ff98cc3 100644 --- a/sys-apps/calculate-utilities/Manifest +++ b/sys-apps/calculate-utilities/Manifest @@ -5,5 +5,6 @@ EBUILD calculate-utilities-3.2.0_alpha3-r1.ebuild 815 SHA256 d979d77520dc609ec65 EBUILD calculate-utilities-3.2.0_alpha3-r2.ebuild 815 SHA256 4d3859770e84dcb76f2cb800c9b198acd7336cdad0f293ec50035c3b00aa3839 SHA512 df293f106eea06c0b8a5cbf533a71cc149aa83647d49df811bb0db8ead9598a22106c005fa3b6d4172bdb94c6440dbcf545aa573842f7607e9fb6b7990e378ad WHIRLPOOL 6d0da416b53f1a04b35b17048d9ad4c25d377a2c7da26ad7d2e3ee55da53b72d0e3d87b480138d798426b38557d1a882804af5a2be4680692eb9725eb38e3706 EBUILD calculate-utilities-3.2.0_alpha3.ebuild 812 SHA256 7aa150fabd4171e2dd45f6892b0596ad7bf3394c629b6f3f383b8c5fd8bf86b7 SHA512 34f08c147d7b3d3f8164ab3d21fdc5ca1e2f82c2a6880a3b93f7ab0771d8b874ed388b311148e69bb9cf4d716542f3d98dbbed7c38422a5b4739299fad5897b0 WHIRLPOOL 20deaa70b41be90e1e1b3d6e54117e6ca26fa394b155d3f3ab4d2d5c617467ce58b76762e31b71f73a969bab361924127832ec2b790c397bedd5045baf20cd1c EBUILD calculate-utilities-3.2.0_alpha4-r1.ebuild 821 SHA256 5dce13bb317b2ae448edb8f61db57a442f21e7a15cdeb90f550ea1cf98d00f9d SHA512 dc8c2c4a3651a0d4b928acc4b47e1a2cd817ec5145207c9eb8ffd9765691ad1fc8bdbe0e44d977bdf1e2c3663a2762ecb6b65cb9e05e5c5793e22293a6add303 WHIRLPOOL 107d63d512a784e296bccd0fbac94904f26df2e4d9a867c8e1cbe347eec183922d7c5addfebc2f896456b866ff59eee93f4951d6c12c7bbb809ab75c007c574e +EBUILD calculate-utilities-3.2.0_alpha4-r2.ebuild 827 SHA256 5bc052d0127a8d9eb83fb309730f11d54f0381e57926c42907d74f3fe60c5433 SHA512 19d5e3c07ee79359ec10c3bb724e104aea05acdbf6f615dad442177c0885b1a4927e3342149221e0dc044ba0e09ab371912790040321e151b1feac18d9c7068f WHIRLPOOL 2a5bb42ece1c8966601916b347916e5bad524704ab06f45d66aa082452abfe3e1ae60592f7331ca306bfde3923447fbb3e231d3d48f0bc144e4fd35be0056494 EBUILD calculate-utilities-3.2.0_alpha4.ebuild 812 SHA256 c3528f2fcb9980d90b8948fe672a64c0a899364a4a8f7a8290990536f7f31631 SHA512 ffad0effd883749802e6dc12779054010949aa2eccf68ee3560f5239c2b45f683cc5ae00d7582fec7d1d0382a35fc6a73411abf1aa58e43417e26b52130885a8 WHIRLPOOL 56d339c417b70eb53d942d533e56bc530e85fdc4f3bf6c8c30ff07af69e0bd98d373d6dbb27b944af4c8e9d596cd1b75424699391cd49b21a48a3ae8bc014fa1 EBUILD calculate-utilities-3.2.9999.ebuild 800 SHA256 acbb7a4e34387baa1ade9bf97637972fbfc97afa56367381d622198b5237e983 SHA512 9e0c74eb499157b6d3ace20d7e9da630660e46b74a6d575e222e1638c87f85660635187489b9312a45f193780c301d87c1dbb9a0f60414e178e8f54080c71ffd WHIRLPOOL 9b56f590f36d29d3518c66c453f97b14d083e36b62adb70a8916ae4e30b527431602a9edd40d703e5cb4296a01f8c982157b602651ee57a9c0ddb7a4c6aa2fe1 diff --git a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha4-r2.ebuild b/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha4-r2.ebuild new file mode 100644 index 0000000..4574bb3 --- /dev/null +++ b/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha4-r2.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.2.0_alpha4-r1 + =sys-apps/calculate-i18n-3.2.0_alpha4 + =sys-apps/calculate-lib-3.2.0_alpha4-r1 + =sys-apps/calculate-core-3.2.0_alpha4-r1 + =sys-apps/calculate-update-3.2.0_alpha4-r1 + cl_client? ( =sys-apps/calculate-client-3.2.0_alpha4 ) + cl_desktop? ( =sys-apps/calculate-desktop-3.2.0_alpha4 ) + cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.0_alpha4 ) + cl_console? ( =sys-apps/calculate-console-3.2.0_alpha4-r1 ) +"