--- /usr/portage/media-sound/timidity++/timidity++-2.13.2.ebuild	2005-02-22 22:37:15.000000000 +0100
+++ timidity++-2.13.2.ebuild	2005-03-20 14:42:57.984604512 +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.6 2005/02/22 21:26:18 chriswhite 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 ao speex flac ncurses"
 
 inherit gnuconfig eutils
 
@@ -19,70 +19,94 @@
 KEYWORDS="amd64 ppc sparc x86"
 
 RDEPEND=">=sys-libs/ncurses-5.0
-	X? ( virtual/x11 )
+	X? (
+		virtual/x11
+		gtk? ( >=x11-libs/gtk+-2.0 )
+		tcltk? ( >=dev-lang/tk-8.1 )
+		motif? ( >=x11-libs/openmotif-2.1 )
+	)
 	esd? ( >=media-sound/esound-0.2.22 )
-	gtk? ( =x11-libs/gtk+-1.2* )
 	nas? ( >=media-libs/nas-1.4 )
 	alsa? ( media-libs/alsa-lib )
-	motif? ( >=x11-libs/openmotif-2.1 )
 	slang? ( >=sys-libs/slang-1.4 )
 	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 )
+	ao? ( >=media-libs/libao-0.8.5 )"
 
 DEPEND="${RDEPEND}
 	sys-devel/autoconf"
 
 RDEPEND="${RDEPEND}
-	X? ( tcltk? ( >=dev-lang/tk-8.1 ) )
 	emacs? ( virtual/emacs )"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${P}-gtk26.patch
+	# fix header location of speex
+	sed -i -e "s:#include <speex:#include <speex/speex:g" configure* timidity/speex_a.c
 }
 
 src_compile() {
 	local myconf
 	local audios
-	local interfaces
 
-	interfaces="dynamic,ncurses,emacs,vt100"
+	if ! use X && ( use gtk || use motif || use tcltk ); then
+		eerror "You must enable X11 support to enable X-dependent interfaces."
+		ebeep
+		ewait 2
+	fi
 
 	if use X ; then
-		myconf="${myconf} --with-x --enable-spectrogram --enable-wrd"
-		interfaces="${interfaces},xskin,xaw"
-		# wrapping in a "use arts" because of bug #48761
-		use arts || use gtk && interfaces="${interfaces},gtk"
-		use motif && interfaces="${interfaces},motif"
+		myconf="${myconf}
+			--with-x
+			--enable-spectrogram
+			--enable-wrd
+			--enable-xskin
+			--enable-xaw
+			$(use_enable gtk)
+			$(use_enable motif)
+			$(use_enable tcltk)"
 	else
 		myconf="${myconf} --without-x"
 	fi
 
-	use slang && interfaces="${interfaces},slang"
+	use flac && audios="${audios},flac"
+	use speex && audios="${audios},speex"
+	use oggvorbis && audios="${audios},vorbis"
 
 	use oss && audios="${audios},oss"
 	use esd && audios="${audios},esd"
-	use oggvorbis && audios="${audios},vorbis"
-	use nas && { audios="${audios},nas"; myconf="${myconf} --with-nas-library=/usr/X11R6/$(get_libdir)/libaudio.so"; }
 	use arts && audios="${audios},arts"
 	use jack && audios="${audios},jack"
 	use portaudio && use !ppc && audios="${audios},portaudio"
+	use ao && audios="${audios},ao"
 
-	use alsa \
-		&& audios="${audios},alsa" \
-		&& interfaces="${interfaces},alsaseq" \
-		&& myconf="${myconf} --with-default-output=alsa"
+	if use nas; then
+		audios="${audios},nas"
+		myconf="${myconf} --with-nas-library=/usr/$(get_libdir)/libaudio.so"
+	fi
+
+	if use alsa; then
+		audios="${audios},alsa"
+		myconf="${myconf} --with-default-output=alsa --enable-alsaeq"
+	fi
 
 	econf \
 		--localstatedir=/var/state/timidity++ \
 		--with-elf \
 		--enable-audio=${audios} \
-		--enable-interface=${interfaces} \
 		--enable-server \
 		--enable-network \
+		--enable-dynamic \
+		--enable-vt100 \
+		$(use_enable emacs) \
+		$(use_enable slang) \
+		$(use_enable ncurses) \
 		${myconf} || die
 
 	emake || die
@@ -94,11 +118,8 @@
 	dodoc AUTHORS ChangeLog* INSTALL*
 	dodoc NEWS README* ${FILESDIR}/timidity.cfg
 
-	insinto /etc/conf.d
-	newins ${FILESDIR}/conf.d.timidity timidity
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/init.d.timidity timidity
+	newconfd ${FILESDIR}/conf.d.timidity timidity
+	newinitd ${FILESDIR}/init.d.timidity timidity
 
 	insinto /etc
 	newins ${FILESDIR}/timidity.cfg-r1 timidity.cfg
@@ -106,8 +127,7 @@
 	dodir /usr/share/timidity
 	dosym /etc/timidity.cfg /usr/share/timidity/timidity.cfg
 
-	exeinto /usr/bin
-	newexe ${FILESDIR}/timidity-update timidity-update
+	newbin ${FILESDIR}/timidity-update timidity-update
 
 	if use emacs ; then
 		dosed 's:/usr/local/bin/timidity:/usr/bin/timidity:g' /usr/share/emacs/site-lisp/timidity.el