--- optipng-0.7.3.ebuild	2012-09-18 05:01:19.000000000 +0000
+++ optipng-0.7.3-r1.ebuild	2012-09-21 21:10:46.600910735 +0000
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/optipng-0.7.3.ebuild,v 1.2 2012/09/18 04:45:38 nativemad Exp $
 
-EAPI=2
+EAPI=4
+
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Compress PNG files without affecting image quality"
@@ -28,6 +29,8 @@
 	sed -i \
 		-e 's/^#ifdef AT_FDCWD/#if defined(AT_FDCWD) \&\& !(defined (__SVR4) \&\& defined (__sun))/' \
 		src/optipng/osys.c || die
+
+	tc-export CC AR RANLIB
 }
 
 src_configure() {
@@ -40,16 +43,14 @@
 src_compile() {
 	emake \
 		-C src/optipng \
-		CC="$(tc-getCC)" \
 		GENTOO_CFLAGS="${CFLAGS}" \
-		GENTOO_LDFLAGS="${LDFLAGS}" \
-		|| die "emake failed"
+		GENTOO_LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
-	dodoc README.txt doc/*.txt || die
-	dohtml doc/*.html || die
-	doman src/optipng/man/optipng.1 || die
+	dodoc README.txt doc/*.txt
+	dohtml doc/*.html
+	doman src/${PN}/man/${PN}.1
 
-	dobin src/optipng/optipng || die "dobin failed"
+	dobin src/${PN}/${PN}
 }