--- xorg-x11-6.7.0-r1.ebuild.old	2004-07-06 19:02:30.314885872 +0900
+++ xorg-x11-6.7.0-r1.ebuild	2004-07-06 19:06:55.005986952 +0900
@@ -409,6 +409,14 @@
 				XF86OSCardDrivers XF86ExtraCardDrivers" >> config/cf/host.def
 		fi
 
+		if use ppc64
+		then
+			echo "#define MakeDllModules YES" >> config/cf/host.def
+			echo "#define XF86VgaHw YES" >> config/cf/host.def
+			echo "#define XF86FBDevHw YES" >> config/cf/host.def
+			echo "#define XF86CardDrivers fbdev v4l ati vga" >> config/cf/host.def
+		fi
+
 		if use sparc
 		then
 			echo "#define XF86CardDrivers sunffb sunleo suncg6 suncg3 suncg14 \
@@ -1093,6 +1101,10 @@
 	# Remove xterm app-defaults, since we don't install xterm
 	rm ${D}/etc/X11/app-defaults/{UXTerm,XTerm,XTerm-color}
 
+	if use ppc64; then
+		ld -whole-archive -shared -o ${D}/usr/X11R6/lib/modules/drivers/fbdevhw.so ${S}/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.o
+	fi
+
 	setup_config_files
 }
 
@@ -1316,6 +1328,14 @@
 
 pkg_postinst() {
 
+	if use ppc64
+	then
+		mv ${ROOT}/usr/X11R6/lib/modules/drivers/fbdev_drv.so ${ROOT}/usr/X11R6/lib/modules/drivers/fbdev_drv.so.orig
+		mv ${ROOT}/usr/X11R6/lib/modules/drivers/ati_drv.so ${ROOT}/usr/X11R6/lib/modules/drivers/ati_drv.so.orig
+		ld -whole-archive -shared -o ${ROOT}/usr/X11R6/lib/modules/drivers/fbdev_drv.so ${ROOT}/usr/X11R6/lib/modules/drivers/fbdev_drv.so.orig ${ROOT}/usr/X11R6/lib/modules/drivers/fbdevhw.so ${ROOT}/usr/X11R6/lib/modules/libshadow.so ${ROOT}/usr/X11R6/lib/modules/libshadowfb.so ${ROOT}/usr/X11R6/lib/modules/libfb.so
+		ld -whole-archive -shared -o ${ROOT}/usr/X11R6/lib/modules/drivers/ati_drv.so ${ROOT}/usr/X11R6/lib/modules/drivers/ati_drv.so.orig ${ROOT}/usr/X11R6/lib/modules/drivers/radeon_drv.so ${ROOT}/usr/X11R6/lib/modules/drivers/atimisc_drv.so ${ROOT}/usr/X11R6/lib/modules/drivers/fbdev_drv.so ${ROOT}/usr/X11R6/lib/modules/drivers/r128_drv.so ${ROOT}/usr/X11R6/lib/modules/drivers/vga_drv.so
+	fi
+
 	env-update
 
 	if [ "${ROOT}" = "/" ]