From 6d3ae04377cc8f02e0afefc835cbcb150f8b1833 Mon Sep 17 00:00:00 2001 From: Mike Khiretskiy Date: Mon, 23 Jun 2014 12:56:34 +0400 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D1=81=D0=BA=D1=80=D0=B8=D0=BF=D1=82=20=D1=83?= =?UTF-8?q?=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2=D0=BA=D0=B8=20=D0=B2=D0=B8?= =?UTF-8?q?=D0=B4=D0=B5=D0=BE=D0=B4=D1=80=D0=B0=D0=B9=D0=B2=D0=B5=D1=80?= =?UTF-8?q?=D0=B0=20=D0=B2=D0=BE=20=D0=B2=D1=80=D0=B5=D0=BC=D1=8F=20=D0=B7?= =?UTF-8?q?=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sys-apps/calculate-assemble/Manifest | 2 + .../calculate-assemble-2.2.31-r10.ebuild | 45 +++++++++++++++++++ ...culate-assemble-2.2.31-video-script3.patch | 13 ++++++ sys-apps/calculate-utilities/Manifest | 1 + .../calculate-utilities-2.2.31-r31.ebuild | 30 +++++++++++++ 5 files changed, 91 insertions(+) create mode 100644 sys-apps/calculate-assemble/calculate-assemble-2.2.31-r10.ebuild create mode 100644 sys-apps/calculate-assemble/files/calculate-assemble-2.2.31-video-script3.patch create mode 100644 sys-apps/calculate-utilities/calculate-utilities-2.2.31-r31.ebuild diff --git a/sys-apps/calculate-assemble/Manifest b/sys-apps/calculate-assemble/Manifest index 7fae5f7ec..858ac41fe 100644 --- a/sys-apps/calculate-assemble/Manifest +++ b/sys-apps/calculate-assemble/Manifest @@ -4,9 +4,11 @@ AUX calculate-assemble-2.2.31-force_checkout.patch 1793 SHA256 2103992660ed97040 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-rebuild_changed.patch 7918 SHA256 9031fcbfb2b750dc9b4da0b4071fcec4db63dbff706f4d348907028a14aa48da SHA512 9db9d323dae181d77c14f902fd3f27961642f768cd995d0d727adf1297e9577c0db71155ea883f25e3657fe02b33390413c5a40dea81d9837af7c41dfa6d13ff WHIRLPOOL f7d66c2832d1a41cf8107b53324f6dc9d2cb03b85f4f854ecbbfa7cefdf9d195f82d8122a2d82d5bf604de30e341b2a6634d586edcde577a685d8d5597226d4d +AUX calculate-assemble-2.2.31-video-script3.patch 646 SHA256 d10a0a4c1e46367a4d8668cfb893050f9700426e0148e00e38c2c58c20758855 SHA512 795b884e2712b77162c1f58ddacabd7cf723c13a5a493414be87b8dd5f900369c2237764164cce70e69d19f0caea359a07e4fdc5f908c11aa835e7bc4482520a WHIRLPOOL eb88da8ccef1b40e4f26d5495e75aa0431197ae38be16f502a01a3afc2ca9ffca5b19d67e73fb3162de63a942badb2f35061dd394154d8935bf315feafc099b3 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-r10.ebuild 1368 SHA256 ae9718e5b87a35f6708ada87ea7b8f29b2031c5e2df87ae0e90f22dc977cc8ed SHA512 be1457491673113a35f55953a9ccf34ce8a7b797744ae718bb1f58cbe08fb9e46b41fbeee43e8f66321a2097c07f790428de0696c628e79ab3224493f6ff6820 WHIRLPOOL a85d04571b5b3c7013c2b3c5b3270dcf529a5afbf31f43076709599a46c487947988429d7839e7ed05a4e73ed45a54a0f42c76c1eee33324f5c14bd91c6d60c5 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.31-r9.ebuild 1300 SHA256 3b15e318604ceb2148f13e2e89480da79c15c1ae26459b89e894d6c73e1e9e10 SHA512 815fc9e2352f17eab0c833c23b4654a5b96f722c2c4e6bc961ba21d13741a07e1261b446464f645221b18e1136225397e5eb33be48982ed89442b737e27e9b9f WHIRLPOOL 7e54a529cba9b9e38b7effc331a811211acf063a1ed998ffd9b34ca44c042d909b75e95ca6398f229fe750a95811c0e12fee13cc29ab02b7e1757c2459df6b94 diff --git a/sys-apps/calculate-assemble/calculate-assemble-2.2.31-r10.ebuild b/sys-apps/calculate-assemble/calculate-assemble-2.2.31-r10.ebuild new file mode 100644 index 000000000..33415c86d --- /dev/null +++ b/sys-apps/calculate-assemble/calculate-assemble-2.2.31-r10.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/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" + epatch "${FILESDIR}/calculate-assemble-2.2.31-video_script3.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" + # add rebuild changed + epatch "${FILESDIR}/calculate-assemble-2.2.31-rebuild_changed.patch" + +} diff --git a/sys-apps/calculate-assemble/files/calculate-assemble-2.2.31-video-script3.patch b/sys-apps/calculate-assemble/files/calculate-assemble-2.2.31-video-script3.patch new file mode 100644 index 000000000..feb0e8175 --- /dev/null +++ b/sys-apps/calculate-assemble/files/calculate-assemble-2.2.31-video-script3.patch @@ -0,0 +1,13 @@ +diff --git pym/cl_fill_assemble.py pym/cl_fill_assemble.py +index 22b57ad..feef5c6 100644 +--- pym/cl_fill_assemble.py ++++ pym/cl_fill_assemble.py +@@ -496,7 +496,7 @@ class fillVars(object, glob_attr): + reVerSplit = cl_assemble.reVerSplit + yield "#!/bin/bash" + yield "PKG=$1" +- yield "MASK=`cl-core --method variables_show --only-value install.os_nvidia_mask 2>/dev/null`" ++ yield "MASK=`cl-core --method core_variables_show --only-value install.os_nvidia_mask 2>/dev/null`" + yield "PORTAGE=/usr/portage" + yield "OVERLAY=/var/lib/layman/calculate" + yield "WORLD=/var/lib/portage/world" diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest index c23d44757..4c955fa55 100644 --- a/sys-apps/calculate-utilities/Manifest +++ b/sys-apps/calculate-utilities/Manifest @@ -7,6 +7,7 @@ EBUILD calculate-utilities-2.2.31-r27.ebuild 676 SHA256 36a923a987117677a1abaab4 EBUILD calculate-utilities-2.2.31-r28.ebuild 676 SHA256 5ac3364907cbf8123af1ba160af2c7fde1cb4a0958a2436181b15276786817b6 SHA512 836cabb714f3bef93e1b38e25c36d6134cbdec2373f603ff3dd8eb9bdd4ad086c7689ea3a38224451fbf494bf4654f5de60f4349f6c41199579ea0a9da4c6739 WHIRLPOOL 4b780d5492c073132cacc19de7c1e6e093267f8d79c469fffa6a48e416bffddd8b9871f4eb853bb6c78ebb300aea5ccde240e21ac023c7318b2ef51841aeadeb EBUILD calculate-utilities-2.2.31-r29.ebuild 676 SHA256 1893d84bcba83494a1ebb124590e6b5174de168437c6b84586a723d44bc10453 SHA512 7f4ab2c1387ab49664da9d8e3637915388cbdec5ada6aa76d12e07c254901eecfa6b8f066c1ddf9b1dc629c995918ca97e5ef229887341cfff5ffcc756b1919b WHIRLPOOL 87929e1529c146b01d60ea3790b4667cf81e8dcc0bc5b5aaf11d87c8f56ac581353fd7ba286c0a7a67f8b7677428d432f3618f96818e498c2978c57af6e021d6 EBUILD calculate-utilities-2.2.31-r30.ebuild 676 SHA256 3cdf7087b8a4f4f668b3b70cf3b3f8ff35eb1353dd475cd4edb9fc57c3ca5a2c SHA512 21d85a235afd5ea1b3c182e2cd20dea67f409ee10166919fbf7fba7c9f939a5af51920b7b1e18e44e4ced103f21675d8181bbaec76f56ff1d93e6bb9747af75a WHIRLPOOL edeca839bf65b77ef4c58763ab8f648a807b5112b2a070a1d78b020de29894ad2fc655d465bb80ad724d334769a261346eec873424d8601e047d3a78bcfca831 +EBUILD calculate-utilities-2.2.31-r31.ebuild 677 SHA256 6b43b1d0be24831662b7c8c44d194d216e22480ee884db180b84a0e33db8cffd SHA512 2fe9a1e3917ae0ec21795cfb9cc47641acd2a17e887177abe85dc8ee63237a43ff2ba4a2240d59690427f01538b975dc34fac3b770b1ecc81bd7194e55b7fe3b WHIRLPOOL 18367f6166146d97675512a0907e0335291f79aecd27add8922c78537181480c6c72e5aec5e674994e0d5f89cfcdf38310badb6ed9c1777e164456267b9212eb EBUILD calculate-utilities-2.2.9999.ebuild 831 SHA256 630a2373531bdbda2cac289c82332b3688d57d00b403795b93f68cce36824265 SHA512 cf7553e27cd0772548f746d97ab90093c2aa945e34273aa29df222727684451b6ceadda577e2ac0af943a61f84871286d1505ee3682020437a449542f2750255 WHIRLPOOL c48a8b8d9b64ebd3e32105cfad5b86db16373e3ab90e2fc50c7d2cf8908840ea91ba7a32c537a6406feb1f37d03a21619e0b1e33f1ef11a1047c21a6393d0284 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 diff --git a/sys-apps/calculate-utilities/calculate-utilities-2.2.31-r31.ebuild b/sys-apps/calculate-utilities/calculate-utilities-2.2.31-r31.ebuild new file mode 100644 index 000000000..ce4656b40 --- /dev/null +++ b/sys-apps/calculate-utilities/calculate-utilities-2.2.31-r31.ebuild @@ -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 + !