Version bump and cleanup.

7 files changed, 47 insertions, 135 deletions

diff --git a/media-sound/timidity++/ChangeLog b/media-sound/timidity++/ChangeLog
index 87a4861111dd..b6338868f02d 100644
--- a/media-sound/timidity++/ChangeLog
+++ b/media-sound/timidity++/ChangeLog
@@ -1,9 +1,19 @@
 # ChangeLog for media-sound/timidity++
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.37 2004/09/23 21:18:09 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.38 2004/10/08 04:35:52 eradicator Exp $
+
+*timidity++-2.13.2 (07 Oct 2004)
+
+  07 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -timidity++-2.13.0.ebuild, -timidity++-2.13.0_rc2.ebuild,
+  +timidity++-2.13.2.ebuild:
+  Version bump and cleanup.
+
+*timidity++-2.13.0-r2 (23 Sep 2004)
 
   23 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  +files/timidity-update, +files/timidity.cfg-r1:
+  +files/timidity-update, +files/timidity.cfg-r1,
+  +timidity++-2.13.0-r2.ebuild:
   Revision bump to make use of the timidity-update script provided by ohn
   Richard Moser <nigelenki@comcast.net>.
 
diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
index 30e3d6fdbebe..5473c4e50d7e 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -4,6 +4,7 @@ MD5 13899c922214c56eebe745acd729ebd3 timidity++-2.12.0-r3.ebuild 3030
 MD5 fa9b67effb9e65ff0cf86d77a163e329 timidity++-2.13.0.ebuild 3339
 MD5 e82dc7ad47d16884f0f413c024be1106 timidity++-2.13.0_rc2.ebuild 3251
 MD5 f5761d69f3e3386d4f57747aeb46f627 timidity++-2.13.0-r1.ebuild 3614
+MD5 76b0104b719283d6517ba2caaaca4a41 timidity++-2.13.2.ebuild 3762
 MD5 63304f38f62e9ed082fa9decc18ed134 timidity++-2.13.0-r2.ebuild 3787
 MD5 15fce5a2d3dfc834b4de65428105e63b files/timidity-update 2513
 MD5 dbfc5d45b6177ffaf7dd74d4971a520a files/conf.d.timidity 912
@@ -18,3 +19,4 @@ MD5 4e4757646a4d2477f9bfe883d0b5ae88 files/timidity.cfg 2723
 MD5 0dda67bb7cae71bca455ce730c53bfd1 files/digest-timidity++-2.13.0-r1 71
 MD5 0dda67bb7cae71bca455ce730c53bfd1 files/digest-timidity++-2.13.0-r2 71
 MD5 80fb82d4216373cbf4efafd7719628e0 files/timidity.cfg-r1 669
+MD5 2762e58e610bb861189b3d6b424312fc files/digest-timidity++-2.13.2 71
diff --git a/media-sound/timidity++/files/digest-timidity++-2.13.0 b/media-sound/timidity++/files/digest-timidity++-2.13.0
deleted file mode 100644
index dc487e1b77c4..000000000000
--- a/media-sound/timidity++/files/digest-timidity++-2.13.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 63284981e1ac81fce2b53cc4b1f4c468 TiMidity++-2.13.0.tar.bz2 1418739
diff --git a/media-sound/timidity++/files/digest-timidity++-2.13.0_rc2 b/media-sound/timidity++/files/digest-timidity++-2.13.0_rc2
deleted file mode 100644
index fb2ba31d919f..000000000000
--- a/media-sound/timidity++/files/digest-timidity++-2.13.0_rc2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cf76d9b90d296a96fb36078337d35805 TiMidity++-2.13.0-rc2.tar.bz2 1367867
diff --git a/media-sound/timidity++/files/digest-timidity++-2.13.2 b/media-sound/timidity++/files/digest-timidity++-2.13.2
new file mode 100644
index 000000000000..95bd00b0521f
--- /dev/null
+++ b/media-sound/timidity++/files/digest-timidity++-2.13.2
@@ -0,0 +1 @@
+MD5 a82ceeb2245e22f4de2b41da21eaee32 TiMidity++-2.13.2.tar.bz2 1581230
diff --git a/media-sound/timidity++/timidity++-2.13.0_rc2.ebuild b/media-sound/timidity++/timidity++-2.13.0_rc2.ebuild
deleted file mode 100644
index 3f13add73099..000000000000
--- a/media-sound/timidity++/timidity++-2.13.0_rc2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.0_rc2.ebuild,v 1.13 2004/07/04 23:08:59 fvdpol Exp $
-
-inherit gnuconfig
-
-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="~x86 ~ppc ~amd64 ~sparc"
-IUSE="oss nas esd motif X gtk oggvorbis tcltk slang alsa kde jack portaudio emacs"
-
-RDEPEND=">=sys-libs/ncurses-5.0
-	X? ( virtual/x11 )
-	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 )
-	kde? ( kde-base/arts )
-	jack? ( !sparc? ( media-sound/jack-audio-connection-kit ) )
-	portaudio? ( !ppc? ( media-libs/portaudio ) )
-	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
-
-DEPEND="${RDEPEND}
-	sys-devel/autoconf"
-
-RDEPEND="${RDEPEND}
-	tcltk? ( >=dev-lang/tk-8.1 )
-	emacs? ( virtual/emacs )"
-
-src_compile() {
-	local myconf
-	local audios
-	local interfaces
-
-	interfaces="dynamic,ncurses,emacs,vt100"
-
-	if use X ; then
-		myconf="${myconf} --with-x --enable-spectrogram --enable-wrd"
-		interfaces="${interfaces},xskin,xaw"
-		use gtk && interfaces="${interfaces},gtk"
-		use motif && interfaces="${interfaces},motif"
-	else
-		myconf="${myconf} --without-x"
-	fi
-
-	use slang && interfaces="${interfaces},slang"
-
-	use oss && audios="${audios},oss"
-	use esd && audios="${audios},esd"
-	use oggvorbis && audios="${audios},vorbis"
-	use nas && audios="${audios},nas"
-	use kde && audios="${audios},arts"
-	use sparc || (use jack && audios="${audios},jack")
-	(use x86 || use sparc) && use portaudio && audios="${audios},portaudio"
-
-	use alsa \
-		&& audios="${audios},alsa" \
-		&& interfaces="${interfaces},alsaseq" \
-		&& myconf="${myconf} --with-default-output=alsa"
-
-	econf \
-		--localstatedir=/var/state/timidity++ \
-		--with-elf \
-		--enable-audio=${audios} \
-		--enable-interface=${interfaces} \
-		--enable-server \
-		--enable-network \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodir /usr/share/timidity/config
-	insinto /usr/share/timidity/config
-	doins ${FILESDIR}/timidity.cfg
-	dodoc AUTHORS ChangeLog* INSTALL*
-	dodoc NEWS README*
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/conf.d.timidity timidity
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/init.d.timidity timidity
-
-	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"
-	einfo "/usr/share/timidity/config/timidity.cfg. This"
-	einfo "file must to copied into /usr/share/timidity/"
-	einfo "and edited to match your configuration."
-	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'"
-}
diff --git a/media-sound/timidity++/timidity++-2.13.0.ebuild b/media-sound/timidity++/timidity++-2.13.2.ebuild
index 241d4bb7a2e2..fd208d52ec9e 100644
--- a/media-sound/timidity++/timidity++-2.13.0.ebuild
+++ b/media-sound/timidity++/timidity++-2.13.2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.0.ebuild,v 1.5 2004/07/04 23:08:59 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.2.ebuild,v 1.1 2004/10/08 04:35:52 eradicator Exp $
+
+IUSE="oss nas esd motif X gtk oggvorbis tcltk slang alsa arts jack portaudio emacs"
 
 inherit gnuconfig
 
@@ -11,12 +13,10 @@ 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"
-RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
-IUSE="oss nas esd motif X gtk oggvorbis tcltk slang alsa kde jack portaudio emacs"
 
 RDEPEND=">=sys-libs/ncurses-5.0
 	X? ( virtual/x11 )
@@ -26,8 +26,8 @@ RDEPEND=">=sys-libs/ncurses-5.0
 	alsa? ( media-libs/alsa-lib )
 	motif? ( >=x11-libs/openmotif-2.1 )
 	slang? ( >=sys-libs/slang-1.4 )
-	kde? ( kde-base/arts )
-	jack? ( !sparc? ( media-sound/jack-audio-connection-kit ) )
+	arts? ( kde-base/arts )
+	jack? ( media-sound/jack-audio-connection-kit )
 	portaudio? ( !ppc? ( media-libs/portaudio ) )
 	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
 
@@ -48,7 +48,8 @@ src_compile() {
 	if use X ; then
 		myconf="${myconf} --with-x --enable-spectrogram --enable-wrd"
 		interfaces="${interfaces},xskin,xaw"
-		use gtk && interfaces="${interfaces},gtk"
+		# wrapping in a "use arts" because of bug #48761
+		use arts || use gtk && interfaces="${interfaces},gtk"
 		use motif && interfaces="${interfaces},motif"
 	else
 		myconf="${myconf} --without-x"
@@ -60,9 +61,9 @@ src_compile() {
 	use esd && audios="${audios},esd"
 	use oggvorbis && audios="${audios},vorbis"
 	use nas && { audios="${audios},nas"; myconf="${myconf} --with-nas-library=/usr/X11R6/lib/libaudio.so"; }
-	use kde && audios="${audios},arts"
-	(! use sparc) && use jack && audios="${audios},jack"
-	(use x86 || use sparc) && use portaudio && audios="${audios},portaudio"
+	use arts && audios="${audios},arts"
+	use jack && audios="${audios},jack"
+	use portaudio && audios="${audios},portaudio"
 
 	use alsa \
 		&& audios="${audios},alsa" \
@@ -83,11 +84,9 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodir /usr/share/timidity/config
-	insinto /usr/share/timidity/config
-	doins ${FILESDIR}/timidity.cfg
+
 	dodoc AUTHORS ChangeLog* INSTALL*
-	dodoc NEWS README*
+	dodoc NEWS README* ${FILESDIR}/timidity.cfg
 
 	insinto /etc/conf.d
 	newins ${FILESDIR}/conf.d.timidity timidity
@@ -95,6 +94,15 @@ src_install() {
 	exeinto /etc/init.d
 	newexe ${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
+
+	exeinto /usr/bin
+	newexe ${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
@@ -104,12 +112,19 @@ src_install() {
 
 pkg_postinst() {
 	einfo ""
-	einfo "A timidity config file has been installed in"
-	einfo "/usr/share/timidity/config/timidity.cfg. This"
-	einfo "file must to copied into /usr/share/timidity/"
-	einfo "and edited to match your configuration."
+	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
 }