--- dosemu-1.4.1_pre20091009.ebuild	2013-07-17 12:07:31.117681458 -0500
+++ dosemu-1.4.1_pre20130107.ebuild	2013-07-17 12:09:06.644145284 -0500
@@ -1,22 +1,28 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/dosemu/dosemu-1.4.1_pre20091009.ebuild,v 1.4 2013/06/11 19:40:45 slyfox Exp $
+# $Header: $
 
-inherit eutils flag-o-matic
+EAPI="5"
+
+inherit flag-o-matic
 
 P_FD="dosemu-freedos-1.0-bin"
+COMMIT="15cfb41ff20a052769d753c3262c57ecb050ad71"
+
 DESCRIPTION="DOS Emulator"
 HOMEPAGE="http://www.dosemu.org/"
 SRC_URI="mirror://sourceforge/dosemu/${P_FD}.tgz
-	mirror://gentoo/${P}.tar.bz2"
+	http://sourceforge.net/code-snapshots/git/d/do/dosemu/code.git/dosemu-code-${COMMIT}.zip -> ${P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="X svga gpm debug alsa sndfile"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="X svga gpm debug alsa sndfile fluidsynth"
 
-RDEPEND="X? ( x11-libs/libXxf86vm
+RDEPEND="X? ( x11-libs/libX11
+		x11-libs/libXxf86vm
 		x11-libs/libXau
+		x11-libs/libXext
 		x11-libs/libXdmcp
 		x11-apps/xset
 		x11-apps/xlsfonts
@@ -26,39 +32,41 @@
 	gpm? ( sys-libs/gpm )
 	alsa? ( media-libs/alsa-lib )
 	sndfile? ( media-libs/libsndfile )
+	fluidsynth? ( media-sound/fluidsynth )
+	media-libs/libsdl
 	>=sys-libs/slang-1.4"
 
 DEPEND="${RDEPEND}
 	X? ( x11-proto/xf86dgaproto )
 	>=sys-devel/autoconf-2.57"
-S="${WORKDIR}/${PN}"
 
-src_compile() {
-	epatch "${FILESDIR}"/${P}-flex.patch #437074
+S="${WORKDIR}/${PN}-code-${COMMIT}"
 
+src_prepare() {
 	# Has problems with -O3 on some systems
 	replace-flags -O[3-9] -O2
 
 	# Fix compilation on hardened
 	append-flags -fno-pic
+}
 
+src_configure() {
 	unset KERNEL
 
-	econf `use_with X x` \
-		`use_enable svga svgalib` \
-		`use_enable debug` \
-		`use_with gpm` \
-		`use_with alsa` \
-		`use_with sndfile` \
+	econf $(use_with X x) \
+		$(use_with svga svgalib) \
+		$(use_enable debug) \
+		$(use_with gpm) \
+		$(use_with alsa) \
+		$(use_with sndfile) \
+		$(use_with fluidsynth) \
 		--with-fdtarball="${DISTDIR}"/${P_FD}.tgz \
 		--sysconfdir=/etc/dosemu/ \
-		--with-docdir=/usr/share/doc/${PF} || die
-
-	emake || die
+		--with-docdir=/usr/share/doc/${PF}
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	default
 	# Don't remove COPYING, see bug #137286
-	dodoc BUGS ChangeLog COPYING NEWS README THANKS || die
+	dodoc COPYING
 }