summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2009-02-09 13:50:40 +0000
committerWilliam Hubbs <williamh@gentoo.org>2009-02-09 13:50:40 +0000
commitc8b50b00da118be925621969ab923d7e598a83d9 (patch)
tree2104543e5559c5a8354c36df4f9cd40ec3532455 /app-accessibility
parentVersion bump, bug 258028. (diff)
downloadgentoo-2-c8b50b00da118be925621969ab923d7e598a83d9.tar.gz
gentoo-2-c8b50b00da118be925621969ab923d7e598a83d9.tar.bz2
gentoo-2-c8b50b00da118be925621969ab923d7e598a83d9.zip
This fixes the gcc 4.3 patching order for bug #205401.
(Portage version: 2.2_rc23/cvs/Linux i686)
Diffstat (limited to 'app-accessibility')
-rw-r--r--app-accessibility/festival/ChangeLog6
-rw-r--r--app-accessibility/festival/festival-1.96_beta-r1.ebuild8
2 files changed, 9 insertions, 5 deletions
diff --git a/app-accessibility/festival/ChangeLog b/app-accessibility/festival/ChangeLog
index 3c20b11116e3..cf99294b0c96 100644
--- a/app-accessibility/festival/ChangeLog
+++ b/app-accessibility/festival/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-accessibility/festival
# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/ChangeLog,v 1.82 2009/02/09 03:18:23 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/ChangeLog,v 1.83 2009/02/09 13:50:40 williamh Exp $
+
+ 09 Feb 2009; William Hubbs <williamh@gentoo.org>
+ festival-1.96_beta-r1.ebuild:
+ Fixed the gcc 4.3 patch order for bug #205401.
*festival-1.96_beta-r1 (09 Feb 2009)
diff --git a/app-accessibility/festival/festival-1.96_beta-r1.ebuild b/app-accessibility/festival/festival-1.96_beta-r1.ebuild
index 93e3fff36ace..ed45ffccb9e2 100644
--- a/app-accessibility/festival/festival-1.96_beta-r1.ebuild
+++ b/app-accessibility/festival/festival-1.96_beta-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-1.96_beta-r1.ebuild,v 1.1 2009/02/09 03:18:23 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-1.96_beta-r1.ebuild,v 1.2 2009/02/09 13:50:40 williamh Exp $
inherit eutils toolchain-funcs
@@ -48,9 +48,6 @@ src_unpack() {
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
- # copy what we need for MultiSyn from speech_tools.
- cp -pr "${WORKDIR}"/speech_tools/base_class "${S}"/src/modules/MultiSyn
-
# fix the reference to /usr/lib/festival
sed -i -e "s:\(FTLIBDIR.*=.*\)\$.*:\1/usr/share/festival:" "${S}"/config/project.mak
@@ -67,6 +64,9 @@ src_unpack() {
epatch "${FILESDIR}"/${P}-gcc43.patch
epatch "${FILESDIR}"/speech-tools-1.2.96_beta-gcc43-include.patch
+ # copy what we need for MultiSyn from speech_tools.
+ cp -pr "${WORKDIR}"/speech_tools/base_class "${S}"/src/modules/MultiSyn
+
if use alsa; then
echo "(Parameter.set 'Audio_Command \"aplay -q -c 1 -t raw -f s16 -r \$SR \$FILE\")" >> ${S}/lib/siteinit.scm
echo "(Parameter.set 'Audio_Method 'Audio_Command)" >> ${S}/lib/siteinit.scm