Force enable dri unconditionaly. Per bug #216196.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

6 files changed, 40 insertions, 42 deletions

diff --git a/x11-drivers/xf86-video-ati/ChangeLog b/x11-drivers/xf86-video-ati/ChangeLog
index c37ea9666977..57189f3bc831 100644
--- a/x11-drivers/xf86-video-ati/ChangeLog
+++ b/x11-drivers/xf86-video-ati/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/xf86-video-ati
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/ChangeLog,v 1.86 2009/05/04 15:54:20 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/ChangeLog,v 1.87 2009/05/14 17:18:07 scarabeus Exp $
+
+  14 May 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  xf86-video-ati-6.6.3.ebuild, xf86-video-ati-6.8.0-r1.ebuild,
+  xf86-video-ati-6.12.1-r1.ebuild, xf86-video-ati-6.12.2.ebuild:
+  Force enable dri unconditionaly. Per bug #216196.
 
   04 May 2009; Samuli Suominen <ssuominen@gentoo.org>
   xf86-video-ati-6.6.3.ebuild, xf86-video-ati-6.8.0-r1.ebuild,
diff --git a/x11-drivers/xf86-video-ati/Manifest b/x11-drivers/xf86-video-ati/Manifest
index a8d751396965..822fad1599c7 100644
--- a/x11-drivers/xf86-video-ati/Manifest
+++ b/x11-drivers/xf86-video-ati/Manifest
@@ -15,9 +15,9 @@ DIST xf86-video-ati-6.12.1.tar.bz2 896448 RMD160 928c0b24c906a53e0df5da651831dd8
 DIST xf86-video-ati-6.12.2.tar.bz2 902480 RMD160 79f6be946e121a9a27240f1a6b05b7dce0714a2f SHA1 a09a579ece160e714774d3a54da3e1f2bc48ec36 SHA256 1beebba17719f7b9bfbbede156dc33a2dd29ed164657badcb62c7149cfae2750
 DIST xf86-video-ati-6.6.3.tar.bz2 723083 RMD160 a1c24c13ea88fa38f34e3f0540b53082ab2ae129 SHA1 b911df1f4b41ad37028c708e2c95e5a729a32ede SHA256 d08a429e1fb1620ae81839181a4dc6cd579d52fc440d44d7bba36d19be355780
 DIST xf86-video-ati-6.8.0.tar.bz2 901737 RMD160 8414af2de5f21f4106a25631cfb8a4a206f5b0dd SHA1 b6974237b6ae9b45b32fc37f31a3fee7358230d3 SHA256 3863851e3c85d25cc38941eec63e866656806821b028519ae32ab8b276664fba
-EBUILD xf86-video-ati-6.12.1-r1.ebuild 1497 RMD160 5d36133c0209ddf4d87dade2c948868c37698f21 SHA1 388da72d3c182e0db688f7a53f4861eef4670149 SHA256 93dd36adf7647f92e019088c8666f37bcde11191802c7dacaaa3b65407b89c7b
-EBUILD xf86-video-ati-6.12.2.ebuild 1501 RMD160 386fc2f7eefab537a3115ca109c6bbc265e0a8a4 SHA1 07f914a236bd7a06c2e0e3542fee3c04a4cdf6b9 SHA256 e163c230eee7ec92dfeecdb6634d70814bbabde782e635904c854f859e610e62
-EBUILD xf86-video-ati-6.6.3.ebuild 941 RMD160 e050068e7863b7ee6441fbdaf3b6d1fee5fc4c16 SHA1 f9df5f297b9738c5cf6238f902d2cda9b6c598e2 SHA256 0fee8355f95b3129e79eac666e366656abddfde33cc2e811be006d3c9a4400ca
-EBUILD xf86-video-ati-6.8.0-r1.ebuild 1641 RMD160 13fd922e0e4dd168d4f7ffceaf438f4213b8ca96 SHA1 8726a7f6bf72db79fb3835dfac68c25d41f84436 SHA256 2dad9d63a5166fecf2f88dcfad608e665b96f2759e836baafd823f82a2a63765
-MISC ChangeLog 16980 RMD160 efd6567bb08d2bae3a51a7bd72573f4ff2fb1e31 SHA1 49bdec7a1d5d22cb425616fd3147aa936bcf0a05 SHA256 ec48f157c66d86802a8306c320dfd7623d52db934162418296260c90d59ff60a
+EBUILD xf86-video-ati-6.12.1-r1.ebuild 1460 RMD160 4d9c30a1f02d0990f5f62c8889c71f543607cad8 SHA1 1c3dcc8043ee8caaf0a23964db8a3a7c65f5d153 SHA256 3a406925216fc1107cf1805f49cf72bc2d970fe0810d1e018573ac011231d48b
+EBUILD xf86-video-ati-6.12.2.ebuild 1464 RMD160 04682812cc8afabca06b19a67612e595d0b24ee7 SHA1 37ce229aaf8be927f6a74e5b25eb2d58a3a4a6b1 SHA256 267244a5275a688e7eb7887d15deb55c236c7e5f476e4fdd94d2180261ede751
+EBUILD xf86-video-ati-6.6.3.ebuild 907 RMD160 fe6739e27b845b97d3a439c919f90e3f7afad0f3 SHA1 54b4c62c2e687710b6ac1dd5396a669bf6bd0799 SHA256 9ba49de8a1893a94f2d2ccc6d49dece192024d4f8c4862ef2df8f7a326cf807f
+EBUILD xf86-video-ati-6.8.0-r1.ebuild 1603 RMD160 664f69acc26a4266c0c2f6695d75c3ee747e5086 SHA1 d6b111b36fadee016648239dd25738d2257c9688 SHA256 22b919cc788a52aaba81e84144117fbf6e7bb2ca93a3f4412d6171a8394a0756
+MISC ChangeLog 17213 RMD160 04f0819fa6010a7244e43790f0123356887d51b5 SHA1 69a3546aaf453774646ddfa87d1f32b7c620a94c SHA256 af6ffd79f766629a25e580f40b861ec8689449c9952e5748434df2122c677ab5
 MISC metadata.xml 248 RMD160 cd03ee11e8c21ba22717305780d821549335a397 SHA1 4f893793186c0aa6214bb5092f97868bbda6f8b5 SHA256 64ccac620d70982408e05b4b61b818f4ca934afa73457b4a7a1a5a729f3ff1b6
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.1-r1.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.1-r1.ebuild
index ad96fac60370..1d6ea1ddb40e 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.1-r1.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.1-r1.ebuild,v 1.8 2009/05/04 15:54:20 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.1-r1.ebuild,v 1.9 2009/05/14 17:18:07 scarabeus Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -10,7 +10,7 @@ inherit x-modular eutils
 DESCRIPTION="ATI video driver"
 
 KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="dri"
+IUSE=""
 
 SRC_PATCHES="http://dev.gentooexperimental.org/~scarabeus/${PV}-patches-01.tar.bz2"
 SRC_URI="${SRC_URI}
@@ -18,23 +18,21 @@ SRC_URI="${SRC_URI}
 
 RDEPEND=">=x11-base/xorg-server-1.2"
 DEPEND="${RDEPEND}
+	>=x11-libs/libdrm-2
 	>=x11-misc/util-macros-1.1.3
 	x11-proto/fontsproto
+	x11-proto/glproto
 	x11-proto/randrproto
 	x11-proto/videoproto
 	x11-proto/xextproto
 	x11-proto/xineramaproto
+	x11-proto/xf86driproto
 	x11-proto/xf86miscproto
 	x11-proto/xproto
-	dri? ( x11-proto/glproto
-			x11-proto/xf86driproto
-			>=x11-libs/libdrm-2 )"
+"
+CONFIGURE_OPTIONS="--enable-dri"
 
-pkg_setup() {
-	CONFIGURE_OPTIONS="$(use_enable dri)"
-}
-
-PATCHES=""
+#PATCHES=""
 
 src_unpack() {
 	x-modular_src_unpack
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.2.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.2.ebuild
index 4b6a4689a244..956dd52637c5 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.2.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.2.ebuild,v 1.2 2009/05/04 15:54:20 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.2.ebuild,v 1.3 2009/05/14 17:18:07 scarabeus Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -10,7 +10,7 @@ inherit x-modular eutils
 DESCRIPTION="ATI video driver"
 
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="dri"
+IUSE=""
 
 #SRC_PATCHES="http://dev.gentooexperimental.org/~scarabeus/${PV}-patches-01.tar.bz2"
 SRC_URI="${SRC_URI}
@@ -18,23 +18,21 @@ SRC_URI="${SRC_URI}
 
 RDEPEND=">=x11-base/xorg-server-1.2"
 DEPEND="${RDEPEND}
+	>=x11-libs/libdrm-2
 	>=x11-misc/util-macros-1.1.3
 	x11-proto/fontsproto
+	x11-proto/glproto
 	x11-proto/randrproto
 	x11-proto/videoproto
 	x11-proto/xextproto
 	x11-proto/xineramaproto
+	x11-proto/xf86driproto
 	x11-proto/xf86miscproto
 	x11-proto/xproto
-	dri? ( x11-proto/glproto
-			x11-proto/xf86driproto
-			>=x11-libs/libdrm-2 )"
+"
+CONFIGURE_OPTIONS="--enable-dri"
 
-pkg_setup() {
-	CONFIGURE_OPTIONS="$(use_enable dri)"
-}
-
-PATCHES=""
+#PATCHES=""
 
 src_unpack() {
 	x-modular_src_unpack
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.3.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.3.ebuild
index 4c6af9f3ccfb..908a43cb3db1 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.3.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.3.ebuild,v 1.14 2009/05/04 15:54:20 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.3.ebuild,v 1.15 2009/05/14 17:18:07 scarabeus Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -14,20 +14,19 @@ IUSE="dri"
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
 DEPEND="${RDEPEND}
+	>=x11-libs/libdrm-2
+	x11-proto/glproto
 	x11-proto/fontsproto
 	x11-proto/randrproto
 	x11-proto/videoproto
 	x11-proto/xextproto
 	x11-proto/xineramaproto
+	x11-proto/xf86driproto
 	x11-proto/xf86miscproto
 	x11-proto/xproto
-	dri? ( x11-proto/glproto
-			x11-proto/xf86driproto
-			>=x11-libs/libdrm-2 )"
+"
 
-pkg_setup() {
-	CONFIGURE_OPTIONS="$(use_enable dri)"
-}
+CONFIGURE_OPTIONS="--enable-dri"
 
 src_install() {
 	x-modular_src_install
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.8.0-r1.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.8.0-r1.ebuild
index cdf0be0e687f..eeabd56cfeac 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.8.0-r1.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-6.8.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.8.0-r1.ebuild,v 1.12 2009/05/04 15:54:20 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.8.0-r1.ebuild,v 1.13 2009/05/14 17:18:07 scarabeus Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -10,24 +10,22 @@ inherit x-modular
 DESCRIPTION="ATI video driver"
 
 KEYWORDS="alpha amd64 ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="dri"
+IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.2"
 DEPEND="${RDEPEND}
+	>=x11-libs/libdrm-2
 	x11-proto/fontsproto
+	x11-proto/glproto
 	x11-proto/randrproto
 	x11-proto/videoproto
 	x11-proto/xextproto
 	x11-proto/xineramaproto
+	x11-proto/xf86driproto
 	x11-proto/xf86miscproto
 	x11-proto/xproto
-	dri? ( x11-proto/glproto
-			x11-proto/xf86driproto
-			>=x11-libs/libdrm-2 )"
-
-pkg_setup() {
-	CONFIGURE_OPTIONS="$(use_enable dri)"
-}
+"
+CONFIGURE_OPTIONS="--enable-dri"
 
 PATCHES=(
 	"${FILESDIR}/${PV}/0001-Bump-CRTC-size-limits-on-AVIVO-chips-so-30-displays.patch"