Fixing $T overwriting done in these ebuilds that caused access violations with eclass logs.

5 files changed, 19 insertions, 15 deletions

diff --git a/media-sound/festival/ChangeLog b/media-sound/festival/ChangeLog
index d5ea56af4462..d0df74580fb2 100644
--- a/media-sound/festival/ChangeLog
+++ b/media-sound/festival/ChangeLog
@@ -3,6 +3,10 @@
 # $Header: /home/cvsroot/gentoo-x86/media-sound/festival/ChangeLog,v 1 2002/05/07
 # 03:58:19 naz Exp $
 
+  25 Jan 2004; <carpaski@gentoo.org> festival-1.4.2*: Fixed all references
+	to $T as that is a portage variable and yields AccessViolations when set
+	incorrectly.
+
   08 Jan 2004; <gustavoz@gentoo.org> festival-1.4.2-r3.ebuild:
   the parrot is stable on sparc
 
diff --git a/media-sound/festival/festival-1.4.2-r1.ebuild b/media-sound/festival/festival-1.4.2-r1.ebuild
index 38d10e2e3c85..8a17fdc5d593 100644
--- a/media-sound/festival/festival-1.4.2-r1.ebuild
+++ b/media-sound/festival/festival-1.4.2-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/festival/festival-1.4.2-r1.ebuild,v 1.6 2003/09/07 00:06:04 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/festival/festival-1.4.2-r1.ebuild,v 1.7 2004/01/26 08:33:09 carpaski Exp $
 
 S=${WORKDIR}/${PN}
-T=${WORKDIR}/speech_tools
+TOOLSDIR=${WORKDIR}/speech_tools
 DESCRIPTION="Festival Text to Speech engine"
 GCCPV=`cc -dumpversion`
 IUSE=""
@@ -41,7 +41,7 @@ KEYWORDS="x86 -ppc"
 DEPEND="virtual/glibc"
 
 src_compile() {
-	cd ${T}
+	cd ${TOOLSDIR}
 	# This came from upstream as a quick fix to compile with gcc-3x
 	patch -p1 < ${FILESDIR}/${P}.patch || die
 
@@ -49,7 +49,7 @@ src_compile() {
 	# static linking seems to work <rigo@home.nl>
 
 	if [ ${GCCPV} != "2.95.3" ] ; then
-		echo "COMPILERLIBS=/usr/lib/gcc-lib/i686-pc-linux-gnu/${GCCPV}/libstdc++.a /usr/lib/gcc-lib/i686-pc-linux-gnu/${GCCPV}/libgcc_s.so.1" >> ${T}/config/config
+		echo "COMPILERLIBS=/usr/lib/gcc-lib/i686-pc-linux-gnu/${GCCPV}/libstdc++.a /usr/lib/gcc-lib/i686-pc-linux-gnu/${GCCPV}/libgcc_s.so.1" >> ${TOOLSDIR}/config/config
 	fi
 	# testsuite still fails to build under gcc-3.2
 	mv Makefile Makefile.orig
diff --git a/media-sound/festival/festival-1.4.2-r2.ebuild b/media-sound/festival/festival-1.4.2-r2.ebuild
index cf6e7c5663a5..109e43a42a7c 100644
--- a/media-sound/festival/festival-1.4.2-r2.ebuild
+++ b/media-sound/festival/festival-1.4.2-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/festival/festival-1.4.2-r2.ebuild,v 1.6 2003/09/11 01:21:31 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/festival/festival-1.4.2-r2.ebuild,v 1.7 2004/01/26 08:33:09 carpaski Exp $
 
 S=${WORKDIR}/${PN}
-T=${WORKDIR}/speech_tools
+TOOLSDIR=${WORKDIR}/speech_tools
 DESCRIPTION="Festival Text to Speech engine"
 GCCPV=`cc -dumpversion`
 IUSE=""
@@ -41,7 +41,7 @@ KEYWORDS="x86 ~ppc"
 DEPEND="virtual/glibc"
 
 src_compile() {
-	cd ${T}
+	cd ${TOOLSDIR}
 	# This came from upstream as a quick fix to compile with gcc-3x
 	patch -p1 < ${FILESDIR}/${P}.patch || die
 
@@ -51,7 +51,7 @@ src_compile() {
 		[ `uname -m` = "ppc" ] \
 	        && ARCHTYPE="powerpc-unknown" \
 	        || ARCHTYPE="`uname -m`-pc"
-		echo "COMPILERLIBS=/usr/lib/gcc-lib/${ARCHTYPE}-linux-gnu/${GCCPV}/libstdc++.a /usr/lib/gcc-lib/${ARCHTYPE}-linux-gnu/${GCCPV}/libgcc_s.so.1" >> ${T}/config/config
+		echo "COMPILERLIBS=/usr/lib/gcc-lib/${ARCHTYPE}-linux-gnu/${GCCPV}/libstdc++.a /usr/lib/gcc-lib/${ARCHTYPE}-linux-gnu/${GCCPV}/libgcc_s.so.1" >> ${TOOLSDIR}/config/config
 	fi
 	# testsuite still fails to build under gcc-3.2
 	mv Makefile Makefile.orig
diff --git a/media-sound/festival/festival-1.4.2-r3.ebuild b/media-sound/festival/festival-1.4.2-r3.ebuild
index f845606d28b5..004b6adf3228 100644
--- a/media-sound/festival/festival-1.4.2-r3.ebuild
+++ b/media-sound/festival/festival-1.4.2-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/festival/festival-1.4.2-r3.ebuild,v 1.5 2004/01/08 13:53:14 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/festival/festival-1.4.2-r3.ebuild,v 1.6 2004/01/26 08:33:09 carpaski Exp $
 
 S=${WORKDIR}/${PN}
-T=${WORKDIR}/speech_tools
+TOOLSDIR=${WORKDIR}/speech_tools
 DESCRIPTION="Festival Text to Speech engine"
 GCCPV=`cc -dumpversion`
 IUSE=""
@@ -41,14 +41,14 @@ KEYWORDS="x86 ~ppc sparc"
 DEPEND="virtual/glibc"
 
 src_compile() {
-	cd ${T}
+	cd ${TOOLSDIR}
 	# This came from upstream as a quick fix to compile with gcc-3x
 	patch -p1 < ${FILESDIR}/${P}.patch || die
 
 	econf
 	# static linking seems to work <rigo@home.nl>
 	if [ ${GCCPV} != "2.95.3" ] ; then
-		echo "COMPILERLIBS=/usr/lib/gcc-lib/${CHOST}/${GCCPV}/libstdc++.a /usr/lib/gcc-lib/${CHOST}/${GCCPV}/libgcc_s.so.1" >> ${T}/config/config
+		echo "COMPILERLIBS=/usr/lib/gcc-lib/${CHOST}/${GCCPV}/libstdc++.a /usr/lib/gcc-lib/${CHOST}/${GCCPV}/libgcc_s.so.1" >> ${TOOLSDIR}/config/config
 	fi
 	# testsuite still fails to build under gcc-3.2
 	mv Makefile Makefile.orig
diff --git a/media-sound/festival/festival-1.4.2.ebuild b/media-sound/festival/festival-1.4.2.ebuild
index 4ab9470ecccb..bb7e75450169 100644
--- a/media-sound/festival/festival-1.4.2.ebuild
+++ b/media-sound/festival/festival-1.4.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/festival/festival-1.4.2.ebuild,v 1.8 2003/09/07 00:06:04 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/festival/festival-1.4.2.ebuild,v 1.9 2004/01/26 08:33:09 carpaski Exp $
 
 S=${WORKDIR}/${PN}
-T=${WORKDIR}/speech_tools
+TOOLSDIR=${WORKDIR}/speech_tools
 DESCRIPTION="Festival Test to Speech engine"
 HOMEPAGE="http://www.cstr.ed.ac.uk/"
 SITE="http://www.speech.cs.cmu.edu/${PN}/cstr/${PN}/${PV}"
@@ -27,7 +27,7 @@ LICENSE="FESTIVAL BSD as-is"
 KEYWORDS="x86 -ppc"
 
 src_compile() {
-	cd ${T}
+	cd ${TOOLSDIR}
 	econf || die
 	patch -p1 < ${WORKDIR}/speech_tools.patch || die