--- sfftobmp-3.0.ebuild	2008-01-16 22:36:24.000000000 +0100
+++ sfftobmp-3.1.1.ebuild	2008-04-14 22:18:51.000000000 +0200
@@ -3,18 +3,18 @@
 # $Header: /var/cvsroot/gentoo-x86/media-gfx/sfftobmp/sfftobmp-3.0.ebuild,v 1.9 2008/01/16 21:27:00 maekke Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
 
-inherit autotools
+inherit autotools eutils
 
-MY_P=${PN}_${PV/./_}
+MY_P=${PN}${PV//./_}
 S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="sff to bmp converter"
 HOMEPAGE="http://sfftools.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sfftools/${MY_P}_src.zip"
+SRC_URI="mirror://sourceforge/sfftools/${MY_P}.zip"
 
 SLOT="0"
 IUSE=""
 LICENSE="as-is"
 KEYWORDS="amd64 ~hppa ppc x86"
@@ -27,13 +27,11 @@
 	app-arch/unzip"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	sed -i -e "s:#include <iostream>:&\n#include <cerrno>\n:" \
-		src/common.cpp || die
-
+	epatch "${FILESDIR}"/${P}-gcc43.patch
 	eautoreconf
 }
 
 src_install() {
 	make DESTDIR="${D}" install || die