-r3 stable ppc per JoseJX. Finally cleaning out crufty old versions.

Package-Manager: portage-2.0.51.22-r2

10 files changed, 33 insertions, 429 deletions

diff --git a/app-accessibility/festival-gaim/Manifest b/app-accessibility/festival-gaim/Manifest
index a10c1187c34f..873cd2604f0f 100644
--- a/app-accessibility/festival-gaim/Manifest
+++ b/app-accessibility/festival-gaim/Manifest
@@ -1,19 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d639a2c23e8088638cac57f8cf82771a ChangeLog 3231
-MD5 5bcf47524cd7ffe2d71f1201d4a6567c festival-gaim-1.00.ebuild 829
+MD5 da814f2fc8dad0f570a866eaad511282 ChangeLog 3294
 MD5 1846f613d6d41e3b8ad07c732edeafe1 metadata.xml 205
-MD5 a77b6388fc4d0bb71b6e606be4d5b20c festival-gaim-1.1.ebuild 1055
+MD5 5e75530a189fdd85fc2469b8ec8723f3 festival-gaim-1.1.ebuild 1054
 MD5 3b50bbaba4f54669ea7c69ad866079ff festival-gaim-1.1-r1.ebuild 1152
-MD5 dcb2796b5c841c223bc2508ef85795ab files/digest-festival-gaim-1.00 69
-MD5 1a5f43e004ec0bfa631cc7628f65a91b files/festival-gaim-0.71-gentoo.patch 1073
 MD5 7aed20e85b6947be6eb5912946b33068 files/digest-festival-gaim-1.1 65
 MD5 7aed20e85b6947be6eb5912946b33068 files/digest-festival-gaim-1.1-r1 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC65usArHZZzCEUG0RAr2nAJ9OkjyTNjpYHLdEeNcKp8lyrtBSZwCeJ7zh
-/qy0maZBdeRgokRlmFgYGM4=
-=RpbI
------END PGP SIGNATURE-----
diff --git a/app-accessibility/festival/ChangeLog b/app-accessibility/festival/ChangeLog
index 863ddad07cf2..77f3458bb098 100644
--- a/app-accessibility/festival/ChangeLog
+++ b/app-accessibility/festival/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-accessibility/festival
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/ChangeLog,v 1.28 2005/07/28 07:07:33 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/ChangeLog,v 1.29 2005/07/30 20:22:30 eradicator Exp $
+
+  30 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/festival-1.4.2.patch, files/server.scm, -festival-1.4.3-r2.ebuild,
+  festival-1.4.3-r3.ebuild, festival-1.4.3-r4.ebuild:
+  -r3 stable ppc per JoseJX.  Finally cleaning out crufty old versions.
 
   27 Jul 2005; Guy Martin <gmsoft@gentoo.org> festival-1.4.3-r3.ebuild,
   festival-1.4.3-r4.ebuild:
diff --git a/app-accessibility/festival/Manifest b/app-accessibility/festival/Manifest
index 28e2eca08381..7280087551f3 100644
--- a/app-accessibility/festival/Manifest
+++ b/app-accessibility/festival/Manifest
@@ -1,13 +1,20 @@
-MD5 9c3ae77019cac04a6e1fa5c35358e266 ChangeLog 7739
-MD5 46db43791444b3bd68c0c435c132dda7 festival-1.4.3-r2.ebuild 5847
-MD5 47cc4ea7db76224e6333854012f26412 festival-1.4.3-r3.ebuild 5921
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 15ff82eec907ad4ee95bfef88d38ad03 ChangeLog 8003
 MD5 4f5d797c455932135181f0c31b5e71b2 metadata.xml 185
-MD5 4f44548ed0205f4c31b465d101ef1881 festival-1.4.3-r4.ebuild 4931
+MD5 ebcf501039cf8ce01b8d0d8a8dc72c6b festival-1.4.3-r3.ebuild 5924
+MD5 1c4f5be6c7e16cf9e7e849b157b9f7ea festival-1.4.3-r4.ebuild 4935
 MD5 c7f0c77b597f9a682ad2921edb0d26fb files/digest-festival-1.4.3-r4 863
-MD5 f38f904b9dfc77c788a63f51ccd2abb7 files/digest-festival-1.4.3-r2 863
-MD5 f38f904b9dfc77c788a63f51ccd2abb7 files/digest-festival-1.4.3-r3 863
-MD5 44bdf5d07947b391cecc75ed8ca49445 files/festival-1.4.2.patch 8724
 MD5 b380d6440fe49096f7705d6f1adf01ee files/festival-1.4.3-asterisk.patch 3028
 MD5 70fe1c867e8782c7ff288056677fda0c files/festival-gcc3.3.diff 5257
 MD5 8517199b1c2ba4350258e5511e93c2ea files/festival.rc 621
-MD5 957439462cff84152bc18202042e65c8 files/server.scm 773
+MD5 ac6ab1a049e2d4ec374892de9f058704 files/server.scm 781
+MD5 f38f904b9dfc77c788a63f51ccd2abb7 files/digest-festival-1.4.3-r3 863
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC6+HNArHZZzCEUG0RAlG3AJsHCk/bXa2XqQXvO4K8l5xa5zZmHgCcCD3P
+DuzKl8Oz9OJDE4v2qE7bodY=
+=TIAX
+-----END PGP SIGNATURE-----
diff --git a/app-accessibility/festival/festival-1.4.3-r2.ebuild b/app-accessibility/festival/festival-1.4.3-r2.ebuild
deleted file mode 100644
index 8861b29bc46f..000000000000
--- a/app-accessibility/festival/festival-1.4.3-r2.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-1.4.3-r2.ebuild,v 1.7 2005/07/09 19:43:19 swegener Exp $
-
-inherit eutils
-
-DESCRIPTION="Festival Text to Speech engine"
-HOMEPAGE="http://www.cstr.ed.ac.uk/"
-SITE="http://www.speech.cs.cmu.edu/${PN}/cstr/${PN}/${PV}"
-SRC_URI="${SITE}/${P}-release.tar.gz
-	${SITE}/festlex_CMU.tar.gz
-	${SITE}/festlex_OALD.tar.gz
-	${SITE}/festlex_POSLEX.tar.gz
-	${SITE}/festvox_don.tar.gz
-	${SITE}/festvox_ellpc11k.tar.gz
-	${SITE}/festvox_kallpc16k.tar.gz
-	${SITE}/festvox_kedlpc16k.tar.gz
-	${SITE}/festvox_rablpc16k.tar.gz
-	${SITE}/festvox_us1.tar.gz
-	${SITE}/festvox_us2.tar.gz
-	${SITE}/festvox_us3.tar.gz
-	doc? ( ${SITE}/festdoc-1.4.2.tar.gz )"
-
-LICENSE="FESTIVAL BSD as-is"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="asterisk doc"
-
-RDEPEND="=app-accessibility/speech-tools-1.2.3-r1"
-DEPEND="${RDEPEND}
-	sys-apps/sed"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${P}-release.tar.gz
-	unpack festlex_CMU.tar.gz
-	unpack festlex_OALD.tar.gz
-	unpack festlex_POSLEX.tar.gz
-	unpack festvox_don.tar.gz
-	unpack festvox_ellpc11k.tar.gz
-	unpack festvox_kallpc16k.tar.gz
-	unpack festvox_kedlpc16k.tar.gz
-	unpack festvox_rablpc16k.tar.gz
-	unpack festvox_us1.tar.gz
-	unpack festvox_us2.tar.gz
-	unpack festvox_us3.tar.gz
-
-	cd ${S}
-
-	use doc && unpack festdoc-1.4.2.tar.gz && mv festdoc-1.4.2 festdoc
-
-	epatch ${FILESDIR}/${PN}-gcc3.3.diff
-
-	use asterisk && epatch ${FILESDIR}/${P}-asterisk.patch
-
-	sed -i "s@EST=\$(TOP)/../speech_tools@EST=/usr/$(get_libdir)/speech-tools@" config/config.in
-
-	# testsuite still fails to build under gcc-3.2
-	# sed -i '/^BUILD_DIRS =/s/testsuite//' Makefile || die
-
-	sed -i "/^const char \*festival_libdir/s:FTLIBDIR:\"/usr/$(get_libdir)/festival\":" src/arch/festival/festival.cc
-	sed -i '/^MODULE_LIBS/s/-ltermcap/-lncurses/' config/modules/editline.mak || die
-}
-
-src_compile() {
-	econf || die
-	emake -j1 \
-		PROJECT_LIBDEPS="" \
-		REQUIRED_LIBDEPS="" \
-		LOCAL_LIBDEPS="" \
-		OPTIMISE_CXXFLAGS="${CXXFLAGS}" \
-		OPTIMISE_CCFLAGS="${CFLAGS}" \
-		|| die
-}
-
-src_install() {
-	# Install the binaries
-	cd ${WORKDIR}/festival/src/main
-	dobin festival
-	cd ${WORKDIR}/festival/examples
-	dobin saytime
-	cd ${WORKDIR}/festival/bin
-	dobin text2wave
-	cd ${WORKDIR}/festival/lib/etc/*Linux*
-	dobin audsp
-
-	einfo
-	einfo "Please ignore errors about skipped directories. They are harmless."
-	einfo
-
-	# Install the main libraries
-	insinto /usr/$(get_libdir)/festival
-	doins ${WORKDIR}/festival/lib/*
-
-	# Install the header files
-	insinto /usr/include/festival
-	doins ${WORKDIR}/festival/src/include/*.h
-
-	# Install the dicts and vioces
-	FESTLIB=${WORKDIR}/festival/lib
-	DESTLIB=/usr/$(get_libdir)/festival
-	insinto ${DESTLIB}/dicts
-	doins ${FESTLIB}/dicts/COPYING.poslex \
-		${FESTLIB}/dicts/wsj.wp39.poslexR ${FESTLIB}/dicts/wsj.wp39.tri.ngrambin
-	insinto ${DESTLIB}/dicts/cmu
-	doins ${FESTLIB}/dicts/cmu/*
-	insinto ${DESTLIB}/dicts/oald
-	doins ${FESTLIB}/dicts/oald/*
-
-	FESTLIB=${WORKDIR}/festival/lib/voices/spanish/el_diphone
-	DESTLIB=/usr/$(get_libdir)/festival/voices/spanish/el_diphone
-	insinto ${DESTLIB}/festvox
-	doins ${FESTLIB}/festvox/*
-	insinto ${DESTLIB}/group
-	doins ${FESTLIB}/group/*
-
-	FESTLIB=${WORKDIR}/festival/lib/voices/english
-	DESTLIB=/usr/$(get_libdir)/festival/voices/english
-	insinto ${DESTLIB}/don_diphone
-	doins ${FESTLIB}/don_diphone/*
-	insinto ${DESTLIB}/don_diphone/festvox
-	doins ${FESTLIB}/don_diphone/festvox/*
-
-	insinto ${DESTLIB}/kal_diphone
-	doins ${FESTLIB}/kal_diphone/*
-	insinto ${DESTLIB}/kal_diphone/festvox
-	doins ${FESTLIB}/kal_diphone/festvox/*
-	insinto ${DESTLIB}/kal_diphone/group
-	doins ${FESTLIB}/kal_diphone/group/*
-
-	insinto ${DESTLIB}/ked_diphone
-	doins ${FESTLIB}/ked_diphone/*
-	insinto ${DESTLIB}/ked_diphone/festvox
-	doins ${FESTLIB}/ked_diphone/festvox/*
-	insinto ${DESTLIB}/ked_diphone/group
-	doins ${FESTLIB}/ked_diphone/group/*
-
-	insinto ${DESTLIB}/rab_diphone
-	doins ${FESTLIB}/rab_diphone/*
-	insinto ${DESTLIB}/rab_diphone/festvox
-	doins ${FESTLIB}/rab_diphone/festvox/*
-	insinto ${DESTLIB}/rab_diphone/group
-	doins ${FESTLIB}/rab_diphone/group/*
-
-	insinto ${DESTLIB}/us1_mbrola
-	doins ${FESTLIB}/us1_mbrola/*
-	insinto ${DESTLIB}/us1_mbrola/festvox
-	doins ${FESTLIB}/us1_mbrola/festvox/*
-
-	insinto ${DESTLIB}/us2_mbrola
-	doins ${FESTLIB}/us2_mbrola/*
-	insinto ${DESTLIB}/us2_mbrola/festvox
-	doins ${FESTLIB}/us2_mbrola/festvox/*
-
-	insinto ${DESTLIB}/us3_mbrola
-	doins ${FESTLIB}/us3_mbrola/*
-	insinto ${DESTLIB}/us3_mbrola/festvox
-	doins ${FESTLIB}/us3_mbrola/festvox/*
-
-	# Sample server.scm configuration for the server
-	dodir /etc/festival
-	insinto /etc/festival
-	doins ${FILESDIR}/server.scm
-
-	# Install the init script
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/festival.rc festival
-
-	# Need to fix saytime to look for festival in the correct spot
-	dosed "s:${WORKDIR}/festival/bin/festival:/usr/bin/festival:" /usr/bin/saytime
-	dosed "s:${WORKDIR}/festival/bin/festival:/usr/bin/festival:" /usr/bin/text2wave
-
-	# Install the docs
-	cd ${S} # needed
-	into /usr
-	dodoc ACKNOWLEDGMENTS NEWS README
-	doman doc/festival.1 doc/festival_client.1
-
-	if use doc; then
-		cd ${S}/festdoc/festival/html
-		dohtml *.html
-		cd ${S}/festdoc/festival
-		dodoc festival.ps
-		cd ${S}/festdoc/festival/info
-		doinfo *
-	fi
-}
-
-pkg_postinst() {
-	einfo
-	einfo "    To test festival, simply type:"
-	einfo '        "saytime"'
-	einfo
-	einfo "    Or for something more fun:"
-	einfo '        "echo "Gentoo can speak" | festival --tts"'
-	einfo
-	einfo "    To enable the festival server at boot, run"
-	einfo "       rc-update add festival default"
-	einfo
-	einfo "    You must setup the server's port, access list, etc in this file:"
-	einfo "       /etc/festival/server.scm"
-	einfo
-	einfo "    Emerge mbrola to enable some additional voices."
-	einfo
-}
diff --git a/app-accessibility/festival/festival-1.4.3-r3.ebuild b/app-accessibility/festival/festival-1.4.3-r3.ebuild
index fb54fa76a489..23e35f471298 100644
--- a/app-accessibility/festival/festival-1.4.3-r3.ebuild
+++ b/app-accessibility/festival/festival-1.4.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-1.4.3-r3.ebuild,v 1.8 2005/07/28 07:07:33 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-1.4.3-r3.ebuild,v 1.9 2005/07/30 20:22:30 eradicator Exp $
 
 inherit eutils
 
@@ -23,7 +23,7 @@ SRC_URI="${SITE}/${P}-release.tar.gz
 
 LICENSE="FESTIVAL BSD as-is"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ppc64 sparc x86 hppa"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 hppa"
 IUSE="asterisk doc"
 
 RDEPEND=">=app-accessibility/speech-tools-1.2.3-r2"
diff --git a/app-accessibility/festival/festival-1.4.3-r4.ebuild b/app-accessibility/festival/festival-1.4.3-r4.ebuild
index 14901972de7c..2d3cbfa2dc09 100644
--- a/app-accessibility/festival/festival-1.4.3-r4.ebuild
+++ b/app-accessibility/festival/festival-1.4.3-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-1.4.3-r4.ebuild,v 1.3 2005/07/28 07:07:33 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-1.4.3-r4.ebuild,v 1.4 2005/07/30 20:22:30 eradicator Exp $
 
 inherit eutils toolchain-funcs
 
@@ -24,7 +24,7 @@ SRC_URI="${SITE}/${P}-release.tar.gz
 
 LICENSE="FESTIVAL BSD as-is"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~hppa"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="asterisk doc mbrola"
 
 RDEPEND=">=app-accessibility/speech-tools-1.2.3-r2
diff --git a/app-accessibility/festival/files/digest-festival-1.4.3-r2 b/app-accessibility/festival/files/digest-festival-1.4.3-r2
deleted file mode 100644
index 7933fac5b8b9..000000000000
--- a/app-accessibility/festival/files/digest-festival-1.4.3-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-MD5 c070523bea2baa0bcaa2d922481abbb5 festival-1.4.3-release.tar.gz 630179
-MD5 a3ffcd09dcbf1306fdef3c84c1c521d6 festlex_CMU.tar.gz 1697709
-MD5 45a03689025849d02ec963a5b338ef37 festlex_OALD.tar.gz 1472516
-MD5 742c266e4c4978fae2b5c1bf6f549eb4 festlex_POSLEX.tar.gz 242914
-MD5 90442079e34a3a694077f8715d15fbdf festvox_don.tar.gz 645583
-MD5 e96a97644d36fcb89952ca65c283cea3 festvox_ellpc11k.tar.gz 1473907
-MD5 abbd12e1d04ecdcae07f1d0044f3a947 festvox_kallpc16k.tar.gz 4104056
-MD5 35d4a2f377d05913ddae61db542afca1 festvox_kedlpc16k.tar.gz 4221528
-MD5 cefcdda6cd48027da36d78f2f711451b festvox_rablpc16k.tar.gz 5369001
-MD5 d0c3e727003e715a65daf01003101813 festvox_us1.tar.gz 11040
-MD5 fbcc8baacbff3aa2aaaf5a93701bb5e0 festvox_us2.tar.gz 11037
-MD5 06dbfe2edaab6ffa31deeaf522e0c33e festvox_us3.tar.gz 11220
-MD5 faabc25a6c1b11854c41adc257c47bdb festdoc-1.4.2.tar.gz 1652551
diff --git a/app-accessibility/festival/files/festival-1.4.2.patch b/app-accessibility/festival/files/festival-1.4.2.patch
deleted file mode 100644
index db804401c95d..000000000000
--- a/app-accessibility/festival/files/festival-1.4.2.patch
+++ /dev/null
@@ -1,174 +0,0 @@
---- speech_tools/configure.in.orig	2001-06-18 19:21:34.000000000 -0400
-+++ speech_tools/configure.in	2002-08-25 18:06:17.000000000 -0400
-@@ -42,6 +42,9 @@
- 
- AC_C_BIGENDIAN
- 
-+AC_CHECK_LIB(termcap, tputs, [TERMCAPLIB=-ltermcap], [TERMCAPLIB=-lncurses])
-+AC_SUBST(TERMCAPLIB)
-+
- dnl Which version of GCC do we have here
- COMPILERTYPE=gcc
- AC_TRY_COMPILE([#include <stdio.h>],
-@@ -52,11 +55,23 @@
-                [COMPILERTYPE=gcc295])
- AC_TRY_COMPILE([#include <stdio.h>],
-                [int j= 
--                #if __GNUC__ == 3
-+                #if __GNUC__ == 3  && __GNUC_MINOR__ == 0
-                 3;
-                 #endif ],
-                [COMPILERTYPE=gcc30])
- AC_TRY_COMPILE([#include <stdio.h>],
-+               [int j= 
-+                #if __GNUC__ == 3  && __GNUC_MINOR__ == 1
-+                3;
-+                #endif ],
-+               [COMPILERTYPE=gcc31])
-+AC_TRY_COMPILE([#include <stdio.h>],
-+               [int j= 
-+                #if __GNUC__ == 3 
-+                3;
-+                #endif ],
-+               [COMPILERTYPE=gcc32])
-+AC_TRY_COMPILE([#include <stdio.h>],
-                [ int j=
-                 #if __GNUC__ == 2 && __GNUC_MINOR__ == 96
-                 3;
---- speech_tools/config/compilers/Makefile.orig	2001-06-18 19:13:27.000000000 -0400
-+++ speech_tools/config/compilers/Makefile	2002-08-25 18:07:11.000000000 -0400
-@@ -41,7 +41,7 @@
- 	egcs.mak gcc27emx.mak \
-         suncc.mak suncc40.mak \
-         jolt.mak jdk.mak jdk12.mak none.mak \
--	jikes.mak gcc296.mak gcc30.mak
-+	jikes.mak gcc296.mak gcc30.mak gcc31.mak gcc32.mak
- 
- FILES = Makefile $(COMPILERS) gcc_defaults.mak suncc_defaults.mak jdk_defaults.mak jikes_defaults.mak
- 
---- speech_tools/config/compilers/gcc31.mak.orig	2002-09-27 21:18:49.000000000 -0400
-+++ speech_tools/config/compilers/gcc31.mak	2002-08-25 18:07:45.000000000 -0400
-@@ -0,0 +1,60 @@
-+ ###########################################################################
-+ ##                                                                       ##
-+ ##                Centre for Speech Technology Research                  ##
-+ ##                     University of Edinburgh, UK                       ##
-+ ##                         Copyright (c) 1999                            ##
-+ ##                        All Rights Reserved.                           ##
-+ ##                                                                       ##
-+ ##  Permission is hereby granted, free of charge, to use and distribute  ##
-+ ##  this software and its documentation without restriction, including   ##
-+ ##  without limitation the rights to use, copy, modify, merge, publish,  ##
-+ ##  distribute, sublicense, and/or sell copies of this work, and to      ##
-+ ##  permit persons to whom this work is furnished to do so, subject to   ##
-+ ##  the following conditions:                                            ##
-+ ##   1. The code must retain the above copyright notice, this list of    ##
-+ ##      conditions and the following disclaimer.                         ##
-+ ##   2. Any modifications must be clearly marked as such.                ##
-+ ##   3. Original authors' names are not deleted.                         ##
-+ ##   4. The authors' names are not used to endorse or promote products   ##
-+ ##      derived from this software without specific prior written        ##
-+ ##      permission.                                                      ##
-+ ##                                                                       ##
-+ ##  THE UNIVERSITY OF EDINBURGH AND THE CONTRIBUTORS TO THIS WORK        ##
-+ ##  DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING      ##
-+ ##  ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT   ##
-+ ##  SHALL THE UNIVERSITY OF EDINBURGH NOR THE CONTRIBUTORS BE LIABLE     ##
-+ ##  FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES    ##
-+ ##  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN   ##
-+ ##  AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,          ##
-+ ##  ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF       ##
-+ ##  THIS SOFTWARE.                                                       ##
-+ ##                                                                       ##
-+ ###########################################################################
-+ ##                                                                       ##
-+ ##                 Author: Alan W Black (awb@cs.cmu.edu)                 ##
-+ ##                   Date: Sun Aug 25 2002                               ##
-+ ## --------------------------------------------------------------------  ##
-+ ## Settings for GCC-3.1                                                  ##
-+ ##                                                                       ##
-+ ###########################################################################
-+
-+include $(EST)/config/compilers/gcc_defaults.mak
-+
-+COMPILER_DESC=gcc-3.1
-+
-+ifndef GCC31
-+    GCC31 = gcc
-+endif
-+
-+CC= $(GCC31)
-+CXX = $(GCC31)
-+
-+WARN_CXXFLAGS  +=  -Wno-non-template-friend
-+
-+STATIC_LINKFLAGS = -Dstatic
-+
-+COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%) -lstdc++
-+
-+
-+
-+
---- speech_tools/config/compilers/gcc32.mak.orig	2002-09-27 21:18:55.000000000 -0400
-+++ speech_tools/config/compilers/gcc32.mak	2002-08-25 18:26:42.000000000 -0400
-@@ -0,0 +1,60 @@
-+ ###########################################################################
-+ ##                                                                       ##
-+ ##                Centre for Speech Technology Research                  ##
-+ ##                     University of Edinburgh, UK                       ##
-+ ##                         Copyright (c) 1999                            ##
-+ ##                        All Rights Reserved.                           ##
-+ ##                                                                       ##
-+ ##  Permission is hereby granted, free of charge, to use and distribute  ##
-+ ##  this software and its documentation without restriction, including   ##
-+ ##  without limitation the rights to use, copy, modify, merge, publish,  ##
-+ ##  distribute, sublicense, and/or sell copies of this work, and to      ##
-+ ##  permit persons to whom this work is furnished to do so, subject to   ##
-+ ##  the following conditions:                                            ##
-+ ##   1. The code must retain the above copyright notice, this list of    ##
-+ ##      conditions and the following disclaimer.                         ##
-+ ##   2. Any modifications must be clearly marked as such.                ##
-+ ##   3. Original authors' names are not deleted.                         ##
-+ ##   4. The authors' names are not used to endorse or promote products   ##
-+ ##      derived from this software without specific prior written        ##
-+ ##      permission.                                                      ##
-+ ##                                                                       ##
-+ ##  THE UNIVERSITY OF EDINBURGH AND THE CONTRIBUTORS TO THIS WORK        ##
-+ ##  DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING      ##
-+ ##  ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT   ##
-+ ##  SHALL THE UNIVERSITY OF EDINBURGH NOR THE CONTRIBUTORS BE LIABLE     ##
-+ ##  FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES    ##
-+ ##  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN   ##
-+ ##  AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,          ##
-+ ##  ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF       ##
-+ ##  THIS SOFTWARE.                                                       ##
-+ ##                                                                       ##
-+ ###########################################################################
-+ ##                                                                       ##
-+ ##                 Author: Alan W Black (awb@cs.cmu.edu)                 ##
-+ ##                   Date: Sun Aug 25 2002                               ##
-+ ## --------------------------------------------------------------------  ##
-+ ## Settings for GCC-3.2                                                  ##
-+ ##                                                                       ##
-+ ###########################################################################
-+
-+include $(EST)/config/compilers/gcc_defaults.mak
-+
-+COMPILER_DESC=gcc-3.2
-+
-+ifndef GCC32
-+    GCC32 = gcc
-+endif
-+
-+CC= $(GCC32)
-+CXX = g++
-+
-+WARN_CXXFLAGS  +=  -Wno-non-template-friend -Wno-deprecated
-+
-+STATIC_LINKFLAGS = -Dstatic
-+
-+COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%) -lstdc++
-+
-+
-+
-+
diff --git a/app-accessibility/festival/files/server.scm b/app-accessibility/festival/files/server.scm
index 410289e045f4..3f7872ee2283 100644
--- a/app-accessibility/festival/files/server.scm
+++ b/app-accessibility/festival/files/server.scm
@@ -4,8 +4,8 @@
 ;(Parameter.set 'Audio_Method 'mplayeraudio)
 ;(Parameter.set 'Audio_Method 'sunaudio)
 
-; For a list of voices, look in /usr/lib/festival/voices/
-; To use the mbrola voices, you must emerge the 'mbrola' package
+; For a list of voices, look in /usr/share/festival/voices/
+; To use the mbrola voices, you must emerge festival with USE='mbrola'
 ; us1_mbrola is my (eradicator) personal favorite voice.
 ;(voice_us1_mbrola)
 
diff --git a/app-accessibility/speech-tools/Manifest b/app-accessibility/speech-tools/Manifest
index fc84a9a20090..135b9119ee02 100644
--- a/app-accessibility/speech-tools/Manifest
+++ b/app-accessibility/speech-tools/Manifest
@@ -1,10 +1,8 @@
-MD5 10f3290322449dcc689d03bfcabd5e28 ChangeLog 4616
+MD5 4e913014dced6086798b28e55f513981 ChangeLog 4733
 MD5 4f5d797c455932135181f0c31b5e71b2 metadata.xml 185
-MD5 4ffd23c3ded99e85692162aeb531e04c speech-tools-1.2.3-r1.ebuild 3007
-MD5 3d434d078e0a6b8360fa613c9d6cd61d speech-tools-1.2.3-r2.ebuild 3109
-MD5 c678bc34a4c5bb03bebcafd18a57c9f0 speech-tools-1.2.3-r3.ebuild 3134
+MD5 8eb2d76103b81a020b2164f14cbb39c7 speech-tools-1.2.3-r2.ebuild 3113
+MD5 0295d80cf519d408c45638daff6bacf9 speech-tools-1.2.3-r3.ebuild 3138
 MD5 a143fa8cb76f282bdd72ae3ad821f9c5 files/58speech-tools 34
-MD5 dbb77def95ba86c97fb18472325f2e18 files/digest-speech-tools-1.2.3-r1 224
-MD5 dbb77def95ba86c97fb18472325f2e18 files/digest-speech-tools-1.2.3-r2 224
 MD5 19e3325adc92d921d82884fe58485055 files/speech-tools-gcc3.3.diff 25787
+MD5 dbb77def95ba86c97fb18472325f2e18 files/digest-speech-tools-1.2.3-r2 224
 MD5 dbb77def95ba86c97fb18472325f2e18 files/digest-speech-tools-1.2.3-r3 224