Fixed dependencies for bug #199886.

Applied a gcc 4.3 patch for bug #205401 -- thanks to dirtyepic@gentoo.org.
Package-Manager: portage-2.1.4_rc14

4 files changed, 53 insertions, 30 deletions

diff --git a/app-accessibility/festival/ChangeLog b/app-accessibility/festival/ChangeLog
index 6c8c4c7258cb..fe452e8ee82c 100644
--- a/app-accessibility/festival/ChangeLog
+++ b/app-accessibility/festival/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-accessibility/festival
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/ChangeLog,v 1.69 2007/08/29 13:57:47 williamh Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/ChangeLog,v 1.70 2008/01/12 06:59:52 williamh Exp $
+
+  12 Jan 2008; William Hubbs <williamh@gentoo.org>
+  +files/festival-1.96_beta-gcc43.patch, festival-1.96_beta.ebuild:
+  Fixed dependencies for bug #199886.
+  Applied a gcc 4.3 patch for bug #205401 -- thanks to dirtyepic@gentoo.org.
 
   29 Aug 2007; William Hubbs <williamh@gentoo.org>
   +files/festival-1.96_beta-init-scm.patch:
diff --git a/app-accessibility/festival/Manifest b/app-accessibility/festival/Manifest
index 07ca5b3a1aad..50c866234ec6 100644
--- a/app-accessibility/festival/Manifest
+++ b/app-accessibility/festival/Manifest
@@ -26,6 +26,10 @@ AUX festival-1.95_beta-init-scm.patch 856 RMD160 442150175506a5ec0732ff81d685b6b
 MD5 0d90e554622ad8ed993b508a4e84eccd files/festival-1.95_beta-init-scm.patch 856
 RMD160 442150175506a5ec0732ff81d685b6bb5d2bf891 files/festival-1.95_beta-init-scm.patch 856
 SHA256 71bc918dffd72adb21b8cd7394358929e23aa1e32849a4c7f0aa85aa6d4cba40 files/festival-1.95_beta-init-scm.patch 856
+AUX festival-1.96_beta-gcc43.patch 547 RMD160 e5842ef3e8cd40e6af85a48b60e3b012efb213a6 SHA1 3dc6b811919db2f636435f9ca78a83b276f40755 SHA256 2bb1b1355e60636efb5e66dc5c00330343f01cc9702ac920f87b062185f03216
+MD5 193c53b0c2a2f5b198a415537de04e78 files/festival-1.96_beta-gcc43.patch 547
+RMD160 e5842ef3e8cd40e6af85a48b60e3b012efb213a6 files/festival-1.96_beta-gcc43.patch 547
+SHA256 2bb1b1355e60636efb5e66dc5c00330343f01cc9702ac920f87b062185f03216 files/festival-1.96_beta-gcc43.patch 547
 AUX festival-1.96_beta-init-scm.patch 856 RMD160 442150175506a5ec0732ff81d685b6bb5d2bf891 SHA1 11ca7d2eb3f9e8f92fac542d3779e18c5d5c2f5b SHA256 71bc918dffd72adb21b8cd7394358929e23aa1e32849a4c7f0aa85aa6d4cba40
 MD5 0d90e554622ad8ed993b508a4e84eccd files/festival-1.96_beta-init-scm.patch 856
 RMD160 442150175506a5ec0732ff81d685b6bb5d2bf891 files/festival-1.96_beta-init-scm.patch 856
@@ -91,14 +95,14 @@ EBUILD festival-1.95_beta.ebuild 5168 RMD160 975d7c90ae660a8edfd13958c68b7010936
 MD5 b0caf2a641b2c030ac9763ede83b00a2 festival-1.95_beta.ebuild 5168
 RMD160 975d7c90ae660a8edfd13958c68b70109369fce3 festival-1.95_beta.ebuild 5168
 SHA256 4c354ebbbaede351148c928fcb2a42a5a7877ef1991e0cb31272aec4ab556d8a festival-1.95_beta.ebuild 5168
-EBUILD festival-1.96_beta.ebuild 4563 RMD160 79c2df243673ac3d85e055d82a3b648d9f909d76 SHA1 2aa5d9fbc4f2c5ef2342651a4a54e1bf348cc7be SHA256 c404763cb8edbd10ab293dc742a473b805b9b1794696c71cf0f0c90c4f3553cc
-MD5 d192625021133c8e4d6048035e0f4cd6 festival-1.96_beta.ebuild 4563
-RMD160 79c2df243673ac3d85e055d82a3b648d9f909d76 festival-1.96_beta.ebuild 4563
-SHA256 c404763cb8edbd10ab293dc742a473b805b9b1794696c71cf0f0c90c4f3553cc festival-1.96_beta.ebuild 4563
-MISC ChangeLog 13884 RMD160 feaf61043ba01f60f7dc6b7690ff3c17e874f1d0 SHA1 70031dcd87dbc6df29eb4fa96a3250bc28942374 SHA256 505b41796aac4c212ea3961a6db67eaa275734333f52403227117084d88b2003
-MD5 4b18cfa4ed23feff4be6a1089c52bbdc ChangeLog 13884
-RMD160 feaf61043ba01f60f7dc6b7690ff3c17e874f1d0 ChangeLog 13884
-SHA256 505b41796aac4c212ea3961a6db67eaa275734333f52403227117084d88b2003 ChangeLog 13884
+EBUILD festival-1.96_beta.ebuild 4658 RMD160 351f71e2ad6ea8f65f1d345c41ee9c779289c299 SHA1 5aad74dfe97f62197aab909eb21cbffa7ccd1228 SHA256 c12e858572dd908b77f14c60849b43e1ce4869ae8c45d80bca81510b7edeec08
+MD5 e52d1244651aa495e0aae72f3a9d47f3 festival-1.96_beta.ebuild 4658
+RMD160 351f71e2ad6ea8f65f1d345c41ee9c779289c299 festival-1.96_beta.ebuild 4658
+SHA256 c12e858572dd908b77f14c60849b43e1ce4869ae8c45d80bca81510b7edeec08 festival-1.96_beta.ebuild 4658
+MISC ChangeLog 14119 RMD160 465f29ae75348de40891715ae4746c85c38d7af1 SHA1 37dc09b6e793c3072b4c0a3fa13747ca22a37a8f SHA256 5b09cbbdb6672537ac3f41ca0f7016e2db2c3ff5f4f01412454f86814b0fa785
+MD5 7e0a5459b7089544786c5a0146edf6f8 ChangeLog 14119
+RMD160 465f29ae75348de40891715ae4746c85c38d7af1 ChangeLog 14119
+SHA256 5b09cbbdb6672537ac3f41ca0f7016e2db2c3ff5f4f01412454f86814b0fa785 ChangeLog 14119
 MISC metadata.xml 248 RMD160 ba4734da964d3d5db60feb339d3e89de2eb87ab6 SHA1 bdd70f0d466d7bea88716581054941113ce22a16 SHA256 b40271c6a99e7610d9df3544a98da28417f406b82a48b04f1a8a9bb474cd04cc
 MD5 dd298b30a3c1071fdfd33569480dcfd3 metadata.xml 248
 RMD160 ba4734da964d3d5db60feb339d3e89de2eb87ab6 metadata.xml 248
diff --git a/app-accessibility/festival/festival-1.96_beta.ebuild b/app-accessibility/festival/festival-1.96_beta.ebuild
index 3b6b93297e84..37bbb1324712 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-2007 Gentoo Foundation
+# 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.1 2007/08/28 05:17:33 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-1.96_beta.ebuild,v 1.2 2008/01/12 06:59:52 williamh Exp $
 
 inherit eutils toolchain-funcs
 
@@ -27,10 +27,9 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="mbrola"
 
-RDEPEND="mbrola? ( >=app-accessibility/mbrola-3.0.1h-r2 )"
-
-DEPEND="${RDEPEND}
-	>=app-accessibility/speech-tools-1.2.96_beta"
+DEPEND=">=app-accessibility/speech-tools-1.2.96_beta"
+RDEPEND="${DEPEND}
+	mbrola? ( >=app-accessibility/mbrola-3.0.1h-r2 )"
 
 S=${WORKDIR}/festival
 
@@ -42,20 +41,23 @@ src_unpack() {
 	unpack ${A}
 
 	# tell festival to use the speech-tools we have installed.
-	sed -i -e "s:\(EST=\).*:\1/usr/share/speech-tools:" ${S}/config/config.in
-	sed -i -e "s:\$(EST)/lib:/usr/$(get_libdir):" ${S}/config/project.mak
+	sed -i -e "s:\(EST=\).*:\1/usr/share/speech-tools:" "${S}"/config/config.in
+	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
 
 	# fix the reference  to /usr/lib/festival
-	sed -i -e "s:\(FTLIBDIR.*=.*\)\$.*:\1/usr/share/festival:" ${S}/config/project.mak
+	sed -i -e "s:\(FTLIBDIR.*=.*\)\$.*:\1/usr/share/festival:" "${S}"/config/project.mak
 
 	# Fix path for examples in festival.scm
-	sed -i -e "s:\.\./examples/:/usr/share/doc/${PF}/examples/:" ${S}/lib/festival.scm
+	sed -i -e "s:\.\./examples/:/usr/share/doc/${PF}/examples/:" "${S}"/lib/festival.scm
 
 	# patch init.scm to look for siteinit.scm and sitevars.scm in /etc/festival
-	epatch ${FILESDIR}/${P}-init-scm.patch
+	epatch "${FILESDIR}"/${P}-init-scm.patch
+
+	# Apply a patch for gcc4.3.
+	epatch "${FILESDIR}"/${P}-gcc43.patch
 }
 
 src_compile() {
@@ -78,10 +80,10 @@ src_install() {
 	doins -r examples
 
 	# Need to fix saytime, etc. to look for festival in the correct spot
-	for ex in ${D}/usr/share/doc/${PF}/examples/*.sh; do
+	for ex in "${D}"/usr/share/doc/${PF}/examples/*.sh; do
 		exnoext=${ex%%.sh}
-		chmod a+x ${exnoext}
-		dosed "s:${S}/bin/festival:/usr/bin/festival:" ${exnoext##$D}
+		chmod a+x "${exnoext}"
+		dosed "s:${S}/bin/festival:/usr/bin/festival:" "${exnoext##$D}"
 	done
 
 	# Install the header files
@@ -90,15 +92,15 @@ src_install() {
 
 	insinto /etc/festival
 	# Sample server.scm configuration for the server
-	doins ${FILESDIR}/server.scm
+	doins "${FILESDIR}"/server.scm
 	doins lib/site*
 
 	# Install the init script
-	newinitd ${FILESDIR}/festival.rc festival
+	newinitd "${FILESDIR}"/festival.rc festival
 
 	# Install the docs
-	dodoc ${S}/{ACKNOWLEDGMENTS,NEWS,README}
-	doman ${S}/doc/{festival.1,festival_client.1}
+	dodoc "${S}"/{ACKNOWLEDGMENTS,NEWS,README}
+	doman "${S}"/doc/{festival.1,festival_client.1}
 
 	# create the directory where our log file will go.
 	diropts -m 0755 -o festival -g audio
@@ -138,7 +140,7 @@ mbrola_voices() {
 	# This assumes all mbrola voices are named after the voices defined
 	# in MBROLA, i.e. if MBROLA contains a voice fr1, then the Festival
 	# counterpart should be named fr1_mbrola.
-	for language in ${S}/lib/voices/*; do
+	for language in "${S}"/lib/voices/*; do
 		for mvoice in ${language}/*_mbrola; do
 			voice=${mvoice##*/}
 			database=${voice%%_mbrola}
diff --git a/app-accessibility/festival/files/festival-1.96_beta-gcc43.patch b/app-accessibility/festival/files/festival-1.96_beta-gcc43.patch
new file mode 100644
index 000000000000..d4f01200dc63
--- /dev/null
+++ b/app-accessibility/festival/files/festival-1.96_beta-gcc43.patch
@@ -0,0 +1,12 @@
+diff -Naur festival-orig/src/modules/Text/text_modes.cc festival/src/modules/Text/text_modes.cc
+--- festival-orig/src/modules/Text/text_modes.cc	2004-09-30 07:04:18.000000000 -0600
++++ festival/src/modules/Text/text_modes.cc	2008-01-07 22:32:44.000000000 -0600
+@@ -60,7 +60,7 @@
+ {
+ 
+     volatile EST_String tmpname = make_tmp_filename();
+-    volatile EST_String inname = get_c_string(filename);
++    volatile EST_String inname(get_c_string(filename));
+     volatile EST_String filter;
+     volatile EST_TokenStream ts;
+     volatile LISP func;