Исправлен calculate-assemble для работы с emerge @module-rebuild

atratsevskiy
Mike khiretskiy 11 years ago
parent 05c0aec264
commit b61a6f63e5

@ -2,10 +2,12 @@ AUX calculate-assemble-2.2.31-discard_clt.patch 703 SHA256 6f1b5208fc3e8f5aefeea
AUX calculate-assemble-2.2.31-fix_video_script.patch 805 SHA256 3b18976d9f5af7584510c4de1741f403fb7a86cf155007eceed67138821ad20b SHA512 a8496f2d27ab8a9de5ddccc285e872505b85e6073879d792112e6675000bf4b4b330195e082d98d794b8cb40790d6aac26d24aa9e78e868f743377c72a99c16c WHIRLPOOL 779ee5fc911897fc796828e281ac00d2bc73fb8029af6c67a206bd8ccebb129f40d0cec0ba83c7a663dfc70dbb5c213f1df43736f8588647f579947438fbfe76
AUX calculate-assemble-2.2.31-force_checkout.patch 1793 SHA256 2103992660ed97040ae4ab54ebb7ecee56d4dd7e0791a1cb5deff613474114e4 SHA512 f7f027667f738fb955dd9a11e4f896d4713a1eff321c7cc095b9752a4efb1e31e5a8eaecf51a7c5b08cbbd54ab54dcd6d968b4b5ac338a1ce3952e0712effeea WHIRLPOOL 0217c51dd984001cd49e3972734b87a0aca8cdfc92aea2db212e057459ccd2bee1824e14c0af3fd1512cf9064ac32231a80eb8bbee4b1cc262d708bdb707e892
AUX calculate-assemble-2.2.31-force_option.patch 10779 SHA256 b46a1b7fee8df1d50bb2aa1e7150dfad3c8365cf4402220da933eda58f8424fd SHA512 70788138099f97f4f1c545a742a464ed87bbd99eed311a2d78b1db798211e01ecbb18eb75ed70d071cbed0ac8c3e9b29eb3796acc5e13772d497670d916816e8 WHIRLPOOL d3c60830ea6438e2ae62e08f0c9a06c100e72ebbeadedc64bd9970baf3fad09ccb4ec2531850d1a0dc11e940f9204671c6506b53b24a5f99a5d2e67b25843687
AUX calculate-assemble-2.2.31-module_rebuild.patch 1010 SHA256 1cb20de6e82c29d71f9c2739df0f5955cbc408342c708c45c3dfdb89068c45dd SHA512 465521abc8852f27dd069815aa06e80184020e75bf275db63f35deed8a821cb2a45ead1812d93ee6f5c26199ed8a4c2ebb1e787edcff62229af8bf9669b84b53 WHIRLPOOL e6683c11db200a4ebde039809f1dd76e34fb67ff8c826f867b52126c3d23497cfe328a8b58a450932831d64f04d3359f9ba76c2319765d56551afa53ac941cfc
AUX calculate-assemble-2.2.31-video_script.patch 1148 SHA256 629fb65eba9bff6f5e47b357cdbca14ca945b9848221caf8d13c2dafe504f53f SHA512 64d4b6ca7b119e1ee5a0b4c75b2cfebb6d738c5616018f9d09de43694ddeea2182a77aab85646b6096d6d92ae24f61d4368a3fac4eb76b6ab4ef02a186d32d96 WHIRLPOOL d1b47d83ea170aebdc1f1b19c8dc85ddb5b6047d5bf057c87c0864bd0836b5bce12fc36eb882d10207b5b92a349f3ec3af93449867607f43e6a24c4041e331ef
AUX calculate-assemble-2.2.31-video_script2.patch 825 SHA256 b44dc9d7fc9e0550ae01857322313e5e0e558a0c050b6393072f5ff1da966194 SHA512 c2657c5afca7887440dc337bdfa94392e39fd90c3aa4d011b44c0ea5427c3a63d98df3f9324f3266777c24228c01fe1623ca6bb24f7c73871674ff16cde482a8 WHIRLPOOL bd18de7a17d33c2434854b4e79c0c579ac2619d6ba9b43f3524403fc7596b351f0e938180742e2db9562305a68c0edb15ba5504835fd463c0dd2f5aa3dc6a639
DIST calculate-assemble-2.2.31.tar.bz2 28977 SHA256 8488de0b12ee9a9c30d0dd8d5f16f8da11b8b135147ffa29856c91a757afaad8 SHA512 50f9c0cd8442630c882a23a41e73b29355758cd91d4f9911f01c27d2dd7bf0c4b5bc90226075d4cb01ee05829652ed134ae80f89e1795beef5089989e142c223 WHIRLPOOL c3317c2843dc82b77abcecdc3120bbc1df7a31b4cb3dd33de623b2cb30ac9ec40e4cf2662f898eccb41d5a3cc2e75a9e3cbe34f4d989cb6463c3f5524aa43df7
EBUILD calculate-assemble-2.2.31-r6.ebuild 1118 SHA256 7c090c0220f152bf5793076f31d8364283a3347bc3eb1f27e76ca27a46ae140b SHA512 f491fce12317c3e9d37d236f35f6de6337543bebf887fb543c56775fc17b4eff9d9ffa96aec7940fd079694364c223cce6335135c164d655d543d930f4296b4c WHIRLPOOL 78fa3217b696ffc01f0aaac918f84bd1c7d166e972270a726facbb4e128a5b1c31d7bc28c501d2dd1d453f097c388040de5a96a180a61e66f456a9017bf1af08
EBUILD calculate-assemble-2.2.31-r7.ebuild 1206 SHA256 91e4915756b5544351de688b1041958a75f84a97bdee56d9923f8fd7bbfb9006 SHA512 885f638f42c909b395a788931df728cf26198eed5b9ab0a87e22c679fca4e9a6e9443305406d36fa1f9956fe42ce358d26401403f09c21ebd5611fa18ce99c79 WHIRLPOOL 4bd4ff116c5c79743b74fa17eb0d079fd61d21da6dc48c38d67f0437ac24696ec46330f669c8749159a4a5b30d37dd4b035e37ce317cfdeeeb47a3e5106c03a2
EBUILD calculate-assemble-2.2.9999.ebuild 572 SHA256 5bc8194c32bc4677cf79eaf6ae5f2112cafa51ae900dc3ebb6e879d9414858ea SHA512 62a111e959134709ef7529bfe87ccdfb20b103efc5305bf497ee9f427b3f956f180cd5c612641e557607606de9dbae3326c7881cc16afd9372b752ef65d63c93 WHIRLPOOL 8340a2b45b9941a61473ec4d66d944524dcf6f973ad9a03b9b92471cf5c92199949b2d707e7f738d86bbc9774eebac561df52891385e57d75aa811f47b4c5821
MISC ChangeLog 16686 SHA256 759d02ea5f6029eab950ac93cf54a1c43dcc007a82be8e42cb82eac38369e979 SHA512 d4927fc6204a0a496248edbf3daf5b9259f0fc519a759c1dc8a6d6c2abab33074e75cd29e1696af3debaaac23548d0dc021e8d28c21d5c38cb8b2f06a973be0d WHIRLPOOL 7bd8bf84215ef77ec4035419f79d3226f3db13d6fb417e2b882bd4899bc240764ccc5a32154d8469153dc1c052936aad886a69916148bbf2bffa8d782b343401
MISC metadata.xml 273 SHA256 4e25d45ba43b2ab7f7ae8ab4cfc05c406566cfb143a87166de77fbd8d9f8a943 SHA512 98b0d7d37e851ea86b498b2c0675bf505c75cb00d13932720475cda8a485db2325e2551954af3c534b2f9ef213f372c563d739d25d04a3da681a661c9ade6e91 WHIRLPOOL 44babe185c821b525b0dc317acb29e01223eacd5862804a64e0884502c25a541f53d322f1e63649c90285e93834b802beb21e4b34bd27be4b8d66ae6ac882c96

@ -0,0 +1,41 @@
# 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/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The utilities for assembling tasks of Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-builder-2.2.31"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# fix video script
epatch "${FILESDIR}/calculate-assemble-2.2.31-video_script.patch"
epatch "${FILESDIR}/calculate-assemble-2.2.31-video_script2.patch"
# discard clt
epatch "${FILESDIR}/calculate-assemble-2.2.31-discard_clt.patch"
# force checkout branches
epatch "${FILESDIR}/calculate-assemble-2.2.31-force_checkout.patch"
# -F option
epatch "${FILESDIR}/calculate-assemble-2.2.31-force_option.patch"
# newline for world
epatch "${FILESDIR}/calculate-assemble-2.2.31-fix_video_script.patch"
# fix module rebuild
epatch "${FILESDIR}/calculate-assemble-2.2.31-module_rebuild.patch"
}

@ -0,0 +1,24 @@
commit 59187d5a114f5d01d33096cdf114357878a8ad6d
Author: Mike khiretskiy <mh@calculate.ru>
Date: Thu Jan 9 11:57:36 2014 +0400
Пересборка модулей ядра осуществляется через emerge @module-rebuild
diff --git pym/cl_assemble.py pym/cl_assemble.py
index da7327e..ded1c47 100644
--- pym/cl_assemble.py
+++ pym/cl_assemble.py
@@ -177,11 +177,9 @@ class cl_assemble(color_print):
{'command':'emerge --depclean',
'step':'depclean'},
# module rebuild
- {'command':'modulesRebuild()',
+ {'command':'emerge @module-rebuild',
'step':'module',
- 'condition':'sys-kernel/.*source.*',
- 'message':_("Executing '%s'")%'module-rebuild -X rebuild',
- 'progname':'module-rebuild'},
+ 'condition':'sys-kernel/.*source.*'},
# xorg module rebuild
{'command':'emerge @x11-module-rebuild',
'step':'x11module',

@ -2,6 +2,7 @@ EBUILD calculate-utilities-2.2.31-r22.ebuild 676 SHA256 d2669cbd504fc4c4cf7f86ce
EBUILD calculate-utilities-2.2.31-r23.ebuild 676 SHA256 dfd10df352809a3211df614acd26ac7dc305c914fa7c0476f436d20cab6c2581 SHA512 a5930278b9725e889cc384b76e5aa9a4c059ccc61b698a6fc7c2d5c2d03fc61247df23521834ffe13db35e209031c32dd796e2b9da37d16939423ac695a73ae0 WHIRLPOOL 579f159ebecca79df13b08914fe1576a43a79453f45b7cac2a344c05a199355483c5ca6d0a2e050fbc39a668da2d4821421dfaf1c2b8651d51d16c909da437a6
EBUILD calculate-utilities-2.2.31-r24.ebuild 676 SHA256 05e2c68538b3739912571fb6cac53cec321638f0bdc6f3d5c5080476dee50b01 SHA512 64117e72beed2a6ce62e60499f24267b7b2b8d68efef9991631fcdd672a01c955f0fbb71ca1e760cc1e515c3b000a8d1e187895d714c06e3507d864722a9fd06 WHIRLPOOL e028c39ea98ff2479b4b908b5c4a36c2378f3f907de239f5c63ddfbdb7a914a530116d30d9a464f0ec1a58c804995ad9ee3605c745558ba4f013170fda2009dd
EBUILD calculate-utilities-2.2.31-r25.ebuild 676 SHA256 3d869a4ec7ca07a0afebb7a4c6da399fb202305b9089108e6823c08903cd30cd SHA512 91143edcb8969950e77ced767758488c619bcf8ed0e58bc81dfd06c1f98e85808325344ea7b814e6b7222addac855122882d6dbef705eb7f63208e94fe873d52 WHIRLPOOL ccfb9eb1f0208c71a3f28bb6e34e4ea5f9a053e6d5ea4af08f31355f1496568bd0856f8ad78e64baaa2ed793ac10ca969c8a87f29eaab517e10fcdd3ae89ec2d
EBUILD calculate-utilities-2.2.31-r26.ebuild 676 SHA256 f27fff785fd7c5f7d1af3417ed07dfa69320f1faa57840263e75218a70d45793 SHA512 8939378234f3b5ac1253df35ac5b69d154c00d01213589301867a81501b494b416fc23814a3ab2ed7889c27fb69970a30bcecc73e13df52d000bf86e6eb379bb WHIRLPOOL c26dd9e522180a6c886421e66ae245afe28b5345f6ae91f7e70b047fac4b6c8c28b017b25630b803104704a22866c8df8c8def5a21f3569d0d18e2f50a9cb471
EBUILD calculate-utilities-2.2.9999.ebuild 842 SHA256 56d97b7d2ce11d23b25d9036b4e2ee196b547ce1d11b0cc349a8205515b66bf1 SHA512 fc7802b92ade52210fa7381b55c48638da6d9adee6d2f03f18d6bdd0050756089b3ca8de944f4e865517554523b40737abe9f22587ecae74079eec563f80868b WHIRLPOOL f1382f0629a8dae37aaecf40cb8cbc3682bde3b43e92c9c6a84cda75897dc5d5de043233fb7a3f929749520b05fe3af94187c7a3ccdae4e252e83699d871f225
EBUILD calculate-utilities-3.1.6-r12.ebuild 770 SHA256 620f29f93e0d5ff2d8b426946fb45b892bc5316904dc4bdc1b7a4e0750236f04 SHA512 7608d4391302e420abef7fd8236010692ea0d3aba29fadd5b8d3e3c31ef34dee29b0ee83e96c091f502c26e798975ec1c6fbc4ed51c5417b72589b64f4cc2a88 WHIRLPOOL 485e1eb97d02c22b10959aec1c2897f5c76c739fc13dda1b876c5bc47e3d52443e68067848bb894921dae1dc0e121b58e583c548ed45304033b93596d17f269a
EBUILD calculate-utilities-3.1.8-r1.ebuild 755 SHA256 3bec5752d8439e0bb64c921fe5bd708e2f942b7555229f7a2c2cc6415e58cd63 SHA512 8f40e2fccf74a54471ad0b15c06d2e1ab5a3857c62d00d9d805aba12b016944982eceff2eb2ab3b75e6488ec85d40de75257cd23d12fc5eaccd31c841b2759ec WHIRLPOOL c93eca9734e7c9112aa5453433c77e5c37b4b0a3094e473fe39189657427ab5efdfb17c157944ea48b7438c268eedcb116a8de2ef6fbefa1947c21187075d53d

@ -0,0 +1,30 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=3
DESCRIPTION="Calculate Utilities meta package"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
SRC_URI=""
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="
cl_assemble
cl_builder
cl_server
"
RDEPEND="${RDEPEND}
!sys-apps/calculate-templates
!<sys-apps/calculate-install-3.0.0_alpha1
=sys-apps/calculate-lib-2.2.31-r4
=sys-apps/calculate-i18n-2.2.31
cl_assemble? ( =sys-apps/calculate-assemble-2.2.31-r7 )
cl_builder? ( =sys-apps/calculate-builder-2.2.31-r15 )
cl_server? ( =sys-apps/calculate-server-2.1.16-r11 )
"
Loading…
Cancel
Save