Removed old versions.

Package-Manager: portage-2.1.4.4

25 files changed, 24 insertions, 3582 deletions

diff --git a/app-accessibility/festival/ChangeLog b/app-accessibility/festival/ChangeLog
index 9f01bc4363ee..d92d9b7d3679 100644
--- a/app-accessibility/festival/ChangeLog
+++ b/app-accessibility/festival/ChangeLog
@@ -1,6 +1,19 @@
 # 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.77 2008/03/13 02:55:28 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/ChangeLog,v 1.78 2008/03/20 01:39:24 williamh Exp $
+
+  20 Mar 2008; William Hubbs <williamh@gentoo.org>
+  -files/festival-1.4.3-asterisk.patch,
+  -files/festival-1.95_beta-asterisk.patch,
+  -files/festival-1.95_beta-fbsd.patch,
+  -files/festival-1.95_beta-gcc41-amd64-int-pointer.patch,
+  -files/festival-1.95_beta-gcc41-amd64.patch,
+  -files/festival-1.95_beta-gcc41.patch, -files/festival-gcc3.3.diff,
+  -files/festival-1.95_beta-init-scm.patch, -festival-1.4.3-r3.ebuild,
+  -festival-1.4.3-r4.ebuild, -festival-1.95_beta.ebuild,
+  -festival-1.95_beta-r1.ebuild, -festival-1.95_beta-r2.ebuild,
+  -festival-1.95_beta-r3.ebuild, -festival-1.95_beta-r4.ebuild:
+  Removed old versions.
 
   13 Mar 2008; William Hubbs <williamh@gentoo.org>
   festival-1.96_beta.ebuild:
diff --git a/app-accessibility/festival/festival-1.4.3-r3.ebuild b/app-accessibility/festival/festival-1.4.3-r3.ebuild
deleted file mode 100644
index c2f8dcd6f987..000000000000
--- a/app-accessibility/festival/festival-1.4.3-r3.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2007 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.15 2007/04/28 17:18:39 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="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="asterisk doc"
-
-RDEPEND=">=app-accessibility/speech-tools-1.2.3-r2
-	!>=app-accessibility/speech-tools-1.2.95_beta"
-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/share/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/share/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/share/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/share/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/share/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/share/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
-	insinto /etc/festival
-	doins ${FILESDIR}/server.scm
-
-	# Install the init script
-	newinitd ${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
-
-	# We used to put stuff here, so be safe for now...
-	dodir /usr/lib
-	dosym ../share/festival /usr/lib/festival
-}
-
-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-r4.ebuild b/app-accessibility/festival/festival-1.4.3-r4.ebuild
deleted file mode 100644
index 2310189c1b70..000000000000
--- a/app-accessibility/festival/festival-1.4.3-r4.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2007 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.12 2007/04/28 17:18:39 swegener Exp $
-
-inherit eutils toolchain-funcs
-
-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_kallpc16k.tar.gz
-	${SITE}/festvox_kedlpc16k.tar.gz
-	${SITE}/festvox_rablpc16k.tar.gz
-	linguas_es? ( ${SITE}/festvox_ellpc11k.tar.gz )
-	doc? ( ${SITE}/festdoc-1.4.2.tar.gz )
-	mbrola? (
-		${SITE}/festvox_us1.tar.gz
-		${SITE}/festvox_us2.tar.gz
-		${SITE}/festvox_us3.tar.gz )"
-
-LICENSE="FESTIVAL BSD as-is"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 mips ~ppc ~ppc64 sparc ~x86"
-IUSE="asterisk doc linguas_es mbrola"
-
-RDEPEND=">=app-accessibility/speech-tools-1.2.3-r2
-	!>=app-accessibility/speech-tools-1.2.95_beta
-	mbrola? ( >=app-accessibility/mbrola-3.0.1h-r2 )"
-
-DEPEND="${RDEPEND}
-	sys-apps/findutils
-	sys-apps/sed"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-
-	use doc && mv festdoc-1.4.2 festdoc
-
-	epatch ${FILESDIR}/${PN}-gcc3.3.diff
-
-	use asterisk && epatch ${FILESDIR}/${P}-asterisk.patch
-
-	sed -i -e "s@EST=\$(TOP)/../speech_tools@EST=/usr/share/speech-tools@" ${S}/config/config.in
-
-	# testsuite still fails to build under gcc-3.2
-	# sed -i '/^BUILD_DIRS =/s/testsuite//' ${S}/Makefile || die
-
-	sed -i -e "/^const char \*festival_libdir/s:FTLIBDIR:\"/usr/share/festival\":" ${S}/src/arch/festival/festival.cc
-	sed -i -e '/^MODULE_LIBS/s/-ltermcap/-lncurses/' ${S}/config/modules/editline.mak || die
-
-	# Fix hardcoded path for examples that will be finally installed in /usr/$(get_libdir)/festival/examples
-	sed -i -e "s:\.\./examples/:/usr/share/doc/${PF}/examples/:" ${S}/lib/festival.scm
-}
-
-src_compile() {
-	econf || die
-	emake -j1 PROJECT_LIBDEPS="" REQUIRED_LIBDEPS="" LOCAL_LIBDEPS="" OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die
-}
-
-src_install() {
-	# Install the binaries
-	dobin ${S}/src/main/festival
-	dobin ${S}/lib/etc/*Linux*/audsp
-
-	# Install the main libraries
-	insinto /usr/share/festival
-	doins ${S}/lib/*
-
-	# Install the examples
-	insinto /usr/share/doc/${PF}/examples/
-	doins -r ${S}/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
-		exnoext=${ex%%.sh}
-		chmod a+x ${exnoext}
-		dosed "s:${S}/bin/festival:/usr/bin/festival:" ${exnoext##$D}
-	done
-
-	# Install the header files
-	insinto /usr/include/festival
-	doins ${S}/src/include/*.h
-
-	# Install the dicts
-	insinto /usr/share/festival/dicts
-	doins -r ${S}/lib/dicts/*
-
-	# Installs all existing voices, no matter what language.
-	insinto /usr/share/festival/voices
-	doins -r ${S}/lib/voices/*
-
-	# Sample server.scm configuration for the server
-	insinto /etc/festival
-	doins ${FILESDIR}/server.scm
-
-	# Install the init script
-	newinitd ${FILESDIR}/festival.rc festival
-
-	use mbrola && mbrola_voices
-
-	# Install the docs
-	dodoc ${S}/{ACKNOWLEDGMENTS,NEWS,README}
-	doman ${S}/doc/{festival.1,festival_client.1}
-
-	if use doc; then
-		dohtml ${WORKDIR}/festdoc/festival/html/*.html
-		dodoc ${WORKDIR}/festdoc/festival/festival.ps
-		doinfo ${WORKDIR}/festdoc/festival/info/*
-	fi
-}
-
-pkg_postinst() {
-	einfo
-	einfo "    Useful examples include saytime, text2wave. For example, try:"
-	einfo "        \"/usr/share/doc/${PF}/examples/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
-}
-
-# This is because Portage will not remove links from Festival to MBROLA
-# databases: as long as the target of a link exists, the link cannot be
-# removed by Portage.
-# So we do it by hand here...
-#
-# If we do this, it gets deleted during an upgrade.
-#pkg_prerm() {
-#	find /usr/share/festival/voices -type l -path "*_mbrola*" -exec rm -f {} \;
-#}
-
-# Fix mbrola databases: create symbolic links from festival voices
-# directories to MBROLA install dirs.
-mbrola_voices() {
-
-	# This is in case there is no mbrola voice for a particular language.
-	local shopts=$(shopt -p nullglob)
-	shopt -s nullglob
-
-	# 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 mvoice in ${language}/*_mbrola; do
-			voice=${mvoice##*/}
-			database=${voice%%_mbrola}
-			dosym /opt/mbrola/${database} /usr/share/festival/voices/${language##*/}/${voice}/${database}
-		done
-	done
-
-	# Restore shopts
-	${shopts}
-}
diff --git a/app-accessibility/festival/festival-1.95_beta-r1.ebuild b/app-accessibility/festival/festival-1.95_beta-r1.ebuild
deleted file mode 100644
index 82d42029ec2e..000000000000
--- a/app-accessibility/festival/festival-1.95_beta-r1.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-1.95_beta-r1.ebuild,v 1.10 2007/04/28 17:18:39 swegener Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Festival Text to Speech engine"
-HOMEPAGE="http://www.cstr.ed.ac.uk/"
-SITE="http://www.cstr.ed.ac.uk/downloads/${PN}/${PV/_beta//}"
-MY_P=${PN}-1.95-beta
-SRC_URI="${SITE}/${MY_P}.tar.gz
-	${SITE}/speech_tools-1.2.95-beta.tar.gz
-	${SITE}/festlex_POSLEX.tar.gz
-	${SITE}/festlex_CMU.tar.gz
-	${SITE}/festlex_OALD.tar.gz
-	${SITE}/festvox_rablpc16k.tar.gz
-	${SITE}/festvox_don.tar.gz
-	${SITE}/festvox_kallpc16k.tar.gz
-	${SITE}/festvox_kedlpc16k.tar.gz
-	${SITE}/festvox_cmu_us_bdl_arctic_hts.tar.gz
-	${SITE}/festvox_cmu_us_slt_arctic_hts.tar.gz
-	${SITE}/festvox_cmu_us_jmk_arctic_hts.tar.gz
-	${SITE}/festvox_cmu_us_awb_arctic_hts.tar.gz
-	linguas_es? ( ${SITE}/festvox_ellpc11k.tar.gz )
-	mbrola? (
-		${SITE}/festvox_en1.tar.gz
-		${SITE}/festvox_us1.tar.gz
-		${SITE}/festvox_us2.tar.gz
-		${SITE}/festvox_us3.tar.gz )"
-LICENSE="FESTIVAL BSD as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="asterisk esd linguas_es mbrola X"
-
-RDEPEND="sys-libs/ncurses
-	esd? ( media-sound/esound )
-	mbrola? ( >=app-accessibility/mbrola-3.0.1h-r2 )"
-
-DEPEND="${RDEPEND}
-	X? (
-			x11-libs/libX11
-			x11-libs/libXt )
-	sys-apps/sed"
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A}
-
-	use asterisk && epatch ${FILESDIR}/${P}-asterisk.patch
-	use esd && sed -i -e 's/# \(INCLUDE_MODULES += ESD_AUDIO\)/\1/' ${S}/speech_tools/config/config.in
-	use X || sed -i -e 's/-lX11 -lXt//' ${S}/speech_tools/config/modules/esd_audio.mak
-
-	# testsuite still fails to build under gcc-3.2
-	# sed -i '/^BUILD_DIRS =/s/testsuite//' ${S}/Makefile || die
-
-	sed -i -e "/^const char \*festival_libdir/s:FTLIBDIR:\"/usr/share/festival\":" ${S}/festival/src/arch/festival/festival.cc
-	sed -i -e '/^MODULE_LIBS/s/-ltermcap/-lncurses/' ${S}/festival/config/modules/editline.mak || die
-
-	# Fix hardcoded path for examples that will be finally installed in /usr/$(get_libdir)/festival/examples
-	sed -i -e "s:\.\./examples/:/usr/share/doc/${PF}/examples/:" ${S}/festival/lib/festival.scm
-
-	# gcc 4.1 compatibility patches
-	epatch ${FILESDIR}/${P}-gcc41.patch
-	epatch ${FILESDIR}/${P}-gcc41-amd64.patch
-	epatch ${FILESDIR}/${P}-gcc41-amd64-int-pointer.patch
-
-	epatch ${FILESDIR}/${P}-init-scm.patch
-}
-
-src_compile() {
-	cd ${S}/speech_tools
-	econf || die
-	emake -j1 OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die
-	cd ${S}/festival
-	econf || die
-	emake -j1 PROJECT_LIBDEPS="" REQUIRED_LIBDEPS="" LOCAL_LIBDEPS="" OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die
-}
-
-src_install() {
-	# Install the binaries
-	dobin ${S}/festival/src/main/festival
-	dobin ${S}/festival/lib/etc/*Linux*/audsp
-
-	# Install the main libraries
-	insinto /usr/share/festival
-	doins ${S}/festival/lib/*
-
-	# Install the examples
-	insinto /usr/share/doc/${PF}/examples/
-	doins -r ${S}/festival/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
-		exnoext=${ex%%.sh}
-		chmod a+x ${exnoext}
-		dosed "s:${S}/festival/bin/festival:/usr/bin/festival:" ${exnoext##$D}
-	done
-
-	# Install the header files
-	insinto /usr/include/festival
-	doins ${S}/festival/src/include/*.h
-
-	# Install the dicts
-	insinto /usr/share/festival/dicts
-	doins -r ${S}/festival/lib/dicts/*
-
-	# Installs all existing voices, no matter what language.
-	insinto /usr/share/festival/voices
-	doins -r ${S}/festival/lib/voices/*
-
-	insinto /etc/festival
-	# Sample server.scm configuration for the server
-	doins ${FILESDIR}/server.scm
-	doins ${S}/festival/lib/site*
-
-	# Install the init script
-	newinitd ${FILESDIR}/festival.rc festival
-
-	use mbrola && mbrola_voices
-
-	# Install the docs
-	dodoc ${S}/festival/{ACKNOWLEDGMENTS,NEWS,README}
-	doman ${S}/festival/doc/{festival.1,festival_client.1}
-}
-
-pkg_postinst() {
-	einfo
-	elog "    Useful examples include saytime, text2wave. For example, try:"
-	elog "        \"/usr/share/doc/${PF}/examples/saytime\""
-	einfo
-	elog "    Or for something more fun:"
-	elog '        "echo "Gentoo can speak" | festival --tts"'
-	einfo
-	elog "    To enable the festival server at boot, run"
-	elog "       rc-update add festival default"
-	einfo
-	elog "    You must setup the server's port, access list, etc in this file:"
-	elog "       /etc/festival/server.scm"
-	einfo
-	elog "This version also allows configuration of site specific"
-	elog "initialization in /etc/festival/siteinit.scm and"
-	elog "variables in /etc/festival/sitevars.scm."
-	einfo
-}
-
-# Fix mbrola databases: create symbolic links from festival voices
-# directories to MBROLA install dirs.
-mbrola_voices() {
-
-	# This is in case there is no mbrola voice for a particular language.
-	local shopts=$(shopt -p nullglob)
-	shopt -s nullglob
-
-	# 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}/festival/lib/voices/*; do
-		for mvoice in ${language}/*_mbrola; do
-			voice=${mvoice##*/}
-			database=${voice%%_mbrola}
-			dosym /opt/mbrola/${database} /usr/share/festival/voices/${language##*/}/${voice}/${database}
-		done
-	done
-
-	# Restore shopts
-	${shopts}
-}
diff --git a/app-accessibility/festival/festival-1.95_beta-r2.ebuild b/app-accessibility/festival/festival-1.95_beta-r2.ebuild
deleted file mode 100644
index bb8c05f8d612..000000000000
--- a/app-accessibility/festival/festival-1.95_beta-r2.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-1.95_beta-r2.ebuild,v 1.2 2007/04/28 17:18:39 swegener Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Festival Text to Speech engine"
-HOMEPAGE="http://www.cstr.ed.ac.uk/"
-SITE="http://www.cstr.ed.ac.uk/downloads/${PN}/${PV/_beta//}"
-MY_P=${PN}-1.95-beta
-SRC_URI="${SITE}/${MY_P}.tar.gz
-	${SITE}/speech_tools-1.2.95-beta.tar.gz
-	${SITE}/festlex_POSLEX.tar.gz
-	${SITE}/festlex_CMU.tar.gz
-	${SITE}/festlex_OALD.tar.gz
-	${SITE}/festvox_rablpc16k.tar.gz
-	${SITE}/festvox_don.tar.gz
-	${SITE}/festvox_kallpc16k.tar.gz
-	${SITE}/festvox_kedlpc16k.tar.gz
-	${SITE}/festvox_cmu_us_bdl_arctic_hts.tar.gz
-	${SITE}/festvox_cmu_us_slt_arctic_hts.tar.gz
-	${SITE}/festvox_cmu_us_jmk_arctic_hts.tar.gz
-	${SITE}/festvox_cmu_us_awb_arctic_hts.tar.gz
-	linguas_es? ( ${SITE}/festvox_ellpc11k.tar.gz )
-	mbrola? (
-		${SITE}/festvox_en1.tar.gz
-		${SITE}/festvox_us1.tar.gz
-		${SITE}/festvox_us2.tar.gz
-		${SITE}/festvox_us3.tar.gz )"
-LICENSE="FESTIVAL BSD as-is"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="asterisk esd linguas_es mbrola X"
-
-RDEPEND="sys-libs/ncurses
-	esd? ( media-sound/esound )
-	mbrola? ( >=app-accessibility/mbrola-3.0.1h-r2 )"
-
-DEPEND="${RDEPEND}
-	X? (
-			x11-libs/libX11
-			x11-libs/libXt )
-	sys-apps/sed"
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A}
-
-	use asterisk && epatch ${FILESDIR}/${P}-asterisk.patch
-	use esd && sed -i -e 's/# \(INCLUDE_MODULES += ESD_AUDIO\)/\1/' ${S}/speech_tools/config/config.in
-	use X || sed -i -e 's/-lX11 -lXt//' ${S}/speech_tools/config/modules/esd_audio.mak
-
-	# testsuite still fails to build under gcc-3.2
-	# sed -i '/^BUILD_DIRS =/s/testsuite//' ${S}/Makefile || die
-
-	sed -i -e "/^const char \*festival_libdir/s:FTLIBDIR:\"/usr/share/festival\":" ${S}/festival/src/arch/festival/festival.cc
-	sed -i -e '/^MODULE_LIBS/s/-ltermcap/-lncurses/' ${S}/festival/config/modules/editline.mak || die
-
-	# Fix hardcoded path for examples that will be finally installed in /usr/$(get_libdir)/festival/examples
-	sed -i -e "s:\.\./examples/:/usr/share/doc/${PF}/examples/:" ${S}/festival/lib/festival.scm
-
-	# gcc 4.1 compatibility patches
-	epatch ${FILESDIR}/${P}-gcc41.patch
-	epatch ${FILESDIR}/${P}-gcc41-amd64.patch
-	epatch ${FILESDIR}/${P}-gcc41-amd64-int-pointer.patch
-
-	epatch ${FILESDIR}/${P}-init-scm.patch
-}
-
-src_compile() {
-	cd ${S}/speech_tools
-	econf || die
-	emake -j1 OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die
-	cd ${S}/festival
-	econf || die
-	emake -j1 PROJECT_LIBDEPS="" REQUIRED_LIBDEPS="" LOCAL_LIBDEPS="" OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die
-}
-
-src_install() {
-	# Install the binaries
-	dobin ${S}/festival/src/main/festival
-	dobin ${S}/festival/lib/etc/*Linux*/audsp
-	dolib.a ${S}/festival/src/lib/libFestival.a
-
-	# Install the main libraries
-	insinto /usr/share/festival
-	doins ${S}/festival/lib/*
-
-	# Install the examples
-	insinto /usr/share/doc/${PF}/examples/
-	doins -r ${S}/festival/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
-		exnoext=${ex%%.sh}
-		chmod a+x ${exnoext}
-		dosed "s:${S}/festival/bin/festival:/usr/bin/festival:" ${exnoext##$D}
-	done
-
-	# Install the header files
-	insinto /usr/include/festival
-	doins ${S}/festival/src/include/*.h
-
-	# Install the dicts
-	insinto /usr/share/festival/dicts
-	doins -r ${S}/festival/lib/dicts/*
-
-	# Installs all existing voices, no matter what language.
-	insinto /usr/share/festival/voices
-	doins -r ${S}/festival/lib/voices/*
-
-	insinto /etc/festival
-	# Sample server.scm configuration for the server
-	doins ${FILESDIR}/server.scm
-	doins ${S}/festival/lib/site*
-
-	# Install the init script
-	newinitd ${FILESDIR}/festival.rc festival
-
-	use mbrola && mbrola_voices
-
-	# Install the docs
-	dodoc ${S}/festival/{ACKNOWLEDGMENTS,NEWS,README}
-	doman ${S}/festival/doc/{festival.1,festival_client.1}
-}
-
-pkg_postinst() {
-	einfo
-	elog "    Useful examples include saytime, text2wave. For example, try:"
-	elog "        \"/usr/share/doc/${PF}/examples/saytime\""
-	einfo
-	elog "    Or for something more fun:"
-	elog '        "echo "Gentoo can speak" | festival --tts"'
-	einfo
-	elog "    To enable the festival server at boot, run"
-	elog "       rc-update add festival default"
-	einfo
-	elog "    You must setup the server's port, access list, etc in this file:"
-	elog "       /etc/festival/server.scm"
-	einfo
-	elog "This version also allows configuration of site specific"
-	elog "initialization in /etc/festival/siteinit.scm and"
-	elog "variables in /etc/festival/sitevars.scm."
-	einfo
-}
-
-# Fix mbrola databases: create symbolic links from festival voices
-# directories to MBROLA install dirs.
-mbrola_voices() {
-
-	# This is in case there is no mbrola voice for a particular language.
-	local shopts=$(shopt -p nullglob)
-	shopt -s nullglob
-
-	# 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}/festival/lib/voices/*; do
-		for mvoice in ${language}/*_mbrola; do
-			voice=${mvoice##*/}
-			database=${voice%%_mbrola}
-			dosym /opt/mbrola/${database} /usr/share/festival/voices/${language##*/}/${voice}/${database}
-		done
-	done
-
-	# Restore shopts
-	${shopts}
-}
diff --git a/app-accessibility/festival/festival-1.95_beta-r3.ebuild b/app-accessibility/festival/festival-1.95_beta-r3.ebuild
deleted file mode 100644
index 47c6bd5e47ef..000000000000
--- a/app-accessibility/festival/festival-1.95_beta-r3.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-1.95_beta-r3.ebuild,v 1.2 2007/04/28 17:18:39 swegener Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Festival Text to Speech engine"
-HOMEPAGE="http://www.cstr.ed.ac.uk/"
-SITE="http://www.cstr.ed.ac.uk/downloads/${PN}/${PV/_beta//}"
-MY_P=${PN}-1.95-beta
-SRC_URI="${SITE}/${MY_P}.tar.gz
-	${SITE}/speech_tools-1.2.95-beta.tar.gz
-	${SITE}/festlex_POSLEX.tar.gz
-	${SITE}/festlex_CMU.tar.gz
-	${SITE}/festlex_OALD.tar.gz
-	${SITE}/festvox_rablpc16k.tar.gz
-	${SITE}/festvox_don.tar.gz
-	${SITE}/festvox_kallpc16k.tar.gz
-	${SITE}/festvox_kedlpc16k.tar.gz
-	${SITE}/festvox_cmu_us_bdl_arctic_hts.tar.gz
-	${SITE}/festvox_cmu_us_slt_arctic_hts.tar.gz
-	${SITE}/festvox_cmu_us_jmk_arctic_hts.tar.gz
-	${SITE}/festvox_cmu_us_awb_arctic_hts.tar.gz
-	linguas_es? ( ${SITE}/festvox_ellpc11k.tar.gz )
-	mbrola? (
-		${SITE}/festvox_en1.tar.gz
-		${SITE}/festvox_us1.tar.gz
-		${SITE}/festvox_us2.tar.gz
-		${SITE}/festvox_us3.tar.gz )"
-LICENSE="FESTIVAL BSD as-is"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="asterisk esd linguas_es mbrola X"
-
-RDEPEND="sys-libs/ncurses
-	esd? ( media-sound/esound )
-	mbrola? ( >=app-accessibility/mbrola-3.0.1h-r2 )"
-
-DEPEND="${RDEPEND}
-	X? (
-			x11-libs/libX11
-			x11-libs/libXt )
-	sys-apps/sed"
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A}
-
-	use asterisk && epatch ${FILESDIR}/${P}-asterisk.patch
-	use esd && sed -i -e 's/# \(INCLUDE_MODULES += ESD_AUDIO\)/\1/' ${S}/speech_tools/config/config.in
-	use X || sed -i -e 's/-lX11 -lXt//' ${S}/speech_tools/config/modules/esd_audio.mak
-
-	# testsuite still fails to build under gcc-3.2
-	# sed -i '/^BUILD_DIRS =/s/testsuite//' ${S}/Makefile || die
-
-	sed -i -e "/^const char \*festival_libdir/s:FTLIBDIR:\"/usr/share/festival\":" ${S}/festival/src/arch/festival/festival.cc
-	sed -i -e '/^MODULE_LIBS/s/-ltermcap/-lncurses/' ${S}/festival/config/modules/editline.mak || die
-
-	# Fix hardcoded path for examples that will be finally installed in /usr/$(get_libdir)/festival/examples
-	sed -i -e "s:\.\./examples/:/usr/share/doc/${PF}/examples/:" ${S}/festival/lib/festival.scm
-
-	# gcc 4.1 compatibility patches
-	epatch ${FILESDIR}/${P}-gcc41.patch
-	epatch ${FILESDIR}/${P}-gcc41-amd64.patch
-	epatch ${FILESDIR}/${P}-gcc41-amd64-int-pointer.patch
-
-	epatch ${FILESDIR}/${P}-init-scm.patch
-}
-
-src_compile() {
-	cd ${S}/speech_tools
-	econf || die
-	emake -j1 OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die
-	cd ${S}/festival
-	econf || die
-	emake -j1 PROJECT_LIBDEPS="" REQUIRED_LIBDEPS="" LOCAL_LIBDEPS="" OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die
-}
-
-src_install() {
-	# Install the binaries
-	dobin ${S}/festival/src/main/festival
-	dobin ${S}/festival/lib/etc/*Linux*/audsp
-	dolib.a ${S}/festival/src/lib/libFestival.a
-
-	# Install the main libraries
-	insinto /usr/share/festival
-	doins -r ${S}/festival/lib/*
-
-	# Install the examples
-	insinto /usr/share/doc/${PF}/examples/
-	doins -r ${S}/festival/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
-		exnoext=${ex%%.sh}
-		chmod a+x ${exnoext}
-		dosed "s:${S}/festival/bin/festival:/usr/bin/festival:" ${exnoext##$D}
-	done
-
-	# Install the header files
-	insinto /usr/include/festival
-	doins ${S}/festival/src/include/*.h
-
-	# Install the dicts
-	insinto /usr/share/festival/dicts
-	doins -r ${S}/festival/lib/dicts/*
-
-	# Installs all existing voices, no matter what language.
-	insinto /usr/share/festival/voices
-	doins -r ${S}/festival/lib/voices/*
-
-	insinto /etc/festival
-	# Sample server.scm configuration for the server
-	doins ${FILESDIR}/server.scm
-	doins ${S}/festival/lib/site*
-
-	# Install the init script
-	newinitd ${FILESDIR}/festival.rc festival
-
-	use mbrola && mbrola_voices
-
-	# Install the docs
-	dodoc ${S}/festival/{ACKNOWLEDGMENTS,NEWS,README}
-	doman ${S}/festival/doc/{festival.1,festival_client.1}
-}
-
-pkg_postinst() {
-	elog
-	elog "    Useful examples include saytime, text2wave. For example, try:"
-	elog "        \"/usr/share/doc/${PF}/examples/saytime\""
-	elog
-	elog "    Or for something more fun:"
-	elog '        "echo "Gentoo can speak" | festival --tts"'
-	elog
-	elog "    To enable the festival server at boot, run"
-	elog "       rc-update add festival default"
-	elog
-	elog "    You must setup the server's port, access list, etc in this file:"
-	elog "       /etc/festival/server.scm"
-	elog
-	elog "This version also allows configuration of site specific"
-	elog "initialization in /etc/festival/siteinit.scm and"
-	elog "variables in /etc/festival/sitevars.scm."
-	elog
-}
-
-# Fix mbrola databases: create symbolic links from festival voices
-# directories to MBROLA install dirs.
-mbrola_voices() {
-
-	# This is in case there is no mbrola voice for a particular language.
-	local shopts=$(shopt -p nullglob)
-	shopt -s nullglob
-
-	# 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}/festival/lib/voices/*; do
-		for mvoice in ${language}/*_mbrola; do
-			voice=${mvoice##*/}
-			database=${voice%%_mbrola}
-			dosym /opt/mbrola/${database} /usr/share/festival/voices/${language##*/}/${voice}/${database}
-		done
-	done
-
-	# Restore shopts
-	${shopts}
-}
diff --git a/app-accessibility/festival/festival-1.95_beta-r4.ebuild b/app-accessibility/festival/festival-1.95_beta-r4.ebuild
deleted file mode 100644
index 69a7676cf733..000000000000
--- a/app-accessibility/festival/festival-1.95_beta-r4.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-1.95_beta-r4.ebuild,v 1.9 2007/07/06 10:39:12 uberlord Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Festival Text to Speech engine"
-HOMEPAGE="http://www.cstr.ed.ac.uk/"
-SITE="http://www.cstr.ed.ac.uk/downloads/${PN}/${PV/_beta//}"
-MY_P=${PN}-1.95-beta
-SRC_URI="${SITE}/${MY_P}.tar.gz
-	${SITE}/speech_tools-1.2.95-beta.tar.gz
-	${SITE}/festlex_POSLEX.tar.gz
-	${SITE}/festlex_CMU.tar.gz
-	${SITE}/festlex_OALD.tar.gz
-	${SITE}/festvox_rablpc16k.tar.gz
-	${SITE}/festvox_don.tar.gz
-	${SITE}/festvox_kallpc16k.tar.gz
-	${SITE}/festvox_kedlpc16k.tar.gz
-	${SITE}/festvox_cmu_us_bdl_arctic_hts.tar.gz
-	${SITE}/festvox_cmu_us_slt_arctic_hts.tar.gz
-	${SITE}/festvox_cmu_us_jmk_arctic_hts.tar.gz
-	${SITE}/festvox_cmu_us_awb_arctic_hts.tar.gz
-	linguas_es? ( ${SITE}/festvox_ellpc11k.tar.gz )
-	mbrola? (
-		${SITE}/festvox_en1.tar.gz
-		${SITE}/festvox_us1.tar.gz
-		${SITE}/festvox_us2.tar.gz
-		${SITE}/festvox_us3.tar.gz )"
-LICENSE="FESTIVAL BSD as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="asterisk esd linguas_es mbrola X"
-
-RDEPEND="sys-libs/ncurses
-	esd? ( media-sound/esound )
-	mbrola? ( >=app-accessibility/mbrola-3.0.1h-r2 )"
-
-DEPEND="${RDEPEND}
-	X? (
-			x11-libs/libX11
-			x11-libs/libXt )
-	sys-apps/sed"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	enewuser festival -1 -1 -1 audio
-}
-
-src_unpack() {
-	unpack ${A}
-
-	use asterisk && epatch ${FILESDIR}/${P}-asterisk.patch
-	use esd && sed -i -e 's/# \(INCLUDE_MODULES += ESD_AUDIO\)/\1/' ${S}/speech_tools/config/config.in
-	use X || sed -i -e 's/-lX11 -lXt//' ${S}/speech_tools/config/modules/esd_audio.mak
-
-	# testsuite still fails to build under gcc-3.2
-	# sed -i '/^BUILD_DIRS =/s/testsuite//' ${S}/Makefile || die
-
-	sed -i -e "/^const char \*festival_libdir/s:FTLIBDIR:\"/usr/share/festival\":" ${S}/festival/src/arch/festival/festival.cc
-	sed -i -e '/^MODULE_LIBS/s/-ltermcap/-lncurses/' ${S}/festival/config/modules/editline.mak || die
-
-	# Fix hardcoded path for examples that will be finally installed in /usr/$(get_libdir)/festival/examples
-	sed -i -e "s:\.\./examples/:/usr/share/doc/${PF}/examples/:" ${S}/festival/lib/festival.scm
-
-	epatch ${FILESDIR}/${P}-init-scm.patch
-
-	# Allow building on fbsd, #183686
-	epatch ${FILESDIR}/${P}-fbsd.patch
-
-	# gcc 4.1 compatibility patches
-	epatch ${FILESDIR}/${P}-gcc41.patch
-	epatch ${FILESDIR}/${P}-gcc41-amd64-int-pointer.patch
-	epatch ${FILESDIR}/${P}-gcc41-amd64.patch
-}
-
-src_compile() {
-	cd ${S}/speech_tools
-	econf || die
-	emake -j1 OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die
-	cd ${S}/festival
-	econf || die
-	emake -j1 PROJECT_LIBDEPS="" REQUIRED_LIBDEPS="" LOCAL_LIBDEPS="" OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die
-}
-
-src_install() {
-	# Install the binaries
-	dobin ${S}/festival/src/main/festival
-	dobin ${S}/festival/lib/etc/*Linux*/audsp
-	dolib.a ${S}/festival/src/lib/libFestival.a
-
-	# Install the main libraries
-	insinto /usr/share/festival
-	doins -r ${S}/festival/lib/*
-
-	# Install the examples
-	insinto /usr/share/doc/${PF}/examples/
-	doins -r ${S}/festival/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
-		exnoext=${ex%%.sh}
-		chmod a+x ${exnoext}
-		dosed "s:${S}/festival/bin/festival:/usr/bin/festival:" ${exnoext##$D}
-	done
-
-	# Install the header files
-	insinto /usr/include/festival
-	doins ${S}/festival/src/include/*.h
-
-	# Install the dicts
-	insinto /usr/share/festival/dicts
-	doins -r ${S}/festival/lib/dicts/*
-
-	# Installs all existing voices, no matter what language.
-	insinto /usr/share/festival/voices
-	doins -r ${S}/festival/lib/voices/*
-
-	insinto /etc/festival
-	# Sample server.scm configuration for the server
-	doins ${FILESDIR}/server.scm
-	doins ${S}/festival/lib/site*
-
-	# Install the init script
-	newinitd ${FILESDIR}/festival.rc festival
-
-	use mbrola && mbrola_voices
-
-	# Install the docs
-	dodoc ${S}/festival/{ACKNOWLEDGMENTS,NEWS,README}
-	doman ${S}/festival/doc/{festival.1,festival_client.1}
-
-	# create the directory where our log file will go.
-	diropts -m 0755 -o festival -g audio
-	keepdir /var/log/festival
-}
-
-pkg_postinst() {
-	elog
-	elog "    Useful examples include saytime, text2wave. For example, try:"
-	elog "        \"/usr/share/doc/${PF}/examples/saytime\""
-	elog
-	elog "    Or for something more fun:"
-	elog '        "echo "Gentoo can speak" | festival --tts"'
-	elog
-	elog "    To enable the festival server at boot, run"
-	elog "       rc-update add festival default"
-	elog
-	elog "    You must setup the server's port, access list, etc in this file:"
-	elog "       /etc/festival/server.scm"
-	elog
-	elog "This version also allows configuration of site specific"
-	elog "initialization in /etc/festival/siteinit.scm and"
-	elog "variables in /etc/festival/sitevars.scm."
-	elog
-}
-
-# Fix mbrola databases: create symbolic links from festival voices
-# directories to MBROLA install dirs.
-mbrola_voices() {
-
-	# This is in case there is no mbrola voice for a particular language.
-	local shopts=$(shopt -p nullglob)
-	shopt -s nullglob
-
-	# 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}/festival/lib/voices/*; do
-		for mvoice in ${language}/*_mbrola; do
-			voice=${mvoice##*/}
-			database=${voice%%_mbrola}
-			dosym /opt/mbrola/${database} /usr/share/festival/voices/${language##*/}/${voice}/${database}
-		done
-	done
-
-	# Restore shopts
-	${shopts}
-}
diff --git a/app-accessibility/festival/festival-1.95_beta.ebuild b/app-accessibility/festival/festival-1.95_beta.ebuild
deleted file mode 100644
index 734016a4b2e6..000000000000
--- a/app-accessibility/festival/festival-1.95_beta.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-1.95_beta.ebuild,v 1.8 2007/04/28 17:18:39 swegener Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Festival Text to Speech engine"
-HOMEPAGE="http://www.cstr.ed.ac.uk/"
-SITE="http://www.cstr.ed.ac.uk/downloads/${PN}/${PV/_beta//}"
-MY_P=${PN}-1.95-beta
-SRC_URI="${SITE}/${MY_P}.tar.gz
-	${SITE}/speech_tools-1.2.95-beta.tar.gz
-	${SITE}/festlex_POSLEX.tar.gz
-	${SITE}/festlex_CMU.tar.gz
-	${SITE}/festlex_OALD.tar.gz
-	${SITE}/festvox_rablpc16k.tar.gz
-	${SITE}/festvox_don.tar.gz
-	${SITE}/festvox_kallpc16k.tar.gz
-	${SITE}/festvox_kedlpc16k.tar.gz
-	${SITE}/festvox_cmu_us_bdl_arctic_hts.tar.gz
-	${SITE}/festvox_cmu_us_slt_arctic_hts.tar.gz
-	${SITE}/festvox_cmu_us_jmk_arctic_hts.tar.gz
-	${SITE}/festvox_cmu_us_awb_arctic_hts.tar.gz
-	linguas_es? ( ${SITE}/festvox_ellpc11k.tar.gz )
-	mbrola? (
-		${SITE}/festvox_en1.tar.gz
-		${SITE}/festvox_us1.tar.gz
-		${SITE}/festvox_us2.tar.gz
-		${SITE}/festvox_us3.tar.gz )"
-LICENSE="FESTIVAL BSD as-is"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ~ppc64 sparc ~x86"
-IUSE="asterisk esd linguas_es mbrola X"
-
-RDEPEND="sys-libs/ncurses
-	mbrola? ( >=app-accessibility/mbrola-3.0.1h-r2 )"
-
-DEPEND="${RDEPEND}
-	sys-apps/sed"
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A}
-
-	use asterisk && epatch ${FILESDIR}/${P}-asterisk.patch
-	use esd && sed -i -e 's/# \(INCLUDE_MODULES += ESD_AUDIO\)/\1/' ${S}/speech_tools/config/config.in
-	use X || sed -i -e 's/-lX11 -lXt//' ${S}/speech_tools/config/modules/esd_audio.mak
-
-	# testsuite still fails to build under gcc-3.2
-	# sed -i '/^BUILD_DIRS =/s/testsuite//' ${S}/Makefile || die
-
-	sed -i -e "/^const char \*festival_libdir/s:FTLIBDIR:\"/usr/share/festival\":" ${S}/festival/src/arch/festival/festival.cc
-	sed -i -e '/^MODULE_LIBS/s/-ltermcap/-lncurses/' ${S}/festival/config/modules/editline.mak || die
-
-	# Fix hardcoded path for examples that will be finally installed in /usr/$(get_libdir)/festival/examples
-	sed -i -e "s:\.\./examples/:/usr/share/doc/${PF}/examples/:" ${S}/festival/lib/festival.scm
-
-	# gcc 4.1 compatibility patches
-	epatch ${FILESDIR}/${P}-gcc41.patch
-	if use amd64; then
-		epatch ${FILESDIR}/${P}-gcc41-amd64.patch
-		epatch ${FILESDIR}/${P}-gcc41-amd64-int-pointer.patch
-	fi
-}
-
-src_compile() {
-	cd ${S}/speech_tools
-	econf || die
-	emake -j1 OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die
-	cd ${S}/festival
-	econf || die
-	emake -j1 PROJECT_LIBDEPS="" REQUIRED_LIBDEPS="" LOCAL_LIBDEPS="" OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die
-}
-
-src_install() {
-	# Install the binaries
-	dobin ${S}/festival/src/main/festival
-	dobin ${S}/festival/lib/etc/*Linux*/audsp
-
-	# Install the main libraries
-	insinto /usr/share/festival
-	doins ${S}/festival/lib/*
-
-	# Install the examples
-	insinto /usr/share/doc/${PF}/examples/
-	doins -r ${S}/festival/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
-		exnoext=${ex%%.sh}
-		chmod a+x ${exnoext}
-		dosed "s:${S}/festival/bin/festival:/usr/bin/festival:" ${exnoext##$D}
-	done
-
-	# Install the header files
-	insinto /usr/include/festival
-	doins ${S}/festival/src/include/*.h
-
-	# Install the dicts
-	insinto /usr/share/festival/dicts
-	doins -r ${S}/festival/lib/dicts/*
-
-	# Installs all existing voices, no matter what language.
-	insinto /usr/share/festival/voices
-	doins -r ${S}/festival/lib/voices/*
-
-	# Sample server.scm configuration for the server
-	insinto /etc/festival
-	doins ${FILESDIR}/server.scm
-
-	# Install the init script
-	newinitd ${FILESDIR}/festival.rc festival
-
-	use mbrola && mbrola_voices
-
-	# Install the docs
-	dodoc ${S}/festival/{ACKNOWLEDGMENTS,NEWS,README}
-	doman ${S}/festival/doc/{festival.1,festival_client.1}
-}
-
-pkg_postinst() {
-	einfo
-	einfo "    Useful examples include saytime, text2wave. For example, try:"
-	einfo "        \"/usr/share/doc/${PF}/examples/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
-}
-
-# Fix mbrola databases: create symbolic links from festival voices
-# directories to MBROLA install dirs.
-mbrola_voices() {
-
-	# This is in case there is no mbrola voice for a particular language.
-	local shopts=$(shopt -p nullglob)
-	shopt -s nullglob
-
-	# 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}/festival/lib/voices/*; do
-		for mvoice in ${language}/*_mbrola; do
-			voice=${mvoice##*/}
-			database=${voice%%_mbrola}
-			dosym /opt/mbrola/${database} /usr/share/festival/voices/${language##*/}/${voice}/${database}
-		done
-	done
-
-	# Restore shopts
-	${shopts}
-}
diff --git a/app-accessibility/festival/files/festival-1.4.3-asterisk.patch b/app-accessibility/festival/files/festival-1.4.3-asterisk.patch
deleted file mode 100644
index d6d7885e1949..000000000000
--- a/app-accessibility/festival/files/festival-1.4.3-asterisk.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -u -r festival-1.4.3/lib/tts.scm festival-1.4.3-asterisk/lib/tts.scm
---- festival-1.4.3.orig/lib/tts.scm	2003-01-09 07:39:22.000000000 -0800
-+++ festival/lib/tts.scm	2003-08-14 12:07:00.000000000 -0700
-@@ -234,6 +234,17 @@
-        (utt.synth
- 	(eval (list 'Utterance 'Text string))))))
- 
-+;; begin tts_textasterisk
-+(define (tts_textasterisk string mode)
-+  "(tts_textasterisk STRING MODE)
-+Apply tts to STRING.  This function is specifically designed for
-+use in server mode so a single function call may synthesize the string.
-+This function name may be added to the server safe functions."
-+  (utt.send.wave.asterisk 
-+   (utt.synth
-+    (eval (list 'Utterance 'Text string)))))
-+;; end tts_textasterisk
-+
- (define (tts_return_to_client)
-   "(tts_return_to_client)
- This function is called by clients who wish to return waveforms of
-diff -u -r festival-1.4.3/src/arch/festival/wave.cc festival-1.4.3-asterisk/src/arch/festival/wave.cc
---- festival-1.4.3.orig/src/arch/festival/wave.cc	2003-01-13 11:09:55.000000000 -0800
-+++ festival/src/arch/festival/wave.cc	2003-08-14 12:10:53.000000000 -0700
-@@ -381,6 +381,7 @@
- 	type = "nist";
-     else
- 	type = get_c_string(ltype);
-+
-     w->save(tmpfile,type);
- #ifdef WIN32
-     send(ft_server_socket,"WV\n",3,0);
-@@ -393,6 +394,44 @@
-     return utt;
- }
- 
-+// begin utt_send_wave_asterisk()
-+static LISP utt_send_wave_asterisk(LISP utt)
-+{
-+    // Send the waveform to a client (must be acting as server)
-+    EST_Utterance *u = utterance(utt);
-+    EST_Wave *w;
-+    EST_String tmpfile = make_tmp_filename();
-+    LISP ltype;
-+    EST_String type;
-+
-+    w = get_utt_wave(u);
-+    if (ft_server_socket == -1)
-+    {
-+       cerr << "utt_send_wave_client: not in server mode" << endl;
-+       festival_error();
-+    }
-+       
-+    ltype = ft_get_param("Wavefiletype");
-+    if (ltype == NIL)
-+       type = "nist";
-+    else
-+       type = get_c_string(ltype);
-+    w->resample(8000);
-+    w->rescale(5);
-+
-+    w->save(tmpfile,type);
-+#ifdef WIN32
-+    send(ft_server_socket,"WV\n",3,0);
-+#else
-+    write(ft_server_socket,"WV\n",3);
-+#endif
-+    socket_send_file(ft_server_socket,tmpfile);
-+    unlink(tmpfile);
-+
-+    return utt;
-+}
-+// end utt_send_wave_asterisk()
-+
- static LISP send_sexpr_to_client(LISP l)
- {
-     EST_String tmpfile = make_tmp_filename();
-@@ -465,6 +504,15 @@
-  "(utt.send.wave.client UTT)\n\
-   Sends wave in UTT to client.  If not in server mode gives an error\n\
-   Note the client must be expecting to receive the waveform.");
-+
-+// begin asterisk mod
-+    init_subr_1("utt.send.wave.asterisk",utt_send_wave_asterisk,
-+ "(utt.send.wave.asterisk UTT)\n\
-+  Sends wave in UTT to client.  If not in server mode gives an error\n\
-+  Note the client must be expecting to receive the waveform. The waveform\
-+  is rescaled and resampled according to what asterisk needs");
-+// end asterisk mod
-+
-     init_subr_1("send_sexpr_to_client", send_sexpr_to_client,
-  "(send_sexpr_to_client SEXPR)\n\
- Sends given sexpression to currently connected client.");
diff --git a/app-accessibility/festival/files/festival-1.95_beta-asterisk.patch b/app-accessibility/festival/files/festival-1.95_beta-asterisk.patch
deleted file mode 100644
index e4e2106e15c6..000000000000
--- a/app-accessibility/festival/files/festival-1.95_beta-asterisk.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- festival/lib/festival.scm.o	2006-03-19 17:30:55.000000000 -0600
-+++ festival/lib/festival.scm	2006-03-19 17:36:07.000000000 -0600
-@@ -621,4 +621,14 @@
-      "tobi.scm" "f2bf0lr.scm"))
-   t)
- 
-+;;; Command for Asterisk begin
-+(define (tts_textasterisk string mode)
-+    "(tts_textasterisk STRING MODE)
-+      Apply tts to STRING.  This function is specifically designed for
-+        use in server mode so a single function call may synthesize the string.
-+	  This function name may be added to the server safe functions."
-+	        (utt.send.wave.client (utt.wave.resample (utt.wave.rescale (utt.synth
-+		                    (eval (list 'Utterance 'Text string))) 5) 8000)))
-+				    ;;; Command for Asterisk end
-+
- (provide 'festival)
diff --git a/app-accessibility/festival/files/festival-1.95_beta-fbsd.patch b/app-accessibility/festival/files/festival-1.95_beta-fbsd.patch
deleted file mode 100644
index 1d7622007076..000000000000
--- a/app-accessibility/festival/files/festival-1.95_beta-fbsd.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- speech_tools/audio/voxware.cc.orig	2007-06-29 14:37:11 -0700
-+++ speech_tools/audio/voxware.cc	2007-06-29 14:37:37 -0700
-@@ -61,7 +61,7 @@
- #include "EST_error.h"
- 
- #ifdef SUPPORT_FREEBSD16
--#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- #include <fcntl.h>
- int freebsd16_supported = TRUE;
- int linux16_supported = FALSE;
---- speech_tools/audio/voxware.cc.orig	2007-06-29 14:53:01 -0700
-+++ speech_tools/audio/voxware.cc	2007-06-29 14:53:20 -0700
-@@ -66,6 +66,7 @@
- int freebsd16_supported = TRUE;
- int linux16_supported = FALSE;
- static char *aud_sys_name = "FreeBSD";
-+static int stereo_only = 0;
- #endif
- 
- #ifdef SUPPORT_LINUX16
diff --git a/app-accessibility/festival/files/festival-1.95_beta-gcc41-amd64-int-pointer.patch b/app-accessibility/festival/files/festival-1.95_beta-gcc41-amd64-int-pointer.patch
deleted file mode 100644
index 25f162012fa1..000000000000
--- a/app-accessibility/festival/files/festival-1.95_beta-gcc41-amd64-int-pointer.patch
+++ /dev/null
@@ -1,359 +0,0 @@
---- speech_tools/include/EST_simplestats.h	2006/07/21 02:18:39	1.1
-+++ speech_tools/include/EST_simplestats.h	2006/07/21 02:35:43
-@@ -194,7 +194,7 @@ enum EST_tprob_type {tprob_string, tprob
-     for example
-     \begin{verbatim}
-        EST_DiscreteProbistribution pdf;
--       for (int i=pdf.item_start(); i < pdf.item_end(); i=pdf.item_next(i))
-+       for (long i=pdf.item_start(); i < pdf.item_end(); i=pdf.item_next(i))
-        {
-           EST_String name;
-           double prob;
-@@ -265,17 +265,17 @@ public:
-     /// 
-     double frequency(const int i) const; 
-     /// Used for iterating through members of the distribution
--    int item_start() const;
-+    long item_start() const;
-     /// Used for iterating through members of the distribution
--    int item_next(int idx) const;
-+    long item_next(long idx) const;
-     /// Used for iterating through members of the distribution
--    int item_end(int idx) const;
-+    int item_end(long idx) const;
-     /// During iteration returns name given index 
--    const EST_String &item_name(int idx) const;
-+    const EST_String &item_name(long idx) const;
-     /// During iteration returns name and frequency given index  
--    void item_freq(int idx,EST_String &s,double &freq) const;
-+    void item_freq(long idx,EST_String &s,double &freq) const;
-     /// During iteration returns name and probability given index
--    void item_prob(int idx,EST_String &s,double &prob) const;
-+    void item_prob(long idx,EST_String &s,double &prob) const;
- 
-     /// Returns discrete vocabulary of distribution
-     inline const EST_Discrete *const get_discrete() const { return discrete; };
---- speech_tools/stats/wagon/wagon_aux.cc	2006/07/21 02:18:39	1.1
-+++ speech_tools/stats/wagon/wagon_aux.cc	2006/07/21 02:36:09
-@@ -537,7 +537,7 @@ ostream & operator <<(ostream &s, WImpur
-     }
-     else if (imp.t == wnim_class)
-     {
--	int i;
-+	long i;
- 	EST_String name;
- 	double prob;
- 
---- speech_tools/stats/EST_DProbDist.cc	2006/07/21 02:18:39	1.1
-+++ speech_tools/stats/EST_DProbDist.cc	2006/07/21 02:41:32
-@@ -305,15 +305,15 @@ double EST_DiscreteProbDistribution::ent
- }
- 
- //  For iterating through members of a probability distribution
--int EST_DiscreteProbDistribution::item_start(void) const
-+long EST_DiscreteProbDistribution::item_start(void) const
- {
-     if (type == tprob_discrete)
- 	return 0;
-     else
--	return (int)scounts.list.head();
-+	return (long)scounts.list.head();
- }
- 
--int EST_DiscreteProbDistribution::item_end(int idx) const
-+int EST_DiscreteProbDistribution::item_end(long idx) const
- {
-     if (type == tprob_discrete)
- 	return (idx >= icounts.length());
-@@ -321,15 +321,15 @@ int EST_DiscreteProbDistribution::item_e
- 	return ((EST_Litem *)idx == 0);
- }
- 
--int EST_DiscreteProbDistribution::item_next(int idx) const
-+long EST_DiscreteProbDistribution::item_next(long idx) const
- {
-     if (type == tprob_discrete)
- 	return ++idx;
-     else
--	return (int)next((EST_Litem *)idx);
-+	return (long)next((EST_Litem *)idx);
- }
- 
--const EST_String &EST_DiscreteProbDistribution::item_name(int idx) const
-+const EST_String &EST_DiscreteProbDistribution::item_name(long idx) const
- {
-     if (type == tprob_discrete)
- 	return discrete->name(idx);
-@@ -337,7 +337,7 @@ const EST_String &EST_DiscreteProbDistri
- 	return scounts.list((EST_Litem *)idx).k;
- }
- 
--void EST_DiscreteProbDistribution::item_freq(int idx,EST_String &s,double &freq) const
-+void EST_DiscreteProbDistribution::item_freq(long idx,EST_String &s,double &freq) const
- {
-     if (type == tprob_discrete)
-     {
-@@ -351,7 +351,7 @@ void EST_DiscreteProbDistribution::item_
-     }
- }
- 
--void EST_DiscreteProbDistribution::item_prob(int idx,EST_String &s,double &prob) const
-+void EST_DiscreteProbDistribution::item_prob(long idx,EST_String &s,double &prob) const
- {
-     if (type == tprob_discrete)
-     {
-@@ -368,7 +368,7 @@ void EST_DiscreteProbDistribution::item_
- ostream & operator<<(ostream &s, const EST_DiscreteProbDistribution &pd)
- {
-     // Output best with probabilities
--    int i;
-+    long i;
-     double prob;
-     double sum=0;
-     EST_String name;
---- speech_tools/grammar/ngram/EST_Ngrammar.cc	2006/07/21 02:18:39	1.1
-+++ speech_tools/grammar/ngram/EST_Ngrammar.cc	2006/07/21 02:38:54
-@@ -180,7 +180,7 @@ bool EST_BackoffNgrammarState::accumulat
- 					  const double count)
- {
- 
--//    int i;
-+//    long i;
- //    cerr << "accumulate level " << p_level << " : ";
- //    for(i=0;i<words.n();i++)
- //    {
-@@ -302,7 +302,7 @@ void EST_BackoffNgrammarState::print_fre
-     // not right - just print out, then recurse through children
-     // change to use 'backoff_traverse'
-     
--    int k;
-+    long k;
-     double freq;
-     EST_String name;
-     for (k=p_pdf.item_start();
-@@ -369,7 +369,7 @@ void EST_BackoffNgrammarState::zap()
- {
- 
-     // recursively delete this state and all its children
--    int k;
-+    long k;
-     double freq;
-     EST_String name;
-     for (k=p_pdf.item_start();
-@@ -452,7 +452,7 @@ bool EST_BackoffNgrammarState::set_backo
- 
- void EST_BackoffNgrammarState::frequency_of_frequencies(EST_DVector &ff)
- {
--    int k,max=ff.n();
-+    long k; int max=ff.n();
-     double freq;
-     EST_String name;
-     for (k=p_pdf.item_start();
-@@ -911,7 +911,7 @@ void EST_Ngrammar::accumulate(const EST_
- {
-     
-     /*
--       int i;
-+       long i;
-        for(i=0;i<words.n();i++)
-        {
-        cerr << vocab_pdf.item_name(words(i));
-@@ -1581,7 +1581,7 @@ void EST_Ngrammar::prune_backoff_represe
-     // remove any branches with zero frequency count
-     
-     // find children of this state with zero freq and zap them
--    int k;
-+    long k;
-     double freq;
-     EST_String name;
-     for (k=start_state->pdf_const().item_start();
-@@ -2320,7 +2320,7 @@ void EST_Ngrammar::print_freqs(ostream &
- 	backoff_representation->print_freqs(os,p_order);
-     else
-     {
--	int i,j,k;
-+	int i,j; long k;
- 	EST_IVector window(p_order-1);
- 	
- 	for (i=0; i < p_num_states; i++)
-@@ -2661,7 +2661,7 @@ EST_Ngrammar::backoff_traverse(EST_Backo
-     function(start_state,params);
-     
-     // and recurse down the tree
--    int k;
-+    long k;
-     double freq;
-     EST_String name;
-     for (k=start_state->pdf_const().item_start();
-@@ -2692,7 +2692,7 @@ EST_Ngrammar::backoff_traverse(EST_Backo
-     {
- 	// and recurse down the tree if we haven't
- 	// reached the level yet
--	int k;
-+	long k;
- 	double freq;
- 	EST_String name;
- 	
---- speech_tools/grammar/ngram/ngrammar_io.cc	2006/07/21 02:18:39	1.1
-+++ speech_tools/grammar/ngram/ngrammar_io.cc	2006/07/21 02:39:05
-@@ -281,7 +281,7 @@ EST_read_status 
- load_ngram_cstr_bin(const EST_String filename, EST_Ngrammar &n)
- {
-     EST_TokenStream ts;
--    int i,j,k,order;
-+    int i,j,order; long k;
-     int num_entries;
-     double approx_num_samples = 0.0;
-     long freq_data_start, freq_data_end;
-@@ -407,7 +407,7 @@ EST_write_status
- save_ngram_htk_ascii_sub(const EST_String &word, ostream *ost, 
- 			 EST_Ngrammar &n, double floor)
- {
--    int k;
-+    long k;
-     EST_String name;
-     double freq;
-     EST_StrVector this_ngram(2); // assumes bigram
-@@ -734,7 +734,7 @@ save_ngram_cstr_ascii(const EST_String f
-     // awb's format
-     (void)trace;
-     ostream *ost;
--    int i,k;
-+    int i; long k;
-     
-     if (filename == "-")
- 	ost = &cout;
-@@ -831,7 +831,7 @@ save_ngram_cstr_bin(const EST_String fil
-     if (n.representation() == EST_Ngrammar::sparse)
- 	return misc_write_error;
-     
--    int i,k;
-+    int i; long k;
-     FILE *ofd;
-     double lfreq = -1;
-     double count = -1;
---- speech_tools/grammar/ngram/ngrammar_aux.cc	2006/07/21 02:18:39	1.1
-+++ speech_tools/grammar/ngram/ngrammar_aux.cc	2006/07/21 02:39:20
-@@ -117,7 +117,7 @@ smooth_ExponentialFit(EST_DVector &N, in
- 
- void make_f_of_f(EST_BackoffNgrammarState *s,void *params)
- {
--    int k;
-+    long k;
-     double freq;
-     EST_String name;
- 
-@@ -138,7 +138,7 @@ void make_f_of_f(EST_BackoffNgrammarStat
- 
- void get_max_f(EST_BackoffNgrammarState *s,void *params)
- {
--    int k;
-+    long k;
-     double freq;
-     EST_String name;
- 
-@@ -158,7 +158,7 @@ void get_max_f(EST_BackoffNgrammarState 
- 
- void map_f_of_f(EST_BackoffNgrammarState *s,void *params)
- {
--    int k;
-+    long k;
-     double freq;
-     EST_String name;
- 
-@@ -184,7 +184,7 @@ void map_f_of_f(EST_BackoffNgrammarState
- 
- void zero_small_f(EST_BackoffNgrammarState *s,void *params)
- {
--    int k;
-+    long k;
-     double freq;
-     EST_String name;
- 
-@@ -204,7 +204,7 @@ void zero_small_f(EST_BackoffNgrammarSta
- 
- void frequency_of_frequencies(EST_DVector &ff, EST_Ngrammar &n,int this_order)
- {
--  int i,k,size;
-+  int i,size; long k;
-   double max=0.0;
- 
-   // if ff has zero size, do complete frequency of frequencies
-@@ -302,7 +302,7 @@ void frequency_of_frequencies(EST_DVecto
- 
- void map_frequencies(EST_Ngrammar &n, const EST_DVector &map, const int this_order)
- {
--  int i,k;
-+  int i; long k;
- 
- 
-   switch(n.representation())
---- speech_tools/grammar/ngram/EST_PST.cc	2006/07/21 02:18:39	1.1
-+++ speech_tools/grammar/ngram/EST_PST.cc	2006/07/21 02:39:31
-@@ -71,7 +71,7 @@ EST_PredictionSuffixTree_tree_node::prin
- 	// Base -- print from pd 
- 	EST_String s;
- 	double freq;
--	for (int i = pd.item_start(); 
-+	for (long i = pd.item_start(); 
- 	     !pd.item_end(i); 
- 	     i=pd.item_next(i))
- 	{
-@@ -98,7 +98,7 @@ EST_PredictionSuffixTree_tree_node::prin
- 	EST_String s;
- 	double prob;
- 	os << get_path() << " :";
--	for (int i = pd.item_start(); !pd.item_end(i) ; i=pd.item_next(i))
-+	for (long i = pd.item_start(); !pd.item_end(i) ; i=pd.item_next(i))
- 	{
- 	    pd.item_prob(i,s,prob);
- 	    os << " " << s << " " << prob;
---- speech_tools/grammar/ngram/freqsmooth.cc	2006/07/21 02:18:39	1.1
-+++ speech_tools/grammar/ngram/freqsmooth.cc	2006/07/21 02:46:42
-@@ -74,7 +74,7 @@ void fs_build_backoff_ngrams(EST_Ngramma
- 				 EST_Ngrammar &ngram)
- {
-     // Build all the backoff grammars back to uni-grams
--    int i,j,k,l;
-+    int i,j,l; long k;
- 
-     for (i=0; i < ngram.order()-1; i++)
- 	backoff_ngrams[i].init(i+1,EST_Ngrammar::dense,
-@@ -110,7 +110,7 @@ int fs_backoff_smooth(EST_Ngrammar *back
- {
-     // For all ngrams which are too infrequent, adjust their
-     // frequencies based on their backoff probabilities
--    int i,j;
-+    int i; long j;
-     double occurs;
-     double backoff_prob;
- 
---- speech_tools/grammar/wfst/wfst_train.cc	2006/07/21 02:18:39	1.1
-+++ speech_tools/grammar/wfst/wfst_train.cc	2006/07/21 02:39:47
-@@ -299,7 +299,7 @@ static LISP find_best_split(EST_WFST &wf
-     LISP *ssplits;
-     gc_protect(&splits);
-     EST_String sname;
--    int b,best_b,i;
-+    int b,best_b; long i;
-     int num_pdfs;
-     double best_score, score, sfreq;
- 
-@@ -374,7 +374,7 @@ static double score_pdf_combine(EST_Disc
-     // Find score of (a+b) vs (all-(a+b))
-     EST_DiscreteProbDistribution ab(a);
-     EST_DiscreteProbDistribution all_but_ab(all);
--    int i;
-+    long i;
-     EST_String sname;
-     double sfreq, score;
-     for (i=b.item_start(); !b.item_end(i);
-@@ -506,7 +506,7 @@ static double find_score_if_split(EST_WF
-     EST_DiscreteProbDistribution pdf_split(&wfst.in_symbols());
-     EST_DiscreteProbDistribution pdf_remain(&wfst.in_symbols());
-     int in, tostate, id;
--    int i;
-+    long i;
-     double sfreq;
-     EST_String sname;
- 
diff --git a/app-accessibility/festival/files/festival-1.95_beta-gcc41-amd64.patch b/app-accessibility/festival/files/festival-1.95_beta-gcc41-amd64.patch
deleted file mode 100644
index d6ab0749ae45..000000000000
--- a/app-accessibility/festival/files/festival-1.95_beta-gcc41-amd64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- speech_tools/ling_class/item_feats.cc	2006/06/27 11:43:49	1.1
-+++ speech_tools/ling_class/item_feats.cc	2006/06/27 11:44:25
-@@ -78,7 +78,7 @@ EST_String get_featname(const EST_Item_f
-    EST_String name = EST_FeatureFunctionContext::global->get_featfunc_name(func, found);
- 
-    if (!found)
--	EST_error("featfunc 0x%x has no name", (int)func);
-+	EST_error("featfunc 0x%p has no name", func);
- 
-     return name;
- }
diff --git a/app-accessibility/festival/files/festival-1.95_beta-gcc41.patch b/app-accessibility/festival/files/festival-1.95_beta-gcc41.patch
deleted file mode 100644
index 72da4177bf2f..000000000000
--- a/app-accessibility/festival/files/festival-1.95_beta-gcc41.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- speech_tools/include/EST_Chunk.h	2006/06/05 00:32:45	1.1
-+++ speech_tools/include/EST_Chunk.h	2006/06/05 01:41:28
-@@ -103,6 +103,8 @@
-  /*                                                                      */
-  /************************************************************************/
- 
-+class EST_ChunkPtr;
-+
- class EST_Chunk  {
-   public:
-     typedef  unsigned short use_counter;
-@@ -152,6 +154,13 @@ class EST_Chunk  {
-  /*                                                                      */
-  /************************************************************************/
- 
-+EST_ChunkPtr chunk_allocate(int bytes);
-+EST_ChunkPtr chunk_allocate(int bytes, const char *initial, int initial_len);
-+EST_ChunkPtr chunk_allocate(int bytes, const EST_ChunkPtr &initial, int initial_start, int initial_len);
-+
-+void make_updatable(EST_ChunkPtr &shared, EST_Chunk::EST_chunk_size inuse);
-+void make_updatable(EST_ChunkPtr &shared);
-+
- class EST_ChunkPtr {
-   private:
-     EST_Chunk *ptr;
---- speech_tools/include/ling_class/EST_Item.h	2006/06/05 00:39:43	1.1
-+++ speech_tools/include/ling_class/EST_Item.h	2006/06/05 00:40:02
-@@ -79,6 +79,9 @@ use we envisage.  Traversal of the items
- 
- */
- 
-+class EST_Item;
-+int same_item(const EST_Item *l1,const EST_Item *l2);
-+
- class EST_Item 
- {
-   private:
---- ./speech_tools/base_class/EST_Pathname_unix.cc	2006/06/05 00:59:34	1.1
-+++ ./speech_tools/base_class/EST_Pathname_unix.cc	2006/06/05 01:19:16
-@@ -89,7 +89,7 @@ EST_Pathname EST_Pathname::as_directory(
-     return *this;
- 
-   if (length() > 0)
--    return ::operator +(EST_String(*this), "/");
-+    return EST_String(*this) + "/";
-   
-   return "./";
- }
---- festival/src/modules/clunits/clunits.h	2006/06/05 01:58:30	1.1
-+++ festival/src/modules/clunits/clunits.h	2006/06/05 01:58:47
-@@ -83,9 +83,9 @@ class CLDB {
-     CLfile *get_fileitem(const EST_String &name)
- 	{ return (CLfile *)fileindex.lookup(name); }
-     void load_coefs_sig(EST_Item *unit);
--    CLfile *CLDB::get_file_coefs_sig(const EST_String &fileid);
-+    CLfile *get_file_coefs_sig(const EST_String &fileid);
-     void load_join_coefs(CLunit *unit);
--    CLfile *CLDB::get_file_join_coefs(const EST_String &fileid);
-+    CLfile *get_file_join_coefs(const EST_String &fileid);
- };
- 
- 
---- festival/src/modules/MultiSyn/EST_JoinCostCache.h	2006/06/05 02:00:28	1.1
-+++ festival/src/modules/MultiSyn/EST_JoinCostCache.h	2006/06/05 02:00:57
-@@ -56,11 +56,11 @@
- /** Object oriented approach for better and for worse... 
- */
- 
-+#include <ostream>
- #include "EST_TList.h"
- #include "ling_class/EST_Item.h"
- 
- class EST_JoinCost;
--class ostream;
- 
- class EST_JoinCostCache {
- public:
diff --git a/app-accessibility/festival/files/festival-1.95_beta-init-scm.patch b/app-accessibility/festival/files/festival-1.95_beta-init-scm.patch
deleted file mode 100644
index efe575b0c2b7..000000000000
--- a/app-accessibility/festival/files/festival-1.95_beta-init-scm.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- festival/lib/init.scm	2006-09-15 01:34:32.000000000 -0500
-+++ festival/lib/init.scm	2006-09-15 01:50:30.000000000 -0500
-@@ -52,8 +52,8 @@
- 
- ;;;  A chance to set various variables to a local setting e.g.
- ;;;  lexdir, voices_dir audio etc etc.
--(if (probe_file (path-append libdir "sitevars.scm"))
--    (load (path-append libdir "sitevars.scm")))
-+(if (probe_file "/etc/festival/sitevars.scm")
-+    (load "/etc/festival/sitevars.scm"))
- 
- ;;; CSTR siod extensions
- (require 'cstr)
-@@ -133,8 +133,8 @@
- ;;;
- ;;;  Local site initialization, if the file exists load it
- ;;;
--(if (probe_file (path-append libdir "siteinit.scm"))
--    (load (path-append libdir "siteinit.scm")))
-+(if (probe_file "/etc/festival/siteinit.scm")
-+    (load "/etc/festival/siteinit.scm"))
- 
- ;;;  User initialization, if a user has a personal customization
- ;;;  file loaded it
diff --git a/app-accessibility/festival/files/festival-gcc3.3.diff b/app-accessibility/festival/files/festival-gcc3.3.diff
deleted file mode 100644
index 2cbee7d400f7..000000000000
--- a/app-accessibility/festival/files/festival-gcc3.3.diff
+++ /dev/null
@@ -1,142 +0,0 @@
-diff -Naur festival.org/src/modules/base/phrasify.cc festival/src/modules/base/phrasify.cc
---- festival.org/src/modules/base/phrasify.cc	2001-04-04 06:55:20.000000000 -0500
-+++ festival/src/modules/base/phrasify.cc	2003-06-22 10:41:41.000000000 -0500
-@@ -218,7 +218,7 @@
- 	    EST_Val npbreak = wagon_predict(w,phrase_type_tree);
- 	    w->set("pbreak",npbreak.string());  // may reset to BB
- 	}
--	pbreak = w->f("pbreak");
-+	pbreak = (EST_String)w->f("pbreak");
- 	if (pbreak == "B")
- 	    w->set("blevel",3);
- 	else if (pbreak == "mB")
-diff -Naur festival.org/src/modules/base/word.cc festival/src/modules/base/word.cc
---- festival.org/src/modules/base/word.cc	2001-04-04 06:55:20.000000000 -0500
-+++ festival/src/modules/base/word.cc	2003-06-22 10:41:41.000000000 -0500
-@@ -64,10 +64,10 @@
-     for (w=u->relation("Word")->first(); w != 0; w = next(w))
-     {
- 	lpos = NIL;
--	pos = ffeature(w,"hg_pos");
-+	pos = (EST_String)ffeature(w,"hg_pos");
-                         // explicit homograph pos disambiguation
- 	if (pos == "0")
--	    pos = ffeature(w,"pos");
-+	    pos = (EST_String)ffeature(w,"pos");
- 	if (pos != "0")
- 	    lpos = rintern(pos);
- 
-@@ -100,8 +100,8 @@
-     //  from which a list can be read.
-     EST_String p;
- 
--    if (((p = ffeature(w,"phonemes")) != "0") ||
--	((p = ffeature(w,"R:Token.parent.phonemes")) != "0"))
-+    if (((p = (EST_String)ffeature(w,"phonemes")) != "0") ||
-+	((p = (EST_String)ffeature(w,"R:Token.parent.phonemes")) != "0"))
-     {
- 	LISP phones = read_from_lstring(strintern(p));
- 
-diff -Naur festival.org/src/modules/Intonation/int_tree.cc festival/src/modules/Intonation/int_tree.cc
---- festival.org/src/modules/Intonation/int_tree.cc	2001-04-04 06:55:20.000000000 -0500
-+++ festival/src/modules/Intonation/int_tree.cc	2003-06-22 10:41:41.000000000 -0500
-@@ -87,11 +87,11 @@
-     for (s=u->relation("Syllable")->first(); s != 0; s=next(s))
-     {
- 	if ((paccent = accent_specified(s)) == "0") // check if pre-specified
--	    paccent = wagon_predict(s,accent_tree);
-+	    paccent = (EST_String)wagon_predict(s,accent_tree);
- 	if (paccent != "NONE")
- 	    add_IntEvent(u,s,paccent);
- 	if ((ptone = tone_specified(s)) == "0")
--	    ptone = wagon_predict(s,endtone_tree);
-+	    ptone = (EST_String)wagon_predict(s,endtone_tree);
- 	if (ptone != "NONE")
- 	    add_IntEvent(u,s,ptone);
-     }
-@@ -107,11 +107,11 @@
-     EST_Item *token = parent(word,"Token");
-     EST_String paccent("0");
-     if (token)
--	paccent = ffeature(token,"accent");
-+	paccent = (EST_String)ffeature(token,"accent");
- 	
-     if (paccent == "0")
-     {
--	paccent = ffeature(word,"accent");
-+	paccent = (EST_String)ffeature(word,"accent");
- 	if (paccent == "0")
- 	    return paccent;
-     }
-@@ -139,11 +139,11 @@
-     EST_Item *token = parent(word,"Token");
-     EST_String ptone("0");
-     if (token)
--	ptone = ffeature(token,"tone");
-+	ptone = (EST_String)ffeature(token,"tone");
- 
-     if (ptone == "0")
-     {
--	ptone = ffeature(word,"tone");
-+	ptone = (EST_String)ffeature(word,"tone");
- 	if (ptone == "0")
- 	    return ptone;
-     }
-diff -Naur festival.org/src/modules/Text/token.cc festival/src/modules/Text/token.cc
---- festival.org/src/modules/Text/token.cc	2001-04-04 06:55:20.000000000 -0500
-+++ festival/src/modules/Text/token.cc	2003-06-22 10:41:41.000000000 -0500
-@@ -230,7 +230,7 @@
- 	else
- 	    return cons(strintern(tok),NIL);
-     }
--    else if ((token_pos = ffeature(token,"token_pos")) == "ordinal")
-+    else if ((token_pos = (EST_String)ffeature(token,"token_pos")) == "ordinal")
- 	return say_num_as_ordinal(tok);
-     else if (token_pos == "year")
- 	return say_num_as_year(tok);
-@@ -404,7 +404,7 @@
-     const char *tokch = tok;
- 
-     for (i=0; i<tok.length(); i++)
--	if (strchr(PunctuationChars,tokch[i]) == NULL)
-+	if (strchr((const char *)PunctuationChars,tokch[i]) == NULL)
- 	    return FALSE;
- 
-     return TRUE;
-diff -Naur festival.org/src/modules/Text/xxml.cc festival/src/modules/Text/xxml.cc
---- festival.org/src/modules/Text/xxml.cc	2001-04-04 06:55:20.000000000 -0500
-+++ festival/src/modules/Text/xxml.cc	2003-06-22 10:41:41.000000000 -0500
-@@ -93,7 +93,7 @@
- 	    cerr << "xxml parse error: unexpected end of file \n";
- 	    festival_error();
- 	}
--	line = ts.get_upto_eoln();
-+	line = (EST_String)ts.get_upto_eoln();
- 	type = line.at(0,1);
- 	remainder = line.after(0);
- 	if (type == "-")
-@@ -159,7 +159,7 @@
-     EST_Token t;
- 
-     ts.open_string(remainder);
--    name = ts.get();
-+    name = (EST_String)ts.get();
-     if ((t=ts.get()) == "IMPLIED")
- 	att = cons(rintern(name),cons(NIL,NIL));
-     else if (t == "TOKEN")
-diff -Naur festival.org/src/modules/UniSyn_diphone/us_diphone_index.cc festival/src/modules/UniSyn_diphone/us_diphone_index.cc
---- festival.org/src/modules/UniSyn_diphone/us_diphone_index.cc	2002-07-02 06:18:30.000000000 -0500
-+++ festival/src/modules/UniSyn_diphone/us_diphone_index.cc	2003-06-22 10:41:41.000000000 -0500
-@@ -106,9 +106,9 @@
- 
-     if (!item)
- 	return "";
--    else if ((d1 = item->f(dname+"_"+dir,def)) != "0")
-+    else if ((d1 = (EST_String)item->f(dname+"_"+dir,def)) != "0")
- 	return d1;
--    else if ((d1 = item->f(dname,def)) != "0")
-+    else if ((d1 = (EST_String)item->f(dname,def)) != "0")
- 	return d1;
-     else
- 	return item->f("name","0").string();
-
diff --git a/app-accessibility/speech-tools/ChangeLog b/app-accessibility/speech-tools/ChangeLog
index 4e1683e3142b..514083461903 100644
--- a/app-accessibility/speech-tools/ChangeLog
+++ b/app-accessibility/speech-tools/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-accessibility/speech-tools
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/ChangeLog,v 1.58 2008/03/13 02:52:14 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/ChangeLog,v 1.59 2008/03/20 01:37:48 williamh Exp $
+
+  20 Mar 2008; William Hubbs <williamh@gentoo.org>
+  -files/speech-tools-1.2.95_beta-gcc41-amd64-int-pointer.patch,
+  -files/speech-tools-1.2.95_beta-gcc41-amd64.patch,
+  -files/speech-tools-1.2.95_beta-gcc41.patch,
+  -files/speech-tools-gcc3.3.diff, -speech-tools-1.2.3-r2.ebuild,
+  -speech-tools-1.2.3-r3.ebuild, -speech-tools-1.2.95_beta.ebuild,
+  -speech-tools-1.2.95_beta-r1.ebuild:
+  Removed old versions.
 
   13 Mar 2008; William Hubbs <williamh@gentoo.org>
   speech-tools-1.2.96_beta.ebuild:
diff --git a/app-accessibility/speech-tools/files/speech-tools-1.2.95_beta-gcc41-amd64-int-pointer.patch b/app-accessibility/speech-tools/files/speech-tools-1.2.95_beta-gcc41-amd64-int-pointer.patch
deleted file mode 100644
index 25f162012fa1..000000000000
--- a/app-accessibility/speech-tools/files/speech-tools-1.2.95_beta-gcc41-amd64-int-pointer.patch
+++ /dev/null
@@ -1,359 +0,0 @@
---- speech_tools/include/EST_simplestats.h	2006/07/21 02:18:39	1.1
-+++ speech_tools/include/EST_simplestats.h	2006/07/21 02:35:43
-@@ -194,7 +194,7 @@ enum EST_tprob_type {tprob_string, tprob
-     for example
-     \begin{verbatim}
-        EST_DiscreteProbistribution pdf;
--       for (int i=pdf.item_start(); i < pdf.item_end(); i=pdf.item_next(i))
-+       for (long i=pdf.item_start(); i < pdf.item_end(); i=pdf.item_next(i))
-        {
-           EST_String name;
-           double prob;
-@@ -265,17 +265,17 @@ public:
-     /// 
-     double frequency(const int i) const; 
-     /// Used for iterating through members of the distribution
--    int item_start() const;
-+    long item_start() const;
-     /// Used for iterating through members of the distribution
--    int item_next(int idx) const;
-+    long item_next(long idx) const;
-     /// Used for iterating through members of the distribution
--    int item_end(int idx) const;
-+    int item_end(long idx) const;
-     /// During iteration returns name given index 
--    const EST_String &item_name(int idx) const;
-+    const EST_String &item_name(long idx) const;
-     /// During iteration returns name and frequency given index  
--    void item_freq(int idx,EST_String &s,double &freq) const;
-+    void item_freq(long idx,EST_String &s,double &freq) const;
-     /// During iteration returns name and probability given index
--    void item_prob(int idx,EST_String &s,double &prob) const;
-+    void item_prob(long idx,EST_String &s,double &prob) const;
- 
-     /// Returns discrete vocabulary of distribution
-     inline const EST_Discrete *const get_discrete() const { return discrete; };
---- speech_tools/stats/wagon/wagon_aux.cc	2006/07/21 02:18:39	1.1
-+++ speech_tools/stats/wagon/wagon_aux.cc	2006/07/21 02:36:09
-@@ -537,7 +537,7 @@ ostream & operator <<(ostream &s, WImpur
-     }
-     else if (imp.t == wnim_class)
-     {
--	int i;
-+	long i;
- 	EST_String name;
- 	double prob;
- 
---- speech_tools/stats/EST_DProbDist.cc	2006/07/21 02:18:39	1.1
-+++ speech_tools/stats/EST_DProbDist.cc	2006/07/21 02:41:32
-@@ -305,15 +305,15 @@ double EST_DiscreteProbDistribution::ent
- }
- 
- //  For iterating through members of a probability distribution
--int EST_DiscreteProbDistribution::item_start(void) const
-+long EST_DiscreteProbDistribution::item_start(void) const
- {
-     if (type == tprob_discrete)
- 	return 0;
-     else
--	return (int)scounts.list.head();
-+	return (long)scounts.list.head();
- }
- 
--int EST_DiscreteProbDistribution::item_end(int idx) const
-+int EST_DiscreteProbDistribution::item_end(long idx) const
- {
-     if (type == tprob_discrete)
- 	return (idx >= icounts.length());
-@@ -321,15 +321,15 @@ int EST_DiscreteProbDistribution::item_e
- 	return ((EST_Litem *)idx == 0);
- }
- 
--int EST_DiscreteProbDistribution::item_next(int idx) const
-+long EST_DiscreteProbDistribution::item_next(long idx) const
- {
-     if (type == tprob_discrete)
- 	return ++idx;
-     else
--	return (int)next((EST_Litem *)idx);
-+	return (long)next((EST_Litem *)idx);
- }
- 
--const EST_String &EST_DiscreteProbDistribution::item_name(int idx) const
-+const EST_String &EST_DiscreteProbDistribution::item_name(long idx) const
- {
-     if (type == tprob_discrete)
- 	return discrete->name(idx);
-@@ -337,7 +337,7 @@ const EST_String &EST_DiscreteProbDistri
- 	return scounts.list((EST_Litem *)idx).k;
- }
- 
--void EST_DiscreteProbDistribution::item_freq(int idx,EST_String &s,double &freq) const
-+void EST_DiscreteProbDistribution::item_freq(long idx,EST_String &s,double &freq) const
- {
-     if (type == tprob_discrete)
-     {
-@@ -351,7 +351,7 @@ void EST_DiscreteProbDistribution::item_
-     }
- }
- 
--void EST_DiscreteProbDistribution::item_prob(int idx,EST_String &s,double &prob) const
-+void EST_DiscreteProbDistribution::item_prob(long idx,EST_String &s,double &prob) const
- {
-     if (type == tprob_discrete)
-     {
-@@ -368,7 +368,7 @@ void EST_DiscreteProbDistribution::item_
- ostream & operator<<(ostream &s, const EST_DiscreteProbDistribution &pd)
- {
-     // Output best with probabilities
--    int i;
-+    long i;
-     double prob;
-     double sum=0;
-     EST_String name;
---- speech_tools/grammar/ngram/EST_Ngrammar.cc	2006/07/21 02:18:39	1.1
-+++ speech_tools/grammar/ngram/EST_Ngrammar.cc	2006/07/21 02:38:54
-@@ -180,7 +180,7 @@ bool EST_BackoffNgrammarState::accumulat
- 					  const double count)
- {
- 
--//    int i;
-+//    long i;
- //    cerr << "accumulate level " << p_level << " : ";
- //    for(i=0;i<words.n();i++)
- //    {
-@@ -302,7 +302,7 @@ void EST_BackoffNgrammarState::print_fre
-     // not right - just print out, then recurse through children
-     // change to use 'backoff_traverse'
-     
--    int k;
-+    long k;
-     double freq;
-     EST_String name;
-     for (k=p_pdf.item_start();
-@@ -369,7 +369,7 @@ void EST_BackoffNgrammarState::zap()
- {
- 
-     // recursively delete this state and all its children
--    int k;
-+    long k;
-     double freq;
-     EST_String name;
-     for (k=p_pdf.item_start();
-@@ -452,7 +452,7 @@ bool EST_BackoffNgrammarState::set_backo
- 
- void EST_BackoffNgrammarState::frequency_of_frequencies(EST_DVector &ff)
- {
--    int k,max=ff.n();
-+    long k; int max=ff.n();
-     double freq;
-     EST_String name;
-     for (k=p_pdf.item_start();
-@@ -911,7 +911,7 @@ void EST_Ngrammar::accumulate(const EST_
- {
-     
-     /*
--       int i;
-+       long i;
-        for(i=0;i<words.n();i++)
-        {
-        cerr << vocab_pdf.item_name(words(i));
-@@ -1581,7 +1581,7 @@ void EST_Ngrammar::prune_backoff_represe
-     // remove any branches with zero frequency count
-     
-     // find children of this state with zero freq and zap them
--    int k;
-+    long k;
-     double freq;
-     EST_String name;
-     for (k=start_state->pdf_const().item_start();
-@@ -2320,7 +2320,7 @@ void EST_Ngrammar::print_freqs(ostream &
- 	backoff_representation->print_freqs(os,p_order);
-     else
-     {
--	int i,j,k;
-+	int i,j; long k;
- 	EST_IVector window(p_order-1);
- 	
- 	for (i=0; i < p_num_states; i++)
-@@ -2661,7 +2661,7 @@ EST_Ngrammar::backoff_traverse(EST_Backo
-     function(start_state,params);
-     
-     // and recurse down the tree
--    int k;
-+    long k;
-     double freq;
-     EST_String name;
-     for (k=start_state->pdf_const().item_start();
-@@ -2692,7 +2692,7 @@ EST_Ngrammar::backoff_traverse(EST_Backo
-     {
- 	// and recurse down the tree if we haven't
- 	// reached the level yet
--	int k;
-+	long k;
- 	double freq;
- 	EST_String name;
- 	
---- speech_tools/grammar/ngram/ngrammar_io.cc	2006/07/21 02:18:39	1.1
-+++ speech_tools/grammar/ngram/ngrammar_io.cc	2006/07/21 02:39:05
-@@ -281,7 +281,7 @@ EST_read_status 
- load_ngram_cstr_bin(const EST_String filename, EST_Ngrammar &n)
- {
-     EST_TokenStream ts;
--    int i,j,k,order;
-+    int i,j,order; long k;
-     int num_entries;
-     double approx_num_samples = 0.0;
-     long freq_data_start, freq_data_end;
-@@ -407,7 +407,7 @@ EST_write_status
- save_ngram_htk_ascii_sub(const EST_String &word, ostream *ost, 
- 			 EST_Ngrammar &n, double floor)
- {
--    int k;
-+    long k;
-     EST_String name;
-     double freq;
-     EST_StrVector this_ngram(2); // assumes bigram
-@@ -734,7 +734,7 @@ save_ngram_cstr_ascii(const EST_String f
-     // awb's format
-     (void)trace;
-     ostream *ost;
--    int i,k;
-+    int i; long k;
-     
-     if (filename == "-")
- 	ost = &cout;
-@@ -831,7 +831,7 @@ save_ngram_cstr_bin(const EST_String fil
-     if (n.representation() == EST_Ngrammar::sparse)
- 	return misc_write_error;
-     
--    int i,k;
-+    int i; long k;
-     FILE *ofd;
-     double lfreq = -1;
-     double count = -1;
---- speech_tools/grammar/ngram/ngrammar_aux.cc	2006/07/21 02:18:39	1.1
-+++ speech_tools/grammar/ngram/ngrammar_aux.cc	2006/07/21 02:39:20
-@@ -117,7 +117,7 @@ smooth_ExponentialFit(EST_DVector &N, in
- 
- void make_f_of_f(EST_BackoffNgrammarState *s,void *params)
- {
--    int k;
-+    long k;
-     double freq;
-     EST_String name;
- 
-@@ -138,7 +138,7 @@ void make_f_of_f(EST_BackoffNgrammarStat
- 
- void get_max_f(EST_BackoffNgrammarState *s,void *params)
- {
--    int k;
-+    long k;
-     double freq;
-     EST_String name;
- 
-@@ -158,7 +158,7 @@ void get_max_f(EST_BackoffNgrammarState 
- 
- void map_f_of_f(EST_BackoffNgrammarState *s,void *params)
- {
--    int k;
-+    long k;
-     double freq;
-     EST_String name;
- 
-@@ -184,7 +184,7 @@ void map_f_of_f(EST_BackoffNgrammarState
- 
- void zero_small_f(EST_BackoffNgrammarState *s,void *params)
- {
--    int k;
-+    long k;
-     double freq;
-     EST_String name;
- 
-@@ -204,7 +204,7 @@ void zero_small_f(EST_BackoffNgrammarSta
- 
- void frequency_of_frequencies(EST_DVector &ff, EST_Ngrammar &n,int this_order)
- {
--  int i,k,size;
-+  int i,size; long k;
-   double max=0.0;
- 
-   // if ff has zero size, do complete frequency of frequencies
-@@ -302,7 +302,7 @@ void frequency_of_frequencies(EST_DVecto
- 
- void map_frequencies(EST_Ngrammar &n, const EST_DVector &map, const int this_order)
- {
--  int i,k;
-+  int i; long k;
- 
- 
-   switch(n.representation())
---- speech_tools/grammar/ngram/EST_PST.cc	2006/07/21 02:18:39	1.1
-+++ speech_tools/grammar/ngram/EST_PST.cc	2006/07/21 02:39:31
-@@ -71,7 +71,7 @@ EST_PredictionSuffixTree_tree_node::prin
- 	// Base -- print from pd 
- 	EST_String s;
- 	double freq;
--	for (int i = pd.item_start(); 
-+	for (long i = pd.item_start(); 
- 	     !pd.item_end(i); 
- 	     i=pd.item_next(i))
- 	{
-@@ -98,7 +98,7 @@ EST_PredictionSuffixTree_tree_node::prin
- 	EST_String s;
- 	double prob;
- 	os << get_path() << " :";
--	for (int i = pd.item_start(); !pd.item_end(i) ; i=pd.item_next(i))
-+	for (long i = pd.item_start(); !pd.item_end(i) ; i=pd.item_next(i))
- 	{
- 	    pd.item_prob(i,s,prob);
- 	    os << " " << s << " " << prob;
---- speech_tools/grammar/ngram/freqsmooth.cc	2006/07/21 02:18:39	1.1
-+++ speech_tools/grammar/ngram/freqsmooth.cc	2006/07/21 02:46:42
-@@ -74,7 +74,7 @@ void fs_build_backoff_ngrams(EST_Ngramma
- 				 EST_Ngrammar &ngram)
- {
-     // Build all the backoff grammars back to uni-grams
--    int i,j,k,l;
-+    int i,j,l; long k;
- 
-     for (i=0; i < ngram.order()-1; i++)
- 	backoff_ngrams[i].init(i+1,EST_Ngrammar::dense,
-@@ -110,7 +110,7 @@ int fs_backoff_smooth(EST_Ngrammar *back
- {
-     // For all ngrams which are too infrequent, adjust their
-     // frequencies based on their backoff probabilities
--    int i,j;
-+    int i; long j;
-     double occurs;
-     double backoff_prob;
- 
---- speech_tools/grammar/wfst/wfst_train.cc	2006/07/21 02:18:39	1.1
-+++ speech_tools/grammar/wfst/wfst_train.cc	2006/07/21 02:39:47
-@@ -299,7 +299,7 @@ static LISP find_best_split(EST_WFST &wf
-     LISP *ssplits;
-     gc_protect(&splits);
-     EST_String sname;
--    int b,best_b,i;
-+    int b,best_b; long i;
-     int num_pdfs;
-     double best_score, score, sfreq;
- 
-@@ -374,7 +374,7 @@ static double score_pdf_combine(EST_Disc
-     // Find score of (a+b) vs (all-(a+b))
-     EST_DiscreteProbDistribution ab(a);
-     EST_DiscreteProbDistribution all_but_ab(all);
--    int i;
-+    long i;
-     EST_String sname;
-     double sfreq, score;
-     for (i=b.item_start(); !b.item_end(i);
-@@ -506,7 +506,7 @@ static double find_score_if_split(EST_WF
-     EST_DiscreteProbDistribution pdf_split(&wfst.in_symbols());
-     EST_DiscreteProbDistribution pdf_remain(&wfst.in_symbols());
-     int in, tostate, id;
--    int i;
-+    long i;
-     double sfreq;
-     EST_String sname;
- 
diff --git a/app-accessibility/speech-tools/files/speech-tools-1.2.95_beta-gcc41-amd64.patch b/app-accessibility/speech-tools/files/speech-tools-1.2.95_beta-gcc41-amd64.patch
deleted file mode 100644
index d6ab0749ae45..000000000000
--- a/app-accessibility/speech-tools/files/speech-tools-1.2.95_beta-gcc41-amd64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- speech_tools/ling_class/item_feats.cc	2006/06/27 11:43:49	1.1
-+++ speech_tools/ling_class/item_feats.cc	2006/06/27 11:44:25
-@@ -78,7 +78,7 @@ EST_String get_featname(const EST_Item_f
-    EST_String name = EST_FeatureFunctionContext::global->get_featfunc_name(func, found);
- 
-    if (!found)
--	EST_error("featfunc 0x%x has no name", (int)func);
-+	EST_error("featfunc 0x%p has no name", func);
- 
-     return name;
- }
diff --git a/app-accessibility/speech-tools/files/speech-tools-1.2.95_beta-gcc41.patch b/app-accessibility/speech-tools/files/speech-tools-1.2.95_beta-gcc41.patch
deleted file mode 100644
index 14819e2efe13..000000000000
--- a/app-accessibility/speech-tools/files/speech-tools-1.2.95_beta-gcc41.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- speech_tools/include/EST_Chunk.h	2006/06/05 00:32:45	1.1
-+++ speech_tools/include/EST_Chunk.h	2006/06/05 01:41:28
-@@ -103,6 +103,8 @@
-  /*                                                                      */
-  /************************************************************************/
- 
-+class EST_ChunkPtr;
-+
- class EST_Chunk  {
-   public:
-     typedef  unsigned short use_counter;
-@@ -152,6 +154,13 @@ class EST_Chunk  {
-  /*                                                                      */
-  /************************************************************************/
- 
-+EST_ChunkPtr chunk_allocate(int bytes);
-+EST_ChunkPtr chunk_allocate(int bytes, const char *initial, int initial_len);
-+EST_ChunkPtr chunk_allocate(int bytes, const EST_ChunkPtr &initial, int initial_start, int initial_len);
-+
-+void make_updatable(EST_ChunkPtr &shared, EST_Chunk::EST_chunk_size inuse);
-+void make_updatable(EST_ChunkPtr &shared);
-+
- class EST_ChunkPtr {
-   private:
-     EST_Chunk *ptr;
---- speech_tools/include/ling_class/EST_Item.h	2006/06/05 00:39:43	1.1
-+++ speech_tools/include/ling_class/EST_Item.h	2006/06/05 00:40:02
-@@ -79,6 +79,9 @@ use we envisage.  Traversal of the items
- 
- */
- 
-+class EST_Item;
-+int same_item(const EST_Item *l1,const EST_Item *l2);
-+
- class EST_Item 
- {
-   private:
---- ./speech_tools/base_class/EST_Pathname_unix.cc	2006/06/05 00:59:34	1.1
-+++ ./speech_tools/base_class/EST_Pathname_unix.cc	2006/06/05 01:19:16
-@@ -89,7 +89,7 @@ EST_Pathname EST_Pathname::as_directory(
-     return *this;
- 
-   if (length() > 0)
--    return ::operator +(EST_String(*this), "/");
-+    return EST_String(*this) + "/";
-   
-   return "./";
- }
diff --git a/app-accessibility/speech-tools/files/speech-tools-gcc3.3.diff b/app-accessibility/speech-tools/files/speech-tools-gcc3.3.diff
deleted file mode 100644
index 98d866389260..000000000000
--- a/app-accessibility/speech-tools/files/speech-tools-gcc3.3.diff
+++ /dev/null
@@ -1,774 +0,0 @@
-diff -Naur sp/base_class/vec_mat_aux.cc speech_tools/base_class/vec_mat_aux.cc
---- sp/base_class/vec_mat_aux.cc	2003-06-22 04:36:32.000000000 -0500
-+++ speech_tools/base_class/vec_mat_aux.cc	2003-06-22 04:44:56.000000000 -0500
-@@ -453,15 +453,15 @@
- 	return (a.a_no_check(0,0) * a.a_no_check(1,1)) - 
- 	    (a.a_no_check(0,1) * a.a_no_check(1,0));
-     
--    float p;
-+    double p;
-     
-     // create cofactor matrix
-     j = 1;
-     for (i = 0; i < n; ++i)
-     {
--	p = (float)(i + j + 2);	// because i & j should start at 1
-+	p = (double)(i + j + 2);	// because i & j should start at 1
- 	//	cout << "power " <<p << endl;
--	A[i] = pow(-1.0, p) * determinant(sub(a, i, j));
-+	A[i] = pow((double)-1.0, p) * determinant(sub(a, i, j));
-     }
-     //    cout << "cofactor " << A;
-     
-diff -Naur sp/config/compilers/gcc_defaults.mak speech_tools/config/compilers/gcc_defaults.mak
---- sp/config/compilers/gcc_defaults.mak	2002-11-29 07:34:50.000000000 -0600
-+++ speech_tools/config/compilers/gcc_defaults.mak	2003-06-22 04:45:11.000000000 -0500
-@@ -45,7 +45,7 @@
- COMPILER_VERSION_COMMAND=$(CXX) -v 2>&1 | tail -1 | sed -e 's/^....//'
- 
- CFLAGS  = $(GCC_SYSTEM_OPTIONS) $(CC_OTHER_FLAGS)
--CXXFLAGS  =  $(GCC_SYSTEM_OPTIONS) -fno-implicit-templates $(CC_OTHER_FLAGS)
-+CXXFLAGS  =  $(GCC_SYSTEM_OPTIONS) $(CC_OTHER_FLAGS)
- 
- DEBUG_CCFLAGS   = -g
- DEBUG_CXXFLAGS  = -g
-diff -Naur sp/config/config.in speech_tools/config/config.in
---- sp/config/config.in	2002-07-22 17:58:44.000000000 -0500
-+++ speech_tools/config/config.in	2003-06-22 04:45:11.000000000 -0500
-@@ -61,7 +61,7 @@
- # VERBOSE=1
- # DEBUG=1
- # PROFILE=gprof
--# SHARED=1
-+SHARED=1
- 
- ## Directory specific selections which override the above
- 
-diff -Naur sp/grammar/ngram/EST_Ngrammar.cc speech_tools/grammar/ngram/EST_Ngrammar.cc
---- sp/grammar/ngram/EST_Ngrammar.cc	2003-06-22 04:36:32.000000000 -0500
-+++ speech_tools/grammar/ngram/EST_Ngrammar.cc	2003-06-22 04:44:56.000000000 -0500
-@@ -579,7 +579,7 @@
- 	return false;
-     }
-     
--    p_num_states = (int)pow(vocab->length(),p_order-1);
-+    p_num_states = (int)pow((double)vocab->length(),(double)p_order-1);
-     p_states = new EST_NgrammarState[p_num_states];
-     for (i=0; i < p_num_states; i++)
- 	p_states[i].init(i,pred_vocab);
-@@ -597,7 +597,7 @@
- 	return false;
-     }
-     
--    p_num_states = (int)pow(vocab->length(),p_order-1);
-+    p_num_states = (int)pow((double)vocab->length(),(double)p_order-1);
-     p_states = new EST_NgrammarState[p_num_states];
-     
-     return (bool)(p_states != NULL);
-diff -Naur sp/grammar/ngram/ngrammar_aux.cc speech_tools/grammar/ngram/ngrammar_aux.cc
---- sp/grammar/ngram/ngrammar_aux.cc	2003-06-22 04:36:32.000000000 -0500
-+++ speech_tools/grammar/ngram/ngrammar_aux.cc	2003-06-22 04:44:56.000000000 -0500
-@@ -110,7 +110,7 @@
-     }
-   
-   for(int r=first;r<=last;r++)
--    N[r] = exp(a)* pow((float)r, b);
-+    N[r] = exp(a)* pow((double)r, (double)b);
-   
-   return true;
- }
-@@ -252,7 +252,7 @@
- 		  for (i=1;i<ff.n();i++)
- 		    total += ff(i);
- 		  
--		  ff[0] = pow(n.get_vocab_length(),n.order()) - total;
-+		  ff[0] = pow((double)n.get_vocab_length(),(double)n.order()) - total;
- 	      }
- 	}
- 	break;
-@@ -285,7 +285,7 @@
- 		  double total=0;
- 		  for (i=1;i<ff.n();i++)
- 		    total += ff(i);
--		  ff[0] = pow(n.get_vocab_length(),this_order) - total;
-+		  ff[0] = pow((double)n.get_vocab_length(),(double)this_order) - total;
- 
- 
- 
-diff -Naur sp/grammar/ngram/ngrammar_io.cc speech_tools/grammar/ngram/ngrammar_io.cc
---- sp/grammar/ngram/ngrammar_io.cc	2003-06-22 04:36:32.000000000 -0500
-+++ speech_tools/grammar/ngram/ngrammar_io.cc	2003-06-22 04:44:56.000000000 -0500
-@@ -756,7 +756,7 @@
- 	n.print_freqs(*ost,floor);
-     else if (n.representation() == EST_Ngrammar::backoff)
-     {
--	int total_ngrams = (int)pow(n.get_vocab_length(),n.order()-1);
-+	int total_ngrams = (int)pow((double)n.get_vocab_length(),(double)n.order()-1);
- 	
- 	for(i=0;i<total_ngrams;i++)
- 	{
-@@ -903,7 +903,7 @@
- 	// word in the ngram is the least significant 'bit'
- 	
- 	// number of ngrams, excluding last word, is
--	int total_ngrams = (int)pow(n.get_vocab_length(),n.order()-1);
-+	int total_ngrams = (int)pow((double)n.get_vocab_length(),(double)n.order()-1);
- 	
- 	for(i=0;i<total_ngrams;i++)
- 	{
-diff -Naur sp/grammar/wfst/wfst_train.cc speech_tools/grammar/wfst/wfst_train.cc
---- sp/grammar/wfst/wfst_train.cc	2002-12-26 14:29:40.000000000 -0600
-+++ speech_tools/grammar/wfst/wfst_train.cc	2003-06-22 07:34:42.000000000 -0500
-@@ -95,7 +95,7 @@
- 	LISP s = NIL;
- 	do
- 	{
--	    t = ts.get();
-+	    t = (EST_String)ts.get();
- 	    id = wfst.in_symbol(t);
- 	    if (id == -1)
- 	    {
-diff -Naur sp/include/EST_Chunk.h speech_tools/include/EST_Chunk.h
---- sp/include/EST_Chunk.h	2001-04-04 06:55:32.000000000 -0500
-+++ speech_tools/include/EST_Chunk.h	2003-06-22 04:55:05.000000000 -0500
-@@ -49,7 +49,9 @@
- #    define HAVE_WALLOC_H (1)
- #endif
- 
--#include <iostream.h>
-+using namespace std;
-+
-+#include <iostream>
- #include <limits.h>
- #include <sys/types.h>
- 
-diff -Naur sp/include/EST_Complex.h speech_tools/include/EST_Complex.h
---- sp/include/EST_Complex.h	2001-04-04 06:55:32.000000000 -0500
-+++ speech_tools/include/EST_Complex.h	2003-06-22 05:28:46.000000000 -0500
-@@ -39,7 +39,7 @@
- 
- #ifndef __EST_COMPLEX_H__
- #define __EST_COMPLEX_H__
--
-+using namespace std;
- #include "EST_iostream.h"
- #include <math.h>
- 
-diff -Naur sp/include/EST_dynamic_model.h speech_tools/include/EST_dynamic_model.h
---- sp/include/EST_dynamic_model.h	2001-04-04 06:55:32.000000000 -0500
-+++ speech_tools/include/EST_dynamic_model.h	2003-06-22 04:44:56.000000000 -0500
-@@ -39,7 +39,7 @@
- 
- #include <stdlib.h>
- #include <stdio.h>
--#include <fstream.h>
-+#include <fstream>
- #include "EST.h"
- #include "EST_model_types.h"
- 
-diff -Naur sp/include/EST_iostream.h speech_tools/include/EST_iostream.h
---- sp/include/EST_iostream.h	2001-04-04 06:55:32.000000000 -0500
-+++ speech_tools/include/EST_iostream.h	2003-06-22 04:44:56.000000000 -0500
-@@ -50,8 +50,8 @@
- #   include <iostream.h>
- #   include <strstrea.h>
- #elif defined(SYSTEM_IS_UNIX)
--#   include <iostream.h>
--#   include <strstream.h>
-+#   include <iostream>
-+#   include <strstream>
- #elif defined(SYSTEM_IS_WIN32)
- #   include "win32/EST_iostream_win32.h"
- #   include <strstrea.h>
-diff -Naur sp/include/EST_lattice_io.h speech_tools/include/EST_lattice_io.h
---- sp/include/EST_lattice_io.h	2001-04-04 06:55:32.000000000 -0500
-+++ speech_tools/include/EST_lattice_io.h	2003-06-22 04:44:56.000000000 -0500
-@@ -40,8 +40,8 @@
- #ifndef __EST_LATTICE_IO_H__
- #define __EST_LATTICE_IO_H__
- 
--#include <String.h>
--#include <ostream.h>
-+#include <String>
-+#include <ostream>
- #include "sp_common_types.h"
- #include "wp_grammar.h"
- #include "EST_lattice.h"
-diff -Naur sp/include/EST_model_types.h speech_tools/include/EST_model_types.h
---- sp/include/EST_model_types.h	2001-04-04 06:55:32.000000000 -0500
-+++ speech_tools/include/EST_model_types.h	2003-06-22 04:44:56.000000000 -0500
-@@ -39,7 +39,7 @@
- 
- #include <stdlib.h>
- #include <stdio.h>
--#include <fstream.h>
-+#include <fstream>
- #include "EST.h"
- #include "EST_Handleable.h"
- #include "EST_THandle.h"
-diff -Naur sp/include/EST_String.h speech_tools/include/EST_String.h
---- sp/include/EST_String.h	2001-04-04 08:11:27.000000000 -0500
-+++ speech_tools/include/EST_String.h	2003-06-22 05:07:19.000000000 -0500
-@@ -37,15 +37,15 @@
- #ifdef HAVE_CONFIG_H
- #    include "est_string_config.h"
- #endif
--
-+using namespace std;
- class EST_String;
- class EST_Regex;
- 
- #define EST_Regex_max_subexpressions 10
- 
--#include <string.h>
-+#include <string>
- #ifdef NO_EST
--#    include <iostream.h>
-+#    include <iostream>
- #else
- #    include "EST_iostream.h"
- #endif
-diff -Naur sp/include/EST_THash.h speech_tools/include/EST_THash.h
---- sp/include/EST_THash.h	2002-12-26 09:48:53.000000000 -0600
-+++ speech_tools/include/EST_THash.h	2003-06-22 07:24:49.000000000 -0500
-@@ -35,8 +35,8 @@
- 
- #ifndef __EST_THASH_H__
- #define __EST_THASH_H__
--
--#include <iostream.h>
-+using namespace std;
-+#include <iostream>
- #include "EST_String.h"
- #include "EST_system.h"
- #include "EST_bool.h"
-@@ -274,34 +274,76 @@
-   * has a different default hash function.
-   */
- 
-+template<class V>  class EST_TStringHash;
-+
- template<class V>
--class EST_TStringHash : public EST_THash<EST_String, V> {
-+class EST_StringHash_Pair {
- public:
-+  EST_String k;
-+  V v;
-+private:
-+  EST_StringHash_Pair<V> *next;
-+  friend class EST_TStringHash<V>;
-+};
-+
-+template<class V>
-+class EST_TStringHash : public EST_THash<EST_String, V> {
-+private:
-+  static V Dummy_Value;
-+  unsigned int p_num_entries;
-+  unsigned int p_num_buckets;
-+  EST_StringHash_Pair<V> **p_buckets;
-+  unsigned int (*p_hash_function)(const EST_String &key, unsigned int size);
-+
-+protected:
-+  struct IPointer_s {  unsigned int b; EST_StringHash_Pair<V> *p; };
-+  typedef struct IPointer_s IPointer;
-+  void skip_blank(IPointer &ip) const 
-+    {
-+      while (ip.p==NULL && ip.b<p_num_buckets)
-+	{ip.b++; ip.p = ip.b<p_num_buckets?p_buckets[ip.b]:0; } 
-+    }
-+  
-+  void point_to_first(IPointer &ip) const 
-+    { ip.b=0; ip.p = ip.b<p_num_buckets?p_buckets[ip.b]:0; 
-+    skip_blank(ip);}
-+
-+  void move_pointer_forwards(IPointer &ip) const 
-+    { 
-+      ip.p = ip.p->next; 
-+      skip_blank(ip);
-+    }
-+
-+  bool points_to_something(const IPointer &ip) const { return ip.b<p_num_buckets; }
-+
-+  EST_StringHash_Pair<V> &points_at(const IPointer &ip) { return *(ip.p); }
- 
-+  friend class EST_TStructIterator< EST_TStringHash<V>, IPointer, EST_StringHash_Pair<V> >;
-+  friend class EST_TRwStructIterator< EST_TStringHash<V>, IPointer, EST_StringHash_Pair<V> >;
-+  friend class EST_TIterator< EST_TStringHash<V>, IPointer, EST_StringHash_Pair<V> >;
-+  friend class EST_TRwIterator< EST_TStringHash<V>, IPointer, EST_StringHash_Pair<V> >;
-+
-+public:
-   /// Create a string hash table of <parameter>size</parameter> buckets.
-   EST_TStringHash(int size) : EST_THash<EST_String, V>(size, StringHash) {};
- 
-   /// An entry returned by the iterator is a key value pair.
--  typedef EST_Hash_Pair<EST_String, V> Entry;
--
--/*    struct IPointer_s{  unsigned int b; Entry *p; };
--      typedef struct IPointer_s IPointer; */
--
-+  typedef EST_StringHash_Pair<V> Entry;
- 
-   /// Give the iterator a sensible name.
--  typedef EST_TStructIterator< EST_THash<EST_String, V>, IPointer, EST_Hash_Pair<EST_String, V> > Entries;
--
--  typedef EST_TRwStructIterator< EST_THash<EST_String, V>, IPointer, EST_Hash_Pair<EST_String, V> > RwEntries;
--  //@}
-+  typedef EST_TStructIterator< EST_TStringHash<V>, IPointer, EST_StringHash_Pair<V> > Entries;
-+  typedef EST_TRwStructIterator< EST_TStringHash<V>, IPointer, EST_StringHash_Pair<V> > RwEntries;
- 
-+protected:
-+  struct IPointer_k_s {  unsigned int b; EST_StringHash_Pair<V> *p; };
-+  typedef struct IPointer_k_s IPointer_k;
-+  
-+public:
-   typedef EST_String KeyEntry;
- 
--/*  struct IPointer_k_s {  unsigned int b; EST_Hash_Pair<EST_String, V> *p; };
--    typedef struct IPointer_k_s IPointer_k; */
--
-   /// Give the iterator a sensible name.
--  typedef EST_TIterator< EST_THash<EST_String, V>, IPointer_k, EST_String > KeyEntries;
--  typedef EST_TRwIterator< EST_THash<EST_String, V>, IPointer_k, EST_String > KeyRwEntries;
-+  typedef EST_TIterator< EST_TStringHash<V>, IPointer_k, EST_String > KeyEntries;
-+  typedef EST_TRwIterator< EST_TStringHash<V>, IPointer_k, EST_String > KeyRwEntries;
- };
- 
- 
-diff -Naur sp/include/EST_TList.h speech_tools/include/EST_TList.h
---- sp/include/EST_TList.h	2001-04-04 06:55:32.000000000 -0500
-+++ speech_tools/include/EST_TList.h	2003-06-22 04:44:56.000000000 -0500
-@@ -43,7 +43,7 @@
- #ifndef __Tlist_H__
- #define __Tlist_H__
- 
--#include <iostream.h>
-+#include <iostream>
- #include "EST_common.h"
- #include "EST_UList.h"
- #include "EST_TSortable.h"
-diff -Naur sp/include/EST_TMatrix.h speech_tools/include/EST_TMatrix.h
---- sp/include/EST_TMatrix.h	2001-07-25 06:02:36.000000000 -0500
-+++ speech_tools/include/EST_TMatrix.h	2003-06-22 05:25:18.000000000 -0500
-@@ -41,7 +41,8 @@
- #ifndef __TMatrix_H__
- #define __TMatrix_H__
- 
--#include <iostream.h>
-+using namespace std;
-+#include <iostream>
- #include "EST_rw_status.h"
- #include "EST_TVector.h"
- #include "instantiate/EST_TMatrixI.h"
-diff -Naur sp/include/EST_TTimeIndex.h speech_tools/include/EST_TTimeIndex.h
---- sp/include/EST_TTimeIndex.h	2001-04-04 08:11:27.000000000 -0500
-+++ speech_tools/include/EST_TTimeIndex.h	2003-06-22 04:44:56.000000000 -0500
-@@ -35,7 +35,7 @@
- #ifndef __EST_TTIMEINDEX_H__
- #define __EST_TTIMEINDEX_H__
- 
--#include <iostream.h>
-+#include <iostream>
- 
- /** A time index for a container. The container defines how to get an
-   * object and so on, this lets you find a point in the container not
-diff -Naur sp/include/EST_TVector.h speech_tools/include/EST_TVector.h
---- sp/include/EST_TVector.h	2003-01-12 15:29:02.000000000 -0600
-+++ speech_tools/include/EST_TVector.h	2003-06-22 05:32:34.000000000 -0500
-@@ -40,7 +40,8 @@
- #ifndef __EST_TVector_H__
- #define __EST_TVector_H__
- 
--#include <iostream.h>
-+using namespace std;
-+#include <iostream>
- #include "EST_bool.h"
- #include "EST_rw_status.h"
- 
-diff -Naur sp/include/EST_UList.h speech_tools/include/EST_UList.h
---- sp/include/EST_UList.h	2001-04-04 06:55:32.000000000 -0500
-+++ speech_tools/include/EST_UList.h	2003-06-22 04:44:56.000000000 -0500
-@@ -41,7 +41,7 @@
- #ifndef __EST_ULIST_H__
- #define __EST_ULIST_H__
- 
--#include <iostream.h>
-+#include <iostream>
- #include "EST_common.h"
- #include "EST_String.h"
- 
-diff -Naur sp/intonation/tilt/tilt_utils.cc speech_tools/intonation/tilt/tilt_utils.cc
---- sp/intonation/tilt/tilt_utils.cc	2003-06-22 04:36:32.000000000 -0500
-+++ speech_tools/intonation/tilt/tilt_utils.cc	2003-06-22 04:44:56.000000000 -0500
-@@ -378,9 +378,9 @@
- 
-     x = (t / (dur)) * 2.0;
-     if (x < 1.0)
--	val = pow(x, 2.0);
-+	val = pow((double)x, 2.0);
-     else
--	val = 2 - pow((2 - x), 2.0);
-+	val = 2 - pow((double)(2.0 - x), 2.0);
- 	
-     val = (val / 2.0);
- 	
-@@ -398,9 +398,9 @@
-     x = (t / length) * 2.0;
-     
-     if (x < 1.0)
--	val = pow(x, curve);
-+	val = pow((double)x, (double)curve);
-     else
--	val = 2 - pow((2 - x), curve);
-+	val = 2 - pow((double)(2.0 - x), (double)curve);
-     
-     val = val / 2.0;
-     
-diff -Naur sp/ling_class/EST_relation_aux.cc speech_tools/ling_class/EST_relation_aux.cc
---- sp/ling_class/EST_relation_aux.cc	2001-04-04 06:55:32.000000000 -0500
-+++ speech_tools/ling_class/EST_relation_aux.cc	2003-06-22 05:38:20.000000000 -0500
-@@ -416,7 +416,7 @@
- 	if (k->F("end") > lab.head()->F("end"))
- 	    break;
- 
--    filename = k->f("file");
-+    filename = (EST_String)k->f("file");
-     a.f.set("name", (filename + ext));
-     kstart = 0.0;
-     
-@@ -454,7 +454,7 @@
- 	    k = next(k);
- 	    kstart = start(k);
- 	    a.clear();
--	    filename = k->f("file");
-+	    filename = (EST_String)k->f("file");
- 	    a.f.set("name", (filename + ext));
- 	}
- 	else
-diff -Naur sp/main/wfst_run_main.cc speech_tools/main/wfst_run_main.cc
---- sp/main/wfst_run_main.cc	2003-06-22 04:36:32.000000000 -0500
-+++ speech_tools/main/wfst_run_main.cc	2003-06-22 04:44:56.000000000 -0500
-@@ -213,7 +213,7 @@
- 	   (int)R.samples(),R.mean()*100,(1-R.mean())*100);
-     if (al.present("-perplexity"))
-     {
--	printf("perplexity is %f\n", pow(2.0,(-1 * (sumlogp/count))));
-+	printf("perplexity is %f\n", pow(2.0,(double)(-1 * (sumlogp/count))));
-     }
- 
-     if (ofd != stdout)
-diff -Naur sp/sigpr/filter.cc speech_tools/sigpr/filter.cc
---- sp/sigpr/filter.cc	2003-06-22 04:36:32.000000000 -0500
-+++ speech_tools/sigpr/filter.cc	2003-06-22 04:44:56.000000000 -0500
-@@ -419,7 +419,7 @@
- 	
-     // check frequency_response has dimension 2^N
-     int N = fastlog2(frequency_response.n());
--    if(frequency_response.n() !=  (int)pow(2,(float)N)){
-+    if(frequency_response.n() !=  (int)pow(2,(double)N)){
- 	cerr << "Desired frequency response must have dimension 2^N" << endl;
- 	return EST_FVector(0);
-     }
-@@ -470,10 +470,10 @@
-     int i;
-     int N=10;			// good minimum size
-     
--    int fft_size = (int)pow(2, N);
-+    int fft_size = (int)pow(2.0, (double)N);
-     while(fft_size < order*4){	// rule of thumb !?
- 	N++;
--	fft_size = (int)pow(2, N);
-+	fft_size = (int)pow(2.0, (double)N);
-     }
-     
-     // freq response is from 0 to sampling freq and therefore
-diff -Naur sp/sigpr/sigpr_frame.cc speech_tools/sigpr/sigpr_frame.cc
---- sp/sigpr/sigpr_frame.cc	2003-06-22 04:36:32.000000000 -0500
-+++ speech_tools/sigpr/sigpr_frame.cc	2003-06-22 04:44:56.000000000 -0500
-@@ -499,7 +499,7 @@
- {
-     power = 0.0;
-     for (int i = 0; i < frame.length(); i++)
--	power += pow(frame(i), 2.0);
-+	power += pow((double)frame(i), 2.0);
- 
-     power /= frame.length();
- }
-diff -Naur sp/siod/slib_math.cc speech_tools/siod/slib_math.cc
---- sp/siod/slib_math.cc	2003-06-22 04:36:32.000000000 -0500
-+++ speech_tools/siod/slib_math.cc	2003-06-22 04:44:56.000000000 -0500
-@@ -14,14 +14,13 @@
- 
- LISP numberp(LISP x)
- {if FLONUMP(x) return(truth); else return(NIL);}
--
--static LISP plus(LISP args)
-+static LISP lplus(LISP args)
- {
-     LISP l;
-     double sum;
-     for (sum=0.0,l=args; l != NIL; l=cdr(l))
-     {
--	if (NFLONUMP(car(l))) err("wrong type of argument to plus",car(l));
-+	if (NFLONUMP(car(l))) err("wrong type of argument to lplus",car(l));
- 	sum += FLONM(car(l));
-     }
-     return flocons(sum);
-@@ -138,7 +137,7 @@
-  init_subr_1("number?",numberp,
-  "(number? DATA)\n\
-   Returns t if DATA is a number, nil otherwise.");
-- init_lsubr("+",plus,
-+ init_lsubr("+",lplus,
-  "(+ NUM1 NUM2 ...)\n\
-   Returns the sum of NUM1 and NUM2 ...  An error is given is any argument\n\
-   is not a number.");
-diff -Naur sp/speech_class/EST_track_aux.cc speech_tools/speech_class/EST_track_aux.cc
---- sp/speech_class/EST_track_aux.cc	2003-06-22 04:36:32.000000000 -0500
-+++ speech_tools/speech_class/EST_track_aux.cc	2003-06-22 04:44:56.000000000 -0500
-@@ -351,7 +351,7 @@
-     mean /= n;
-     
-     for (i = 0, var = 0.0; i < tr.num_frames(); ++i)
--	var += tr.track_break(i) ? 0.0 : pow(tr.a(i, channel) - mean, 2.0);
-+	var += tr.track_break(i) ? 0.0 : pow((double)(tr.a(i, channel) - mean), 2.0);
-     
-     var /= n;
-     sd = sqrt(var);
-@@ -369,7 +369,7 @@
-     
-     for (i = 0; i < size; ++i)
- 	if (a.val(i) && b.val(i))
--	    sum += pow((a.a(i, channel) - b.a(i, channel)), 2.0);
-+	    sum += pow((double)(a.a(i, channel) - b.a(i, channel)), 2.0);
-     
-     sum = sqrt(sum / size);
-     return sum;
-@@ -461,7 +461,7 @@
-     for (p = tl.head(); p; p = next(p))
- 	for (i = 0; i < tl(p).num_frames(); ++i)
- 	    if (!tl(p).track_break(i))
--		var +=  pow(tl(p).a(i, channel) - mean, 2.0);
-+		var +=  pow((double)(tl(p).a(i, channel) - mean), 2.0);
- 
-     var /= n;
-     sd = sqrt(var);
-diff -Naur sp/speech_class/EST_TrackFile.cc speech_tools/speech_class/EST_TrackFile.cc
---- sp/speech_class/EST_TrackFile.cc	2002-09-28 09:15:02.000000000 -0500
-+++ speech_tools/speech_class/EST_TrackFile.cc	2003-06-22 07:30:59.000000000 -0500
-@@ -570,15 +570,15 @@
-     
-     while (1)
-     {
--	t = ts.get_upto_eoln();
-+	t = (EST_String)ts.get_upto_eoln();
- 	//	cout << "t=" << t << endl;
- 	if (t.contains("teaching output included"))
- 	    teaching = 1;
- 	if (!t.contains(":"))
- 	    break;
- 	str.open_string(t);
--	k = str.get_upto(":");
--	v = str.get_upto_eoln();
-+	k = (EST_String)str.get_upto(":");
-+	v = (EST_String)str.get_upto_eoln();
- 	if (k == "No. of output units")
- 	    num_channels = v.Int();
- 	if (k == "No. of patterns")
-diff -Naur sp/speech_class/EST_wave_cuts.cc speech_tools/speech_class/EST_wave_cuts.cc
---- sp/speech_class/EST_wave_cuts.cc	2001-04-04 06:55:32.000000000 -0500
-+++ speech_tools/speech_class/EST_wave_cuts.cc	2003-06-22 07:28:07.000000000 -0500
-@@ -67,7 +67,7 @@
- 	if (end < start)
- 	    continue;
- 	wave_subwave(a, sig, start, end-start);
--	filename = k->f("file");
-+	filename = (EST_String)k->f("file");
- 	a.set_name(filename + ext);
- 	wl.append(a);
- 	start = end;
-@@ -87,7 +87,7 @@
-     for (k = keylab.head(); k; k = next(k))
-     {
- 	end = k->F("end",0);
--	key_file_name = k->f("file");
-+	key_file_name = (EST_String)k->f("file");
- 	if (key_file_name == file)
- 	{
- 	    wave_subwave(part, sig, start, end-start);
-diff -Naur sp/speech_class/EST_wave_temp.cc speech_tools/speech_class/EST_wave_temp.cc
---- sp/speech_class/EST_wave_temp.cc	2003-06-22 04:36:32.000000000 -0500
-+++ speech_tools/speech_class/EST_wave_temp.cc	2003-06-22 04:44:56.000000000 -0500
-@@ -83,7 +83,7 @@
-     mean /= n;
-     
-     for (i = 0, mean = 0.0; i < tr.num_samples(); ++i)
--	var += pow(tr.a(i, channel) - mean, 2.0);
-+	var += pow((double)(tr.a(i, channel) - mean), 2.0);
-     
-     var /= n;
-     sd = sqrt(var);
-@@ -96,7 +96,7 @@
-     float sum = 0;
-     
-     for (i = 0; i < size; ++i)
--      sum += pow((a.a(i, channel) - b.a(i, channel)), 2.0);
-+      sum += pow((double)(a.a(i, channel) - b.a(i, channel)), 2.0);
-     
-     sum = sqrt(sum / size);
-     return sum;
-@@ -110,7 +110,7 @@
-     for (i = 0; i < size; ++i)
-     {
-       // cout << i << " " << a.a(i, channel) << " " << b.a(i, channel) << endl;
--	sum += fabs(a.a(i, channel) - b.a(i, channel));
-+	sum += fabs((double)(a.a(i, channel) - b.a(i, channel)));
-     }
-     return sum / size;
- }
-diff -Naur sp/speech_class/ssff.cc speech_tools/speech_class/ssff.cc
---- sp/speech_class/ssff.cc	2001-04-04 06:55:32.000000000 -0500
-+++ speech_tools/speech_class/ssff.cc	2003-06-22 07:29:24.000000000 -0500
-@@ -99,7 +99,7 @@
-     
-     while (ts.peek() != "-----------------")
-     {
--	c = ts.get();
-+	c = (EST_String)ts.get();
- 	if (c == "Comment")
- 	    ts.get_upto_eoln();
- 	else if (c == "Start_Time")
-@@ -124,9 +124,9 @@
- 	}
- 	else if (c == "Column")
- 	{
--	    name = ts.get();
--	    type = ts.get();
--	    size = ts.get();
-+	    name = (EST_String)ts.get();
-+	    type = (EST_String)ts.get();
-+	    size = (EST_String)ts.get();
- 	    cname = EST_String("Channel_")+itoString(num_channels);
- 	    channels.set(cname+".name",name);
- 	    channels.set(cname+".type",type);
-@@ -141,7 +141,7 @@
- 		 (c == "preemphasis") ||
- 		 (c == "frame_duration"))
- 	{
--		type = ts.get();
-+		type = (EST_String)ts.get();
- 		if (type == "SHORT")
- 		    tr.f_set(c,atoi(ts.get().string()));
- 		else if (type == "DOUBLE")
-diff -Naur sp/stats/EST_multistats.cc speech_tools/stats/EST_multistats.cc
---- sp/stats/EST_multistats.cc	2003-06-22 04:36:32.000000000 -0500
-+++ speech_tools/stats/EST_multistats.cc	2003-06-22 04:44:56.000000000 -0500
-@@ -89,7 +89,7 @@
-     {
- 	v[j] = 0.0;
- 	for (i = 0; i < m.num_rows(); ++i)
--	    v[j] += pow(m(i, j) - u(j), 2.0);
-+	    v[j] += pow((double)(m(i, j) - u(j)), 2.0);
- 	v[j] /= m.num_rows() - 1; // sample variance
-     }
-     
-@@ -183,7 +183,7 @@
- 	{
- 	    P(i, j) = 0.0;
- 	    for (k = 0; k < p; ++k)
--		P(i, j) += pow(gu(i, k) - gu(j, k), 2.0) / gv(k);
-+		P(i, j) += pow((double)(gu(i, k) - gu(j, k)), 2.0) / gv(k);
- 	    P(i, j) /= p;
- 	}
-     return P;
-@@ -228,7 +228,7 @@
-     float P = 0.0;
-     
-     for (k = 0; k < n; ++k)
--	P += pow(ui(k) - uj(k), 2.0) / v(k);
-+	P += pow((double)(ui(k) - uj(k)), 2.0) / v(k);
-     P /= n;
-     
-     return P;
-diff -Naur sp/stats/wagon/dlist.cc speech_tools/stats/wagon/dlist.cc
---- sp/stats/wagon/dlist.cc	2001-04-04 08:11:28.000000000 -0500
-+++ speech_tools/stats/wagon/dlist.cc	2003-06-22 07:32:46.000000000 -0500
-@@ -83,7 +83,7 @@
- 
-     for (p=dataset.head(); p != 0; p=next(p))
-     {
--	predict = dlist->predict(*dataset(p));
-+	predict = (EST_String)dlist->predict(*dataset(p));
- 	type = dataset.ftype(0);
- 	real = wgn_discretes[type].name(dataset(p)->get_int_val(0));
- 	pairs.add_item(real,predict,1);
-diff -Naur sp/stats/wagon/wagon.cc speech_tools/stats/wagon/wagon.cc
---- sp/stats/wagon/wagon.cc	2001-09-30 14:13:33.000000000 -0500
-+++ speech_tools/stats/wagon/wagon.cc	2003-06-22 07:33:26.000000000 -0500
-@@ -276,7 +276,7 @@
-     for (p=dataset.head(); p != 0; p=next(p))
-     {
- 	pnode = tree.predict_node((*dataset(p)));
--	predict = pnode->get_impurity().value();
-+	predict = (EST_String)pnode->get_impurity().value();
- 	if (wgn_count_field == -1)
- 	    count = 1.0;
- 	else
-diff -Naur sp/testsuite/hash_example.cc speech_tools/testsuite/hash_example.cc
---- sp/testsuite/hash_example.cc	2003-06-22 04:36:32.000000000 -0500
-+++ speech_tools/testsuite/hash_example.cc	2003-06-22 04:44:56.000000000 -0500
-@@ -71,8 +71,8 @@
- 
- EST_THash<int,float> logs(100);
- 
--logs.add_item(12, log(12));
--logs.add_item(34, log(34));
-+logs.add_item(12, log(12.0));
-+logs.add_item(34, log(34.0));
- 
- cout << "length of `fred' = " << lengths.val("fred") << "\n";
- cout << "log of 34' = " << logs.val(34) << "\n";
-diff -Naur sp/testsuite/hash_regression.cc speech_tools/testsuite/hash_regression.cc
---- sp/testsuite/hash_regression.cc	2002-12-27 07:00:24.000000000 -0600
-+++ speech_tools/testsuite/hash_regression.cc	2003-06-22 07:43:57.000000000 -0500
-@@ -71,7 +71,7 @@
-   {
-     EST_String line;
- 
--    line = file.get();
-+    line = (EST_String)file.get();
- 
-     if (file.eof())
-       break;
-diff -Naur sp/utils/EST_ServiceTable.cc speech_tools/utils/EST_ServiceTable.cc
---- sp/utils/EST_ServiceTable.cc	2002-12-26 09:46:20.000000000 -0600
-+++ speech_tools/utils/EST_ServiceTable.cc	2003-06-22 05:24:16.000000000 -0500
-@@ -42,8 +42,8 @@
- #include "EST_error.h"
- #include "EST_Token.h"
- #include "EST_ServiceTable.h"
--#include <iomanip.h>
--#include <iostream.h>
-+#include <iomanip>
-+#include <iostream>
- #include <time.h>
- 
- #if defined(SYSTEM_IS_WIN32)
-@@ -142,7 +142,7 @@
- 
-       str.must_get("=");
- 
--      EST_Token val = str.get_upto_eoln();
-+      EST_String val = str.get_upto_eoln();
- 
-       if (!entries.t.present(name))
- 	{
-@@ -160,7 +160,7 @@
-       else if (type=="type")
- 	entry.type=val;
-       else if (type=="port")
--	entry.port=val;
-+	entry.port=strtol(val, NULL, 10);
-       else if (type=="cookie")
- 	entry.cookie=val;
-       else
-
diff --git a/app-accessibility/speech-tools/speech-tools-1.2.3-r2.ebuild b/app-accessibility/speech-tools/speech-tools-1.2.3-r2.ebuild
deleted file mode 100644
index 0833dd91acbe..000000000000
--- a/app-accessibility/speech-tools/speech-tools-1.2.3-r2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2007 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.3-r2.ebuild,v 1.13 2007/04/11 19:37:15 betelgeuse Exp $
-
-IUSE="doc"
-
-inherit eutils fixheadtails toolchain-funcs
-
-MY_P=${P/-/_}
-
-DESCRIPTION="Speech tools for Festival Text to Speech engine"
-HOMEPAGE="http://www.cstr.ed.ac.uk/"
-SRC_URI="http://www.cstr.ed.ac.uk/download/festival/1.4.3/${MY_P}-release.tar.gz
-	 doc? ( http://www.cstr.ed.ac.uk/download/festival/1.4.3/festdoc-1.4.2.tar.gz )
-	 mirror://gentoo/speech-tools-1.2.3-gcc3.4.patch.bz2"
-
-LICENSE="FESTIVAL BSD as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
-
-RDEPEND="sys-libs/ncurses"
-DEPEND="${RDEPEND}
-	app-arch/cpio
-	sys-apps/findutils
-	>=sys-apps/sed-4"
-
-S="${WORKDIR}/speech_tools"
-
-src_unpack() {
-	unpack ${MY_P}-release.tar.gz
-	unpack speech-tools-1.2.3-gcc3.4.patch.bz2
-
-	cd ${S}
-	use doc && unpack festdoc-1.4.2.tar.gz && mv festdoc-1.4.2 festdoc
-
-	if [ "$(gcc-version)" == "3.3" ]; then
-		epatch ${FILESDIR}/${PN}-gcc3.3.diff
-	fi
-	if [ "$(gcc-version)" == "3.4" ]; then
-		epatch ${WORKDIR}/${P}-gcc3.4.patch
-	fi
-	ht_fix_file config.guess
-	sed -i 's:-O3:$(OPTIMISE_CXXFLAGS):' base_class/Makefile
-
-	# Compile fix for #41329.
-	sed -i 's/-fpic/-fPIC/' config/compilers/gcc_defaults.mak
-}
-
-src_compile() {
-	econf || die
-	emake -j1 \
-		OPTIMISE_CXXFLAGS="${CXXFLAGS}" \
-		OPTIMISE_CCFLAGS="${CFLAGS}" \
-		|| die
-}
-
-src_install() {
-	cd ${S}/lib
-	dolib.so libestbase.so.1.2.3.1
-	dosym /usr/$(get_libdir)/libestbase.so.1.2.3.1 /usr/$(get_libdir)/libestbase.so
-	dolib.so libeststring.so.1.2
-	dosym /usr/$(get_libdir)/libeststring.so.1.2 /usr/$(get_libdir)/libeststring.so
-	dolib.a libestbase.a
-	dolib.a libestools.a
-	dolib.a libeststring.a
-
-	exeinto /usr/libexec/speech-tools
-	cd ${S}/bin
-
-	dodir /usr/lib/speech-tools/share/testsuite
-	for file in * ; do
-		[ "${file}" = "Makefile" ] && continue
-		doexe ${file}
-		dstfile="/usr/libexec/speech-tools/${file}"
-		dosed "s:${S}/testsuite/data:/usr/share/speech-tools/testsuite:g" ${dstfile}
-		dosed "s:${S}/bin:/usr/libexec/speech-tools:g" ${dstfile}
-		dosed "s:${S}/main:/usr/libexec/speech-tools:g" ${dstfile}
-
-		# This just changes LD_LIBRARY_PATH
-		dosed "s:${S}/lib:/usr/$(get_libdir):g" ${dstfile}
-	done
-
-	insinto /usr/share/speech-tools/lib/siod
-	cd ${S}/lib/siod
-	doins *
-
-	insinto /usr/share/doc/${PF}/example_data
-	cd ${S}/lib/example_data
-	doins *
-
-	cd ${S}
-	find config -print | cpio -pmd ${D}/usr/share/speech-tools || die "Unable to install config files"
-
-	cd ${S}/include
-	dodir /usr/include/speech-tools
-	find . -print | cpio -pmd ${D}/usr/include/speech-tools || die "Unable to install include files"
-
-	dosym /usr/include/speech-tools /usr/share/speech-tools/include
-
-	chown -R root:root ${D}
-
-	find ${D}/usr/share/speech-tools/config -type f | xargs sed -i 's/-ltermcap/-lncurses/g'
-
-	doenvd "${FILESDIR}/58speech-tools"
-
-	cd ${S}
-	dodoc README INSTALL
-	cd ${S}/lib
-	dodoc cstrutt.dtd
-
-	if use doc ; then
-		cd ${S}/festdoc/speech_tools/doc
-		dohtml -r *
-	fi
-}
diff --git a/app-accessibility/speech-tools/speech-tools-1.2.3-r3.ebuild b/app-accessibility/speech-tools/speech-tools-1.2.3-r3.ebuild
deleted file mode 100644
index 96ef8a6132a2..000000000000
--- a/app-accessibility/speech-tools/speech-tools-1.2.3-r3.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2006 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.3-r3.ebuild,v 1.9 2006/07/20 03:21:45 psi29a Exp $
-
-IUSE="doc esd X"
-
-inherit eutils fixheadtails toolchain-funcs
-
-MY_P=${P/-/_}
-
-DESCRIPTION="Speech tools for Festival Text to Speech engine"
-HOMEPAGE="http://www.cstr.ed.ac.uk/"
-CSTR="http://www.cstr.ed.ac.uk/download/festival/1.4.3"
-SRC_URI="${CSTR}/${MY_P}-release.tar.gz
-	 doc? ( ${CSTR}/festdoc-1.4.2.tar.gz )
-	 mirror://gentoo/speech-tools-${PV}-gcc3.4.patch.bz2"
-
-LICENSE="FESTIVAL BSD as-is"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ia64 mips ~ppc ~ppc64 sparc ~x86"
-
-RDEPEND="sys-libs/ncurses"
-DEPEND="${RDEPEND}
-	app-arch/cpio
-	sys-apps/findutils
-	>=sys-apps/sed-4"
-
-S="${WORKDIR}/speech_tools"
-
-src_unpack() {
-	unpack ${A}
-
-	use doc && mv festdoc-1.4.2 festdoc
-
-	cd ${S}
-	[[ "$(gcc-version)" == "3.3" ]] && epatch ${FILESDIR}/${PN}-gcc3.3.diff
-	[[ "$(gcc-version)" == "3.4" ]] && epatch ${WORKDIR}/${P}-gcc3.4.patch
-
-	ht_fix_file ${S}/config.guess
-	sed -i -e 's:-O3:$(OPTIMISE_CXXFLAGS):' ${S}/base_class/Makefile
-
-	# Compile fix for #41329.
-	sed -i -e 's/-fpic/-fPIC/' ${S}/config/compilers/gcc_defaults.mak
-
-	use esd && sed -i -e 's/# \(INCLUDE_MODULES += ESD_AUDIO\)/\1/' ${S}/config/config.in
-	use X || sed -i -e 's/-lX11 -lXt//' ${S}/config/modules/esd_audio.mak
-}
-
-src_compile() {
-	econf || die
-	emake -j1 OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die
-}
-
-src_install() {
-	dolib.so ${S}/lib/{libestbase.so.1.2.3.1,libeststring.so.1.2}
-	dosym /usr/$(get_libdir)/libestbase.so.1.2.3.1 /usr/$(get_libdir)/libestbase.so
-	dosym /usr/$(get_libdir)/libeststring.so.1.2 /usr/$(get_libdir)/libeststring.so
-	dolib.a ${S}/lib/{libestbase.a,libestools.a,libeststring.a}
-
-	cd ${S}/bin
-	for file in *; do
-		[ "${file}" = "Makefile" ] && continue
-		dobin ${file}
-		dstfile="/usr/bin/${file}"
-		dosed "s:${S}/testsuite/data:/usr/share/speech-tools/testsuite:g" ${dstfile}
-		dosed "s:${S}/bin:/usr/libexec/speech-tools:g" ${dstfile}
-		dosed "s:${S}/main:/usr/libexec/speech-tools:g" ${dstfile}
-
-		# This just changes LD_LIBRARY_PATH
-		dosed "s:${S}/lib:/usr/$(get_libdir):g" ${dstfile}
-	done
-
-	exeinto /usr/libexec/speech-tools
-	for file in `find ${S}/main -perm +100 -type f`; do
-		doexe ${file}
-	done
-
-	insinto /usr/share/speech-tools/lib/siod
-	doins ${S}/lib/siod/*
-
-	insinto /usr/share/doc/${PF}/example_data
-	doins ${S}/lib/example_data/*
-
-	cd ${S}
-	find config -print | cpio -pmd ${D}/usr/share/speech-tools || die "Unable to install config files"
-
-	dodir /usr/include/speech-tools
-	cd ${S}/include
-	find . -print | cpio -pmd ${D}/usr/include/speech-tools || die "Unable to install include files"
-	dosym /usr/include/speech-tools /usr/share/speech-tools/include
-
-	chown -R root:0 ${D}
-
-	find ${D}/usr/share/speech-tools/config -type f | xargs sed -i -e 's/-ltermcap/-lncurses/g'
-
-	doenvd ${FILESDIR}/58speech-tools
-
-	dodoc ${S}/{README,INSTALL}
-	dodoc ${S}/lib/cstrutt.dtd
-
-	use doc && dohtml -r ${WORKDIR}/festdoc/speech_tools/doc/*
-}
diff --git a/app-accessibility/speech-tools/speech-tools-1.2.95_beta-r1.ebuild b/app-accessibility/speech-tools/speech-tools-1.2.95_beta-r1.ebuild
deleted file mode 100644
index b5683c2f91a5..000000000000
--- a/app-accessibility/speech-tools/speech-tools-1.2.95_beta-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2006 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.95_beta-r1.ebuild,v 1.9 2006/10/19 14:51:37 kloeri Exp $
-
-IUSE="esd X"
-
-inherit eutils fixheadtails toolchain-funcs
-
-MY_P=${P/speech-/speech_}
-MY_P=${MY_P/_beta/-beta}
-
-DESCRIPTION="Speech tools for Festival Text to Speech engine"
-HOMEPAGE="http://www.cstr.ed.ac.uk/"
-CSTR="http://www.cstr.ed.ac.uk/download/festival/1.95"
-SRC_URI="${CSTR}/${MY_P}.tar.gz"
-
-LICENSE="FESTIVAL BSD as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
-
-RDEPEND="sys-libs/ncurses"
-DEPEND="${RDEPEND}
-	app-arch/cpio
-	sys-apps/findutils
-	esd? ( media-sound/esound )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXt )
-	!<app-accessibility/festival-1.95_beta
-	>=sys-apps/sed-4"
-
-S="${WORKDIR}/speech_tools"
-
-src_unpack() {
-	unpack ${A}
-
-# set the compiler flags.
-	sed -i -e 's:-O3:$(OPTIMISE_CXXFLAGS):' ${S}/base_class/Makefile
-
-	# Compile fix for #41329.
-	sed -i -e 's/-fpic/-fPIC/' ${S}/config/compilers/gcc_defaults.mak
-
-	sed -i -e 's/# \(SHARED=1\)/\1/' ${S}/config/config.in
-	use esd && sed -i -e 's/# \(INCLUDE_MODULES += ESD_AUDIO\)/\1/' ${S}/config/config.in
-	use X || sed -i -e 's/-lX11 -lXt//' ${S}/config/modules/esd_audio.mak
-
-	# gcc 4.1 compatibility patches
-	epatch ${FILESDIR}/${P}-gcc41.patch
-	epatch ${FILESDIR}/${P}-gcc41-amd64.patch
-	epatch ${FILESDIR}/${P}-gcc41-amd64-int-pointer.patch
-}
-
-src_compile() {
-	econf || die
-	emake -j1 OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die
-}
-
-src_install() {
-	dolib.so ${S}/lib/{libestbase.so.1.2.95.1,libeststring.so.1.2}
-	dosym /usr/$(get_libdir)/libestbase.so.1.2.95.1 /usr/$(get_libdir)/libestbase.so
-	dosym /usr/$(get_libdir)/libeststring.so.1.2 /usr/$(get_libdir)/libeststring.so
-	dolib.a ${S}/lib/{libestbase.a,libestools.a,libeststring.a}
-
-	cd ${S}/bin
-	for file in *; do
-		[ "${file}" = "Makefile" ] && continue
-		dobin ${file}
-		dstfile="/usr/bin/${file}"
-		dosed "s:${S}/testsuite/data:/usr/share/speech-tools/testsuite:g" ${dstfile}
-		dosed "s:${S}/bin:/usr/libexec/speech-tools:g" ${dstfile}
-		dosed "s:${S}/main:/usr/libexec/speech-tools:g" ${dstfile}
-
-		# This just changes LD_LIBRARY_PATH
-		dosed "s:${S}/lib:/usr/$(get_libdir):g" ${dstfile}
-	done
-
-	exeinto /usr/libexec/speech-tools
-	for file in `find ${S}/main -perm +100 -type f`; do
-		doexe ${file}
-	done
-
-	insinto /usr/share/speech-tools/lib/siod
-	doins ${S}/lib/siod/*
-
-	insinto /usr/share/doc/${PF}/example_data
-	doins ${S}/lib/example_data/*
-
-	cd ${S}
-	find config -print | cpio -pmd ${D}/usr/share/speech-tools || die "Unable to install config files"
-
-	dodir /usr/include/speech-tools
-	cd ${S}/include
-	find . -print | cpio -pmd ${D}/usr/include/speech-tools || die "Unable to install include files"
-	dosym /usr/include/speech-tools /usr/share/speech-tools/include
-
-	chown -R root:0 ${D}
-
-	find ${D}/usr/share/speech-tools/config -type f | xargs sed -i -e 's/-ltermcap/-lncurses/g'
-
-	#doenvd ${FILESDIR}/58speech-tools
-
-	dodoc ${S}/{README,INSTALL}
-	dodoc ${S}/lib/cstrutt.dtd
-}
diff --git a/app-accessibility/speech-tools/speech-tools-1.2.95_beta.ebuild b/app-accessibility/speech-tools/speech-tools-1.2.95_beta.ebuild
deleted file mode 100644
index a07567ccb8b2..000000000000
--- a/app-accessibility/speech-tools/speech-tools-1.2.95_beta.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2006 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.95_beta.ebuild,v 1.1 2006/09/21 04:36:35 williamh Exp $
-
-IUSE="esd X"
-
-inherit eutils fixheadtails toolchain-funcs
-
-MY_P=${P/speech-/speech_}
-MY_P=${MY_P/_beta/-beta}
-
-DESCRIPTION="Speech tools for Festival Text to Speech engine"
-HOMEPAGE="http://www.cstr.ed.ac.uk/"
-CSTR="http://www.cstr.ed.ac.uk/download/festival/1.95"
-SRC_URI="${CSTR}/${MY_P}.tar.gz"
-
-LICENSE="FESTIVAL BSD as-is"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="sys-libs/ncurses"
-DEPEND="${RDEPEND}
-	app-arch/cpio
-	sys-apps/findutils
-	esd? ( media-sound/esound )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXt )
-	!<app-accessibility/festival-1.95_beta
-	>=sys-apps/sed-4"
-
-S="${WORKDIR}/speech_tools"
-
-src_unpack() {
-	unpack ${A}
-
-# set the compiler flags.
-	sed -i -e 's:-O3:$(OPTIMISE_CXXFLAGS):' ${S}/base_class/Makefile
-
-	# Compile fix for #41329.
-	sed -i -e 's/-fpic/-fPIC/' ${S}/config/compilers/gcc_defaults.mak
-
-	sed -i -e 's/# \(SHARED=1\)/\1/' ${S}/config/config.in
-	use esd && sed -i -e 's/# \(INCLUDE_MODULES += ESD_AUDIO\)/\1/' ${S}/config/config.in
-	use X || sed -i -e 's/-lX11 -lXt//' ${S}/config/modules/esd_audio.mak
-
-	# gcc 4.1 compatibility patches
-	epatch ${FILESDIR}/${P}-gcc41.patch
-	epatch ${FILESDIR}/${P}-gcc41-amd64.patch
-	epatch ${FILESDIR}/${P}-gcc41-amd64-int-pointer.patch
-}
-
-src_compile() {
-	econf || die
-	emake -j1 OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die
-}
-
-src_install() {
-	dolib.so ${S}/lib/{libestbase.so.1.2.95.1,libeststring.so.1.2}
-	dosym /usr/$(get_libdir)/libestbase.so.1.2.3.1 /usr/$(get_libdir)/libestbase.so
-	dosym /usr/$(get_libdir)/libeststring.so.1.2 /usr/$(get_libdir)/libeststring.so
-	dolib.a ${S}/lib/{libestbase.a,libestools.a,libeststring.a}
-
-	cd ${S}/bin
-	for file in *; do
-		[ "${file}" = "Makefile" ] && continue
-		dobin ${file}
-		dstfile="/usr/bin/${file}"
-		dosed "s:${S}/testsuite/data:/usr/share/speech-tools/testsuite:g" ${dstfile}
-		dosed "s:${S}/bin:/usr/libexec/speech-tools:g" ${dstfile}
-		dosed "s:${S}/main:/usr/libexec/speech-tools:g" ${dstfile}
-
-		# This just changes LD_LIBRARY_PATH
-		dosed "s:${S}/lib:/usr/$(get_libdir):g" ${dstfile}
-	done
-
-	exeinto /usr/libexec/speech-tools
-	for file in `find ${S}/main -perm +100 -type f`; do
-		doexe ${file}
-	done
-
-	insinto /usr/share/speech-tools/lib/siod
-	doins ${S}/lib/siod/*
-
-	insinto /usr/share/doc/${PF}/example_data
-	doins ${S}/lib/example_data/*
-
-	cd ${S}
-	find config -print | cpio -pmd ${D}/usr/share/speech-tools || die "Unable to install config files"
-
-	dodir /usr/include/speech-tools
-	cd ${S}/include
-	find . -print | cpio -pmd ${D}/usr/include/speech-tools || die "Unable to install include files"
-	dosym /usr/include/speech-tools /usr/share/speech-tools/include
-
-	chown -R root:0 ${D}
-
-	find ${D}/usr/share/speech-tools/config -type f | xargs sed -i -e 's/-ltermcap/-lncurses/g'
-
-	#doenvd ${FILESDIR}/58speech-tools
-
-	dodoc ${S}/{README,INSTALL}
-	dodoc ${S}/lib/cstrutt.dtd
-}