various stabilizations on mips for bug 77588, also restrict drivers to newport and fbdev on mips

6 files changed, 34 insertions, 25 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 5ce6e58ba534..b692e865ee71 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-base/xorg-x11
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.263 2005/01/11 10:49:53 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.264 2005/01/11 23:24:11 geoman Exp $
+
+  11 Jan 2005; Stephen P. Becker <geoman@gentoo.org>
+  xorg-x11-6.7.0-r3.ebuild, xorg-x11-6.8.0-r3.ebuild,
+  xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.901.ebuild:
+  various stabilizations on mips for bug 77588, also restrict drivers to
+  newport and fbdev on mips
 
   11 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
   xorg-x11-6.8.0-r3.ebuild, xorg-x11-6.8.0-r4.ebuild,
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index b949ec5b7a4b..b9d5c2160fbd 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,25 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 41ca61a28882e37cfa6ebdbda847042d ChangeLog 63965
-MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
+MD5 03519104448364e6236fcfcc59e9c666 xorg-x11-6.8.1.901.ebuild 51065
 MD5 6c24c8a3aa69cebf79e8633555073c36 xorg-x11-6.7.0-r2.ebuild 38088
-MD5 6f04e427204ce7edb6997f355147f17f xorg-x11-6.7.0-r3.ebuild 38106
+MD5 3ee72b3cfdec6235f2d060fdaedce97e xorg-x11-6.8.0-r4.ebuild 51055
+MD5 29b2a67c2b664ace155cc6dc7a4e0201 xorg-x11-6.7.0-r3.ebuild 38112
 MD5 d548e768ef760adbe7776ac667dbda13 xorg-x11-6.8.0-r1.ebuild 41337
-MD5 fc4a87597c9777f4672de5d940e20b03 xorg-x11-6.8.0-r3.ebuild 39985
-MD5 f902ed3ca0999ab47ac78ecf1c6d9e27 xorg-x11-6.8.0-r4.ebuild 50972
-MD5 b5d8d6ab3d56314d8d0ea480473aacc9 xorg-x11-6.8.1.901.ebuild 50980
+MD5 634b547b86d559bdb15ceb1b8e43aabf ChangeLog 64225
+MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
+MD5 b5246b2b24218270b216447c2b3875a0 xorg-x11-6.8.0-r3.ebuild 40076
 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r2 904
 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r3 904
+MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r1 908
 MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r3 908
 MD5 e5419ff1c0cff3236fb5673ef2263bea files/digest-xorg-x11-6.8.0-r4 911
 MD5 f14e22fa0891e99c1000c0d61d7e8a0c files/xpm-secfix-thomas.diff 55674
-MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r1 908
 MD5 9a74da809b31adcfd00fd65af29ee55e files/digest-xorg-x11-6.8.1.901 517
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB4696ArHZZzCEUG0RAvS3AJ0TQ9uTmkvmJjBg8Rq44HF3ySzd/ACfUBEb
-dLIha/K7JdlkubBi9UiQtY0=
-=v8rM
------END PGP SIGNATURE-----
diff --git a/x11-base/xorg-x11/xorg-x11-6.7.0-r3.ebuild b/x11-base/xorg-x11/xorg-x11-6.7.0-r3.ebuild
index fcd15ad65d7e..e3b31f268689 100644
--- a/x11-base/xorg-x11/xorg-x11-6.7.0-r3.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.7.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.7.0-r3.ebuild,v 1.6 2005/01/02 02:21:38 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0-r3.ebuild,v 1.7 2005/01/11 23:24:11 geoman Exp $
 
 # Libraries which are now supplied in shared form that were not in the past
 # include:  libFS.so, libGLw.so, libI810XvMC.so, libXRes.so, libXfontcache.so,
@@ -66,7 +66,7 @@ LICENSE="Adobe-X CID DEC DEC-2 IBM-X NVIDIA-X NetBSD SGI UCB-LBL XC-2
 	nokia tektronix the-open-group todd-c-miller x-truetype xfree86-1.0
 	MIT SGI-B BSD || ( FTL GPL-2 )"
 SLOT="0"
-KEYWORDS="x86 ppc ~sparc alpha ppc64"
+KEYWORDS="x86 ppc ~sparc alpha ppc64 mips"
 
 # Need portage-2.0.50_pre9 for `use !foo`
 DEPEND=">=sys-libs/ncurses-5.1
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r3.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r3.ebuild
index cb4155d82d9a..0c4c58e73cde 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.0-r3.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.8.0-r3.ebuild,v 1.10 2005/01/11 10:49:53 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r3.ebuild,v 1.11 2005/01/11 23:24:11 geoman Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -73,7 +73,7 @@ LICENSE="Adobe-X CID DEC DEC-2 IBM-X NVIDIA-X NetBSD SGI UCB-LBL XC-2
 	nokia tektronix the-open-group todd-c-miller x-truetype xfree86-1.0
 	MIT SGI-B BSD || ( FTL GPL-2 )"
 SLOT="0"
-KEYWORDS="x86 ~ppc sparc ~ppc64 alpha amd64 hppa arm"
+KEYWORDS="x86 ~ppc sparc ~ppc64 alpha amd64 hppa arm mips"
 
 # Need portage-2.0.50_pre9 for `use !foo`
 DEPEND=">=sys-libs/ncurses-5.1
@@ -379,6 +379,11 @@ host_def_setup() {
 			# echo "#define XF86ExtraCardDrivers via" >> ${HOSTCONF}
 		fi
 
+		if use mips
+		then
+			echo "#define XF86CardDrivers fbdev newport" >> ${HOSTCONF}
+		fi
+
 		if use hppa
 		then
 			echo "#define DoLoadableServer NO" >> ${HOSTCONF}
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild
index 01e49f88f982..ae25b8b6847f 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.8.0-r4.ebuild,v 1.42 2005/01/11 10:49:53 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild,v 1.43 2005/01/11 23:24:11 geoman Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -90,7 +90,7 @@ LICENSE="Adobe-X CID DEC DEC-2 IBM-X NVIDIA-X NetBSD SGI UCB-LBL XC-2
 	nokia tektronix the-open-group todd-c-miller x-truetype xfree86-1.0
 	MIT SGI-B BSD || ( FTL GPL-2 )"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc64 ~amd64"
+KEYWORDS="~x86 ~sparc ~ppc64 ~amd64 ~mips"
 
 DEPEND=">=sys-libs/ncurses-5.1
 	>=sys-libs/zlib-1.1.3-r2
@@ -767,6 +767,10 @@ host_def_setup() {
 			echo "#define XF86CardDrivers fbdev" >> config/cf/host.def
 		fi
 
+		if use mips; then
+			echo "#define XF86CardDrivers fbdev" >> ${HOSTCONF}
+		fi
+
 		# Make xv optional for more minimal builds
 		use_build xv BuildXvLibrary
 		use_build xv BuildXvExt
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.1.901.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.1.901.ebuild
index 4363a743764c..86a18d0d5fd9 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.1.901.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.1.901.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.8.1.901.ebuild,v 1.16 2005/01/11 10:49:53 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.1.901.ebuild,v 1.17 2005/01/11 23:24:11 geoman Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -768,6 +768,10 @@ host_def_setup() {
 			echo "#define XF86CardDrivers fbdev" >> config/cf/host.def
 		fi
 
+		if use mips; then
+			echo "#define XF86CardDrivers fbdev newport" >> ${HOSTCONF}
+		fi
+
 		# Make xv optional for more minimal builds
 		use_build xv BuildXvLibrary
 		use_build xv BuildXvExt