Update assemble for fix nvidia-instal

sys-apps/calculate-assemble/Manifest

@@ -1,8 +1,10 @@
+AUX calculate-assemble-2.2.30-fix_install_nvidia.patch 605 SHA256 577678031c6ade23663e5eb7829db5cda954fc06c910543928479c78b9fd2f09 SHA512 b71ce1f2eb505415798002244eb1319abc57e0b3086d4f0a2bf5b6f5e51a8bd9d9568d79f5830d1b4670bba7cc6c45f86532372421d9926be35216aa3563f136 WHIRLPOOL 39048cf908d27835377fa8ac4f89df6249599a8362a0b08b21fefa863c5a39723a5f98ff40d131fd782a75f10a4e3de13fcde0fcd44a66df8bc54fd2878a1997
 AUX calculate-assemble-2.2.30-r1.patch 4285 SHA256 8dae56b2a7cef808fef12942c250b8ed46ec0e98272a868103c74b2b2d742821 SHA512 2c816cb5081f5ea23a4dfed087d43eeb5abb4a3e3d62681165336c062ff9b5786b3491b5cd38c66fa89ab791d5ee1b6b5707f008f1e30eb0b3c6f2b999cf07f5 WHIRLPOOL b3325b0ce5c0f32c375e013f1e5e47a8c1d037886215ef9d56ca4241c924834c5a7b6236283f609f8e3b6a00cda1e2ee98598291d1aa6a2ee23fc81095137362
 AUX calculate-assemble-2.2.30-r2.patch 10635 SHA256 5cd7850456431824c5eb8bb345e8c547cee097de937e5ed0bcf32a3b1e8ea336 SHA512 446960e252c824a4733e8dd3df9e47c1110f466b7dcb30fced0907a55dfd21ef2a3158a78e438038e071fa85bbf6a2d20474e4d4c3c30f0d5b7d340a522456d8 WHIRLPOOL 44bf54694a28a0c0104193eaedf7a47f5d00f5dcfd1a57a6b9e7179b393c0e0563e89371439d0011f5e9883a3e4e28b664c834ce50fd2649bbbbdd5100a1a397
 DIST calculate-assemble-2.2.30.tar.bz2 28740 SHA256 3958e8fc0aac7a704e3d3cba4fffde6a77e9925cbc621d375dbae39518110ad4 SHA512 75dbb69352e9762f4e26729a4cd9ad6e3cf6301dc3e259573e6b3fe3f6d1b5c1c61ba4b36b8783c938fd4f526db259bdeb472db09cd0626a29ae159138a0da69 WHIRLPOOL 027ccd5cee6e53f1c30e212b937129111e1af80f066248ec8a94a7f5a7fcd722fed1f765a7537bb4f206c201e83e5c10818c67a2aa091d071b99ef1e880a400f
 EBUILD calculate-assemble-2.2.30-r1.ebuild 688 SHA256 002d98e482a6ff70ec006980f5a5dfa2f2063233c967dd1313ea771347a392d4 SHA512 d2c54d0d9a4abb8fb0acef4f258215fde8e0e9ff087bcb5f62bed997831f0bf42006a34c28275f6c8598777196c98b89b01c66abfc694799e3662b07fc4679c3 WHIRLPOOL 4158b57dcdd591ac05aeeb69d75db9372f1c1a3a05463713dad7013a0966643d34189e54c2858a182fd069c506463c67df5fe45064bc55b6448285f122ee947d
 EBUILD calculate-assemble-2.2.30-r2.ebuild 688 SHA256 4ef562445c634f9c791019d7d4580dbf8e3e2f6db8a8948b14de02d885db5cd2 SHA512 4b512e110cbae3827717a027b74139cf9d729f867ae5a2235983512c22c855ebb9866a88ddde675ad32126d235ea9404e2189f17c3d041c128345f53413105b3 WHIRLPOOL dc356c00eeafabd871fbbdc334d9d55672f71f0433ff6de7238ba290a2cb4b744b552b1d7e7ee1d7024e6cfdc9b2df193c14baa48fb299b7a5a572716a6e7e92
+EBUILD calculate-assemble-2.2.30-r3.ebuild 761 SHA256 cbbb0e9dbcd2a83d2d8a23198be1937b568688dec984b074f98bea372baa91e3 SHA512 02ad6d2d39e95ebd143c29a5a9ece23a205174de1e2c6de6e4cb4393a0d3d995144f3648ee83709395f10c6c72ea39b7bd0ccf896734fbf90155423833d55a18 WHIRLPOOL 42b92ec7797c0d641b1a2786f100d8be9e45a1f1e34b162e826a12152f03871de1dcbf064ba051cb0d2871a2cfe09152e51a3c8b8fb4726ecdb28a2b5da3f3ce
 EBUILD calculate-assemble-2.2.30.ebuild 566 SHA256 32a365ce380ff51d3064443252bc85455da52a55f6255816cfc511d526f8e83c SHA512 a9c8fcc6a3833255a7bcf6446d450602085cda1d3770a4a5bfcfa8a83092075e4d66a79837b3817d5d1f03492f63f917d9490a45f88119ac8fc29aae39a22db8 WHIRLPOOL 72f890ea8527d636f6f74b15155fd7cd31bca9410bcf16a7a4d960588b087ec50f9b94f5b2560fc21d5611cddb226d06da1fa4cbde6ce27a45d38a3490e0184b
 EBUILD calculate-assemble-2.2.9999.ebuild 572 SHA256 5bc8194c32bc4677cf79eaf6ae5f2112cafa51ae900dc3ebb6e879d9414858ea SHA512 62a111e959134709ef7529bfe87ccdfb20b103efc5305bf497ee9f427b3f956f180cd5c612641e557607606de9dbae3326c7881cc16afd9372b752ef65d63c93 WHIRLPOOL 8340a2b45b9941a61473ec4d66d944524dcf6f973ad9a03b9b92471cf5c92199949b2d707e7f738d86bbc9774eebac561df52891385e57d75aa811f47b4c5821
 MISC ChangeLog 16686 SHA256 759d02ea5f6029eab950ac93cf54a1c43dcc007a82be8e42cb82eac38369e979 SHA512 d4927fc6204a0a496248edbf3daf5b9259f0fc519a759c1dc8a6d6c2abab33074e75cd29e1696af3debaaac23548d0dc021e8d28c21d5c38cb8b2f06a973be0d WHIRLPOOL 7bd8bf84215ef77ec4035419f79d3226f3db13d6fb417e2b882bd4899bc240764ccc5a32154d8469153dc1c052936aad886a69916148bbf2bffa8d782b343401

sys-apps/calculate-assemble/calculate-assemble-2.2.30-r3.ebuild

@@ -0,0 +1,31 @@
+# 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.30"
+
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	# up to r2 version
+	epatch "${FILESDIR}/calculate-assemble-2.2.30-r2.patch"
+	epatch "${FILESDIR}/calculate-assemble-2.2.30-fix_install_nvidia.patch"
+}

sys-apps/calculate-assemble/files/calculate-assemble-2.2.30-fix_install_nvidia.patch

@@ -0,0 +1,13 @@
+diff --git pym/cl_fill_assemble.py pym/cl_fill_assemble.py
+index 21e7832..a273874 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=`cat /etc/portage/nvidia 2>/dev/null`"
++        yield "MASK=`cl-core --method variables_show --only-value install.os_nvidia_mask 2>/dev/null`"
+         yield "PORTAGE=/usr/portage"
+         yield "OVERLAY=/var/lib/layman/calculate"
+         for verName,maskName,drvVer,ebuilds in info:

sys-apps/calculate-utilities/Manifest

@@ -4,6 +4,7 @@ EBUILD calculate-utilities-2.2.30-r14.ebuild 677 SHA256 577c89bd6d653a96729dbb25
 EBUILD calculate-utilities-2.2.30-r15.ebuild 677 SHA256 988a3d27ba687db64de039d6ef30014cd78491b34e8220c51bfd8da9977b8321 SHA512 7e521dc9bab2f42714e1dcc36b03f038625daa2249f0845f2777b3adeb839f5deaee8d426ebe67250e45661b2817ce166d28de9290de646a129ee3cca1f78ff6 WHIRLPOOL 2ef9c4f20a98a0acc71a3cf5580338303b52e45604bef32a604b02a2b7eb2c69fc1708ccbdfd0df032cd7cb44db0192ad23b0354ea8d373a63af7a22403f63d3
 EBUILD calculate-utilities-2.2.30-r16.ebuild 677 SHA256 28b711cb7cf18c350bf7f27bf914af47be58b551df41927e300c9110d6ac4930 SHA512 5f86bd6393be8dfca353f2c26b0f658d422f39b1848d7521b8800325d528281da16a3af675ef78e9c697bcc0041b193232693c079c3f3e5494a3ce82a26d7995 WHIRLPOOL 57713cccf37261558df5227a04225127ebab504eb9ab59770f4d76df368e003362c6ed79062b2a170816b9ffc7fc67c627a257611bbc422aaffc760e2e58d7b1
 EBUILD calculate-utilities-2.2.30-r17.ebuild 677 SHA256 11fbf5611fd3ffc04775b8f78ef994cc4036b3428d806e6a1155c914b89f7e67 SHA512 e5d26237cdc2ef1af1d2ef6fe680cfa644fb29ed53bdd484e0604819d032fcc8a7e69755ae609b671f526cd9b7b00cd1cee57c8196daca50892bf39b9b1eec0d WHIRLPOOL 824afc9043930e9b897805b8d90a17aca2e3bcf347057e74db3b08bf2855729767501fd793e14a37023de27028ed56a629154e85b0696d699ccd9bb61a667178
+EBUILD calculate-utilities-2.2.30-r18.ebuild 677 SHA256 73902c8c8b214450bc5d78dd210c54dde11dc929ea8575d6bcf377f109c05130 SHA512 8c078bba7095405a00c44296318d9e78da6d0e1fc861f04d8209c2055311726ca198de9b447255781fa18d870cd0e299b83cbcee883eff8ce3e573ffbf9b74ec WHIRLPOOL f2811e6d6a7d214803b9843a849aab43eb0d117ba9993b64965a94694091ae057520b5a7ebea007eaaccbd352348a4feec0dec248b9a2dc498157737e244c6bd
 EBUILD calculate-utilities-2.2.9999.ebuild 842 SHA256 56d97b7d2ce11d23b25d9036b4e2ee196b547ce1d11b0cc349a8205515b66bf1 SHA512 fc7802b92ade52210fa7381b55c48638da6d9adee6d2f03f18d6bdd0050756089b3ca8de944f4e865517554523b40737abe9f22587ecae74079eec563f80868b WHIRLPOOL f1382f0629a8dae37aaecf40cb8cbc3682bde3b43e92c9c6a84cda75897dc5d5de043233fb7a3f929749520b05fe3af94187c7a3ccdae4e252e83699d871f225
 EBUILD calculate-utilities-3.1.1-r1.ebuild 755 SHA256 f58d2202899da058cbf4c30575237855164c66727f08c974c30e1f8ee3ff13d9 SHA512 4dd1636f144f5f2a7e16ad263c5476fc20ceba4153d6acfb34172a0193892191b2a6f4a878ca6b2a4f04862e47899298927efe05f03f4317676cee4fdd7290ea WHIRLPOOL d4e9578d370f482d632732384e8acb24f3970b61bb1584600d90541f970786e930464d64c8fec33c38c2d09e5a68f35aa8e576ea7b36fe4df78ad963de7fefb2
 EBUILD calculate-utilities-3.1.1-r2.ebuild 758 SHA256 1f8ad1e134ac71948505ad81a54e8d746761a97f280093c0b1d60880385296f4 SHA512 a3a25cd549d2a37c5c6b7766b19ee540c1f330789a44014979492789d7ee2586aa7374b16bef7239702c6b4a61bd7377832c9e4c02fa2f467c318df3806b399f WHIRLPOOL e8214f526c4b91ddd3e0550344dec802ac1917bf1aa68717d08e5506a51d5d6abbb08ca59a68eca145e9119e72deb263099ed8480f81490029acabcaa764797c

sys-apps/calculate-utilities/calculate-utilities-2.2.30-r18.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
+	!<sys-apps/calculate-install-3.0.0_alpha1
+	=sys-apps/calculate-lib-2.2.30-r1
+	=sys-apps/calculate-i18n-2.2.30-r1
+
+	cl_assemble? ( =sys-apps/calculate-assemble-2.2.30-r3 )
+	cl_builder? ( =sys-apps/calculate-builder-2.2.30-r7 )
+
+	cl_server? ( =sys-apps/calculate-server-2.1.16-r7 )
+"