--- dog-1.7-r3.ebuild	2010-05-21 15:07:06.000000000 +0000
+++ /tmp/dog-1.7-r3.ebuild	2010-08-31 17:04:51.000000000 +0000
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-apps/dog/dog-1.7-r3.ebuild,v 1.9 2010/05/21 15:00:22 darkside Exp $
 
+EAPI=2
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Dog is better than cat"
@@ -14,9 +15,7 @@
 KEYWORDS="alpha amd64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris"
 IUSE=""
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch ${FILESDIR}/${P}-check-ctime.diff
 	epatch ${FILESDIR}/${PV}-manpage-touchup.patch
 	epatch ${FILESDIR}/${P}-64bit-goodness.patch
@@ -29,11 +28,15 @@
 	fi
 
 	sed -i \
-		-e 's,^CFLAGS,#CFLAGS,' \
+		-e 's|gcc ${CFLAGS} -o|gcc ${CFLAGS} ${LDFLAGS} -o|' \
 		-e "s,gcc,$(tc-getCC)," \
 		Makefile || die "sed Makefile failed"
 }
 
+src_compile() {
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
+}
+
 src_install() {
 	dobin dog || die
 	doman dog.1