Closes bug 220285 and adds back the speech engines for bug 211214..

Package-Manager: portage-2.2_rc6/cvs/Linux 2.6.26-gentoo i686

3 files changed, 22 insertions, 18 deletions

diff --git a/app-accessibility/festival/ChangeLog b/app-accessibility/festival/ChangeLog
index 952c4345fc5d..e5811ffb689d 100644
--- a/app-accessibility/festival/ChangeLog
+++ b/app-accessibility/festival/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-accessibility/festival
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/ChangeLog,v 1.79 2008/07/15 19:53:41 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/ChangeLog,v 1.80 2008/08/10 20:48:37 williamh Exp $
+
+  10 Aug 2008; William Hubbs <williamh@gentoo.org>
+  festival-1.96_beta.ebuild:
+  Closes bug 220285 (alsa support), thanks to solar. Also, this adds back
+  the speech synthesis engines needed by bug 211214. Again, thanks to solar.
 
   15 Jul 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/app-accessibility/festival/Manifest b/app-accessibility/festival/Manifest
index 4d2e09f402c8..75c8d5554710 100644
--- a/app-accessibility/festival/Manifest
+++ b/app-accessibility/festival/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX festival-1.96_beta-gcc43.patch 547 RMD160 e5842ef3e8cd40e6af85a48b60e3b012efb213a6 SHA1 3dc6b811919db2f636435f9ca78a83b276f40755 SHA256 2bb1b1355e60636efb5e66dc5c00330343f01cc9702ac920f87b062185f03216
 AUX festival-1.96_beta-init-scm.patch 856 RMD160 442150175506a5ec0732ff81d685b6bb5d2bf891 SHA1 11ca7d2eb3f9e8f92fac542d3779e18c5d5c2f5b SHA256 71bc918dffd72adb21b8cd7394358929e23aa1e32849a4c7f0aa85aa6d4cba40
 AUX festival.rc 638 RMD160 962ec6f32c4d40f88a0ba28ba952078b0692ab9b SHA1 da66766c8a3cd075d308efde55dc677e71ee7850 SHA256 b831cf7edfd83920c9d5f6358054b460e70d49e6c988a7dd1469e37b14eba8d2
@@ -18,13 +15,6 @@ DIST festvox_kedlpc16k.tar.gz 4221528 RMD160 63480c4ed695c86fc8de0f3a0740196debc
 DIST festvox_us1.tar.gz 11040 RMD160 97cfd8e62347aa28cf2319174021bc002044ffd5 SHA1 f740064af99670e35879352d164b7aa9f2079820 SHA256 23b332513867d6e9c340dc888a7ce67843e5a3c03db328cd36975985057c8b8e
 DIST festvox_us2.tar.gz 11037 RMD160 62528dc44291be4f7e7fda1677f3074fcc9fdab7 SHA1 227df7165a47d181eb019c7774d7b8517436507d SHA256 d27ad26213144d956815e804c06e5473191ac12afb44f6a1029b3842e3a3007c
 DIST festvox_us3.tar.gz 11220 RMD160 86946aa9718b7dacfbb884ba02254e59ebdb7247 SHA1 8302d0875c2872c45ff4a8ec633f9bb916a2a814 SHA256 af9ca4d1832e1971aa6e52f6a3ff8f729bf970c7bee1de7e8ac0611ca01871b8
-EBUILD festival-1.96_beta.ebuild 4666 RMD160 f29c5ec0fae23dabb7cb9c1cb638d96b17f490ca SHA1 83040a779aa54620a7416368010b69a1296b9c80 SHA256 7bcf75368850e7677bf6d2432356a24b2c0bedea377e90653c42fd8863ef4f5a
-MISC ChangeLog 15769 RMD160 98bf25b6d06074cc5cc5536f6945104dbfa68442 SHA1 14fa706a090821e7c21c6f7673593ca6439c2836 SHA256 c161c1db5142b3c4c2cfe9765785eb41478353a616fec1b50be672daa2740732
+EBUILD festival-1.96_beta.ebuild 5039 RMD160 4ee8738b74190c138209c24e01b085d0cd5d3074 SHA1 9234f46f822e94e65d090d2bfc64498107d7adb6 SHA256 1c6c81852e809f1dc0c7298a8ae88f2024af4f9e5d4bf5213c85a093b53cec2c
+MISC ChangeLog 16003 RMD160 55901bcb905b8508949f2f8902dd9f84cfa2fd6b SHA1 9c2ac28ed68c2c79ea224f8321522bf7496d1b28 SHA256 f649fea156ef10cbf902f5999bfc7ec617138ee1053458a1e29d7638131bd801
 MISC metadata.xml 320 RMD160 bbe9bfd7f2d31d6fd34b6d07eb39b12224fc076c SHA1 ec6133fa36acb1d0ed4e0df3ed96ec796b5abf63 SHA256 696aed194846ce22b4ed3e3c49b33bcb43e1d62eaa9538e645a62f47555864b8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkh9AJsACgkQoeSe8B0zEfygIQCdE+IE3KZYBHfH19pLX+Rk+yn+
-D5UAoIS6Pm4WOQmv9lktoeK3UF6j5XKJ
-=f9Tt
------END PGP SIGNATURE-----
diff --git a/app-accessibility/festival/festival-1.96_beta.ebuild b/app-accessibility/festival/festival-1.96_beta.ebuild
index 52f9f6ff569c..efb57dc3747f 100644
--- a/app-accessibility/festival/festival-1.96_beta.ebuild
+++ b/app-accessibility/festival/festival-1.96_beta.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-1.96_beta.ebuild,v 1.9 2008/03/13 02:55:28 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-1.96_beta.ebuild,v 1.10 2008/08/10 20:48:37 williamh Exp $
 
 inherit eutils toolchain-funcs
 
@@ -25,10 +25,13 @@ SRC_URI="${SITE}/${MY_P}.tar.gz
 LICENSE="FESTIVAL BSD as-is"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="mbrola"
+IUSE="alsa mbrola"
 
-DEPEND=">=app-accessibility/speech-tools-1.2.96_beta"
-RDEPEND="${DEPEND}
+SP_DEPEND=">=app-accessibility/speech-tools-1.2.96_beta"
+
+DEPEND="${SP_DEPEND}
+	alsa? ( media-sound/alsa-utils )"
+RDEPEND="${SP_DEPEND}
 	mbrola? ( >=app-accessibility/mbrola-3.0.1h-r2 )"
 
 S=${WORKDIR}/festival
@@ -45,7 +48,8 @@ src_unpack() {
 	sed -i -e "s:\$(EST)/lib:/usr/$(get_libdir):" "${S}"/config/project.mak
 
 	# disable the multisyn modules
-	sed -i -e "s:\(ALSO_INCLUDE.*=.*MultiSyn\):# \1:" "${S}"/config/config.in
+	#sed -i -e "s:\(ALSO_INCLUDE.*=.*MultiSyn\):# \1:" "${S}"/config/config.in
+	sed -i -e 's/clunits hts_engine MultiSyn/clunits hts_engine/g' "${S}"/config/config.in
 
 	# fix the reference  to /usr/lib/festival
 	sed -i -e "s:\(FTLIBDIR.*=.*\)\$.*:\1/usr/share/festival:" "${S}"/config/project.mak
@@ -58,6 +62,11 @@ src_unpack() {
 
 	# Apply a patch for gcc4.3.
 	epatch "${FILESDIR}"/${P}-gcc43.patch
+
+	if use alsa; then
+		echo "(Parameter.set 'Audio_Command \"aplay -q -c 1 -t raw -f s16 -r \$SR \$FILE\")" >> ${S}/lib/siteinit.scm
+		echo "(Parameter.set 'Audio_Method 'Audio_Command)" >> ${S}/lib/siteinit.scm
+	fi
 }
 
 src_compile() {