Update 3.1.1 alpha1

atratsevskiy
parent 7f0e153924
commit 1467f90753

@ -43,7 +43,7 @@ EBUILD calculate-install-3.1.0_alpha5.ebuild 903 SHA256 17a3f8ff40b2f2cb8b91c91d
EBUILD calculate-install-3.1.0_alpha7.ebuild 903 SHA256 527c9ad52b9565e8715214c37ae84c61e016467a03b06db7ea9fe92e4f6b6adb SHA512 251bd48ed29fdc2d802fec65a1c4510df45549b423b4f85750ddff2ba951fdecb695139db22afc3531b5a8414586ac70b93c123cc538ae526e7628c8cb439e87 WHIRLPOOL 84fa656d75ce17d442a6221ec04fe3a2ab39e5cf6828778ab469c10f9de5f0daa0479c5f8737d82915426f08eb53bca35ca957d50d07e1e2eff536c297e67b2b
EBUILD calculate-install-3.1.0_alpha8.ebuild 903 SHA256 f1645c97938bf1184b6cb5042170094e085e6369a9242b0d15c2fd8fa3e15d80 SHA512 7cb7b1c6f8b4ec4d0758a9ce575ba6fbb2fd2baa34b6f591605c2ee74abfdb3988fb8f03603d4d2d3000c5c682873a7af5faa63dca1d64d913bdd1cfc68f029a WHIRLPOOL 22f45cd404c74bff1b40f0063eaaaf93628256c0cc691738d7385c7bd1966329120f43647a182a4e90b488531fb39b7ee0364ef0427a9c18ccb565f214c25624
EBUILD calculate-install-3.1.0_beta1.ebuild 913 SHA256 162c66a51cde79208fa6f6513f81d702d1719de1f66b1b538b9dde8a0d8bf6e0 SHA512 552e305e23e9ddfbe57862fb81b907c64351ff1e94e69ed5cda3323efed7fd2fc03fc85106e9387b29e160d96f48b8e0b7de0e470a62cf375902a78729c243a8 WHIRLPOOL 2ec4a2f2f56a9c48bd5898d4415ff21a46bd040a9fd8475c6a5c8307db5d02cf005ef13d3ea81d49334722db9940b5d2dc603b833eb44e85d83a59af5a505bc3
EBUILD calculate-install-3.1.1_alpha1.ebuild 903 SHA256 378ef80d9f3b10f21ac738a89431496bfdacc42cc325fffd0aff6f50fba44653 SHA512 f38277935a0e6c628969eb1277a80c877c445989e27a1af7176086dfd47a418a9a9e923d4a6737038a916b153e64d251e348915e0afcbb9a965d89dc3b60428f WHIRLPOOL 7d1c6f9be7369adf17194f97a684667c746c12dc7d71764a1d5ee5bc862539757b08f1fc67f73e30da9815405beed452050f7bb3ccad9bd6813324a8f774dd98
EBUILD calculate-install-3.1.1_alpha1.ebuild 904 SHA256 45d39126404729c9b5568105d072158b7678125aa9ee0e2919c06a24d1ea2aaa SHA512 b77c01fa6268e9a7b7b1da11276a3e37750ba6316b66062a51bdff328d6d40805937d4dd05dbd1349059ef23e3c9fcc50405fb232e0bd9b354eae375d57989f1 WHIRLPOOL 430a04e40684fd7829d8539a895953cc4cf60d56e8de03507727f83ceb2c4ab2f211a9872d8ba4de5a3586a76d001e6b563d7f4e84af7e5f3607dfc3c4568e6f
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

@ -18,7 +18,7 @@ SLOT="3"
KEYWORDS=""
IUSE="pxe minimal"
DEPEND="~sys-apps/calculate-lib-3.1.1_alpha1
DEPEND="~sys-apps/calculate-core-3.1.1_alpha1
!<sys-apps/calculate-install-2.2.29
app-portage/layman
!app-misc/livecd-tools

@ -16,6 +16,7 @@ AUX calculate-lib-3.1.0_beta1-r4.patch 4994 SHA256 82612c3964153b5cd3dbaf742161e
AUX calculate-lib-3.1.0_beta1-r5.patch 4958 SHA256 467925686ec3b443bc340d8b6622f1aa66f752378b0cd5cb8e37c3d2e5ca2aa1 SHA512 580bf03d0be80f6e556827ae381e32c951dad5b5e8e3f59f32d2541f7a40534420203e0a2269fb7eb207aa10de9a190f3215bdf3fe5fee177d3e8ed080959ef1 WHIRLPOOL 4a9d070b46e16ffff1ebc6bee768ca689f6926c85a28a4dd73f83c4ef8fcad21a653f3585c4bd197574e363b96e6c332ab6d715bcfe92fe2717d4036c20f59f5
AUX calculate-lib-3.1.0_beta1_fix_import.patch 464 SHA256 a16ea0cfb86d88bcf30ef7713949d6a2e8656996296fa5ec983e6f8f324c11ea SHA512 4128918f3f5f2e94c0cc3852d954b99fc58626698925a3e3449ab41281ad8dcd48c43f5b26d5eec875d0c933c9c92bb2eff34b1866880cad5cc37014af07f964 WHIRLPOOL 7a5952488227a3fe2f5e494732ef6d8c47c3e197893ef19be8a984fd051cef13e11810ea502ba4268cfdc49f81ca2ab1a7782f10f7d8ce0a5af5be11e16ee5f1
AUX calculate-lib-3.1.0_beta1_fix_import_env.patch 1468 SHA256 baec3176dd66c50117f5543e898c3df61c4d674d0c1f67c3148bdbe5603402b0 SHA512 f9d179bcfa4a32c6465e5cd5579c8fa0f95ce8964d8680de5bc2eb6592938a08435fa170fd0c0158343327dedb05d61a95cabb91e49da9b8448bc3ec5f2e482f WHIRLPOOL 10ba566b6d15ce28d58f4e036c30e690db577c7074abc528d6284f3e04530f5a4defc02644037f338d22929808fa516c335c27f9931735a79dc057f016adfa05
AUX calculate-lib-3.1.1_alpha1-r1.patch 686 SHA256 e7972851fa90b0715ea6c39a82933ef99c40216c1d1e22e6e0979f7d848f931e SHA512 8158d2f2bb51228777994b1ffc433c7ccd9d6168647b815ac4704522b6db56dc186314e59546a540dc521f8c6076b2b13a51ef4f8472e26ad1cc2657255c3566 WHIRLPOOL 7f2a45af360cda4f09d2ccc3b9194ceb431e4737f546b2d0e75a78b5380a3dae7ead701c8bda3a552ed95b70ee6d60ead1e57ba8679d2b1590e95382323e7d01
DIST calculate-lib-2.1.11.tar.bz2 61687 SHA256 62976c08d4fb4810389ace6f5a99abb5a962f6c8d9053ff943d0669480fb5599 SHA512 e3bc2168a55367cf19ad3a27921b53e5e845643238bf171209ab29752c91b5d4d338a2120774764ac1c79abd93f2deff8680f8faa1407940984ea9fd6a199e67 WHIRLPOOL 0ced92ea493dd8db02b0ae1514ebbb51ee76dc6f441b4a38c984c39da2121fb81dd1f2e840c4c5b71a117a12817a2a269d85676288202aa9801f69727e3338dc
DIST calculate-lib-2.2.29.tar.bz2 120378 SHA256 fc79bf29059ffb1519b6356cba34ebecb2e8c3222a29735f479254c371d363a3 SHA512 dc3c2c20cf0c5389b412b0cd2cba316b3d2367e981e147b3a94b6502ba329b598c7ccad5cd3462b3d7e884d05574c99b0e2e39df63e51d22221b86b783cb0925 WHIRLPOOL b3cdf6010c48d7a86a9f5a0c72effa8f0cc8ec0186fa28977132211dcaa5a3fe4a20ad3ec0b556478a9def1dc0e7c15404e3ab38080f986a4620634ee6570462
DIST calculate-lib-2.2.30.tar.bz2 120055 SHA256 a5aa07e5c5e02d27a8b9fad8c0e4bd0562d40d7a2753c2b57a18d99bd0dd6cb2 SHA512 7e8920f5fd855f05aba6576d5e4751ecf71a3e4107b46671d9a4be8557e1dd616adefad728b6a9ca87656dca6fd17d52bce41462b7fc906d20118e97607f1b1b WHIRLPOOL 0e8441484ee7d91c9926ab2deed8357272fecb2156e5dad45f865f6b13aff6c43868323dececc859ce7824bedd8794cec25b857be30afa83c44a81bcbcf510d2
@ -64,6 +65,7 @@ EBUILD calculate-lib-3.1.0_beta1-r3.ebuild 832 SHA256 54cfd938bdb49299d376bfccaa
EBUILD calculate-lib-3.1.0_beta1-r4.ebuild 832 SHA256 d8a94141a9d067730700fa890e6b4764cafaa9f00ee209851c9a91277e3412a7 SHA512 7672504ef3528bb4564c1d34b9d54582c7df25eaee4475412fbac8e47e9aeb2f6d235f22c4aea45ab8135fdf9b9d69845b9cf7d0975474cc87a152427ae37afd WHIRLPOOL cea79d6eac4b7912a6e90cf46284942c99b790b33028f5d729a332ad41e9e0c418aac0bc1759d7b7ff491fc38d0893dcc92565a40fcedfb06a8a145514e9771f
EBUILD calculate-lib-3.1.0_beta1-r5.ebuild 832 SHA256 67e1a29d143ce228421e176cd5ec5b9a63423e382d81db7170a1ad7746626d0f SHA512 c6c054a35571ee92088e09bf6c7203287277201dd2aca97e1d81498747ff5f17295910fe4ce7b8350d831a373ae0328553e8e04459e03182c30f95256ec74550 WHIRLPOOL 4885b9bd4dd3655f108233805db6b8f52d5533578421f64c36e5f370802d0449ef24286450599e4223f667462a1efb8333678a0fe0611cf57f7180f17566e93c
EBUILD calculate-lib-3.1.0_beta1.ebuild 692 SHA256 565d13cfdd515cb534e56bdcb3c00e7182194d12c8de259851ec9fc5230b28a3 SHA512 a437100783152c3413c4184e90c5820f56529d1cee2e11dc4f0e88acfe3d3267b0fb85a3a9b04193709447f10dc4815d8c49e612ffe02e497a22acef11d68d95 WHIRLPOOL 3411233d326b21fe63e17106f425fec71a21c4cb77bee3d201b97a81870d76fa8a842e96515573b30aba88bb9209301607d8bc982f16b2406b70f9a84c8b4ee9
EBUILD calculate-lib-3.1.1_alpha1-r1.ebuild 821 SHA256 4434ac4458f216b9b574dce1fe886906329293fd7f59ab81be8edaddaf93cc00 SHA512 dfa534ddb6ef7886e18b8ab3c666d9b27579c9e3facfc64e62426cb3628e6f210edef405085b4c8be2d650b2e3e3c8d17a3eff33589957de4f42d2e0a1ed1799 WHIRLPOOL b2f09c5e4600b491cc89d8f26ec171dea96b6f4857b71b55f94401232d1e411fa2a89da9af298af43ffe719a9a723548205d86914ce36638f0afd884b85b7084
EBUILD calculate-lib-3.1.1_alpha1.ebuild 681 SHA256 6a6332013e5a56db775c6490b63b60f959528660b0982e6a414f1614c0b0ffa5 SHA512 19a71823543fe843a05a548207509ee4dcffa784c61e23c56cf17d2c651effbfc63914beb03f0977b804c5cc647407eecdcbdaed4d7478783bec46eee72a50fb WHIRLPOOL 5ffd414c804671057fe2a7a2176999eee0a75574a5043332d3c01f08b93635773800e6b5d9901993e4fbf7f95d175659d621be9231d08f8bdada2654e45f8e1d
EBUILD calculate-lib-3.1.9999.ebuild 708 SHA256 a1d64b7f014831bf6b0a38928d53cb55758b7a12e5f3e98fffd28025ffacbce1 SHA512 3873859a791941d421e2338b437521955da383ce986408f1a951305e2dd75a1a4f771c9ec2caa096c5c8ea6a1776d6d0ed99e025ffa786ba029cafdbadfa439b WHIRLPOOL 5ac1a10b53f810ab527a0ebe52bc87e8397e61375cf6e0acbed89d8f6b8385e72bf234e0fdce479c3a3f1652bb6e520710ce9356750a97d644c0db0a33f6facb
MISC ChangeLog 29851 SHA256 16ca15c794bce78eefc487ed372c3d4960078fbd4c5fe4524211688d0146ef97 SHA512 be6bdf290f391529dce0deb67bf9d367e42e407601dd581f7c08d082399b5860cff2a76d4d64dd876154d51e84f34499db06c715145ac64f78d168aae7e78dbf WHIRLPOOL 2561ccd1eefe3423d97c67aff5c0fe6c8ca624e527fb885b042c8e812194bb1635d7e7d7d86c534562eb780c6b9144d92e24893f2d0696cf8a34a6a912a45788

@ -0,0 +1,35 @@
# 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 library for Calculate 3"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS=""
IUSE="minimal"
DEPEND="!minimal? ( dev-python/py-smbpasswd )
>=dev-python/pyxml-0.8
sys-apps/iproute2
sys-apps/pciutils
sys-fs/lvm2
sys-fs/mdadm
dev-python/pyinotify
sys-apps/file[python]"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-lib-3.1.1_alpha1-r1.patch"
}

@ -0,0 +1,13 @@
diff --git calculate/lib/cl_template.py calculate/lib/cl_template.py
index 1427cfb..625975b 100644
--- calculate/lib/cl_template.py
+++ calculate/lib/cl_template.py
@@ -4539,7 +4539,7 @@ re.M|re.S)
# add packeges for reconfigure
if "merge" in objHeadNew.params:
mergePkgs = objHeadNew.params['merge'].split(',')
- reRight = re.compile(r'^(\w+-\w+/)?[\w-]+$')
+ reRight = re.compile(r'^(\w+-\w+/)?[\w+-]+$')
for wrongPkg in (x for x in mergePkgs if not reRight.match(x)):
self.setError(_("Wrong value '%s' for 'merge' in the template")%
wrongPkg + ": " + nameFileTemplate)

@ -64,6 +64,7 @@ EBUILD calculate-utilities-3.1.0_beta1-r7.ebuild 777 SHA256 859df76494db048a5efb
EBUILD calculate-utilities-3.1.0_beta1-r8.ebuild 780 SHA256 13abc5436de97827e2faf5f13cab45fcf1ad8ac30af3ef4efb70e4291b85b477 SHA512 36b34d9b278b3a06459c6a923ac688aecc1c469acd614ba880a91f773e146f9c0ed6ae887ac16d790effb960f6ac19a30f1f639bce2441eab15819b85adfed9d WHIRLPOOL 0c0654e92474ad897f0321ae454d1adf06d274d0d7443a02b6a0f87628f1210e6681ee77d687ec3fbf5eff051a60989a985df0fc4814b1e573ab0f2e89d30909
EBUILD calculate-utilities-3.1.0_beta1-r9.ebuild 780 SHA256 235a13406e417556e8196ce202413bc8ea25ec46222c91856e86b105049e2763 SHA512 79a1e102f96ff7268dc899e410387beef976143d04e45fa0f65e558636eb4f8cd3ac74e0b1f85fa29741cc392ec19b607f18777837a79cc5bd1bc9152bdc9b37 WHIRLPOOL d4e2d5f58dab275eabe1743418ebafd7619bb858fe1f473a4b1dac5eff6accc9aef2622d96e52448ad27c52cd0924dddabbaef78bffc650e4ba4797a3e7ce7fd
EBUILD calculate-utilities-3.1.0_beta1.ebuild 766 SHA256 b5fb4c34040eb0b1af60cdb0095983a0493f78b8c9b49603ae9be4b181016395 SHA512 ba05fee0c429c5dea0dd72ae8e2df42dd918c5a0c59fc336f317ad1bbdfc4be54e5048627393d460fdd5d3f687d2f74839df11a403e6c951c8b026de5627159d WHIRLPOOL 8044832bc2c1d4767850595e0179c68df663219d126bca5da36ea2177a471d21215434e24680ad6e754f6dec87bfacae4963bcba3967d5bbb04eb17c83122ef1
EBUILD calculate-utilities-3.1.1_alpha1-r1.ebuild 765 SHA256 7c39c49bc9be8d510069354b2dcbdc7b6085012fbd0d9fdfe3419b2fb71c9472 SHA512 ca6bdfce96cffcb1adc3c8c9818614095449cf9052738d86426a7cea0ee51f5373d4e5c48224e1d5bc33ef98cc67c82b1e1cac725bd968e363585ce046bb9a2e WHIRLPOOL 41e6a4597658fd7140d0c03e3b9c186f6eeee3262e6811ca788d903e72f425f0f2dc88028531e21a55d6983e83ce6885b9e4790aea8d9d94069e87ef4fb183ed
EBUILD calculate-utilities-3.1.1_alpha1.ebuild 762 SHA256 d9ae3566270961ca983708b3215cfb608f5a4b106d97d89d70de24b9ac821d5b SHA512 f60f7dc7b51de31d98a8c9d0ed3350bb2b6ee84fb84d0f404d8bb21683b2753bae836fd38e3413a1b44e4bd290678324781db4de9fd05aa17cfe89d5bd550129 WHIRLPOOL cbb91ef628b4072c8aac77426a5f364094639da9b1b6f9a1dfb1f17cf223858aa17cfca68abcf1b4c5ababf5814b07fb1c80c5dbd776cfbb93ed5b1c69b145c4
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,25 @@
# 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.1_alpha1
=sys-apps/calculate-i18n-3.1.1_alpha1
=sys-apps/calculate-lib-3.1.1_alpha1-r1
=sys-apps/calculate-core-3.1.1_alpha1
cl_client? ( =sys-apps/calculate-client-3.1.1_alpha1 )
cl_desktop? ( =sys-apps/calculate-desktop-3.1.1_alpha1 )
cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.1_alpha1 )
cl_console? ( =sys-apps/calculate-console-3.1.1_alpha1 )
"
Loading…
Cancel
Save