Version bump. Closes bug #340317 and #357381.

Package-Manager: portage-2.2.0_alpha9/cvs/Linux i686

6 files changed, 305 insertions, 2 deletions

diff --git a/app-accessibility/festival/ChangeLog b/app-accessibility/festival/ChangeLog
index 51b6642628bb..0adfc2f60b85 100644
--- a/app-accessibility/festival/ChangeLog
+++ b/app-accessibility/festival/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-accessibility/festival
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/ChangeLog,v 1.92 2011/03/04 20:12:51 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/ChangeLog,v 1.93 2011/03/16 22:43:05 neurogeek Exp $
+
+*festival-2.1 (16 Mar 2011)
+
+  16 Mar 2011; Jesus Rivero <neurogeek@gentoo.org> +festival-2.1.ebuild,
+  +files/festival-2.1-gentoo-system.patch,
+  +files/festival-2.1-init-scm.patch, +files/festival-2.1-ldflags.patch:
+  Version bump. Closes bug #340317 and #357381.
 
   04 Mar 2011; William Hubbs <williamh@gentoo.org> festival-1.96_beta.ebuild,
   festival-1.96_beta-r1.ebuild, festival-2.0.95_beta.ebuild:
diff --git a/app-accessibility/festival/Manifest b/app-accessibility/festival/Manifest
index 1b0d1b8b8047..1496f584a4b6 100644
--- a/app-accessibility/festival/Manifest
+++ b/app-accessibility/festival/Manifest
@@ -1,12 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX festival-1.96_beta-gcc43.patch 547 RMD160 e5842ef3e8cd40e6af85a48b60e3b012efb213a6 SHA1 3dc6b811919db2f636435f9ca78a83b276f40755 SHA256 2bb1b1355e60636efb5e66dc5c00330343f01cc9702ac920f87b062185f03216
 AUX festival-1.96_beta-hts-voices.patch 5315 RMD160 1c09bf3fbb0e1af7c6f7eaf0d76b2434cadd5578 SHA1 55121cc6704ff74f438e9e43e89caba9033fe359 SHA256 dab29e024d70674bb7736f9b4f8202bdc2f25b1953ec842c2a2ea6df3ea07ebb
 AUX festival-1.96_beta-init-scm.patch 856 RMD160 442150175506a5ec0732ff81d685b6bb5d2bf891 SHA1 11ca7d2eb3f9e8f92fac542d3779e18c5d5c2f5b SHA256 71bc918dffd72adb21b8cd7394358929e23aa1e32849a4c7f0aa85aa6d4cba40
 AUX festival-2.0.95_beta-init-scm.patch 856 RMD160 442150175506a5ec0732ff81d685b6bb5d2bf891 SHA1 11ca7d2eb3f9e8f92fac542d3779e18c5d5c2f5b SHA256 71bc918dffd72adb21b8cd7394358929e23aa1e32849a4c7f0aa85aa6d4cba40
+AUX festival-2.1-gentoo-system.patch 7736 RMD160 1047902bfe364538f8e62be121963bc930692f8f SHA1 d7001ed3b4a86b2556f6905f3c7b5f4034430aef SHA256 bf595e5bda12ac753265a7630b8ba3042951191f180e08ed375955d76cab2d4b
+AUX festival-2.1-init-scm.patch 856 RMD160 442150175506a5ec0732ff81d685b6bb5d2bf891 SHA1 11ca7d2eb3f9e8f92fac542d3779e18c5d5c2f5b SHA256 71bc918dffd72adb21b8cd7394358929e23aa1e32849a4c7f0aa85aa6d4cba40
+AUX festival-2.1-ldflags.patch 438 RMD160 9aee57fad81e7ec679a6280bfada6fdedb59287d SHA1 0bf3780a8f120ecd74313da9546a5e8ab9fe716c SHA256 4242057ced3647a0f0c9ba3047b290ae498d30d26a0436a95237fc9a653941b2
 AUX festival.rc 633 RMD160 d169d56ecc82b3c76b9cf492b5f8a2e6ed8cf68e SHA1 54681eae7c313197b5571cc05b01d67885637749 SHA256 78ae79b864964c5f850def024d24fee467384c7f5989fb3d0b3beb9a426d40aa
 AUX server.scm 466 RMD160 78e65ec53638c588018534be55ce0d3180444dc7 SHA1 5da0a34d36a072289ffa48bb850af2465e9edce6 SHA256 47fdb50da65813547cef61d44040373e8c0d8f83adddc0e82e10502a1a9b6c3d
 AUX speech-tools-1.2.96_beta-gcc43-include.patch 878 RMD160 fb89c84949548cfdc49ddff50a7129ea63dc9b2d SHA1 afb2ecfacc123411acb7e82ae9b7c707bd32b922 SHA256 dd050d6556b484ecd494dd080c8b917fcc08c264260c4850d5392986f492febe
 DIST festival-1.96-beta.tar.gz 731682 RMD160 566eb3cc5983a969985a5e198b4ea9e4324377f6 SHA1 ffb1a7f8a587cee942de7722f9b7a58e4fd0a8e2 SHA256 4fa48d3525957762c83f289fba361063b8855f57ff50b7db22754d844aeadbee
 DIST festival-2.0.95-beta.tar.gz 783592 RMD160 2f97327aec1dbba5a82a1c23ca52518d2d9fa107 SHA1 5f37e9a8221d2b051f519094c5e943643b358ff4 SHA256 99af9ca89505f7570d69c320353176de316bdfed64202b325836d02a2e35c524
+DIST festival-2.1-release.tar.gz 787313 RMD160 b3c646ecc532e4e05f846db06bbab12a13ec1d6b SHA1 f0c5a4282667898c584516e3605742835f59cb77 SHA256 06f3dcbad9d26e27443fc66947a0faf0c6679482220df4b5f42a261adf758080
 DIST festlex_CMU.tar.gz 1697709 RMD160 852a007b5d50ff32d098a4dbd303a4d9c63a1802 SHA1 968f0007c4cd7d92ce0a786840b6dc64628776b7 SHA256 b485c1e8e8e265e335aa99f083963496fa64b34a314050b10d589e942e10c963
 DIST festlex_OALD.tar.gz 1472516 RMD160 d3fc4c549626dcc2a0d5d37fee7d8ebb3bf89c20 SHA1 53c9470d62da9754db85b11c2c82a3dd6b5ddc71 SHA256 61afc02c4b9dee6322412958ea8be477ee451c3cdab789b88c4907e3e377ccd5
 DIST festlex_POSLEX.tar.gz 242914 RMD160 d52d6cf4f4300751598facf1b6ff7985a8210b09 SHA1 cb7f7a3643c1af95d82144a342397cc118605f73 SHA256 5ef8cc5d35e9f2141b5a0a4774df82dc9731fe7e9800eb09ecf264f2f8503e7b
@@ -24,8 +31,17 @@ DIST festvox_us2.tar.gz 11037 RMD160 62528dc44291be4f7e7fda1677f3074fcc9fdab7 SH
 DIST festvox_us3.tar.gz 11220 RMD160 86946aa9718b7dacfbb884ba02254e59ebdb7247 SHA1 8302d0875c2872c45ff4a8ec633f9bb916a2a814 SHA256 af9ca4d1832e1971aa6e52f6a3ff8f729bf970c7bee1de7e8ac0611ca01871b8
 DIST speech_tools-1.2.96-beta.tar.gz 1275015 RMD160 3d2acc841a8b14e0bff66c9bb08293206f501a7a SHA1 7f208863833a7e7ea4838e0f0f04a4881b32cf56 SHA256 fa1ce5698e1253ee21e67629f394733ef6ad578af671e3a90ea8b73898a12428
 DIST speech_tools-2.0.95-beta.tar.gz 1681824 RMD160 ccb1f249924885c0b0c831bb0bc0c9f6a7279fbb SHA1 d3f13f0f66f763e80c73eb26f07b86572944ba2a SHA256 61f6786468872aeb2ba0db3ba8c42dd23dfba95467b9fb30cc4f3d92a956b554
+DIST speech_tools-2.1-release.tar.gz 1681999 RMD160 59831fbe607f05308f339a3cfb3af53d7337328b SHA1 bbf43b259de8bb91e0c5e8a1defc6e45a10e60f9 SHA256 ff6167cd929a88e2f91b47191c6c4dae87c9c06ba39fccc4465af9d79e9b2be9
 EBUILD festival-1.96_beta-r1.ebuild 5170 RMD160 5182d0fc50ba1b6734db74419127ea7288384695 SHA1 d649e1543dc34d5462208a37b9391bc4153bdba0 SHA256 6597a73603b6b35512f9db533c22ba61ca84af2c2b3f54ea3d0d58d19b285d92
 EBUILD festival-1.96_beta.ebuild 5056 RMD160 f1dc8d68dc291d47df391a8587438728d40a61b8 SHA1 02587ae04204d3c09642eb6db03500dff4d881e7 SHA256 c03975ff86c44c00189eb0bdb03895bb9ea36d9790513b11fbe9d2719f24cdaf
 EBUILD festival-2.0.95_beta.ebuild 4019 RMD160 acc75655886fb21817b0c31c52bfbb7d2f7a00ba SHA1 29a1f2293a57aa87eccc24e992fd25e467969ad5 SHA256 0c446a9b0227e6d4b4b74762a15d15711983d6516148f47301b7009f62593f08
-MISC ChangeLog 17700 RMD160 eba181c33daf6663c427e3745a2dcc74dbf7e746 SHA1 01d3d3bed8b411fb6ab91d980cbba778fe0cbbf8 SHA256 32a70c08225ab61a3cde0647de7bdf94045f15dfe6261b8208925f5545cab358
+EBUILD festival-2.1.ebuild 3434 RMD160 abbd89b85969596b38957f7ad0f41aaec4555768 SHA1 ed965feb1ffbdcb672491ac23c7f716b6b6063cc SHA256 d74f59bec9d8b7ec982f1441e84f0105138bd81e0cc8f0fde94ecc5878bd884b
+MISC ChangeLog 17968 RMD160 468d1220f7589625ae3f61ad2af514e20f1b5708 SHA1 5cc5b6bf269f01061593e9d99043890981e1b0c7 SHA256 70d3cf9d654d2c2940c9637d86af1dde4b2e4bf26716c796eeb34b6777ab2b6a
 MISC metadata.xml 321 RMD160 85d595924e5c87d59427af1f743c76c62cb08eb1 SHA1 f1b34f3b131295eda78d168d1fcebecf3d1d0ada SHA256 54fb73517995daec7601b063031a9021800c7d8fdcc73d969060b7447f0ce6d7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk2A/dEACgkQdIssYB9vBoNgNwCfQsqBzgma5sL4VEN3IcfSGVFK
+92MAn2W4hJvoGPU8ijzwzG6od77jSGG3
+=oq9g
+-----END PGP SIGNATURE-----
diff --git a/app-accessibility/festival/festival-2.1.ebuild b/app-accessibility/festival/festival-2.1.ebuild
new file mode 100644
index 000000000000..5963541ae8eb
--- /dev/null
+++ b/app-accessibility/festival/festival-2.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-2.1.ebuild,v 1.1 2011/03/16 22:43:05 neurogeek Exp $
+
+EAPI="2"
+inherit eutils toolchain-funcs
+
+MY_PV="${PV}-release"
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Festival Text to Speech engine"
+HOMEPAGE="http://www.cstr.ed.ac.uk/projects/festival/"
+SITE="http://www.festvox.org/packed/${PN}/${PV}"
+SRC_URI="${SITE}/${MY_P}.tar.gz
+	${SITE}/festlex_CMU.tar.gz
+	${SITE}/festlex_OALD.tar.gz
+	${SITE}/festlex_POSLEX.tar.gz
+	${SITE}/festvox_cmu_us_awb_cg.tar.gz
+	${SITE}/festvox_cmu_us_rms_cg.tar.gz
+	${SITE}/festvox_cmu_us_slt_arctic_hts.tar.gz
+	${SITE}/festvox_rablpc16k.tar.gz
+	${SITE}/festvox_kallpc16k.tar.gz
+	${SITE}/speech_tools-${MY_PV}.tar.gz"
+
+LICENSE="FESTIVAL BSD as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="~app-accessibility/speech-tools-2.1"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/festival
+
+pkg_setup() {
+	enewuser festival -1 -1 -1 audio
+}
+
+src_prepare() {
+	# tell festival to use the speech-tools we have installed.
+	sed -i -e "s:\(EST=\).*:\1/usr/share/speech-tools:" "${S}"/config/config.in
+	sed -i -e "s:\$(EST)/lib:/usr/$(get_libdir):" "${S}"/config/project.mak
+
+	# fix the reference  to /usr/lib/festival
+	sed -i -e "s:\(FTLIBDIR.*=.*\)\$.*:\1/usr/share/festival:" "${S}"/config/project.mak
+
+	# Fix path for examples in festival.scm
+	sed -i -e "s:\.\./examples/:/usr/share/doc/${PF}/examples/:" "${S}"/lib/festival.scm
+
+	epatch "${FILESDIR}/${P}-ldflags.patch"
+	epatch "${FILESDIR}/${P}-init-scm.patch"
+	epatch "${FILESDIR}/${P}-gentoo-system.patch"
+
+	# copy what we need for MultiSyn from speech_tools.
+	cp -pr "${WORKDIR}"/speech_tools/base_class "${S}"/src/modules/MultiSyn
+
+}
+
+src_configure() {
+	econf || die "econf failed"
+}
+
+src_compile() {
+	emake -j1 PROJECT_LIBDEPS="" REQUIRED_LIBDEPS="" LOCAL_LIBDEPS="" \
+		OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}" \
+		LDFLAGS=${LDFLAGS} \
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die "emake failed"
+}
+
+src_install() {
+	# Install the binaries
+	dobin src/main/festival
+	dobin lib/etc/*Linux*/audsp
+	dolib.a src/lib/libFestival.a
+
+	# Install the main libraries
+	insinto /usr/share/festival
+	doins -r lib/*
+
+	# Install the examples
+	insinto /usr/share/doc/${PF}
+	doins -r examples
+
+	# Need to fix saytime, etc. to look for festival in the correct spot
+	for ex in "${D}"/usr/share/doc/${PF}/examples/*.sh; do
+		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 src/include/*.h
+
+	insinto /etc/festival
+	doins lib/site*
+
+	# Install the docs
+	dodoc "${S}"/{ACKNOWLEDGMENTS,NEWS,README}
+	doman "${S}"/doc/{festival.1,festival_client.1}
+
+	# create the directory where our log file will go.
+	diropts -m 0755 -o festival -g audio
+	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 "This version also allows configuration of site specific"
+	elog "initialization in /etc/festival/siteinit.scm and"
+	elog "variables in /etc/festival/sitevars.scm."
+	elog
+}
diff --git a/app-accessibility/festival/files/festival-2.1-gentoo-system.patch b/app-accessibility/festival/files/festival-2.1-gentoo-system.patch
new file mode 100644
index 000000000000..a09e1379eebf
--- /dev/null
+++ b/app-accessibility/festival/files/festival-2.1-gentoo-system.patch
@@ -0,0 +1,124 @@
+diff -uNr festival.orig/config/systems/GentooLinux.mak festival/config/systems/GentooLinux.mak
+--- festival.orig/config/systems/GentooLinux.mak	1969-12-31 19:00:00.000000000 -0500
++++ festival/config/systems/GentooLinux.mak	2011-02-09 10:43:28.000000000 -0500
+@@ -0,0 +1,42 @@
++ ###########################################################################
++ ##                                                                       ##
++ ##                Centre for Speech Technology Research                  ##
++ ##                     University of Edinburgh, UK                       ##
++ ##                         Copyright (c) 1996                            ##
++ ##                        All Rights Reserved.                           ##
++ ##                                                                       ##
++ ##  Permission is hereby granted, free of charge, to use and distribute  ##
++ ##  this software and its documentation without restriction, including   ##
++ ##  without limitation the rights to use, copy, modify, merge, publish,  ##
++ ##  distribute, sublicense, and/or sell copies of this work, and to      ##
++ ##  permit persons to whom this work is furnished to do so, subject to   ##
++ ##  the following conditions:                                            ##
++ ##   1. The code must retain the above copyright notice, this list of    ##
++ ##      conditions and the following disclaimer.                         ##
++ ##   2. Any modifications must be clearly marked as such.                ##
++ ##   3. Original authors' names are not deleted.                         ##
++ ##   4. The authors' names are not used to endorse or promote products   ##
++ ##      derived from this software without specific prior written        ##
++ ##      permission.                                                      ##
++ ##                                                                       ##
++ ##  THE UNIVERSITY OF EDINBURGH AND THE CONTRIBUTORS TO THIS WORK        ##
++ ##  DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING      ##
++ ##  ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT   ##
++ ##  SHALL THE UNIVERSITY OF EDINBURGH NOR THE CONTRIBUTORS BE LIABLE     ##
++ ##  FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES    ##
++ ##  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN   ##
++ ##  AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,          ##
++ ##  ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF       ##
++ ##  THIS SOFTWARE.                                                       ##
++ ##                                                                       ##
++ ###########################################################################
++ ##                                                                       ##
++ ##                 Author: William Hubbs <williamh@gentoo.org>           ##
++ ## --------------------------------------------------------------------  ##
++ ## Settings for Gentoo Linux distributions.                              ##
++ ##                                                                       ##
++ ###########################################################################
++
++MANDIR=$(INSTALL_PREFIX)/share/man
++# Gentoo does not use termcap
++OS_LIBS = $(LDFLAGS) -ldl -lncurses
+diff -uNr festival.orig/config/systems/Makefile festival/config/systems/Makefile
+--- festival.orig/config/systems/Makefile	2011-02-09 10:41:01.000000000 -0500
++++ festival/config/systems/Makefile	2011-02-09 10:44:22.000000000 -0500
+@@ -41,6 +41,7 @@
+ 	Linux.mak				\
+ 	RedHatLinux.mak				\
+ 	DebianGNULinux.mak			\
++	GentooLinux.mak			\
+ 	alpha_Linux.mak				\
+ 	alpha_OSF1V4.0.mak			\
+ 	alpha_RedHatLinux.mak			\
+@@ -94,6 +95,7 @@
+ 	sparc_SunOS5.8.mak			\
+ 	sparc_SunOS5.mak			\
+ 	unknown_DebianGNULinux.mak		\
++	unknown_GentooLinux.mak		\
+ 	unknown_Linux.mak			\
+ 	unknown_RedHatLinux.mak			\
+ 	power_macintosh_Darwin.mak		\
+diff -uNr festival.orig/config/systems/unknown_GentooLinux.mak festival/config/systems/unknown_GentooLinux.mak
+--- festival.orig/config/systems/unknown_GentooLinux.mak	1969-12-31 19:00:00.000000000 -0500
++++ festival/config/systems/unknown_GentooLinux.mak	2011-02-09 10:45:34.000000000 -0500
+@@ -0,0 +1,41 @@
++###########################################################################
++##                                                                       ##
++##                Centre for Speech Technology Research                  ##
++##                     University of Edinburgh, UK                       ##
++##                         Copyright (c) 1996                            ##
++##                        All Rights Reserved.                           ##
++##                                                                       ##
++##  Permission is hereby granted, free of charge, to use and distribute  ##
++##  this software and its documentation without restriction, including   ##
++##  without limitation the rights to use, copy, modify, merge, publish,  ##
++##  distribute, sublicense, and/or sell copies of this work, and to      ##
++##  permit persons to whom this work is furnished to do so, subject to   ##
++##  the following conditions:                                            ##
++##   1. The code must retain the above copyright notice, this list of    ##
++##      conditions and the following disclaimer.                         ##
++##   2. Any modifications must be clearly marked as such.                ##
++##   3. Original authors' names are not deleted.                         ##
++##   4. The authors' names are not used to endorse or promote products   ##
++##      derived from this software without specific prior written        ##
++##      permission.                                                      ##
++##                                                                       ##
++##  THE UNIVERSITY OF EDINBURGH AND THE CONTRIBUTORS TO THIS WORK        ##
++##  DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING      ##
++##  ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT   ##
++##  SHALL THE UNIVERSITY OF EDINBURGH NOR THE CONTRIBUTORS BE LIABLE     ##
++##  FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES    ##
++##  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN   ##
++##  AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,          ##
++##  ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF       ##
++##  THIS SOFTWARE.                                                       ##
++##                                                                       ##
++###########################################################################
++##                                                                       ##
++##                 Author: William Hubbs <williamh@gentoo.org>           ##
++## --------------------------------------------------------------------  ##
++## Settings for Gentoo Linux distributions.                              ##
++##                                                                       ##
++###########################################################################
++
++include $(EST)/config/systems/Linux.mak
++include $(EST)/config/systems/GentooLinux.mak
+diff -uNr festival.orig/config/system.sh festival/config/system.sh
+--- festival.orig/config/system.sh	2011-02-09 10:41:01.000000000 -0500
++++ festival/config/system.sh	2011-02-09 10:42:10.000000000 -0500
+@@ -70,6 +70,10 @@
+ 	then
+ 	OSTYPE=DebianGNULinux
+ 	OSREV=`cat /etc/debian_version`
++    elif [ -f "/etc/gentoo-release" ]
++    then
++    OSTYPE=GentooLinux
++    OSREV=""
+     else
+ 	# Generic unknown GNU/Linux system.
+ 	OSTYPE=Linux
diff --git a/app-accessibility/festival/files/festival-2.1-init-scm.patch b/app-accessibility/festival/files/festival-2.1-init-scm.patch
new file mode 100644
index 000000000000..efe575b0c2b7
--- /dev/null
+++ b/app-accessibility/festival/files/festival-2.1-init-scm.patch
@@ -0,0 +1,24 @@
+--- 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-2.1-ldflags.patch b/app-accessibility/festival/files/festival-2.1-ldflags.patch
new file mode 100644
index 000000000000..e6559c8a8168
--- /dev/null
+++ b/app-accessibility/festival/files/festival-2.1-ldflags.patch
@@ -0,0 +1,12 @@
+diff -uNr festival.orig/config/systems/Linux.mak festival/config/systems/Linux.mak
+--- festival.orig/config/systems/Linux.mak	2011-02-09 10:08:20.000000000 -0500
++++ festival/config/systems/Linux.mak	2011-02-09 10:09:04.000000000 -0500
+@@ -46,7 +46,7 @@
+ JAVAH=/usr/bin/javah
+ 
+ TCL_LIBRARY = -ltcl
+-OS_LIBS = -ldl 
++OS_LIBS = $(OPTIMISE_LDFLAGS) -ldl 
+ 
+ ## the native audio module for this type of system
+ NATIVE_AUDIO_MODULE = LINUX16