--- /usr/portage/x11-drivers/ati-drivers/ati-drivers-8.20.8.ebuild	2006-01-11 05:36:04.000000000 +0100
+++ /usr/local/portage/x11-drivers/ati-drivers/ati-drivers-8.21.7.ebuild	2006-01-20 23:04:12.000000000 +0100
@@ -8,8 +8,8 @@
 
 DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets"
 HOMEPAGE="http://www.ati.com"
-SRC_URI="x86? ( mirror://gentoo/ati-driver-installer-${PV}-i386.run )
-	 amd64? ( mirror://gentoo/ati-driver-installer-${PV}-x86_64.run )"
+SRC_URI="x86? ( https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-driver-installer-${PV}-i386.run )
+	 amd64? ( https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/64bit/ati-driver-installer-${PV}-x86_64.run )"
 
 LICENSE="ATI"
 KEYWORDS="~amd64 ~x86"
@@ -30,29 +30,38 @@
 
 
 choose_driver_folder() {
-	#new modular X paths, 0 is a workaround.
-	if has_version "x11-base/xorg-server"; then
-		BASE_NAME="${WORKDIR}/x690"
-		xlibdir="xorg"
-	else
-		BASE_NAME="${WORKDIR}/x$(get_version_component_range 1 ${X11_IMPLEM_V})"
-		xlibdir=""
-
-		# Determine if we are facing X.org 6.8.99 aka 6.9
-		if [ "$(get_version_component_range 1 ${X11_IMPLEM_V})" = 6 ] &&
-		   [ "$(get_version_component_range 2 ${X11_IMPLEM_V})" = 8 ] &&
-		   [ "$(get_version_component_range 3 ${X11_IMPLEM_V})" = 99 ]
-		then
-			BASE_NAME="${BASE_NAME}90"
-		else
-			BASE_NAME="${BASE_NAME}$(get_version_component_range 2 ${X11_IMPLEM_V})0"
-		fi
-	fi
-
-	if use amd64 ; then
-		BASE_NAME="${BASE_NAME}_64a"
-	fi
-}
+        echo "X-Version: "
+        echo $(get_version_component_range 1 ${X11_IMPLEM_V})
+        #new modular X paths
+        if [ "$(get_version_component_range 1 ${X11_IMPLEM_V})" = 8 ]
+        then
+                BASE_NAME="${WORKDIR}/x690"
+                xlibdir="xorg"
+        else
+                BASE_NAME="${WORKDIR}/x$(get_version_component_range 1 ${X11_IMPLEM_V})"
+                xlibdir=""
+
+                # Determine if we are facing X.org 6.8.99 aka 6.9
+                if [ "$(get_version_component_range 1 ${X11_IMPLEM_V})" = 6 ] &&
+                   [ "$(get_version_component_range 2 ${X11_IMPLEM_V})" = 8 ] &&
+                   [ "$(get_version_component_range 3 ${X11_IMPLEM_V})" = 99 ]
+                then
+                        BASE_NAME="${BASE_NAME}90"
+                else
+                        BASE_NAME="${BASE_NAME}$(get_version_component_range 2 ${X11_IMPLEM_V})0"
+                fi
+        fi
+        #checking for xorg-server 0.xx and 1.xx
+        if [ "$(get_version_component_range 1 ${X11_IMPLEM_V})" = 0 ] ||
+           [ "$(get_version_component_range 1 ${X11_IMPLEM_V})" = 1 ]
+        then
+                BASE_NAME="${WORKDIR}/x690"
+                xlibdir="xorg"
+        fi
+        if use amd64 ; then
+                BASE_NAME="${BASE_NAME}_64a"
+        fi
+} 
 
 pkg_setup(){
 	#check kernel and sets up KV_OBJ
@@ -125,7 +134,7 @@
 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)
+	ln -s ${BASE_NAME}/../arch/x86/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version)
 
 	if kernel_is 2 6
 	then