summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2011-11-24 15:40:09 +0000
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2011-11-24 15:40:09 +0000
commit510ff6b8497d2dddf924c312610667abfdd99ce4 (patch)
tree34807f7ceec18ecfa809ee6da1e37bd277f2b249 /x11-drivers
parentAdded missing eclass variable (diff)
downloadgentoo-2-510ff6b8497d2dddf924c312610667abfdd99ce4.tar.gz
gentoo-2-510ff6b8497d2dddf924c312610667abfdd99ce4.tar.bz2
gentoo-2-510ff6b8497d2dddf924c312610667abfdd99ce4.zip
Block recent nvidia-drivers when opencl is enabled, bug #391131.
(Portage version: 2.2.0_alpha77/cvs/Linux x86_64)
Diffstat (limited to 'x11-drivers')
-rw-r--r--x11-drivers/ati-drivers/ChangeLog6
-rw-r--r--x11-drivers/ati-drivers/ati-drivers-11.11.ebuild5
2 files changed, 9 insertions, 2 deletions
diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index c408521d230d..03d3c25cb709 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-drivers/ati-drivers
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.263 2011/11/21 15:45:39 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.264 2011/11/24 15:40:09 chithanh Exp $
+
+ 24 Nov 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ ati-drivers-11.11.ebuild:
+ Block recent nvidia-drivers when opencl is enabled, bug #391131.
21 Nov 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
ati-drivers-11.11.ebuild:
diff --git a/x11-drivers/ati-drivers/ati-drivers-11.11.ebuild b/x11-drivers/ati-drivers/ati-drivers-11.11.ebuild
index 5a961bffcfd0..55c517bb66dd 100644
--- a/x11-drivers/ati-drivers/ati-drivers-11.11.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-11.11.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-11.11.ebuild,v 1.2 2011/11/21 15:45:39 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-11.11.ebuild,v 1.3 2011/11/24 15:40:09 chithanh Exp $
EAPI=4
@@ -46,6 +46,9 @@ RDEPEND="
x11-libs/qt-core
x11-libs/qt-gui
)
+ opencl? (
+ !>=x11-drivers/nvidia-drivers-195
+ )
"
DEPEND="${RDEPEND}