--- xorg-x11-6.8.0-r4.ebuild-	2004-11-18 12:13:45.000000000 +0000
+++ xorg-x11-6.8.0-r4.ebuild	2004-11-18 14:27:20.000000000 +0000
@@ -86,7 +86,7 @@
 	nokia tektronix the-open-group todd-c-miller x-truetype xfree86-1.0
 	MIT SGI-B BSD || ( FTL GPL-2 )"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~sparc"
 
 DEPEND=">=sys-libs/ncurses-5.1
 	>=sys-libs/zlib-1.1.3-r2
@@ -231,6 +231,20 @@
 
 	epatch ${FILESDIR}/xpm-secfix-thomas.diff
 
+	if use sparc; then
+		cd ${S}
+		einfo "Apply experimental sunffb sanitizer"
+		epatch ${FILESDIR}/sunffb-imake.patch
+		if use dlloader; then
+			einfo "Fix afb, cfb, and Mesa for correct operation with dlloader"
+			epatch ${FILESDIR}/sparc-dlloader-cflags.patch
+			cd ${S}/programs/Xserver
+			epatch ${FILESDIR}/afb-cfb-dlloader-fixes.patch
+			cd ${S}
+		fi
+	fi
+
+
 	host_def_setup
 
 	cd ${S}
@@ -486,7 +500,7 @@
 		# according to ciaranm
 		# And hardened compiler must be softened. -- fmccor, 20.viii.04
 		sparc)	filter-flags "-fomit-frame-pointer"
-			if use hardened; then
+			if use hardened && ! use dlloader; then
 				einfo "Softening gcc for sparc"
 				ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-pie -fno-PIE"
 				append-flags "-fno-pie -fno-PIE"
@@ -778,7 +792,7 @@
 			suntcx sunbw2 glint mga tdfx ati savage vesa vga fbdev \
 			XF86OSCardDrivers XF86ExtraCardDrivers \
 			DevelDrivers" >> ${HOSTCONF}
-			if use hardened; then
+			if use hardened && ! use dlloader; then
 				einfo "Softening the assembler so cfb modules will play nice with sunffb"
 				echo "#define AsCmd CcCmd -c -x assembler -fno-pie -fno-PIE" >> ${HOSTCONF}
 				echo "#define ModuleAsCmd CcCmd -c -x assembler -fno-pie -fno-PIE" >> ${HOSTCONF}