--- /usr/portage/x11-drivers/ati-drivers/ati-drivers-8.20.8.ebuild	2006-01-10 22:31:36.000000000 -0600
+++ ../gentoo/x11-drivers/ati-drivers/ati-drivers-8.21.7.ebuild	2006-01-21 11:30:26.000083808 -0600
@@ -125,7 +125,14 @@
 src_compile() {
 	einfo "Building the DRM module..."
 	cd ${WORKDIR}/common/lib/modules/fglrx/build_mod
-	ln -s ${BASE_NAME}/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version)
+
+	if use amd64; then
+		ln -s ${WORKDIR}/arch/x86_64/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version)
+	fi
+
+	if use x86; then
+		ln -s ${WORKDIR}/arch/x86/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version)
+	fi
 
 	if kernel_is 2 6
 	then
@@ -194,11 +201,18 @@
 
 	#apps
 	exeinto /opt/ati/bin
-	doexe ${BASE_NAME}/usr/X11R6/bin/*
+	if use amd64; then
+		doexe ${WORKDIR}/arch/x86_64/usr/X11R6/bin/*
+	fi
+
+	if use x86; then
+		doexe ${WORKDIR}/arch/x86/usr/X11R6/bin/*
+	fi
 
 	#ati custom stuff
 	insinto /usr
 	doins -r ${WORKDIR}/common/usr/include
+	
 
 	#env.d entry
 	cp ${FILESDIR}/09ati ${T}/
@@ -232,7 +246,14 @@
 
 	# The GLX libraries
 	exeinto ${ATI_ROOT}/lib
-	doexe ${BASE_NAME}/usr/X11R6/${pkglibdir}/libGL.so.1.2
+	if use amd64; then
+		doexe ${WORKDIR}/arch/x86_64/usr/X11R6/${pkglibdir}/libGL.so.1.2
+	fi
+
+	if use x86; then
+		doexe ${WORKDIR}/arch/x86/usr/X11R6/${pkglibdir}/libGL.so.1.2
+	fi
+
 	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so.1
 	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so
 
@@ -274,6 +295,11 @@
 	else
 		doexe ${BASE_NAME}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a
 	fi
+	
+	if has_version "x11-base/xorg-server"; 	then
+		doexe ${BASE_NAME}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.so
+	fi
+	
 	cp -pPR ${BASE_NAME}/usr/X11R6/${pkglibdir}/lib{fglrx_*,aticonfig} \
 			${D}/usr/$(get_libdir)
 	#Not the best place