--- xorg-x11-6.8.1.902.ebuild-	2005-01-29 14:40:52.000000000 +0000
+++ xorg-x11-6.8.1.902.ebuild-	2005-01-29 14:45:24.000000000 +0000
@@ -44,7 +44,7 @@ 
 # IUSE="gatos" disabled because gatos is broken on ~4.4 now (31 Jan 2004)
 IUSE="3dfx 3dnow bitmap-fonts cjk debug dlloader dmx doc font-server hardened
 	insecure-drivers ipv6 minimal mmx nls opengl pam sdk sse static
-	truetype-fonts type1-fonts uclibc xprint xv"
+	truetype-fonts type1-fonts uclibc xaa xprint xv"
 # IUSE_INPUT_DEVICES="synaptics wacom"
 
 FILES_VER="0.3"
@@ -216,6 +216,17 @@ 
 	cd ${WORKDIR}
 	EPATCH_SUFFIX="patch" \
 	epatch ${PATCHDIR}
+	##
+	# Big sunffb patch for xaa, no cfb, etc.  This is
+	# https://bugs.freedesktop.org/show_bug.cgi?id=1891
+	# einfo "Fix general fb [r,g,b] <--> [b,g,r] mixup"
+	# epatch ${FILESDIR}/072_Xserver_fb_convert_RGB_to_BGR.diff
+	if use sparc && use xaa; then
+		einfo "Applying davem's xorg patch 1891:"
+		einfo "Add xaa support to sunffb, remove some cfb dependency"
+		cd ${WORKDIR}
+		epatch ${FILESDIR}/092_Xserver_sunffb_xaa_extension.diff
+	fi
 	cd ${S}
 
 	host_def_setup
--- files/092_Xserver_sunffb_xaa_extension.diff-	2005-01-29 14:45:24.000000000 +0000
+++ files/092_Xserver_sunffb_xaa_extension.diff-	2005-01-29 14:45:24.000000000 +0000