Revbump. Makes it compile with gcc-4.7

Package-Manager: portage-2.2.0_alpha138/cvs/Linux i686
Manifest-Sign-Key: 0x748B2C601F6F0683

4 files changed, 167 insertions, 5 deletions

diff --git a/app-accessibility/festival/ChangeLog b/app-accessibility/festival/ChangeLog
index ca171a31f260..0c4d4592914a 100644
--- a/app-accessibility/festival/ChangeLog
+++ b/app-accessibility/festival/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-accessibility/festival
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/ChangeLog,v 1.106 2012/09/20 19:58:15 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/ChangeLog,v 1.107 2012/12/04 04:50:43 neurogeek Exp $
+
+*festival-2.1-r1 (03 Dec 2012)
+
+  03 Dec 2012; Jesus Rivero <neurogeek@gentoo.org> +festival-2.1-r1.ebuild,
+  +files/festival-2.1-gcc4.7.patch:
+  Revbump. Makes it compile with gcc-4.7
 
   20 Sep 2012; Jesus Rivero <neurogeek@gentoo.org>
   -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 20dba717471f..07f64bc782d6 100644
--- a/app-accessibility/festival/Manifest
+++ b/app-accessibility/festival/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX festival-1.96_beta-gcc43.patch 547 SHA256 2bb1b1355e60636efb5e66dc5c00330343f01cc9702ac920f87b062185f03216 SHA512 1b6c80fac465a1268985bda328054899efeae3e993c8c1a0455aeb4328c2530b491fa19fbc03818556e5301740b421b76e1169775ede76b6da4d87cab6da876b WHIRLPOOL 466b567d5c36f56d939692f54721abb8e1c8c791a48ac73e9aa9bb6ec07848aa5a08df11a0da9eec1b6113e7e4943add59b784512526b297d528fb3769507344
 AUX festival-1.96_beta-hts-voices.patch 5315 SHA256 dab29e024d70674bb7736f9b4f8202bdc2f25b1953ec842c2a2ea6df3ea07ebb SHA512 98c3d4f10c0edd8b0eede9b34b85b647adb59953ce9239415269582da9a100d4e4fb3dcb6f9a19612f8f1439e701aba7dbc9c9f8ce404c75dd2987b47c80b8a4 WHIRLPOOL 26cd81f1afb7c2316859b326fc402d5835e78cb7141d0aaf2321606f133818394079643d0827613e8e0b5945e8c99fc9cb88bd9343d85be57be6fd6893157b3c
 AUX festival-1.96_beta-init-scm.patch 856 SHA256 71bc918dffd72adb21b8cd7394358929e23aa1e32849a4c7f0aa85aa6d4cba40 SHA512 bf86a21659affa4e7ec2eefedb0bfb3650473a90c72fe30e5ad8aabb9a20a344a792c6f612af466fc50359b4dec7e6f9afb358f1e509428513781b93e7c3c874 WHIRLPOOL 1dcf0fe1c256aa87b88f1173604be58a66cb1dec9841a082d4f77e4ca4e661639ff1a7fe8bd5c4579a9244ce7143bf48f9fe2d5f09fde7d52ceb02502c3e2a49
+AUX festival-2.1-gcc4.7.patch 924 SHA256 7aef97c6784c268ab7e7ab0007673c5d54914409d7246ae1be0f63ca83e882de SHA512 d5d41c1dd60339fd219c51da7f1d6f9348832b2ffe4181787dacdca024d218dc7dbca168b9fbcb75795d681d534d77089aa8bf6fcbfbb47e2946f17c16a12071 WHIRLPOOL 2ad145f28cd1690e5f7e9dd94cc642c6ba4596c9326424e49804b74e97a7bd0da4f3b6c10a584db6f1dac1e8d053557ee4a68cba64a86376bf6bff3358e04bea
 AUX festival-2.1-gentoo-system.patch 7736 SHA256 bf595e5bda12ac753265a7630b8ba3042951191f180e08ed375955d76cab2d4b SHA512 bd15a7668e8702b1171b8a5b0ad615f6dd22ca2f2940f91abd1617fcf29aab70d97f6bf940ff5b8887bd0799af1545f781d17e23000c1f339bd9808afac4860a WHIRLPOOL 7db3db87eaa686755625b87e524d8fe52db56c2c22d0424783375bd7640a9bb11b01220b22335d6a0ea3a4eb4a8ccc6462fb0b486ec3d7a69e134a6e3dc4277a
 AUX festival-2.1-init-scm.patch 856 SHA256 71bc918dffd72adb21b8cd7394358929e23aa1e32849a4c7f0aa85aa6d4cba40 SHA512 bf86a21659affa4e7ec2eefedb0bfb3650473a90c72fe30e5ad8aabb9a20a344a792c6f612af466fc50359b4dec7e6f9afb358f1e509428513781b93e7c3c874 WHIRLPOOL 1dcf0fe1c256aa87b88f1173604be58a66cb1dec9841a082d4f77e4ca4e661639ff1a7fe8bd5c4579a9244ce7143bf48f9fe2d5f09fde7d52ceb02502c3e2a49
 AUX festival-2.1-ldflags.patch 438 SHA256 4242057ced3647a0f0c9ba3047b290ae498d30d26a0436a95237fc9a653941b2 SHA512 5c7eb23673aef0ddcc0d13bec73caa90c807fdd884f73cda33c28bc80d701ef80fbf417987f078f692d418cb3a67a6243652017bb34537a75fd32b29819b9726 WHIRLPOOL 6f16a00a4a8cd1557984c65e6e14e1096b2e817d92d236176f75293c2f815a5a6a6eafa3719c2aafac161682fa179cbe35400d93dc62fa182aba49217d3241e9
@@ -29,13 +30,14 @@ DIST festvox_us2.tar.gz 11037 SHA256 d27ad26213144d956815e804c06e5473191ac12afb4
 DIST festvox_us3.tar.gz 11220 SHA256 af9ca4d1832e1971aa6e52f6a3ff8f729bf970c7bee1de7e8ac0611ca01871b8 SHA512 e9e62e977fe462db0d2d7c5bbe6e871dddeec4bd7d240ecd1e5e5fddddecf177d21263fdb4ebb42a0aac36dea72c64f5cf42d38d838457c26821be46b7202aa7 WHIRLPOOL 503e16c239262526d4542e303149aa842559b1aba44d19fae0f8524d0a9dfe8fe4c676f571944afc92437a18c683b7d5b426df1c269b3e030778e4900cb0be40
 DIST speech_tools-2.1-release.tar.gz 1681999 SHA256 ff6167cd929a88e2f91b47191c6c4dae87c9c06ba39fccc4465af9d79e9b2be9 SHA512 6ef9a7dd01ede152c4dafd0b2037312d62a79d875813d74ea048899a52eee505b93ffbabef9b6c0a1d15aeadb5508fd18a2f392e85276847fe071173aec5db96 WHIRLPOOL 6df6ca5168462599fadf209827e367c963af5ca6be05277618c9d09aac34a3b151665b860a14fa4742482cc77246e372671ac94b23bdca63bbbb7b8c7b234644
 EBUILD festival-1.96_beta.ebuild 5069 SHA256 d208fe76edec24bace6ad20310208b6b75822a61c4411fa941e203516ba9f6f6 SHA512 95ef1e043ec2b2f476cb6a89dc0443c5a423468ec5567248a9892b72427c687553965cab087b2952c5d4525569f8dc491159ec8250af00d7b6b9fe162a376151 WHIRLPOOL 0851257fd886596a85f97add07a30497f30c8505bd4d4fbb01553810cb9884d09b86fdf5e330620dfb61241cd645bbc0a1af5dd7d0d74783c73dee8b5bf82a07
+EBUILD festival-2.1-r1.ebuild 3745 SHA256 c00bf928fdefb503f8c3ae79a7b02d9e6ab037ac1803f6fde835ed2c19e10f62 SHA512 8663e519b82ba85570f53e44d570da7c38f3eb94e5829c584754e3c351c70c3dd2b409adbedec60c3b1aec6ce7febeb9f83deffa06e8fe5b474dcce8bd88e706 WHIRLPOOL 2ac20c923a36154195d1072a917c765d6bba4d64ffea04636d1d111b44b3ad1de7f96641eda75455a6c6fcc9d75e72d37abb1dd9cd4a74130a0fa60ac9e4e8bc
 EBUILD festival-2.1.ebuild 3692 SHA256 c766cfc5c2762d65bde375da2ef16e7ed040c63f6d2d82a4d78681ee5e15be91 SHA512 0593c5286bd2f40023350f5b52f0f9e6b0cde16c6ad24c4f2d99660b7536deb4ed0d3f9a91df6440f611d2b716ddc05a6fc9c1812f036af711e49089e1a5a741 WHIRLPOOL d60db6810eeb5c1cf3cab8dfef475509cae0285204f3a8a0133004c35e6cca032b5b6f4537de131ac6c18b7223ed00cbd68e15d8d7ad5d9df1f04f2b9e82ebc4
-MISC ChangeLog 19802 SHA256 d767757e1e893b261f1cc2860affdcc89e8c375a275a52437d4b82e8dbdd0fac SHA512 42ac997618b65f049e44184971c7b4f6c954ca3660de13d0b807792fe511d1c177f938a584bcc885e7edece934c8bfe0a65695433bfcc7b1db60f804c239e8bd WHIRLPOOL 833885ed1a1a204732da1ba8362db0fdc3df908138c1c1e4a5a1d3d2e80dedba98aacd0d3744e14e936c68e9c397f86f1f1d159f2bdb4a893bba945c37679989
+MISC ChangeLog 19988 SHA256 96d12708d4b41700f1e60b6e7593d22f0e149728cb7ccd113975324492c32d85 SHA512 a49fa10aa0b18e86c47daea43fb5bd12078918a3c2120d972b8a1ed18aa4eeda501d971a98bc1219cf844eef651e895db2468689061884825b9b04406153ab24 WHIRLPOOL 4ae5dcba74deb58639e7bd8528b7fa07cbb6b899cecf3c61ef96fe7012ef64a944fdcd0b7fd88edeb877acc8805cd834874d96987ee704ceacc12fc18fbb8b8d
 MISC metadata.xml 321 SHA256 54fb73517995daec7601b063031a9021800c7d8fdcc73d969060b7447f0ce6d7 SHA512 73ed4c95aa474860fc27c7fa758bc15a5ea5260d39981c72d09ef575f90879159d0740418c7898a08eb723e6a7158dad42eadac6aa7a3731c16aa0787cf40ab3 WHIRLPOOL 85dfa75da59f47878f729cb88ee2886377629771ae00d3b82e090ad9c7dcbb399f1a440e4094dc0290eb5a856c99c55bd8989b2421028b7f6439128d6fcc80e2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAlBbPR0ACgkQdIssYB9vBoNm8wCfWon9g4yiBRsDmzY2iuUcEuPf
-DaQAnRwi4Jd90426SwftLUutBiLBLHY7
-=kFgC
+iEYEAREIAAYFAlC9OtUACgkQdIssYB9vBoMdggCeJrW1YVjm1f2dn49fNFi1zCDR
+YW8AnR1v96IBO9FAXZwyNsbobkElP2x9
+=SVCR
 -----END PGP SIGNATURE-----
diff --git a/app-accessibility/festival/festival-2.1-r1.ebuild b/app-accessibility/festival/festival-2.1-r1.ebuild
new file mode 100644
index 000000000000..491975aee1e2
--- /dev/null
+++ b/app-accessibility/festival/festival-2.1-r1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-2.1-r1.ebuild,v 1.1 2012/12/04 04:50:43 neurogeek Exp $
+
+EAPI="2"
+inherit eutils multilib toolchain-funcs user
+
+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
+		>=sys-libs/ncurses-5.6-r2"
+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${EPREFIX}/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${EPREFIX}/usr/share/festival:" "${S}"/config/project.mak
+
+	# Fix path for examples in festival.scm
+	sed -i -e "s:\.\./examples/:${EPREFIX}/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
+
+	epatch "${FILESDIR}/${P}-gcc4.7.patch"
+
+	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
+}
+
+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-gcc4.7.patch b/app-accessibility/festival/files/festival-2.1-gcc4.7.patch
new file mode 100644
index 000000000000..8ebc8cc472c0
--- /dev/null
+++ b/app-accessibility/festival/files/festival-2.1-gcc4.7.patch
@@ -0,0 +1,29 @@
+diff -uNr festival.orig/src/modules/MultiSyn/base_class/EST_TSimpleVector.cc festival/src/modules/MultiSyn/base_class/EST_TSimpleVector.cc
+--- festival.orig/src/modules/MultiSyn/base_class/EST_TSimpleVector.cc	2012-12-02 23:03:27.000000000 +0000
++++ festival/src/modules/MultiSyn/base_class/EST_TSimpleVector.cc	2012-12-02 23:21:17.000000000 +0000
+@@ -42,6 +42,7 @@
+ 
+ #include "EST_TSimpleVector.h"
+ #include "EST_matrix_support.h"
++#include <cstring>
+ #include <fstream>
+ #include "EST_cutils.h"
+ 
+@@ -49,7 +50,7 @@
+ {
+   if (this->p_column_step==1 && a.p_column_step==1)
+     {
+-    resize(a.n(), FALSE);
++    this->resize(a.n(), FALSE);
+     memcpy((void *)(this->p_memory), (const void *)(a.p_memory), this->n() * sizeof(T));
+     }
+ else
+@@ -70,7 +71,7 @@
+   int old_offset = this->p_offset;
+   unsigned int q;
+ 
+-  just_resize(newn, &old_vals);
++  this->just_resize(newn, &old_vals);
+ 
+   if (set && old_vals)
+     {