Applied a gcc 4.3 patch, thanks to dirtyepic@gentoo.org.

(Portage version: 2.1.4_rc14)

3 files changed, 41 insertions, 12 deletions

diff --git a/app-accessibility/speech-tools/ChangeLog b/app-accessibility/speech-tools/ChangeLog
index 201e63c3f316..0b511014aa2c 100644
--- a/app-accessibility/speech-tools/ChangeLog
+++ b/app-accessibility/speech-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-accessibility/speech-tools
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/ChangeLog,v 1.51 2007/08/31 04:12:37 williamh Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/ChangeLog,v 1.52 2008/01/12 04:47:00 williamh Exp $
+
+  12 Jan 2008; William Hubbs <williamh@gentoo.org>
+  +files/speech-tools-1.2.96_beta-gcc43-include.patch,
+  speech-tools-1.2.96_beta.ebuild:
+  Applied patch from bug #204453 for gcc4.3.
+  Thanks to dirtyepic@gentoo.org.
 
   31 Aug 2007; William Hubbs <williamh@gentoo.org>
   +files/speech-tools-1.2.96_beta-gcc42.patch,
diff --git a/app-accessibility/speech-tools/files/speech-tools-1.2.96_beta-gcc43-include.patch b/app-accessibility/speech-tools/files/speech-tools-1.2.96_beta-gcc43-include.patch
new file mode 100644
index 000000000000..6ab7ebf56614
--- /dev/null
+++ b/app-accessibility/speech-tools/files/speech-tools-1.2.96_beta-gcc43-include.patch
@@ -0,0 +1,22 @@
+diff -Naur speech_tools-orig/base_class/EST_TSimpleMatrix.cc speech_tools/base_class/EST_TSimpleMatrix.cc
+--- speech_tools-orig/base_class/EST_TSimpleMatrix.cc	2004-09-30 06:53:35.000000000 -0600
++++ speech_tools/base_class/EST_TSimpleMatrix.cc	2008-01-05 11:00:07.000000000 -0600
+@@ -42,6 +42,7 @@
+ 
+ #include "EST_TSimpleMatrix.h"
+ #include "EST_TVector.h"
++#include <cstring>
+ #include <fstream>
+ #include <iostream>
+ #include "EST_cutils.h"
+diff -Naur speech_tools-orig/base_class/EST_TSimpleVector.cc speech_tools/base_class/EST_TSimpleVector.cc
+--- speech_tools-orig/base_class/EST_TSimpleVector.cc	2006-07-06 06:57:18.000000000 -0600
++++ speech_tools/base_class/EST_TSimpleVector.cc	2008-01-05 11:00:32.000000000 -0600
+@@ -42,6 +42,7 @@
+ 
+ #include "EST_TSimpleVector.h"
+ #include "EST_matrix_support.h"
++#include <cstring>
+ #include <fstream>
+ #include "EST_cutils.h"
+ 
diff --git a/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild b/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild
index ddca67c64f0e..6a1c9e6b89a7 100644
--- a/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-1.2.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/speech-tools/speech-tools-1.2.96_beta.ebuild,v 1.4 2007/08/31 04:12:37 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild,v 1.5 2008/01/12 04:47:00 williamh Exp $
 
 inherit eutils toolchain-funcs
 
@@ -28,18 +28,19 @@ src_unpack() {
 
 	unpack ${A}
 
-	# apply a patch for gcc 4.2
-	epatch ${FILESDIR}/${P}-gcc42.patch
+	# apply patches for gcc 4.2 and gcc 4.3
+	epatch "${FILESDIR}"/${P}-gcc42.patch
+	epatch "${FILESDIR}"/${P}-gcc43-include.patch
 
 # set compiler flags for base_class
-	sed -i -e "s:-O3:\$(OPTIMISE_CXXFLAGS):" ${S}/base_class/Makefile
+	sed -i -e "s:-O3:\$(OPTIMISE_CXXFLAGS):" "${S}"/base_class/Makefile
 
 	# enable building shared libraries
 	sed -i -e "s/#.*\(SHARED=2\)/\1/" ${CONFIG}
 
 	use esd && sed -i -e "s/#.*\(INCLUDE_MODULES += ESD_AUDIO\)/\1/" ${CONFIG}
 	use nas && sed -i -e "s/#.*\(INCLUDE_MODULES += NAS_AUDIO\)/\1/" ${CONFIG}
-	use X || sed -i -e "s/-lX11 -lXt//" ${S}/config/modules/esd_audio.mak
+	use X || sed -i -e "s/-lX11 -lXt//" "${S}"/config/modules/esd_audio.mak
 }
 
 src_compile() {
@@ -67,7 +68,7 @@ src_install() {
 		dosed "s:${S}/lib:/usr/$(get_libdir):g" ${dstfile}
 	done
 
-	cd ${S}
+	cd "${S}"
 	exeinto /usr/$(get_libdir)/speech-tools
 	for file in `find main -perm +100 -type f`; do
 		doexe ${file}
@@ -86,8 +87,8 @@ src_install() {
 	insinto /usr/include/speech-tools
 	doins -r *
 	dosym /usr/include/speech-tools /usr/share/speech-tools/include
-	cd ${S}
+	cd "${S}"
 
-	dodoc ${S}/README
-	dodoc ${S}/lib/cstrutt.dtd
+	dodoc "${S}"/README
+	dodoc "${S}"/lib/cstrutt.dtd
 }