--- uae-0.8.29-r1.ebuild	2014-03-28 22:04:43.453223770 +0100
+++ uae-0.8.29-r2.ebuild	2014-03-28 22:31:09.685852019 +0100
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-emulation/uae/uae-0.8.29-r1.ebuild,v 1.3 2011/03/27 10:31:29 nirbheek Exp $
 
-EAPI="1"
+EAPI="5"
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="The Umiquious Amiga Emulator"
 HOMEPAGE="http://www.amigaemulator.org/"
@@ -27,17 +27,17 @@
 	scsi? ( app-cdr/cdrtools )"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/uae-0.8.25-allow_spaces_in_zip_filenames.diff
-	epatch "${FILESDIR}"/uae-0.8.25-struct_uae_wrong_fields_name.diff
-	epatch "${FILESDIR}"/${PN}-0.8.26-uae_reset_args.diff
+src_prepare() {
+	epatch "${FILESDIR}"/uae-0.8.25-allow_spaces_in_zip_filenames.diff \
+		"${FILESDIR}"/uae-0.8.25-struct_uae_wrong_fields_name.diff \
+		"${FILESDIR}"/${PN}-0.8.26-uae_reset_args.diff \
+		"${FILESDIR}"/${P}-underlinking.patch
 	cp "${FILESDIR}"/sdlgfx.h "${S}"/src
+
+	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	# disabling lots of options, cause many code-paths are broken, these should compile,
 	# if you want/need other options, please test if they work with other combinations
 	# before opening a bug
@@ -46,7 +46,9 @@
 		$(use_with sdl) $(use_with sdl sdl-gfx) \
 		$(use_with alsa) \
 		$(use_enable scsi scsi-device) || die "econf failed"
+}
 
+src_compile() {
 	emake -j1 || die "emake failed"
 }
 
@@ -62,7 +64,7 @@
 
 pkg_postinst() {
 	elog
-	elog "Upstream recomends using SDL graphics (with an environment variable)"
+	elog "Upstream recommends using SDL graphics (with an environment variable)"
 	elog "SDL_VIDEO_X11_XRANDR=1 for fullscreen support."
 	echo
 }