--- /usr/portage/sys-apps/speedfreq/speedfreq-0.7.2-r2.ebuild	2004-10-09 11:31:36.000000000 +0200
+++ speedfreq-0.7.2-r3.ebuild	2005-01-03 17:02:36.000000000 +0100
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/speedfreq/speedfreq-0.7.2-r2.ebuild,v 1.1 2004/10/09 09:31:36 cardoe Exp $
+# $Header: $
 
 inherit eutils
 
@@ -13,7 +13,9 @@
 KEYWORDS="~x86 ~ppc ~amd64"
 IUSE="acpi"
 
-DEPEND="!ppc? ( acpi? ( sys-apps/acpid ) )"
+DEPEND="!ppc? ( acpi? ( sys-apps/acpid ) )
+		sys-apps/powermgmt-base"
+RDEPEND="virtual/logger"
 
 is_2_6_kernel() {
 	local KV_major="$(echo "${KV}" | cut -d. -f1)"
@@ -54,23 +56,19 @@
 	exeinto /etc/init.d ; newexe ${FILESDIR}/speedfreq.rc speedfreq
 	insinto /etc/conf.d ; newins ${FILESDIR}/speedfreq.conf speedfreq
 	dodoc README
-	if use acpi ; then
-		exeinto /etc/acpi
-		newexe ${FILESDIR}/battery-new.sh battery.sh
+	if useq acpi ; then
+		exeinto /etc/acpi/events
+		doexe ${FILESDIR}/speedfreq_battery
 	fi
 }
 
 pkg_postinst() {
-	if use acpi ; then
-		echo
-		einfo "A sample script for powercontrol has been placed in /etc/acpi/battery.sh"
-		einfo "To use it add the following lines to your /etc/acpi/events/default"
-		einfo " event=battery.*"
-		einfo " action=/etc/acpi/battery.sh %e"
-		einfo "Note that this only supports one battery at the time"
-		echo
-		einfo "Configuration should be done in /etc/conf.d/speedfreq"
-		einfo "Make sure that you have sysfs mounted on /sys"
-		echo
+	echo
+	einfo "Configuration should be done in /etc/conf.d/speedfreq"
+	einfo "Make sure that you have sysfs mounted on /sys"
+	if useq acpi ; then
+		einfo "Please restart acpid for the changes to take effect:"
+		einfo "  $ /etc/init.d/acpid restart"
 	fi
+	echo
 }