diff options
| author |   Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2011-11-24 15:40:09 +0000 |
|---|---|---|
| committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2011-11-24 15:40:09 +0000 |
| commit | d7936584e3fe5f0663d6331a4bb5b3d2f83c4c42 (patch) | |
| tree | 1696f0a83ab6a03198627759bf5f883747b0433c /x11-drivers/ati-drivers | |
| parent | Added missing eclass variable (diff) | |
| download | historical-d7936584e3fe5f0663d6331a4bb5b3d2f83c4c42.tar.gz historical-d7936584e3fe5f0663d6331a4bb5b3d2f83c4c42.tar.bz2 historical-d7936584e3fe5f0663d6331a4bb5b3d2f83c4c42.zip | |
Block recent nvidia-drivers when opencl is enabled, bug #391131.
Package-Manager: portage-2.2.0_alpha77/cvs/Linux x86_64
Diffstat (limited to 'x11-drivers/ati-drivers')
| -rw-r--r-- | x11-drivers/ati-drivers/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-drivers/ati-drivers/Manifest | 4 | ||||
| -rw-r--r-- | x11-drivers/ati-drivers/ati-drivers-11.11.ebuild | 5 |
3 files changed, 11 insertions, 4 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/Manifest b/x11-drivers/ati-drivers/Manifest index cf064be0dd24..035754a9194a 100644 --- a/x11-drivers/ati-drivers/Manifest +++ b/x11-drivers/ati-drivers/Manifest @@ -12,12 +12,12 @@ DIST ati-driver-installer-11-7-x86.x86_64.run 75416437 RMD160 7f693992598e58ecec DIST ati-driver-installer-11-8-x86.x86_64.run 75754239 RMD160 92e33779416228ef75fd8bc8790c5aebd2f3332f SHA1 807a5663b062a9cf6295ac8cf3dee7439aabda57 SHA256 71e0194daef7a50c6d0d3b5712b05375a003d452e39c754278336c3811a2acdf DIST ati-driver-installer-11-9-x86.x86_64.run 76564617 RMD160 8631c510ace5a7d73c97064f8ca16ee9a6fe94e4 SHA1 e01caf1211fd3f9602017a340921aa1b9c38b802 SHA256 d9ad9c8e0bd250ac41c39d9b8e9f77efc82631f4bebacb82ddde982a86530d56 EBUILD ati-drivers-11.10.ebuild 18184 RMD160 b5424f2978fa918fae6d3b91e39fbd5ac73c5055 SHA1 75f9078ed0d9034e582e2ca211cb3626c3c28947 SHA256 5168f7a6f9c86dd0d41fdb2e2390524410c3d2e04d2961de1c8e2606de0beb01 -EBUILD ati-drivers-11.11.ebuild 18859 RMD160 4c1e0433097103b651962c495569d510b3ddb8c5 SHA1 2d1b7eaa9c380232fabdf60662662e255f885c14 SHA256 1803965235235b78f7b123f5a774a0f93523948626ca5d925c979b221761a79a +EBUILD ati-drivers-11.11.ebuild 18909 RMD160 969b43d7d1135957fc8d1c18159f75df5c064849 SHA1 1baf90c174ecf4afcd3bd0a291fa93a9f762b5cb SHA256 adad3be3fab65a1f8b125e59112ed626f0387f766e8ba1b411b5fdf5ea3bba00 EBUILD ati-drivers-11.4.ebuild 17519 RMD160 91cc358252f88c4cfaec77384117907853a88791 SHA1 a262db426e121dc401588bb0b691fcf959162f54 SHA256 dc524e9832910ba6d8e75d4dfdcb3c7cf0dbdfe0fde8132f86a99726fe5e2c48 EBUILD ati-drivers-11.5.ebuild 18366 RMD160 a2ebc6c386c8c92313fa225bb5e10870ba1e4a8e SHA1 e1db1a2241e4e7e7243f658a7d1c16cbeb4f43fd SHA256 9c02162b137b7fc230f0af100ab0c2e2fb53f23fcbe9e34c69589382c5921a2c EBUILD ati-drivers-11.6.ebuild 18265 RMD160 d4d528340fd132a07f415e7c1397b1b3e162f2d9 SHA1 927f46c7e994dd40334a5998a9802efdc0042fe5 SHA256 fec6e4cfdee67e42dbf55a31f1f2470d5227f86bdbcd6e433de32bdd0277d2da EBUILD ati-drivers-11.7.ebuild 18511 RMD160 b9f27982e72171c63044662562ccbce45e74d177 SHA1 0f43c043578f969475d423c11bcebd053d673b36 SHA256 54de74216f659cd5b1587134b7c0ba4a5b6255f39f63fefa55cfa21fe05b5b4d EBUILD ati-drivers-11.8.ebuild 18507 RMD160 424c99bc46a516acc32d0379da7f5fa4ba854646 SHA1 eaccbb3187a55423e5defa93660d595b22dd2c1e SHA256 648d539eae0d9f0c689d5398275d8bf0a777dfc6797eef130b13388da2728ab5 EBUILD ati-drivers-11.9.ebuild 18169 RMD160 04b4aa7a666db3e0225c60e9272e6ced68bc7732 SHA1 6a5183cbf112c075ea09a3bd9c1840e6742304ae SHA256 dc52aeb4a5d1792ede7c301a3b7cb7159cf266cfe19ed9de5517223e496e84de -MISC ChangeLog 73001 RMD160 20bbb2b9d7dbf2de1aa5d99c1e02f1870ae8bf3b SHA1 944c40974582e50cb003647a9a1f604e7a0b2a7b SHA256 16cba7c4d2eb6be8f98bf3c5ee9a6e880da55cc76e22805578331b265f17d267 +MISC ChangeLog 73166 RMD160 dab8f2e1f58dbc5930750207ff2fe90da862adc6 SHA1 6b2afb95435b4c02ed50416534429effbc6cc0c3 SHA256 db98bd3e5d2d2060e0c40af82627571b2506a0f0c45cfd2a52cc347fbccbdaa5 MISC metadata.xml 631 RMD160 4bb276f0a1146ca6da7d80034794c63af1678eb9 SHA1 3b1b9b59e82d5a994b5e225979ef46f668c57fef SHA256 8fccde1e9010a23c674139bfdb1b333d2d2341ea5286b2b8b2ce8a12d502da84 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} |