[gentoo-commits] gentoo-x86 commit in app-accessibility/festival: festival-1.96_beta.ebuild ChangeLog

[William Hubbs (williamh)]

williamh    08/01/12 06:59:53

  Modified:             festival-1.96_beta.ebuild ChangeLog
  Log:
  Fixed dependencies for bug #199886.
  Applied a gcc 4.3 patch for bug #205401 -- thanks to dirtyepic@g.o.
  (Portage version: 2.1.4_rc14)

Revision  Changes    Path
1.2                  app-accessibility/festival/festival-1.96_beta.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/festival/festival-1.96_beta.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/festival/festival-1.96_beta.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/festival/festival-1.96_beta.ebuild?r1=1.1&r2=1.2

Index: festival-1.96_beta.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-1.96_beta.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- festival-1.96_beta.ebuild	28 Aug 2007 05:17:33 -0000	1.1
+++ festival-1.96_beta.ebuild	12 Jan 2008 06:59:52 -0000	1.2
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.ebuild,v 1.1 2007/08/28 05:17:33 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-1.96_beta.ebuild,v 1.2 2008/01/12 06:59:52 williamh Exp $
 
 inherit eutils toolchain-funcs
 
@@ -27,10 +27,9 @@
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="mbrola"
 
-RDEPEND="mbrola? ( >=app-accessibility/mbrola-3.0.1h-r2 )"
-
-DEPEND="${RDEPEND}
-	>=app-accessibility/speech-tools-1.2.96_beta"
+DEPEND=">=app-accessibility/speech-tools-1.2.96_beta"
+RDEPEND="${DEPEND}
+	mbrola? ( >=app-accessibility/mbrola-3.0.1h-r2 )"
 
 S=${WORKDIR}/festival
 
@@ -42,20 +41,23 @@
 	unpack ${A}
 
 	# 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
+	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
 
 	# disable the multisyn modules
-	sed -i -e "s:\(ALSO_INCLUDE.*=.*MultiSyn\):# \1:" ${S}/config/config.in
+	sed -i -e "s:\(ALSO_INCLUDE.*=.*MultiSyn\):# \1:" "${S}"/config/config.in
 
 	# fix the reference  to /usr/lib/festival
-	sed -i -e "s:\(FTLIBDIR.*=.*\)\$.*:\1/usr/share/festival:" ${S}/config/project.mak
+	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
+	sed -i -e "s:\.\./examples/:/usr/share/doc/${PF}/examples/:" "${S}"/lib/festival.scm
 
 	# patch init.scm to look for siteinit.scm and sitevars.scm in /etc/festival
-	epatch ${FILESDIR}/${P}-init-scm.patch
+	epatch "${FILESDIR}"/${P}-init-scm.patch
+
+	# Apply a patch for gcc4.3.
+	epatch "${FILESDIR}"/${P}-gcc43.patch
 }
 
 src_compile() {
@@ -78,10 +80,10 @@
 	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
+	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}
+		chmod a+x "${exnoext}"
+		dosed "s:${S}/bin/festival:/usr/bin/festival:" "${exnoext##$D}"
 	done
 
 	# Install the header files
@@ -90,15 +92,15 @@
 
 	insinto /etc/festival
 	# Sample server.scm configuration for the server
-	doins ${FILESDIR}/server.scm
+	doins "${FILESDIR}"/server.scm
 	doins lib/site*
 
 	# Install the init script
-	newinitd ${FILESDIR}/festival.rc festival
+	newinitd "${FILESDIR}"/festival.rc festival
 
 	# Install the docs
-	dodoc ${S}/{ACKNOWLEDGMENTS,NEWS,README}
-	doman ${S}/doc/{festival.1,festival_client.1}
+	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
@@ -138,7 +140,7 @@
 	# 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 language in "${S}"/lib/voices/*; do
 		for mvoice in ${language}/*_mbrola; do
 			voice=${mvoice##*/}
 			database=${voice%%_mbrola}



1.70                 app-accessibility/festival/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/festival/ChangeLog?rev=1.70&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/festival/ChangeLog?rev=1.70&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/festival/ChangeLog?r1=1.69&r2=1.70

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-accessibility/festival/ChangeLog,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- ChangeLog	29 Aug 2007 13:57:47 -0000	1.69
+++ ChangeLog	12 Jan 2008 06:59:52 -0000	1.70
@@ -1,6 +1,11 @@
 # ChangeLog for app-accessibility/festival
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/ChangeLog,v 1.69 2007/08/29 13:57:47 williamh Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/ChangeLog,v 1.70 2008/01/12 06:59:52 williamh Exp $
+
+  12 Jan 2008; William Hubbs <williamh@g.o>
+  +files/festival-1.96_beta-gcc43.patch, festival-1.96_beta.ebuild:
+  Fixed dependencies for bug #199886.
+  Applied a gcc 4.3 patch for bug #205401 -- thanks to dirtyepic@g.o.
 
   29 Aug 2007; William Hubbs <williamh@g.o>
   +files/festival-1.96_beta-init-scm.patch:



-- 
gentoo-commits@l.g.o mailing list