Revbump to fix a handful of bugs including 76361, 76654, 77286, 83018, and 84752. Thanks Flameeyes for the ebuild.

(Portage version: 2.0.51.19)

4 files changed, 154 insertions, 11 deletions

diff --git a/media-sound/timidity++/ChangeLog b/media-sound/timidity++/ChangeLog
index 8d633586450c..f35c903a6330 100644
--- a/media-sound/timidity++/ChangeLog
+++ b/media-sound/timidity++/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/timidity++
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.44 2005/02/28 10:35:26 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.45 2005/03/21 22:57:36 eradicator Exp $
+
+*timidity++-2.13.2-r1 (21 Mar 2005)
+
+  21 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +timidity++-2.13.2-r1.ebuild:
+  Revbump to fix a handful of bugs including 76361, 76654, 77286, 83018, and
+  84752. Thanks Flameeyes for the ebuild.
 
   28 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
   -files/long-64bit.patch, -files/timidity++-2.12.0-alsalib-fix.patch,
diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
index fb5019cefd74..924d70759984 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 012112e64cc646af5ba55a6aa602678f ChangeLog 7388
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 fabeca60a418a7554441feb685d37281 timidity++-2.13.2-r1.ebuild 4184
 MD5 b89f80300e87fd74d3c006ad0eb58d22 timidity++-2.13.2.ebuild 3868
 MD5 dbfc5d45b6177ffaf7dd74d4971a520a files/conf.d.timidity 912
+MD5 2762e58e610bb861189b3d6b424312fc files/digest-timidity++-2.13.2-r1 71
 MD5 2762e58e610bb861189b3d6b424312fc files/digest-timidity++-2.13.2 71
 MD5 67ee26f08d8de1243029a0a8849cd022 files/gnuconfig_update.patch 477
 MD5 dbc4910aa5c6a5681dd4f121b5db63e8 files/init.d.timidity 457
 MD5 16a4adec164836d4390dc6b0f9a69ce9 files/timidity++-2.13.2-gtk26.patch 588
 MD5 15fce5a2d3dfc834b4de65428105e63b files/timidity-update 2513
 MD5 80fb82d4216373cbf4efafd7719628e0 files/timidity.cfg-r1 669
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCIvP7ArHZZzCEUG0RAtFQAJ0S7dqrTqPKm9+hPVeUmuo+F0rx2QCfZBid
-vMBMuO/zLm8jH9IQ5/W9UUY=
-=Yos6
------END PGP SIGNATURE-----
diff --git a/media-sound/timidity++/files/digest-timidity++-2.13.2-r1 b/media-sound/timidity++/files/digest-timidity++-2.13.2-r1
new file mode 100644
index 000000000000..95bd00b0521f
--- /dev/null
+++ b/media-sound/timidity++/files/digest-timidity++-2.13.2-r1
@@ -0,0 +1 @@
+MD5 a82ceeb2245e22f4de2b41da21eaee32 TiMidity++-2.13.2.tar.bz2 1581230
diff --git a/media-sound/timidity++/timidity++-2.13.2-r1.ebuild b/media-sound/timidity++/timidity++-2.13.2-r1.ebuild
new file mode 100644
index 000000000000..93403f8ccbed
--- /dev/null
+++ b/media-sound/timidity++/timidity++-2.13.2-r1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.2-r1.ebuild,v 1.1 2005/03/21 22:57:36 eradicator Exp $
+
+IUSE="oss nas esd motif X gtk gtk2 oggvorbis tcltk slang alsa arts jack portaudio emacs ao speex flac ncurses"
+
+inherit gnuconfig eutils
+
+MY_PV=${PV/_/-}
+MY_P=TiMidity++-${MY_PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="A handy MIDI to WAV converter with OSS and ALSA output support"
+HOMEPAGE="http://timidity.sourceforge.net/"
+SRC_URI="mirror://sourceforge/timidity/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="ncurses? ( >=sys-libs/ncurses-5.0 )
+	gtk? ( 	gtk2? ( >=x11-libs/gtk+-2.0 )
+		!gtk2? ( =x11-libs/gtk+-1.2* ) )
+	tcltk? ( >=dev-lang/tk-8.1 )
+	motif? ( =x11-libs/openmotif-2.1* )
+
+	esd? ( >=media-sound/esound-0.2.22 )
+	nas? ( >=media-libs/nas-1.4 )
+	alsa? ( media-libs/alsa-lib )
+	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 )
+	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}
+	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
+
+	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 arts && audios="${audios},arts"
+	use jack && audios="${audios},jack"
+	use portaudio && use !ppc && audios="${audios},portaudio"
+	use ao && audios="${audios},ao"
+
+	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-server \
+		--enable-network \
+		--enable-dynamic \
+		--enable-vt100 \
+		$(use_enable emacs) \
+		$(use_enable slang) \
+		$(use_enable ncurses) \
+		$(use_with X x) \
+		$(use_enable X spectrogram) \
+		$(use_enable X wrd) \
+		$(use_enable X xskin) \
+		$(use_enable X xaw) \
+		$(use_enable gtk) \
+		$(use_enable motif) \
+		$(use_enable tcltk) \
+		${myconf} || die
+
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+
+	dodoc AUTHORS ChangeLog* INSTALL*
+	dodoc NEWS README* ${FILESDIR}/timidity.cfg
+
+	newconfd ${FILESDIR}/conf.d.timidity timidity
+	newinitd ${FILESDIR}/init.d.timidity timidity
+
+	insinto /etc
+	newins ${FILESDIR}/timidity.cfg-r1 timidity.cfg
+
+	dodir /usr/share/timidity
+	dosym /etc/timidity.cfg /usr/share/timidity/timidity.cfg
+
+	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
+	else
+		rm ${D}/timidity.el
+	fi
+}
+
+pkg_postinst() {
+	einfo ""
+	einfo "A timidity config file has been installed in /etc/timidity.cfg."
+	einfo ""
+	einfo "Do not edit this file as it will interfere with the timidity-update tool."
+	einfo "You will need to emerge timidity-eawpatches or timidity-shompatches."
+	einfo ""
+	einfo "The tool 'timidity-update' can be used to switch between installed patchsets."
+	einfo ""
+	einfo "An init script for the alsa timidity sequencer has been installed."
+	einfo "If you wish to use the timidity virtual sequencer, edit /etc/conf.d/timidity"
+	einfo "and run 'rc-update add timidity <runlevel> && /etc/init.d/timidity start'"
+
+	if use sparc; then
+		ewarn "sparc support is experimental. oss, alsa, esd, and portaudio do not work."
+		ewarn "-Ow (save to wave file) does..."
+	fi
+}