--- acpid-1.0.10_p4.ebuild	2010-02-07 11:00:28.039332022 -0500
+++ acpid-2.0.1.ebuild	2010-02-07 11:52:13.686985185 -0500
@@ -1,15 +1,13 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/acpid-1.0.10_p4.ebuild,v 1.1 2009/08/31 22:29:13 loki_val Exp $
+# $Header:
 
 inherit toolchain-funcs
 
-MY_P="${P%_p*}-netlink${PV#*_p}"
-S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Daemon for Advanced Configuration and Power Interface"
-HOMEPAGE="http://acpid.sourceforge.net"
-SRC_URI="http://tedfelix.com/linux/${MY_P}.tar.gz"
+HOMEPAGE="http://tedfelix.com/linux/acpid-netlink.html"
+SRC_URI="http://tedfelix.com/linux/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -21,16 +19,19 @@
 
 src_unpack() {
 	unpack ${A}
-	sed -i -e '/^CFLAGS /{s:=:+=:;s:-Werror::;s:-O2 -g::}' "${S}"/Makefile || die
+	sed -i -e '/^CFLAGS /{s:=:+=:;s:-Werror::;s:$(OPT) -g::}' "${S}"/Makefile || die "sed failed"
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" INSTPREFIX="${D}" || die "emake failed"
-	emake -C kacpimon CFLAGS="${CFLAGS} -fno-strict-aliasing" CC="$(tc-getCC)" INSTPREFIX="${D}" || die "emake failed"
+	emake CC="$(tc-getCC)" || die "emake failed"
+	emake -C kacpimon CFLAGS="${CFLAGS} -fno-strict-aliasing" CC="$(tc-getCC)" || die "emake failed"
 }
 
 src_install() {
-	emake INSTPREFIX="${D}" install || die "emake install failed"
+	emake install \
+		DOCDIR=/usr/share/doc/${P} \
+		DESTDIR="${D}" \
+	|| die "install failed"
 
 	dobin kacpimon/kacpimon || die "kacpimon failed to install"
 	newdoc kacpimon/README README-KACPIMON