Fix quoting, install init.d script only when alsa support is used, add ~x86-fbsd keyword.

Package-Manager: portage-2.1.2_rc2-r1

3 files changed, 44 insertions, 23 deletions

diff --git a/media-sound/timidity++/ChangeLog b/media-sound/timidity++/ChangeLog
index b0fbd61e98ff..cfece67cbe85 100644
--- a/media-sound/timidity++/ChangeLog
+++ b/media-sound/timidity++/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/timidity++
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.64 2006/11/12 12:13:01 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.65 2006/11/22 23:32:21 flameeyes Exp $
+
+  22 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
+  timidity++-2.13.2-r2.ebuild:
+  Fix quoting, install init.d script only when alsa support is used, add
+  ~x86-fbsd keyword.
 
   12 Nov 2006; Guy Martin <gmsoft@gentoo.org> timidity++-2.13.2-r2.ebuild:
   Stable on hppa.
diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
index b45eed35239b..74f1b41d4ee0 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX conf.d.timidity 912 RMD160 ba936b4f721ed4d3dac2912659b13b125b09833a SHA1 4636543aa1c2c90afb4ee02e8f11067bda2bd271 SHA256 df5cec5d1335b9bdaf87c358b6d69f4f9300454c16aceaaccb212c98fb08f5a3
 MD5 dbfc5d45b6177ffaf7dd74d4971a520a files/conf.d.timidity 912
 RMD160 ba936b4f721ed4d3dac2912659b13b125b09833a files/conf.d.timidity 912
@@ -28,18 +31,18 @@ RMD160 856294ef64ab459a03375cb86e5f0fbcdef88ab3 files/timidity.cfg-r1 669
 SHA256 50fb27ea57cc225fcb8e8368e8afc130f2bba22d0787ebb6beacd2112550f9ce files/timidity.cfg-r1 669
 DIST TiMidity++-2.13.2.tar.bz2 1581230 RMD160 0156221846a88abef9312700a050972d85084fd8 SHA1 8e603146e1164335303a5ac5dff291f369241b4e SHA256 0a8524b789b57eaf944c3d9bce32c21a4e893016b22a02a24cd0a4c6afee7260
 DIST timidity++-2.13.2-exiterror.patch 21406 RMD160 6b73552e18580422ca4471f12142440a4f3760a9 SHA1 7cd697b4f7cb1ce45cec46c2e0f6e5e8bf1d9d60 SHA256 ccf1a3678beff5cd143bec07b64ca35620b8eac98b093898c072459051752b77
-EBUILD timidity++-2.13.2-r2.ebuild 4181 RMD160 6927b33b1c20674807a136c21c3dc7918e8b6222 SHA1 710be4324bad54d2c119241bad7b09baef871409 SHA256 7cf1006f4605d7fe7467e168f38d7dc6c49cfdb3d4f4c96428c1cab36c8bf010
-MD5 aee87e9e4b5e2f7946736ee2c0b8ab8b timidity++-2.13.2-r2.ebuild 4181
-RMD160 6927b33b1c20674807a136c21c3dc7918e8b6222 timidity++-2.13.2-r2.ebuild 4181
-SHA256 7cf1006f4605d7fe7467e168f38d7dc6c49cfdb3d4f4c96428c1cab36c8bf010 timidity++-2.13.2-r2.ebuild 4181
+EBUILD timidity++-2.13.2-r2.ebuild 4310 RMD160 bd270e155b7ffe9699ce29c950705867c433cb4c SHA1 ddb3019ab49d0916c08cc5e3329558c9794ac4dc SHA256 bc76900ebd9ba966930c0db2902c42f162f95bc514b4fbb54ae2dc4805247ad5
+MD5 dd2860b0bfde170420a88eeee316f077 timidity++-2.13.2-r2.ebuild 4310
+RMD160 bd270e155b7ffe9699ce29c950705867c433cb4c timidity++-2.13.2-r2.ebuild 4310
+SHA256 bc76900ebd9ba966930c0db2902c42f162f95bc514b4fbb54ae2dc4805247ad5 timidity++-2.13.2-r2.ebuild 4310
 EBUILD timidity++-2.13.2.ebuild 3805 RMD160 2a4297f8cd3b9e31129c0a0decf2d1efd98962a3 SHA1 5a341befa2d631911d3db961ec2f73dc57516455 SHA256 de180d93efcfc4f0882cc36897212ac82a6b379cb12bf073ea01c8405b92fd32
 MD5 2a57c4e491884a45b1faf9cb828d13f1 timidity++-2.13.2.ebuild 3805
 RMD160 2a4297f8cd3b9e31129c0a0decf2d1efd98962a3 timidity++-2.13.2.ebuild 3805
 SHA256 de180d93efcfc4f0882cc36897212ac82a6b379cb12bf073ea01c8405b92fd32 timidity++-2.13.2.ebuild 3805
-MISC ChangeLog 10544 RMD160 03dff43578edba135a502b9f94ec9cd0e283ea6a SHA1 57a6ecab2603234a3f2e7bdacd291d26591643e5 SHA256 ec96dcc61b1255bb490d3d695e389b2aed4feebebbbc873992afb924d07e949b
-MD5 f8ab6bfff35168e238fe56e2c3ff9758 ChangeLog 10544
-RMD160 03dff43578edba135a502b9f94ec9cd0e283ea6a ChangeLog 10544
-SHA256 ec96dcc61b1255bb490d3d695e389b2aed4feebebbbc873992afb924d07e949b ChangeLog 10544
+MISC ChangeLog 10726 RMD160 e3b5070f817b0d0bcb446073c8a399af1f83b01a SHA1 3560baf19ac437c5ae4dc541aa1cd56606cab3b5 SHA256 789857849f6a5fd39f848cefa93ee9bb5448dbf61dfd46015259a48ed425f98b
+MD5 2ed80322c79171d47a2199488364d59c ChangeLog 10726
+RMD160 e3b5070f817b0d0bcb446073c8a399af1f83b01a ChangeLog 10726
+SHA256 789857849f6a5fd39f848cefa93ee9bb5448dbf61dfd46015259a48ed425f98b ChangeLog 10726
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -50,3 +53,10 @@ SHA256 706e64e0d9c3a5dc2c3407b65496cfac196de3a2787aeb234921deb177fcc1dc files/di
 MD5 f9f8b7aa60633b1d571491781e2c2f1d files/digest-timidity++-2.13.2-r2 536
 RMD160 c335b2484ab9ba2e1c2cff0a5bc14325614c31ad files/digest-timidity++-2.13.2-r2 536
 SHA256 98bad02a8730d1cd370c7b6f53cecc9bf9ddaa29625e93f228b7feefed147f82 files/digest-timidity++-2.13.2-r2 536
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFZN4YAiZjviIA2XgRAiIrAJ9+Nqq4ukWNkuTJ2Rz7/E9Ryfl/owCfXcfF
+wBwniin+8kTRQBtGjU9XX1Q=
+=frwZ
+-----END PGP SIGNATURE-----
diff --git a/media-sound/timidity++/timidity++-2.13.2-r2.ebuild b/media-sound/timidity++/timidity++-2.13.2-r2.ebuild
index 08fe61f6ac51..b1da537e059c 100644
--- a/media-sound/timidity++/timidity++-2.13.2-r2.ebuild
+++ b/media-sound/timidity++/timidity++-2.13.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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-r2.ebuild,v 1.18 2006/11/12 12:13:01 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.2-r2.ebuild,v 1.19 2006/11/22 23:32:21 flameeyes Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/timidity/${MY_P}.tar.bz2 mirror://gentoo/${P}-exit
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="oss nas esd motif X gtk gtk vorbis tcltk slang alsa arts jack portaudio emacs ao speex flac ncurses"
 
 RDEPEND="ncurses? ( >=sys-libs/ncurses-5.0 )
@@ -44,9 +44,9 @@ PDEPEND="|| ( media-sound/timidity-eawpatches media-sound/timidity-shompatches )
 src_unpack() {
 	unpack ${MY_P}.tar.bz2
 	cd ${S}
-	epatch ${DISTDIR}/${P}-exiterror.patch
-	epatch ${FILESDIR}/${P}-gtk26.patch
-	epatch ${FILESDIR}/${P}-gcc4.patch
+	epatch "${DISTDIR}/${P}-exiterror.patch"
+	epatch "${FILESDIR}/${P}-gtk26.patch"
+	epatch "${FILESDIR}/${P}-gcc4.patch"
 
 	# fix header location of speex
 	sed -i -e "s:#include <speex:#include <speex/speex:g" configure* timidity/speex_a.c
@@ -106,23 +106,26 @@ src_install() {
 	make DESTDIR="${D}" install || die
 
 	dodoc AUTHORS ChangeLog*
-	dodoc NEWS README* ${FILESDIR}/timidity.cfg
+	dodoc NEWS README* "${FILESDIR}/timidity.cfg"
 
-	newconfd ${FILESDIR}/conf.d.timidity timidity
-	newinitd ${FILESDIR}/init.d.timidity timidity
+	# these are only for the ALSA sequencer mode
+	if use alsa; then
+		newconfd "${FILESDIR}/conf.d.timidity" timidity
+		newinitd "${FILESDIR}/init.d.timidity" timidity
+	fi
 
 	insinto /etc
-	newins ${FILESDIR}/timidity.cfg-r1 timidity.cfg
+	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
+	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
+		rm "${D}/timidity.el"
 	fi
 }
 
@@ -135,9 +138,12 @@ pkg_postinst() {
 	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 alsa; then
+		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'"
+	fi
 
 	if use sparc; then
 		ewarn "sparc support is experimental. oss, alsa, esd, and portaudio do not work."