--- xorg-x11-6.8.1.904.ebuild-	2005-02-03 14:42:43.000000000 +0000
+++ xorg-x11-6.8.1.904.ebuild-	2005-02-03 14:11:09.000000000 +0000
@@ -47,7 +47,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.1"
@@ -491,6 +491,12 @@ 
 	cd ${WORKDIR}
 	EPATCH_SUFFIX="patch" \
 	epatch ${PATCHDIR}
+	einfo "Apply sunleo fix"
+	epatch ${FILESDIR}/sunleo-conversion-2.patch
+	if use xaa; then
+		einfo "Activate sunffb+xaa; deactivate sunffb+DRM"
+		epatch ${FILESDIR}/092_Xserver_sunffb_xaa_extension.diff
+	fi
 	cd ${S}
 }
 
--- files/092_Xserver_sunffb_xaa_extension.diff-	2005-01-25 13:49:56.000000000 +0000
+++ files/092_Xserver_sunffb_xaa_extension.diff-	2005-01-25 13:49:56.000000000 +0000
@@ -0,0 +1,2509 @@ 
+$Id$
+
+Add RENDER and X Acceleration Architecture (XAA) support to Sun FFB driver,
+and use FB framebuffer layer instead of MFB and CFB.
+
+This patch by David S. Miller.
+Forward-port by Fabio M. Di Nitto.
+
+diff -ruN xc-old/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_accel.c xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_accel.c
+--- xc-old/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_accel.c	2004-04-23 21:48:16.000000000 +0200