--- /usr/portage/sys-power/pmtools/pmtools-20071116.ebuild	2009-02-28 22:08:49.000000000 +0200
+++ /usr/local/portage/sys-power/pmtools/pmtools-20071116-r1.ebuild	2009-08-15 14:36:56.277111300 +0300
@@ -20,11 +20,9 @@
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${PN}-20071116-acpixtract-pmtools.patch
-
-	sed -i.orig -e '/^CFLAGS/s, -s , ,' \
-		-i.orig -e "s:-Os::g" \
-		acpidump/Makefile || die "sed failed"
+	epatch "${FILESDIR}"/${P}-acpixtract-pmtools.patch
+	epatch "${FILESDIR}"/${P}-cflags-ldflags.patch
+	epatch "${FILESDIR}"/${P}-64bit.patch
 
 	strip-unsupported-flags
 }