From: Donnie Berkholz <dberkholz@gentoo.org>
Date: Wed, 21 Jun 2006 05:36:26 +0000 (+0000)
Subject: (#134604) Don't ever compile sunffb DRI driver, the compilation's broken.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3e52b09465dfe94487870bf988b259ee39c0bb99;p=gentoo.git

(#134604) Don't ever compile sunffb DRI driver, the compilation's broken.
Package-Manager: portage-2.1.1_pre1-r1
---

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 216b1e96da0a..5ad9b476efbd 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-base/xorg-x11
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.544 2006/06/20 20:00:51 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.545 2006/06/21 05:36:26 spyderous Exp $
+
+  21 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.9.0-r2.ebuild:
+  (#134604) Don't ever compile sunffb DRI driver, the compilation's broken.
 
 *xorg-x11-6.9.0-r2 (20 Jun 2006)
 *xorg-x11-6.8.2-r8 (20 Jun 2006)
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index da02b087a1c7..7d4b1dc15dab 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -28,10 +28,10 @@ EBUILD xorg-x11-6.8.2-r8.ebuild 55198 RMD160 216aa2fd5e3b73d8accded22c464fa891dd
 MD5 9d472c52fcb68ee3497c1c26a177bbf1 xorg-x11-6.8.2-r8.ebuild 55198
 RMD160 216aa2fd5e3b73d8accded22c464fa891ddc7193 xorg-x11-6.8.2-r8.ebuild 55198
 SHA256 6376066e0293969a4aaf35f25d5dbe4902826901c5f2158d8cb36a2d98fb48f6 xorg-x11-6.8.2-r8.ebuild 55198
-EBUILD xorg-x11-6.9.0-r2.ebuild 53418 RMD160 f4b9125071ca600026650584e80672244412ca26 SHA1 d2d095c46f4d8e51980902ebbbfc31be7697a017 SHA256 44411dd35bcd123a8d9448d2df5466677c9daa5415eb950cbcaefd45de72eb85
-MD5 17e66fcd064bdce7a5e158bf01f11ba5 xorg-x11-6.9.0-r2.ebuild 53418
-RMD160 f4b9125071ca600026650584e80672244412ca26 xorg-x11-6.9.0-r2.ebuild 53418
-SHA256 44411dd35bcd123a8d9448d2df5466677c9daa5415eb950cbcaefd45de72eb85 xorg-x11-6.9.0-r2.ebuild 53418
+EBUILD xorg-x11-6.9.0-r2.ebuild 53554 RMD160 beb3e5de8e9ad1c2f22d32daa2aeb897fadd3855 SHA1 38213468bb26e9d8d0143d22c5aecb5e362ad256 SHA256 7c7a6fa1e51ded243e30abad5b5650bfe02dbb3ca72a91877d0c5af4e5e7897b
+MD5 9c437706287b24fafeb37aa9dbd7bcd5 xorg-x11-6.9.0-r2.ebuild 53554
+RMD160 beb3e5de8e9ad1c2f22d32daa2aeb897fadd3855 xorg-x11-6.9.0-r2.ebuild 53554
+SHA256 7c7a6fa1e51ded243e30abad5b5650bfe02dbb3ca72a91877d0c5af4e5e7897b xorg-x11-6.9.0-r2.ebuild 53554
 EBUILD xorg-x11-7.0-r1.ebuild 17006 RMD160 627992b23d09536feb904c2128ea253a8e7d8ddc SHA1 fbe945488681a970c88e3403aa7438cbbd491478 SHA256 338b63eabee74f764f6739db8cd341cd7bf9e3f821ca07ee7ad4c214ccec867f
 MD5 67e7474cfcb772d58190a8a5131ce02f xorg-x11-7.0-r1.ebuild 17006
 RMD160 627992b23d09536feb904c2128ea253a8e7d8ddc xorg-x11-7.0-r1.ebuild 17006
@@ -40,10 +40,10 @@ EBUILD xorg-x11-7.1.ebuild 3991 RMD160 22516036cdfa8f25d2ff91a5055901e949ceef1d
 MD5 3c2c849c7c9fbeeed783cac6ad2adf0a xorg-x11-7.1.ebuild 3991
 RMD160 22516036cdfa8f25d2ff91a5055901e949ceef1d xorg-x11-7.1.ebuild 3991
 SHA256 5e9c814847e2203fa2b39003e7eafc2e3502c37c917f51bee667bfd454c020d7 xorg-x11-7.1.ebuild 3991
-MISC ChangeLog 120142 RMD160 a69408ba022768e792da20425e730f7304d8a6bf SHA1 58ba8a04da5c9df5c9d3cd6a379e5dba7fc6dc78 SHA256 abd5c224dbe580b0701554894e47b26d8d4e9261b6248d5f779ec1829e8c87bf
-MD5 54307b1d4ef176c323c27bdc61afa174 ChangeLog 120142
-RMD160 a69408ba022768e792da20425e730f7304d8a6bf ChangeLog 120142
-SHA256 abd5c224dbe580b0701554894e47b26d8d4e9261b6248d5f779ec1829e8c87bf ChangeLog 120142
+MISC ChangeLog 120302 RMD160 3f6c91ef6eddd74fd6fa8eff7c74c30b9e45c227 SHA1 21c86f10ad0e5957573cab1ab92ab07bfaac25fb SHA256 c358c5a882c04f9ea66991a62f595b6b1dbe1e4edb1c90248444be1c26ee6139
+MD5 28f2c7d157517f3e736a1e016a08c8e6 ChangeLog 120302
+RMD160 3f6c91ef6eddd74fd6fa8eff7c74c30b9e45c227 ChangeLog 120302
+SHA256 c358c5a882c04f9ea66991a62f595b6b1dbe1e4edb1c90248444be1c26ee6139 ChangeLog 120302
 MISC metadata.xml 230 RMD160 a293db25b0a2b203eb1b788ee62601190618066e SHA1 c54cfbf65124c6abed943e76d0e3e6c976fc4f12 SHA256 92ca18d8e0533e35b2537904c3d02051148894ef05496a26db29fecc0066a6e0
 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
 RMD160 a293db25b0a2b203eb1b788ee62601190618066e metadata.xml 230
diff --git a/x11-base/xorg-x11/xorg-x11-6.9.0-r2.ebuild b/x11-base/xorg-x11/xorg-x11-6.9.0-r2.ebuild
index 492a8814d24f..41421e3a1351 100644
--- a/x11-base/xorg-x11/xorg-x11-6.9.0-r2.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.9.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.9.0-r2.ebuild,v 1.1 2006/06/20 20:00:51 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.9.0-r2.ebuild,v 1.2 2006/06/21 05:36:26 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -746,6 +746,11 @@ host_def_setup() {
 
 		use_build insecure-drivers BuildDevelDRIDrivers
 
+		# (#134604) sunffb compile broken
+		use insecure-drivers \
+			&& echo "#define DevelDRIDrivers mach64 unichrome" \
+			>> ${HOSTCONF}
+
 		if use ipv6; then
 			# In case Gentoo ever works on a system with IPv6 sockets that don't
 			# also listen on IPv4 (see config/cf/X11.tmpl)