--- /usr/portage/media-sound/timidity++/timidity++-2.13.2.ebuild	2004-12-22 01:13:31.000000000 +0100
+++ timidity++-2.13.2.ebuild	2005-01-10 00:48:48.000000000 +0100
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.2.ebuild,v 1.5 2004/12/22 00:03:54 eradicator Exp $
 
-IUSE="oss nas esd motif X gtk oggvorbis tcltk slang alsa arts jack portaudio emacs"
+IUSE="oss nas esd motif X gtk oggvorbis tcltk slang alsa arts jack portaudio emacs flac speex libao"
 
 inherit gnuconfig eutils
 
@@ -29,7 +29,10 @@
 	arts? ( kde-base/arts )
 	jack? ( media-sound/jack-audio-connection-kit )
 	portaudio? ( !ppc? ( media-libs/portaudio ) )
-	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
+	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )
+	flac? ( >=media-libs/flac-1.1.0 )
+	speex? ( >=media-libs/speex-1.1.5 )
+	libao? ( >=media-libs/libao-0.8.5 )"
 
 DEPEND="${RDEPEND}
 	sys-devel/autoconf"
@@ -42,6 +45,8 @@
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${P}-gtk26.patch
+	# patch header location of speex
+	sed -i -e "s:#include <speex:#include <speex/speex:g" configure* timidity/speex_a.c
 }
 
 src_compile() {
@@ -65,11 +70,14 @@
 
 	use oss && audios="${audios},oss"
 	use esd && audios="${audios},esd"
+	use flac && audios="${audios},flac"
+	use speex && audios="${audios},speex"
 	use oggvorbis && audios="${audios},vorbis"
 	use nas && { audios="${audios},nas"; myconf="${myconf} --with-nas-library=/usr/X11R6/lib/libaudio.so"; }
 	use arts && audios="${audios},arts"
 	use jack && audios="${audios},jack"
 	use portaudio && audios="${audios},portaudio"
+	use libao && audios="${audios},ao"
 
 	use alsa \
 		&& audios="${audios},alsa" \