--- ati-drivers-8.27.10.ebuild	2006-08-01 18:44:42.000000000 -0400
+++ ati-drivers-8.27.10.ebuild	2006-08-02 15:48:29.000000000 -0400
@@ -1,6 +1,6 @@ 
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.27.10.ebuild,v 1.1 2006/08/01 22:44:42 lu_zero Exp $
+# $Header: $
 
 IUSE="acpi doc opengl"
 
@@ -16,10 +16,12 @@ 
 KEYWORDS="-* ~amd64 ~x86"
 
 RDEPEND="|| ( x11-base/xorg-server virtual/x11 )
-	 || ( x11-apps/xauth virtual/x11 )
 	 app-admin/eselect-opengl
 	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )
-	 acpi? ( sys-power/acpid )"
+	 acpi? (
+	 	|| ( x11-apps/xauth virtual/x11 )
+	 	sys-power/acpid 
+	 )"
 
 DEPEND=">=virtual/linux-sources-2.4
 	${RDEPEND}"
@@ -45,7 +47,7 @@ 
 		if [ "$(get_version_component_range 1 ${X11_IMPLEM_V})" = 1 ] &&
 		   [ "$(get_version_component_range 2 ${X11_IMPLEM_V})" = 0 ] &&
 		   [ "$(get_version_component_range 3 ${X11_IMPLEM_V})" = 99 ] ||
-		   [ "$(get_version_component_range 2 ${X11_IMPLEM_V})" -gt 0 ]
+		   [ "$(get_version_component_range 2 ${X11_IMPLEM_V})" != 0 ]
 		then
 			BASE_DIR="${WORKDIR}/x710"
 		else
@@ -114,6 +116,8 @@ 
 	# Set up X11 implementation
 	if has_version "x11-base/xorg-server"; then
 		X11_IMPLEM=xorg-x11
+		X11_IMPLEM_V="$(best_version x11-base/xorg-server)"
+		X11_IMPLEM_V="${X11_IMPLEM_V/x11-base\/xorg-server-/}"
 	elif has_version "<x11-base/xorg-x11-6.8.99"; then
 		X11_IMPLEM=xorg-x11
 		X11_IMPLEM_V="$(best_version x11-base/xorg-x11)"
@@ -139,13 +143,6 @@ 
 
 	rm -rf ${ARCH_DIR}/usr/X11R6/bin/{fgl_glxgears,fireglcontrolpanel}
 
-	cd ${WORKDIR}/common/lib/modules/fglrx/build_mod
-
-	#if kernel_is ge 2 6 16; then
-	#	epatch ${FILESDIR}/${PN}-8.22.5-intermodule.patch
-	#	epatch ${FILESDIR}/${PN}-8.23.7-noiommu.patch
-	#	epatch ${FILESDIR}/${PN}-8.23.7-gcc41.patch
-	#fi
 	if use acpi
 	then
 		sed -i \
@@ -154,6 +151,9 @@ 
 		-e "s/#ffff#/#ffff##:.*MIT-MAGIC-COOKIE/" \
 		"${WORKDIR}/common/etc/ati/authatieventsd.sh" \
 			|| die "sed failed."
+
+		cd ${WORKDIR}
+		epatch ${FILESDIR}/ati-powermode.sh.patch
 	fi
 }
 
@@ -238,8 +238,7 @@ 
 		doexe ${ARCH_DIR}/usr/sbin/*
 		insinto /opt/ati/man/man8
 		doins common/usr/share/man/man8/*
-		cp ${FILESDIR}/atieventsd.rc6 ${T}/atieventsd
-		doinitd ${T}/atieventsd
+		newinitd ${FILESDIR}/atieventsd.rc6 atieventsd
 		dodir /etc/conf.d
 		echo 'ATIEVENTSDOPTS=""' > ${D}/etc/conf.d/atieventsd
 	fi
@@ -354,8 +353,16 @@ 
 	insinto ${X11_DIR}/include/X11/extensions
 	doins ${COMMON_DIR}/usr/X11R6/include/X11/extensions/fglrx_gamma.h
 
+	# misc ati configuration files for /etc
 	dodir /etc
-	cp -pPR ${COMMON_DIR}/etc/* ${D}/etc/
+	cp -pP ${COMMON_DIR}/etc/fglrxprofiles.csv ${D}/etc/
+	cp -pP ${COMMON_DIR}/etc/fglrxrc ${D}/etc/
+	dodir /etc/ati
+	cp -pP ${COMMON_DIR}/etc/ati/logo* ${D}/etc/ati/
+	if use acpi
+	then
+		cp -pP ${COMMON_DIR}/etc/ati/authatieventsd.sh ${D}/etc/ati/
+	fi
 }