Исправление для assemble (удаление nvidia 304)

atratsevskiy
Mike Khiretskiy 9 years ago
parent d80f6420fe
commit 59d58abfb9

@ -0,0 +1,45 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2
http://mirror.yandex.ru/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.32"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# fix rebuild changed packages
epatch "${FILESDIR}/calculate-assemble-2.2.32-fix_rebuild.patch"
# fix assemble path
epatch "${FILESDIR}/calculate-assemble-2.2.32-fix_assemble.patch"
# remove nvidia 173, 304
epatch "${FILESDIR}/calculate-assemble-2.2.32-remove_nvidia_173.patch"
epatch "${FILESDIR}/calculate-assemble-2.2.32-remove_nvidia_304.patch"
# fix creating Packages by emain binhost
epatch "${FILESDIR}/calculate-assemble-2.2.32-binhost.patch"
# disable prelink for + distros
epatch "${FILESDIR}/calculate-assemble-2.2.32-prelink.patch"
# add option --changed-deps for rebuild world
epatch "${FILESDIR}/calculate-assemble-2.2.32-changed_rebuild.patch"
}

@ -0,0 +1,14 @@
diff --git a/pym/cl_assemble.py b/pym/cl_assemble.py
index 48582ad..765feba 100644
--- a/pym/cl_assemble.py
+++ b/pym/cl_assemble.py
@@ -1481,7 +1481,8 @@ class cl_assemble(color_print):
imap(lambda x:x.partition('="')[2].strip('\n"'),
ifilterfalse(lambda x:x.startswith('mask_71') or \
x.startswith('mask_96') or \
- x.startswith('mask_173'),
+ x.startswith('mask_173') or \
+ x.startswith('mask_304'),
ifilter(lambda x:x.startswith('mask_'),
open(nvidiaEclass)))))+\
[('ati-drivers',"",'x11-drivers/ati-drivers')]

@ -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.32-r11
=sys-apps/calculate-i18n-2.2.32
cl_assemble? ( =sys-apps/calculate-assemble-2.2.32-r9 )
cl_builder? ( =sys-apps/calculate-builder-2.2.32-r8 )
cl_server? ( =sys-apps/calculate-server-2.1.16-r18 )
"
Loading…
Cancel
Save