From: Michał Górny <mgorny@gentoo.org>
Date: Thu, 1 Jan 2015 12:39:45 +0000 (+0000)
Subject: Add a blocker on incompatible ati-drivers.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cb18c5d0ed25923e12d9f02144279957c8be4873;p=gentoo.git

Add a blocker on incompatible ati-drivers.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!
---

diff --git a/app-admin/eselect-opengl/ChangeLog b/app-admin/eselect-opengl/ChangeLog
index bb01521c21f2..634aafa1cafa 100644
--- a/app-admin/eselect-opengl/ChangeLog
+++ b/app-admin/eselect-opengl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/eselect-opengl
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v 1.131 2014/12/31 12:23:30 mgorny Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v 1.132 2015/01/01 12:39:44 mgorny Exp $
+
+  01 Jan 2015; Michał Górny <mgorny@gentoo.org> eselect-opengl-1.3.1.ebuild:
+  Add a blocker on incompatible ati-drivers.
 
   31 Dec 2014; Michał Górny <mgorny@gentoo.org> -eselect-opengl-1.3.0.ebuild:
   Remove the buggy intermediate version.
diff --git a/app-admin/eselect-opengl/Manifest b/app-admin/eselect-opengl/Manifest
index 6dd8b1443f21..49495fc2dba8 100644
--- a/app-admin/eselect-opengl/Manifest
+++ b/app-admin/eselect-opengl/Manifest
@@ -6,25 +6,25 @@ DIST glext.h.85.xz 66344 SHA256 f9db24b274581782726b7ece26825bc6dacc10871f24e712
 DIST glxext.h.34.xz 7368 SHA256 cb22353fbd8f87ffea19b4758194af3a38796c41f93058eeb0fa237cce9a77b7 SHA512 525fe3e7d654ddc38dbbcf1b26c2e84099b502d993a176352386b10229fabf1a9ee60686c41d1486f77bcf08424119658b26ebd90d2260a66bc21bdc55340279 WHIRLPOOL 92901129f724e90a53ee602c3a7fb633ba190ad48bd098f5784eb1069e79c8fec4227fae1c59afee728e5e11776c6ff33fee6b5c5eb97b819b082de0713140d8
 DIST opengl.eselect-1.3.1.xz 2588 SHA256 40d805b89a07b85c60a3f7f3461c699f728a83246344950356ce2840bc34bf9e SHA512 052a804e96d8e8afe8b588fdc8996aad21675ea05e3e668c33293df4b9523dde8be083e4a7909a22ec83260c9735694fe4e8aa7e5d8a3736a8e243f29368e532 WHIRLPOOL 3989715d15b4da9ef8162c605a015571bf88dc4526c2fd309222706de0ce918574192263b1a68c4a1ffea9803b3bd0ea43aa3c75d344d0b3a32015f28e5ce533
 EBUILD eselect-opengl-1.2.7.ebuild 1741 SHA256 abf94132d991a53adac42284456b8225dc69a5da639bfb80aa2b846cb7a17eff SHA512 1c52b5c51559d75bf666cb50f01678c4adceeed7f75b63a4849928164b85956393bda4b0a86066fbd801ca3c99f1d5c0247eaf5ef9752922fa6a9f5e71e2969c WHIRLPOOL 3549df8d269f81a2fa926a75038e6139297f45a7426f08f7632c10c6e5517a1422c135625244273a00aea7d213b9dc248c22a6be692392a7d6fbade1298caffa
-EBUILD eselect-opengl-1.3.1.ebuild 1721 SHA256 ce2bb7758a9ad9d1387840049b1fd9d3002aafc4b9e34536efedecb0828e0063 SHA512 9d5fb86bd71882108edece7e7aaa5f672b0b285f7e595dfc9c6681885247b3c97d06a85847a55af08f4ad43c4019da235838bc167cbbf0af1bc01b0417b56b24 WHIRLPOOL c622e778e1c83be51aef98796bf68bd88f26eb8a59c746527a3f5c38753b66ab1d1529c5d821aadc7dc460bff584bf90a11574f601bbd580e7bc45a5a1e7f506
-MISC ChangeLog 19353 SHA256 62a6ed495e8f70aef6cd4cf3f076e60bf2996d468deb7fcf02b1b53ad8630cec SHA512 7052a27574abb9e4892afe0ebe74d20d6a351fe49026fac176039cdc018afd39698f8ac9a9b44c80f34c7b983f9168ecdc06b7a3bdd4a19b6e760d942beda3e2 WHIRLPOOL 6b0ae1d53cee72bb314f5545146e97270037f7de0af0b4af052754c5dbf1c211d8e1ecce3f7fc7b10d971b70d1301a4ad85d0bbb6fb47841bd7b470a9397604e
+EBUILD eselect-opengl-1.3.1.ebuild 1759 SHA256 9acb84e47371c2bf883f8b7b06ee0b0d9631eca9be1b1604c8725c8abb13d3f6 SHA512 462b783682ecf4703e065b23d9e1d84e279d37122df58cc83543a12d1ac8676578fd6b7a24789e0459b4b492e6bbb6d81e59b586ffe333e416369c08b4a9ba39 WHIRLPOOL dc115aa0c517af243bb524ed81d0f5e9c467b2651a93069681f3eb819be18cf4fd547213f3eafba44c105012aa796f1fa5ec5f3daeb3b5b72289e6f19882f76a
+MISC ChangeLog 19478 SHA256 ee524651b9c339fd47a9a36fbe22653d1dc4aad06a55b2f3fba8e05c3d371d0d SHA512 e5d740b341ab8341530028fd070686e7fb7fe02eac85e6b8029c8ab9336f393dafe879ac3b095c426afc5800ca95dd057758508ab4155105eb861ef7f0a5f5ce WHIRLPOOL c21d2cd1e660878d9248036ec7bec441f9c3eacc4b7b59d4539bac4883006c56047d08de676aee50719107d61aa94db896fb81f3826c7fb7a89c217ee042360a
 MISC metadata.xml 259 SHA256 1f2cf0891ca37f4268a47e2eaa69108868aaef98f78c06d56f4ec9cdecad4dd5 SHA512 c7fe3f4a41209e3816dbe12206254ed37ade121f56e0385f4b3cb5d0b463f15b86e3e92ed09e41675b74200014a521d949c3e20c0046c7d6d357aea39235a229 WHIRLPOOL c4e8c2b7ae4e244b02891fac60eb137a84809578c76a1c05d25d8287bf8a2e7e5dfb6248e6b3b207cdcfc9744b4b460a6f8c7763c0a9da2fc8c8efdcb5530840
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUo+rDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUpUARXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOnTwQALQmbVGerJGXq7rWJH9XOmAI
-Qg1KToNN4Okxsboo4tnHLp4vFGJZabhKkD0F7/DzSVQNTFsYc+HIFE/PCKN84ywC
-tkajGA6lIj2Jdm4ikQ12tT7GblwHEISXxLgLT9Xewp+HieHmq03/nyFaBXEhZ9Xp
-MAJRFtyYqPy+qkqzharfYIt41YT7TEbTszuQjfA+CJXlTpFel38XpihwSjP6tv2b
-W9z/vpGUSlqvBoayCzgsTvsl9ONxTcdNDoYiLO4akRZwgHlG+HI0viJV1UhcNe+b
-pD+QDvtmgEJiPtsGsj8tYBSV5/pHf5pqTJG/TyzzsCp15uvhl7Q5NMaV9lw5vpn6
-JXNWwXgWTWspaZoFz6xTfnCsiN3+AFRpZibRn2vpsMEI0aMlINNeyfeNxBetoWNV
-OxjxpmPNcZNCa9bfWyYznSvao66agHX/8Ojmj8h9hnqO4csyZIU5coAwLEAM5fFy
-hx4sslPvV/T5lTuaoiRn6bvgQVvfGeTPu6MeoppTll799b90DRN8rEJTmzaYwTYC
-QLH7kBmbcI1Jw0w/MX4LHuycfHFjCQNjnFQ9bKxkz7N2gyJtzuxbeYfItqCmRtbg
-xkgzkU10+WtFsdzb/IDJQalj55NHLty1xCf7O8aE9G6HM7HylE3X11RnQlVcQxj9
-ZJUSDcTeXB30h9d/jVrF
-=yqoz
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOtBwP/0R+e6UJ+Yu+rtR0O7ct3pFW
+R0Q+/54L1psKdjqSbRKJCBQmVEB7zmq7SE9KaWpBBp5nFJYGaJmPtEs7b50bkXxk
+ejAdhCUixbZ8v3qG1b66190Lto/TeKiqqvvR00LhRV9q8kAssdGNxfjhna/EUy0A
+LEtz69kwWiT/W31C+yYI0nJQusDk13Tvwmvwmkelq58uOKSLFjKwidxIB3w3obN0
+VySDoBb1eq7x1W3FZVnhllB2mG0BsDfKCytWzLiDc7bbjkxvbWuZ7KpZOLiegOS+
+A6rW/DL7S+KTDta+P8fLsDk6JXcJV1bKKgUm5kQF0lFFSn0utK86UkEqRl07vyMZ
+Np9eIlVGAlK+gECVSyREtneoZ+0XckQFK0J4T9MoIgpDbmqiGhLr9x+/7/Hdzgj6
+zoulQ/Kl3f9WRat97PCWC+gEDbduuLMWpRkfF4M5Z/pd8JtLgPFxxbNKsH3HXY6Z
+GUvr4d2EPE9T/fxjL8jg3uwy6lhIwN7vUlnqzX6WH9OAemRdeFYBGVeMmFB3v4zp
+ikplwnL4ipwtvc3XKln3jlLZP4rqtLiCYnp/7j8y6ErsTKoC+EWq9fn4VPuyMwuV
+nyqpQtiQ5q+J6YNvnnNaZxmMTpWwE2OulLRpPNSbkAI7zilx9Ys4LEKP09i+211l
+Ac/A2+VRXSNQhRxE8GMZ
+=KQaS
 -----END PGP SIGNATURE-----
diff --git a/app-admin/eselect-opengl/eselect-opengl-1.3.1.ebuild b/app-admin/eselect-opengl/eselect-opengl-1.3.1.ebuild
index 041294f32168..b1e484305b58 100644
--- a/app-admin/eselect-opengl/eselect-opengl-1.3.1.ebuild
+++ b/app-admin/eselect-opengl/eselect-opengl-1.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/eselect-opengl-1.3.1.ebuild,v 1.2 2014/12/17 19:09:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/eselect-opengl-1.3.1.ebuild,v 1.3 2015/01/01 12:39:44 mgorny Exp $
 
 EAPI=5
 
@@ -27,7 +27,8 @@ RDEPEND=">=app-admin/eselect-1.2.4
 		 !<media-libs/mesa-10.3.4-r1
 		 !=media-libs/mesa-10.3.5
 		 !<x11-proto/glproto-1.4.17-r1
-		 !<x11-base/xorg-server-1.16.2-r1"
+		 !<x11-base/xorg-server-1.16.2-r1
+		 !<x11-drivers/ati-drivers-14.12-r1"
 
 S=${WORKDIR}