Updated to include sample cfg file. Closes #24331.

6 files changed, 97 insertions, 79 deletions

diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
index 1fba8dd0c099..10eec4132bc3 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -1,6 +1,6 @@
-MD5 9da3922190e7b89553b1e3891253685b ChangeLog 1553
+MD5 4ebd264fbc2f20ac558073aaca0d229a ChangeLog 1553
 MD5 a8dde2f198a5abb59182523d33b63d86 timidity++-2.12.0.ebuild 1939
-MD5 4ed43f670a95137dfbd2f7b5cffb2a5a timidity++-2.12.0-r3.ebuild 2389
+MD5 e4cb01989d5bdf5f46467bfd46a2a05f timidity++-2.12.0-r3.ebuild 2389
 MD5 4e4757646a4d2477f9bfe883d0b5ae88 files/timidity.cfg 2723
 MD5 435c2037a224bf9b5a8da7e4d87b48e0 files/digest-timidity++-2.12.0 75
 MD5 435c2037a224bf9b5a8da7e4d87b48e0 files/digest-timidity++-2.12.0-r3 75
diff --git a/media-sound/timidity++/files/digest-timidity++-2.12.0-r2 b/media-sound/timidity++/files/digest-timidity++-2.12.0-r2
deleted file mode 100644
index 1a026bfe37a3..000000000000
--- a/media-sound/timidity++/files/digest-timidity++-2.12.0-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6a878bc9341812d6a0b9a7a7d38c368c TiMidity++-2.12.0-pre1.tar.bz2 967676
diff --git a/media-sound/timidity++/files/digest-timidity++-2.12.0-r1 b/media-sound/timidity++/files/digest-timidity++-2.12.0-r3
index 1a026bfe37a3..1a026bfe37a3 100644
--- a/media-sound/timidity++/files/digest-timidity++-2.12.0-r1
+++ b/media-sound/timidity++/files/digest-timidity++-2.12.0-r3
diff --git a/media-sound/timidity++/files/timidity.cfg b/media-sound/timidity++/files/timidity.cfg
new file mode 100644
index 000000000000..4aa3995fd5ef
--- /dev/null
+++ b/media-sound/timidity++/files/timidity.cfg
@@ -0,0 +1,82 @@
+##############################################################################
+# 
+# Instrument configuration file for timidity
+#
+# Specify library directory:		dir <directory>
+#
+# - Multiple library directories may be given. The ones given last will be
+#   searched first so you can override them in later configuration files.
+#   Extra configuration files and MIDI files will also be searched in these
+#   directories.
+#
+# Set tone bank or drum set to modify:	bank <number>
+#					drumset <number>
+#
+# Map program number to patch map:	<program number> <patch name>
+#
+# - If the patch can't be found in the library directories, TiMidity will 
+#   search again with ".pat" appended to the name.
+#   Programs without a loaded patch will be silent, except that for
+#   banks/drumsets >0, the corresponding patch in  bank/drumset 0 will
+#   be used (if one exists).
+#
+# Read another configuration file:	source <file name>
+#
+
+##############################################################################
+# If you've moved things around since compiling, uncomment and edit this to
+# point to the library directory: 
+#
+#dir /usr/local/lib/timidity
+#
+
+##############################################################################
+# This sets up the default patches in the TiMidity support package
+# "timidity-lib-0.1.tar.gz":
+
+bank 0
+   0 patch/acpiano.pat
+  24 patch/nylongt2.pat
+
+##############################################################################
+# If you have Dustin McCartney's "wowpats" patches, you can source the 
+# config file to set them up for TiMidity:
+#
+# (Note that later entries in config files always override earlier ones)
+#
+#source wowpats.cfg
+#
+
+##############################################################################
+# If you have Dustin McCartney's GS drum sets, you can source the config
+# file to set them up for TiMidity:
+#
+#source gsdrum.cfg
+#
+
+##############################################################################
+# If you have the GUS General MIDI patch set, uncomment the following lines 
+# and edit the "dir" statement to point to your GUS patch directory. 
+#
+#dir /dos-C/ultrasnd/midi
+#source gravis.cfg
+#
+
+##############################################################################
+# If you have the Midia patch set, you can source midia.cfg to set them up.
+# Note that midia.cfg sources gravis.cfg in turn, since the filenames are 
+# almost identical.
+#
+#source midia.cfg
+#
+
+
+##############################################################################
+# Use XG program map.
+# "#extension" is keyword on TiMidity++, not comment.
+#extension source xgmap.cfg
+
+
+##############################################################################
+# End of configuration file
+
diff --git a/media-sound/timidity++/timidity++-2.12.0-r1.ebuild b/media-sound/timidity++/timidity++-2.12.0-r1.ebuild
deleted file mode 100644
index b9ca6cc0618c..000000000000
--- a/media-sound/timidity++/timidity++-2.12.0-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.12.0-r1.ebuild,v 1.1 2003/05/08 10:30:00 jje Exp $
-
-IUSE="nas esd motif X gtk oggvorbis tcltk slang alsa"
-
-MY_P=TiMidity++-${PV}-pre1
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="A handy MIDI to WAV converter with OSS and ALSA output support"
-SRC_URI="http://www.goice.co.jp/member/mo/timidity/dist/${MY_P}.tar.bz2"
-HOMEPAGE="http://www.goice.co.jp/member/mo/timidity/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-
-DEPEND=">=sys-libs/ncurses-5.0
-	X? ( >=x11-base/xfree-4.0 )
-	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 )
-	tcltk? ( >=dev-lang/tk-8.1 )
-	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
-
-src_compile() {
-	local myconf
-	local audios
-	local interfaces
-	
-	interfaces="dynamic,ncurses,emacs,vt100"
-	#audios="oss"
-	
-	use X \
-		&& myconf="${myconf} --with-x \
-			--enable-spectrogram --enable-wrd" \
-		&& interfaces="${interfaces},xskin,xaw" \
-		|| myconf="${myconf} --without-x "
-
-	use slang && interfaces="${interfaces},slang"
-	if [ "`use X`" ]; then \
-		use gtk && interfaces="${interfaces},gtk";
-	fi
-	if [ "`use X`" ]; then \
-		use motif && interfaces="${interfaces},motif";
-	fi
-
-	use alsa \
-		&& audios="${audios},alsa" \
-		&& interfaces="${interfaces},alsaseq" \
-		&& myconf="${myconf} --with-default-output=alsa"
-
-	use esd && audios="${audios},esd"
-	use oggvorbis && audios="${audios},vorbis"
-	use nas && audios="${audios},nas"
-		
-	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
-	dodoc AUTHORS COPYING ChangeLog* INSTALL*
-	dodoc NEWS README*
-}
diff --git a/media-sound/timidity++/timidity++-2.12.0-r2.ebuild b/media-sound/timidity++/timidity++-2.12.0-r3.ebuild
index cad25f689560..1093b2cb0f7e 100644
--- a/media-sound/timidity++/timidity++-2.12.0-r2.ebuild
+++ b/media-sound/timidity++/timidity++-2.12.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.12.0-r2.ebuild,v 1.1 2003/07/19 02:26:37 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.12.0-r3.ebuild,v 1.1 2003/07/21 03:51:37 jje Exp $
 
 IUSE="nas esd motif X gtk oggvorbis tcltk slang alsa"
 
@@ -72,6 +72,18 @@ 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 COPYING ChangeLog* INSTALL*
 	dodoc NEWS README*
 }
+
+pkg_postinst () {
+	einfo ""
+	einfo "A timidity config file has been installed in"
+	einfo "/usr/share/timitidy/config/timidity.cfg. This"
+	einfo "file must to copied into /usr/share/timidity/"
+	einfo "and edited to match your configuration."
+	einfo ""
+}