--- orig/fbgrab-1.0.ebuild	2008-12-07 12:11:32.000000000 +0000
+++ fbgrab-1.0.ebuild	2011-03-30 15:58:58.790956138 +0000
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-gfx/fbgrab/fbgrab-1.0.ebuild,v 1.12 2008/12/07 12:11:32 vapier Exp $
 
-inherit toolchain-funcs
+EAPI="2"
+
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Framebuffer screenshot utility"
 HOMEPAGE="http://hem.bredband.net/gmogmo/fbgrab/"
@@ -15,16 +17,13 @@ IUSE=""
 
 DEPEND="media-libs/libpng"
 
-S=${WORKDIR}/${PN}-1.0
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	sed -i \
 		-e "s:gcc :\$(CC) :" \
 		-e "s:splint:#splint:" \
 		-e "s:-Wall:-Wall ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}:" \
 		Makefile
+	epatch "${FILESDIR}/${PN}-libpng15.patch"
 }
 
 src_compile() {