Revision bump for init script changes.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 206 insertions, 19 deletions

diff --git a/media-sound/timidity++/ChangeLog b/media-sound/timidity++/ChangeLog
index 6cd24e379d81..5bd3d714b0cd 100644
--- a/media-sound/timidity++/ChangeLog
+++ b/media-sound/timidity++/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/timidity++
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.109 2009/03/08 22:11:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.110 2009/05/12 15:16:48 ssuominen Exp $
+
+*timidity++-2.13.2-r8 (12 May 2009)
+
+  12 May 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +timidity++-2.13.2-r8.ebuild, +files/init.d.timidity.3:
+  For init script, use chdir and change group to audio wrt #204727.
 
   08 Mar 2009; Mike Frysinger <vapier@gentoo.org>
   +files/timidity++-2.13.2-protos.patch, timidity++-2.13.2-r7.ebuild:
@@ -34,17 +40,13 @@
 
 *timidity++-2.13.2-r7 (21 May 2008)
 
-  21 May 2008; Samuli Suominen <drac@gentoo.org>
+  21 May 2008; Samuli Suominen <ssuominen@gentoo.org>
   +timidity++-2.13.2-r7.ebuild:
   Revision bump to remove USE portaudio wrt #222841.
 
-  15 Feb 2008; Samuli Suominen <drac@gentoo.org>
+  15 Feb 2008; Samuli Suominen <ssuominen@gentoo.org>
   timidity++-2.13.2-r5.ebuild:
-  Allow slang-2.
-
-  09 Feb 2008; Samuli Suominen <drac@gentoo.org>
-  timidity++-2.13.2-r6.ebuild:
-  Fix timidity++ to work with slang 2.1.3.
+  Make slang depend unstrict so >=2.1.3 is allowed.
 
   25 Nov 2007; Brent Baude <ranger@gentoo.org> timidity++-2.13.2-r6.ebuild:
   Marking timidity++-2.13.2-r6 ~ppc for bug 200205
diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
index 4f24e10f959d..0eb5ce949c15 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -1,10 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 50timidity++-gentoo.el 180 RMD160 120c40280826edc0e6c746ed2b09372222235492 SHA1 0489f1a36d33c6d6402c30000af21274c85e2a5b SHA256 a5ca92074ec2b79251bf33a1fb9c4007f528c036f951c6e4fa87311d7acc11a0
 AUX conf.d.timidity 912 RMD160 ba936b4f721ed4d3dac2912659b13b125b09833a SHA1 4636543aa1c2c90afb4ee02e8f11067bda2bd271 SHA256 df5cec5d1335b9bdaf87c358b6d69f4f9300454c16aceaaccb212c98fb08f5a3
 AUX init.d.timidity 457 RMD160 af1eb92172f06b02f6761e414ea88b6e40c446f4 SHA1 50c7c2ce6aba6f2c0eb9612d93368cfd2b87cbd8 SHA256 8882137a10d5e858fa3c20f91d439192dca0759f43702180085d3514a12a59fd
 AUX init.d.timidity.2 477 RMD160 e9d7244b84279f2672183d7780912856eb69bf4e SHA1 894154b77a6123392fb3b785937571f4b0a0cba4 SHA256 4fbb1496d04f9442228910538bf18aeaaa17e8982288dfd7142ea7efdda30ac0
+AUX init.d.timidity.3 502 RMD160 45dcebcc3e2dd3048b4551941464a6ffcf1b8b0e SHA1 4e9f0069d14bdd121c83163d95f75a02801707a9 SHA256 b11e108210446221ccc8344f07a780349197248194bde5956ca69552f7aa5b14
 AUX timidity++-2.13.2-flac.patch 735 RMD160 65abbbc330b0ae486af3686cea8329a4f9a1b75c SHA1 53f4cbf7a343002a3f6508938ba3e24d1f4bf5f5 SHA256 5ae270f3bc0b74def45dde4b85d178c8ebfbef01752ef6b4ec2588ffda48bbca
 AUX timidity++-2.13.2-flac113.patch 11509 RMD160 709a31cc664a9686f1ac22974459e0c932511418 SHA1 173cc8f2ec5ecfc834d5a0027aa3cdecd3f9f14d SHA256 2ed4abfb75d225f6bd295ba4ffbc63f47c6caab57cb09e670df508c5d7447424
 AUX timidity++-2.13.2-gcc4.patch 1325 RMD160 31383eb4a1d0a839d60af8d635aeba02febc9bb5 SHA1 8d50618a2379c078b07e8d0fc59457855c16106c SHA256 20ca5deb95ccbb527c0212f4ad002a5a8df1a9c005e210494abe7bc240cef3ee
@@ -15,12 +13,6 @@ DIST TiMidity++-2.13.2.tar.bz2 1581230 RMD160 0156221846a88abef9312700a050972d85
 DIST timidity++-2.13.2-exiterror.patch 21406 RMD160 6b73552e18580422ca4471f12142440a4f3760a9 SHA1 7cd697b4f7cb1ce45cec46c2e0f6e5e8bf1d9d60 SHA256 ccf1a3678beff5cd143bec07b64ca35620b8eac98b093898c072459051752b77
 EBUILD timidity++-2.13.2-r5.ebuild 4795 RMD160 b3d8964051bbc173b1fa6eebb98b353dac8fa2db SHA1 4d33c5a6991bfb0c9c2b36b0f02d715e3242d587 SHA256 d22621ec331dfbc7a35efd44f5b1121fd8c66e74fadd4501c569643444a46f09
 EBUILD timidity++-2.13.2-r7.ebuild 5035 RMD160 b236a92f7041815119cc8df8daa991bda924a4f2 SHA1 ebe72a94926ccfbd9164f776d752eef1b597380f SHA256 2b8eaffa23874fb4f1e6330c92eb74208fc1401e38482432fc7c3888edb558ab
-MISC ChangeLog 17164 RMD160 36b3deef5a6ffb50ac1ce0b01af5fb6f03b184e8 SHA1 4cce3e34fe0c3a0c25f77636d26d1546a7efe601 SHA256 712e9eaa864900d6adb61828945319874cbb2017b8d6a77c765d1ab3fe261db9
+EBUILD timidity++-2.13.2-r8.ebuild 5005 RMD160 e5223e9eec0be28ccd0d5f75752ffdc3014313a5 SHA1 238a039309e36e6408f439359e0ee561cd9bee4b SHA256 4f89022480dc909a6199114bc80f16b7fd39a7538cf1d9c5a4d1cda0c5069a15
+MISC ChangeLog 17306 RMD160 7f3040597c05d6edb99f76fb510932366f9b74ad SHA1 240603369db975658c0f8117fd2ddca67d48498e SHA256 70c6765a4b8ec9ca1ab3ef4edcd2f19b0ff2d9f40c35c5c3c9643ab46ca45d06
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
-
-iEYEARECAAYFAkm0Qn4ACgkQn/5bYzqsSmH0VwCdGtTsw3wi17Tejbu8mQHenjBO
-C7sAn0FJcahKeqlsx6PdxTNVQNsC723g
-=rP71
------END PGP SIGNATURE-----
diff --git a/media-sound/timidity++/files/init.d.timidity.3 b/media-sound/timidity++/files/init.d.timidity.3
new file mode 100644
index 000000000000..444a914567ab
--- /dev/null
+++ b/media-sound/timidity++/files/init.d.timidity.3
@@ -0,0 +1,20 @@
+#!/sbin/runscript
+ 
+depend() {
+	after alsasound esound
+}
+ 
+start() {
+	ebegin "Starting TiMidity++ Virtual Midi Sequencer"
+	test -n "$TIMIDITY_PCM_NAME" && export TIMIDITY_PCM_NAME
+	start-stop-daemon --start --background --chdir /usr/share/timidity \
+	--chuid timidity:audio --make-pidfile --pidfile /var/run/timidity.pid \
+	--exec /usr/bin/timidity -- -iA ${TIMIDITY_OPTS}
+	eend $?
+}
+ 
+stop() {
+	ebegin "Stopping TiMidity++"
+	start-stop-daemon --stop --quiet --pidfile /var/run/timidity.pid
+	eend $?
+}
diff --git a/media-sound/timidity++/timidity++-2.13.2-r8.ebuild b/media-sound/timidity++/timidity++-2.13.2-r8.ebuild
new file mode 100644
index 000000000000..fb671c370bf5
--- /dev/null
+++ b/media-sound/timidity++/timidity++-2.13.2-r8.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2009 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-r8.ebuild,v 1.1 2009/05/12 15:16:48 ssuominen Exp $
+
+inherit eutils elisp-common
+
+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 mirror://gentoo/${P}-exiterror.patch"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="oss nas esd motif X gtk vorbis tk slang alsa arts jack emacs ao speex flac ncurses"
+
+DEPEND="ncurses? ( >=sys-libs/ncurses-5 )
+	emacs? ( virtual/emacs )
+	gtk? ( >=x11-libs/gtk+-2 )
+	tk? ( >=dev-lang/tk-8.1 )
+	motif? ( x11-libs/openmotif )
+	esd? ( >=media-sound/esound-0.2.22 )
+	nas? ( >=media-libs/nas-1.4 )
+	alsa? ( media-libs/alsa-lib )
+	slang? ( sys-libs/slang )
+	arts? ( kde-base/arts )
+	jack? ( media-sound/jack-audio-connection-kit )
+	vorbis? ( media-libs/libvorbis )
+	flac? ( media-libs/flac )
+	speex? ( media-libs/speex )
+	ao? ( >=media-libs/libao-0.8.5 )"
+RDEPEND="${DEPEND}
+	alsa? ( media-sound/alsa-utils )
+	app-admin/eselect-timidity"
+
+PDEPEND="|| ( media-sound/timidity-eawpatches media-sound/timidity-shompatches media-sound/timidity-freepats )"
+
+SITEFILE=50${PN}-gentoo.el
+
+pkg_setup() {
+	if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then
+		eerror ""
+		eerror "To be able to build TiMidity++ with ALSA support you need"
+		eerror "to have built media-libs/alsa-lib with midi USE flag."
+		die "Missing midi USE flag on media-libs/alsa-lib"
+	fi
+
+	enewgroup audio 18 # Just make sure it exists
+	enewuser timidity -1 -1 /var/lib/timidity audio
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${DISTDIR}/${P}-exiterror.patch"
+	epatch "${FILESDIR}/${P}-gtk26.patch"
+	epatch "${FILESDIR}/${P}-gcc4.patch"
+	epatch "${FILESDIR}/${P}-flac.patch"
+	epatch "${FILESDIR}/${P}-flac113.patch"
+	epatch "${FILESDIR}"/${P}-protos.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 vorbis && audios="${audios},vorbis"
+
+	use oss && audios="${audios},oss"
+	use esd && audios="${audios},esd"
+	use arts && audios="${audios},arts"
+	use jack && audios="${audios},jack"
+	use ao && audios="${audios},ao"
+
+	if use nas; then
+		audios="${audios},nas"
+		myconf="${myconf} --with-nas-library=/usr/$(get_libdir)/libaudio.so --with-x"
+		use X || ewarn "Basic X11 support will be enabled because required by nas."
+	fi
+
+	if use alsa; then
+		audios="${audios},alsa"
+		myconf="${myconf} --with-default-output=alsa --enable-alsaseq"
+	fi
+
+	# We disable motif by default and then only enable it if it's requested.
+	if use motif; then
+		myconf="${myconf} --enable-motif --with-x"
+		use X || ewarn "Basic X11 support will be enabled because required by motif."
+	fi
+
+	econf \
+		--localstatedir=/var/state/timidity++ \
+		--with-lispdir="${SITELISP}/${PN}" \
+		--with-elf \
+		--enable-audio=${audios} \
+		--enable-server \
+		--enable-network \
+		--enable-dynamic \
+		--enable-vt100 \
+		--enable-spline=cubic \
+		$(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 tk tcltk) \
+		--disable-motif \
+		${myconf} || die
+
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+
+	dodoc AUTHORS ChangeLog*
+	dodoc NEWS README* "${FILESDIR}/timidity.cfg-r1"
+
+	# these are only for the ALSA sequencer mode
+	if use alsa; then
+		newconfd "${FILESDIR}/conf.d.timidity" timidity
+		newinitd "${FILESDIR}/init.d.timidity.3" timidity
+	fi
+
+	insinto /etc
+	newins "${FILESDIR}/timidity.cfg-r1" timidity.cfg
+
+	dodir /usr/share/timidity
+	dosym /etc/timidity.cfg /usr/share/timidity/timidity.cfg
+
+	if use emacs ; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	diropts -o timidity -g nobody -m 0700
+	keepdir /var/lib/timidity
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	elog "A timidity config file has been installed in /etc/timidity.cfg."
+	elog "Do not edit this file as it will interfere with the eselect timidity tool."
+	elog "The tool 'eselect timidity' can be used to switch between installed patchsets."
+
+	if use alsa; then
+		elog "An init script for the alsa timidity sequencer has been installed."
+		elog "If you wish to use the timidity virtual sequencer, edit /etc/conf.d/timidity"
+		elog "and run 'rc-update add timidity <runlevel> && /etc/init.d/timidity start'"
+	fi
+
+	if use sparc; then
+		ewarn "sparc support is experimental. oss, alsa, and esd do not work."
+		ewarn "-Ow (save to wave file) does..."
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}