--- /usr/portage/x11-drivers/ati-drivers/ati-drivers-8.26.18-r1.ebuild	2006-07-06 09:04:05.000000000 -0400
+++ ati-drivers-8.26.18-r1.ebuild	2006-07-06 15:20:38.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.26.18-r1.ebuild,v 1.1 2006/07/06 13:04:05 lu_zero Exp $
+# $Header: $
 
 IUSE="acpi doc opengl"
 
@@ -15,11 +15,13 @@
 KEYWORDS="-* ~amd64 ~x86"
 
 RDEPEND="|| ( x11-base/xorg-server virtual/x11 )
-	 || ( x11-apps/xauth virtual/x11 )
 	 !>=x11-base/xorg-server-1.0.99
 	 app-admin/eselect-opengl
 	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )
-	 acpi? ( sys-power/acpid )"
+	 acpi? (
+	 	    || ( x11-apps/auth virtual/x11 )
+	 		sys-power/acpid 
+	 )"
 
 DEPEND=">=virtual/linux-sources-2.4
 	${RDEPEND}"
@@ -146,6 +148,11 @@
 		-e "s/#ffff#/#ffff##:.*MIT-MAGIC-COOKIE/" \
 		"${WORKDIR}/common/etc/ati/authatieventsd.sh" \
 			|| die "sed failed."
+
+		sed -i \
+		-e "s/\/usr\/X11R6\/bin/\/opt\/ati\/bin/" \
+		"${WORKDIR}/common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
+			|| die "sed (2) failed."
 	fi
 }
 
@@ -224,13 +231,13 @@
 	#apps, man pages, and conf files
 	exeinto /opt/ati/bin
 	doexe ${ARCH_DIR}/usr/X11R6/bin/*
-	if use acpid
+	if use acpi
 	then
 		exeinto /opt/ati/sbin
 		doexe ${ARCH_DIR}/usr/sbin/*
 		insinto /opt/ati/man/man8
 		doins common/usr/share/man/man8/*
-		doinitd ${FILESDIR}/atieventsd.rc6 atieventsd
+		newinitd ${FILESDIR}/atieventsd.rc6 atieventsd
 		dodir /etc/conf.d
 		echo 'ATIEVENTSDOPTS=""' > ${D}/etc/conf.d/atieventsd
 	fi
@@ -345,8 +352,17 @@
 	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
+
 }