Revision bump to make use of the timidity-update script provided by ohn Richard Moser <nigelenki@comcast.net>.

7 files changed, 283 insertions, 3 deletions

diff --git a/media-sound/timidity++/ChangeLog b/media-sound/timidity++/ChangeLog
index 18978955380a..87a4861111dd 100644
--- a/media-sound/timidity++/ChangeLog
+++ b/media-sound/timidity++/ChangeLog
@@ -1,6 +1,11 @@
 # 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.36 2004/09/22 21:52:19 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.37 2004/09/23 21:18:09 eradicator Exp $
+
+  23 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/timidity-update, +files/timidity.cfg-r1:
+  Revision bump to make use of the timidity-update script provided by ohn
+  Richard Moser <nigelenki@comcast.net>.
 
   22 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
   timidity++-2.13.0-r1.ebuild:
diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
index d45ad9ae176d..fd3ca7a54604 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -4,6 +4,8 @@ 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 7d8683bd8258a5272d87a3d95ea9bb11 timidity++-2.13.0-r1.ebuild 3630
+MD5 c5a2baff542e42f5ff684ada7889da15 timidity++-2.13.0-r2.ebuild 3715
+MD5 15fce5a2d3dfc834b4de65428105e63b files/timidity-update 2513
 MD5 dbfc5d45b6177ffaf7dd74d4971a520a files/conf.d.timidity 912
 MD5 435c2037a224bf9b5a8da7e4d87b48e0 files/digest-timidity++-2.12.0-r3 75
 MD5 0dda67bb7cae71bca455ce730c53bfd1 files/digest-timidity++-2.13.0 71
@@ -14,3 +16,5 @@ MD5 c6e1c7a210aef0fcd2bc42c0cb56a650 files/long-64bit.patch 1166
 MD5 8bbea1ed225e28e6c00e1cc57622b2d5 files/timidity++-2.12.0-alsalib-fix.patch 1355
 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
diff --git a/media-sound/timidity++/files/digest-timidity++-2.13.0-r2 b/media-sound/timidity++/files/digest-timidity++-2.13.0-r2
new file mode 100644
index 000000000000..dc487e1b77c4
--- /dev/null
+++ b/media-sound/timidity++/files/digest-timidity++-2.13.0-r2
@@ -0,0 +1 @@
+MD5 63284981e1ac81fce2b53cc4b1f4c468 TiMidity++-2.13.0.tar.bz2 1418739
diff --git a/media-sound/timidity++/files/timidity-update b/media-sound/timidity++/files/timidity-update
new file mode 100644
index 000000000000..20b0f29185c5
--- /dev/null
+++ b/media-sound/timidity++/files/timidity-update
@@ -0,0 +1,117 @@
+#!/bin/sh
+
+VERSION_MJ="1"
+VERSION_MN="0"
+VERSION_RV="0000"
+VERSION_AP=""
+VERSION="${VERSION_MJ}.${VERSION_MN}${VERSION_AP}"
+
+PATCHDIR="/usr/share/timidity"
+
+# Below is the user's local patchset
+HOME_TARGET="$HOME/.timidity/current"
+TARGET="${HOME_TARGET}"
+
+show_help() {
+	echo "$0 ${VERSION}"
+	echo "Usage: $0 [-g] -s PATCHSET"
+	echo "  or:  $0 -r"
+	echo "  or:  $0 [OPTION]"
+	echo "Set the current timidity patch set to PATCHSET."
+	echo
+	echo "Mandatory arguments to long options are mandatory for short options too."
+	echo "  -g                           Change the global patch set instead of the"
+	echo "                               user's patch set"
+	echo "  -r                           Change current user's patch set to current"
+	echo "                               system patch set"
+	echo "  -s [PATCHSET]                Change to patch set PATCHSET"
+	echo "      --help     display this help and exit"
+}
+
+show_error() {
+	
+	echo "$0: bad or missing argument"
+	echo "Try '$0 --help' for more information."
+}
+
+set_patch() {
+	TARGET=$1
+	PATCHSET=$2
+	# If something borken, no go
+	if [ ! -L ${TARGET} -a -e ${TARGET} ] || [ ! -d ${PATCHDIR}/${PATCHSET} ]; then
+		if [ ! -L ${TARGET} -a -e ${TARGET} ]; then
+			echo "  Error:  ${TARGET} exists and is not a symlink"
+			return -1
+		fi
+		if [ ! -d ${PATCHDIR}/${PATCHSET} ]; then
+			echo "  Error:  patch set ${PATCHSET} does not exist"
+			echo "    Look in ${PATCHDIR}/ for patch sets"
+			return -1
+		fi
+		echo "  Error:  Undefined error."
+		return -1
+	fi
+	echo -n "    * Switching to ${PATCHSET} Timidity patch set..."
+	rm -f ${TARGET} 2>/dev/null
+	ln -s ${PATCHDIR}/${PATCHSET} ${TARGET} 2>/dev/null
+	echo "      [  OK  ]"
+	return 0
+}
+
+restore_patches() {
+	TARGET=$1
+	echo -n "    * Setting up local patch set to system global..."
+	rm -f ${TARGET} 2>/dev/null
+	ln -s ${PATCHDIR}/current ${TARGET}
+	echo "      [  OK  ]"
+}
+
+##############
+# Processing #
+#############
+
+# Make sure home directory is there
+if [ ! -e ${HOME}/.timidity ]; then
+	mkdir -p ${HOME}/.timidity
+	restore_patches $TARGET
+fi
+
+
+################
+# No arguments #
+###############
+
+if [ -z "$1" ]; then
+	show_error
+	exit 1
+fi
+
+#########################
+# Actual processing loop#
+########################
+while [ -n "$1" ]; do
+	case "$1" in
+	-g)
+		TARGET="/usr/share/timidity/current"
+		;;
+	-r)
+		restore_patches ${HOME_TARGET}
+		exit 0
+		;;
+	-s)
+		PATCHSET="$2"
+		shift
+		;;
+	--help)
+		show_help
+		exit 0
+		;;
+	*)
+		show_error
+		exit 1
+		;;
+	esac
+	shift
+done
+
+set_patch $TARGET $PATCHSET
diff --git a/media-sound/timidity++/files/timidity.cfg-r1 b/media-sound/timidity++/files/timidity.cfg-r1
new file mode 100644
index 000000000000..3923fb206204
--- /dev/null
+++ b/media-sound/timidity++/files/timidity.cfg-r1
@@ -0,0 +1,24 @@
+##############################################################################
+#
+# timidity-update core configuration file
+#
+# Easy process:
+#
+#  1.  Change directory to patch directory
+#  2.  Source current/timidity.cfg
+#
+# Current patch set will always be symlinked to current, so make sure that the
+# proper timidity.cfg is in there
+#
+# 
+#  - source /usr/share/timidity
+#  - source ~/.timidity/current
+#  - Make ~/.timidity/current point to the current patch set, or to whatever
+#    the individual user sets
+#  - If ~/.timidity/current isn't found, it will try
+#    /usr/share/timidity/current
+#
+
+dir /usr/share/timidity
+dir ~/.timidity
+source current/timidity.cfg
diff --git a/media-sound/timidity++/timidity++-2.13.0-r1.ebuild b/media-sound/timidity++/timidity++-2.13.0-r1.ebuild
index 8a89f39d0dfd..ce66ee226494 100644
--- a/media-sound/timidity++/timidity++-2.13.0-r1.ebuild
+++ b/media-sound/timidity++/timidity++-2.13.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.9 2004/09/22 21:52:19 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.0-r1.ebuild,v 1.10 2004/09/23 21:18:09 eradicator Exp $
 
 inherit gnuconfig
 
@@ -61,7 +61,7 @@ src_compile() {
 	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 sparc) && use jack && audios="${audios},jack"
+	use jack && audios="${audios},jack"
 	(use x86 || use sparc) && use portaudio && audios="${audios},portaudio"
 
 	use alsa \
diff --git a/media-sound/timidity++/timidity++-2.13.0-r2.ebuild b/media-sound/timidity++/timidity++-2.13.0-r2.ebuild
new file mode 100644
index 000000000000..eb9fc285a65e
--- /dev/null
+++ b/media-sound/timidity++/timidity++-2.13.0-r2.ebuild
@@ -0,0 +1,129 @@
+# 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-r2.ebuild,v 1.1 2004/09/23 21:18:09 eradicator 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 arts 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 )
+	arts? ( kde-base/arts )
+	jack? ( 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"
+		# 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"
+	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"; myconf="${myconf} --with-nas-library=/usr/X11R6/lib/libaudio.so"; }
+	use arts && audios="${audios},arts"
+	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
+
+	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
+	
+	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
+		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
+}