--- xfree-4.3.0-r5.ebuild-cvs	2004-04-19 18:50:53.000000000 +0000
+++ xfree-4.3.0-r5.ebuild	2004-04-19 18:32:56.000000000 +0000
@@ -309,6 +309,32 @@
 	# Fix DRI related problems
 	cd ${S}/programs/Xserver/hw/xfree86/
 	epatch ${DISTDIR}/xfree86-dri-resume-v8.patch
+	# And, fix libGL problems for sparc: bug #19776
+	if use sparc
+	then
+		cd ${S}
+		einfo "Add patch for glx dispatch table"
+		epatch ${FILESDIR}/sparc-glx-4.3.0.patch || die "Cannot patch glxext.c -- cannot build good libGL"
+		einfo "Fix for overuse of __sparc_v9__ compiler define on linux"
+		sed -i-  -e \
+		's/#ifdef __sparc_v9__/#if (defined(__sparc_v9__) \&\& (!defined(__linux__) || defined(__linux_sparc_64__)))/' \
+		./extras/Mesa/src/glapi.c
+		sed -i-  -e \
+		's/#ifdef __sparc_v9__/#if (defined(__sparc_v9__) \&\& (!defined(__linux__) || defined(__linux_sparc_64__)))/' \
+		./extras/Mesa/src/SPARC/clip.S
+		sed -i-  -e \
+		's/#ifdef __sparc_v9__/#if (defined(__sparc_v9__) \&\& (!defined(__linux__) || defined(__linux_sparc_64__)))/' \
+		./extras/Mesa/src/SPARC/glapi_sparc.S
+		sed -i-  -e \
+		's/#ifdef __sparc_v9__/#if (defined(__sparc_v9__) \&\& (!defined(__linux__) || defined(__linux_sparc_64__)))/' \
+		./extras/Mesa/src/SPARC/norm.S
+		sed -i-  -e \
+		's/#ifdef __sparc_v9__/#if (defined(__sparc_v9__) \&\& (!defined(__linux__) || defined(__linux_sparc_64__)))/' \
+		./extras/Mesa/src/SPARC/sparc.c
+		sed -i-  -e \
+		's/#ifdef __sparc_v9__/#if (defined(__sparc_v9__) \&\& (!defined(__linux__) || defined(__linux_sparc_64__)))/' \
+		./extras/Mesa/src/SPARC/sparc_matrix.h
+	fi	
 
 	# Update Wacom Driver, hopefully resolving bug #1632
 	# The kernel driver should prob also be updated, this can be
--- xfree-4.3.0-r6.ebuild-cvs	2004-04-19 18:51:16.000000000 +0000
+++ xfree-4.3.0-r6.ebuild	2004-04-19 18:34:55.000000000 +0000
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /home/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r6.ebuild,v 1.25 2004/04/19 19:04:24 spyderous Exp $
+# $Header: /home/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r6.ebuild,v 1.24 2004/04/19 06:14:07 spyderous Exp $
 
 # TODO
 # 14 Mar. 2004 <spyderous@gentoo.org>
@@ -361,6 +361,32 @@
 	# Fix DRI related problems
 	cd ${S}/programs/Xserver/hw/xfree86/
 	epatch ${DISTDIR}/xfree86-dri-resume-v8.patch
+	# And, fix libGL problems for sparc: bug #19776
+	if use sparc
+	then
+		cd ${S}
+		einfo "Add patch for glx dispatch table"
+		epatch ${FILESDIR}/sparc-glx-4.3.0.patch || die "Cannot patch glxext.c -- cannot build good libGL"
+		einfo "Fix for overuse of __sparc_v9__ compiler define on linux"
+		sed -i-  -e \
+		's/#ifdef __sparc_v9__/#if (defined(__sparc_v9__) \&\& (!defined(__linux__) || defined(__linux_sparc_64__)))/' \
+		./extras/Mesa/src/glapi.c
+		sed -i-  -e \
+		's/#ifdef __sparc_v9__/#if (defined(__sparc_v9__) \&\& (!defined(__linux__) || defined(__linux_sparc_64__)))/' \
+		./extras/Mesa/src/SPARC/clip.S
+		sed -i-  -e \
+		's/#ifdef __sparc_v9__/#if (defined(__sparc_v9__) \&\& (!defined(__linux__) || defined(__linux_sparc_64__)))/' \
+		./extras/Mesa/src/SPARC/glapi_sparc.S
+		sed -i-  -e \
+		's/#ifdef __sparc_v9__/#if (defined(__sparc_v9__) \&\& (!defined(__linux__) || defined(__linux_sparc_64__)))/' \
+		./extras/Mesa/src/SPARC/norm.S
+		sed -i-  -e \
+		's/#ifdef __sparc_v9__/#if (defined(__sparc_v9__) \&\& (!defined(__linux__) || defined(__linux_sparc_64__)))/' \
+		./extras/Mesa/src/SPARC/sparc.c
+		sed -i-  -e \
+		's/#ifdef __sparc_v9__/#if (defined(__sparc_v9__) \&\& (!defined(__linux__) || defined(__linux_sparc_64__)))/' \
+		./extras/Mesa/src/SPARC/sparc_matrix.h
+	fi	
 
 	ebegin "Setting up config/cf/host.def"
 	cd ${S}; cp ${FILES_DIR}/${PV}/site.def config/cf/host.def || die
@@ -462,34 +488,6 @@
 
 	if use x86
 	then
-		# optimize Mesa for architecture
-		if use mmx
-		then
-			echo "#define HasMMXSupport	YES" >> config/cf/host.def
-			echo "#define MesaUseMMX YES" >> config/cf/host.def
-		else
-			echo "#define HasMMXSupport	NO" >> config/cf/host.def
-			echo "#define MesaUseMMX NO" >> config/cf/host.def
-		fi
-
-		if use 3dnow
-		then
-			echo "#define Has3DNowSupport YES" >> config/cf/host.def
-			echo "#define MesaUse3DNow YES" >> config/cf/host.def
-		else
-			echo "#define Has3DNowSupport NO" >> config/cf/host.def
-			echo "#define MesaUse3DNow NO" >> config/cf/host.def
-		fi
-
-		if use sse
-		then
-			echo "#define HasKatmaiSupport YES" >> config/cf/host.def
-			echo "#define MesaUseKatmai YES" >> config/cf/host.def
-		else
-			echo "#define HasKatmaiSupport NO" >> config/cf/host.def
-			echo "#define MesaUseKatmai NO" >> config/cf/host.def
-		fi
-
 		# build with glide3 support? (build the tdfx_dri.o module)
 		if use 3dfx
 		then