Version bump.

Package-Manager: portage-2.2_rc67/cvs/Linux i686

4 files changed, 177 insertions, 5 deletions

diff --git a/app-accessibility/festival/ChangeLog b/app-accessibility/festival/ChangeLog
index cd41783686a9..f00463713610 100644
--- a/app-accessibility/festival/ChangeLog
+++ b/app-accessibility/festival/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-accessibility/festival
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/ChangeLog,v 1.89 2010/06/30 14:32:59 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/ChangeLog,v 1.90 2010/06/30 15:09:12 neurogeek Exp $
+
+*festival-2.0.95_beta (30 Jun 2010)
+
+  30 Jun 2010; Jesus Rivero <neurogeek@gentoo.org>
+  +festival-2.0.95_beta.ebuild, +files/festival-2.0.95_beta-init-scm.patch:
+  Version bump.
 
   30 Jun 2010; Jesus Rivero <neurogeek@gentoo.org>
   festival-1.96_beta.ebuild, festival-1.96_beta-r1.ebuild:
diff --git a/app-accessibility/festival/Manifest b/app-accessibility/festival/Manifest
index 3149ddd4c01d..4437791b0c5c 100644
--- a/app-accessibility/festival/Manifest
+++ b/app-accessibility/festival/Manifest
@@ -4,31 +4,38 @@ 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.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 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
 DIST festvox_cmu_us_awb_arctic_hts.tar.gz 878090 RMD160 abfcc3457c1735cf772b051c0ec884e55381ad9b SHA1 b9caaea8b2a5469ae84b219f74382a7e14153551 SHA256 56b930028a14efdaa01b8b34add087bcde75b774b97b205d2f478413203d9a4d
+DIST festvox_cmu_us_awb_cg.tar.gz 4452760 RMD160 02c34c8fbedecf51046e02e9c582729ebc3d0fae SHA1 1e13ec225a7f9313633c238b7bc300ae139c6dc0 SHA256 f6010538b3e2f32152cc75741a62b8c7eecfaa3e51153c9db735723002807264
 DIST festvox_cmu_us_bdl_arctic_hts.tar.gz 1060641 RMD160 cab02ae2be1c3691cfcc2aa6c09ae6829fca9896 SHA1 d07c072609634589a058bb18c501c3cf09a07581 SHA256 caa679c728c8804f4a1dae6ab08e7b31f10b292e572598fb6432d0e18f40bd2b
 DIST festvox_cmu_us_jmk_arctic_hts.tar.gz 909045 RMD160 5e9657f55d7aa10e852cd36d5a73f1dd106e6713 SHA1 768c33e88a150b5b984a4594bfb67ac7e235d176 SHA256 e4f623d1114922c8844ec266d46d558e1521e0ab3bc6e958cdf8f69c28bcc038
+DIST festvox_cmu_us_rms_cg.tar.gz 5222226 RMD160 dceae44e699a64b75104f44b373fc20cddaf90c8 SHA1 bef75ac5657c5d23bc7fa1f69e6010a12fef47b6 SHA256 5f0ffc3181df76b63f3c13db3cdc6e67e02639a3982c6b6fa55bbbd2fe1cbc30
 DIST festvox_cmu_us_slt_arctic_hts.tar.gz 955706 RMD160 541cc0959305c656bc4af4b848c666a707671fe3 SHA1 3e8224f46be9aa04e576b8ab9d218753bf5c80fb SHA256 adcc187fc7db39e17c119811936be57f0b788908f06c3d9b330856ad8357b128
 DIST festvox_kallpc16k.tar.gz 4104056 RMD160 f8be814267359ac9d4fa5d0bcade18e15b64beb2 SHA1 ad18502ae0fd10bdc3db189fa9afa8a167eceebb SHA256 9eb6336f35c202c8069d37e489fb009a7e9fd8539cd47644329db1e92c6aba83
 DIST festvox_kedlpc16k.tar.gz 4221528 RMD160 63480c4ed695c86fc8de0f3a0740196debc710ae SHA1 777e58d25fd499530601c514650328267fb716fb SHA256 6b8f11424bda5c81ae8a58f7838e2a9d12fdb39cdfff6ed89f611305391b1a36
+DIST festvox_rablpc16k.tar.gz 5369001 RMD160 d98cc1df3e922fe9894cf51e5913f8bfd0b99889 SHA1 164983d46df6a09b07a5550f4613047f94b1764a SHA256 54835837ca734e62c0210c0f9dd27380d2ad89819ae91ec6e8cfab4e515b7bdc
 DIST festvox_us1.tar.gz 11040 RMD160 97cfd8e62347aa28cf2319174021bc002044ffd5 SHA1 f740064af99670e35879352d164b7aa9f2079820 SHA256 23b332513867d6e9c340dc888a7ce67843e5a3c03db328cd36975985057c8b8e
 DIST festvox_us2.tar.gz 11037 RMD160 62528dc44291be4f7e7fda1677f3074fcc9fdab7 SHA1 227df7165a47d181eb019c7774d7b8517436507d SHA256 d27ad26213144d956815e804c06e5473191ac12afb44f6a1029b3842e3a3007c
 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
 EBUILD festival-1.96_beta-r1.ebuild 5171 RMD160 b1e6a7fef2bc1a9e61e5e597fe6db3fceb70259f SHA1 33d8ed1c405059dbdda5ea4bcfd27d5d39703681 SHA256 04eab2f2a9c744651b56770f8f1541d3153ff34a7bf8d115b8dff7f33e48452d
 EBUILD festival-1.96_beta.ebuild 5057 RMD160 9bad4911adae9c6214d23bc4ca7511b755efc78b SHA1 cf356f4080f60deee236d600c9713d0bce29a3eb SHA256 31c9906b914e472eadfdf4d3db12acc1c1d415016a06b595acbc10de43c18a77
-MISC ChangeLog 17163 RMD160 c9e2faaf408fdf1c4523b73b7caf98d87c826cb5 SHA1 9b2b2f99b9d3575e5ba85dd452b27bc80c8b8bdb SHA256 3ae1b27772f78cd6436149b149cee73563b388f067b5692f7eb97d1b25e16281
+EBUILD festival-2.0.95_beta.ebuild 4017 RMD160 7589e584fec9b73ccefd696d54244cc225631add SHA1 2d3e96f80214660e8b1136632d4865b0cf7e7bf9 SHA256 5ccf483a9f14a2f6b10dcc9c64dd0f4730c2892824436fc9ff7a37158c0a1ac3
+MISC ChangeLog 17344 RMD160 f2243d021ed6c6fd16e30680603d7a78376a8a7b SHA1 37262aabcb6f00d38a9d276b2b0bae534a5c0441 SHA256 60878da41eca3494d45f2762f1d156aa9e9f4c5a7643dda3cadf4620ab88594d
 MISC metadata.xml 321 RMD160 85d595924e5c87d59427af1f743c76c62cb08eb1 SHA1 f1b34f3b131295eda78d168d1fcebecf3d1d0ada SHA256 54fb73517995daec7601b063031a9021800c7d8fdcc73d969060b7447f0ce6d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkwrR80ACgkQdIssYB9vBoN/ewCcDU1Sabhh3FzNsacL/wKP3jEe
-3TYAnjY1Xf2AlbsafclFuvSo2pxleifH
-=CQqH
+iEYEARECAAYFAkwrUDAACgkQdIssYB9vBoNl8ACcCQPxxNdM6bWRQG7h8FC8ugto
+ko8An2HIyKcnGM4AMKqT+bOenLxurPOP
+=aCYr
 -----END PGP SIGNATURE-----
diff --git a/app-accessibility/festival/festival-2.0.95_beta.ebuild b/app-accessibility/festival/festival-2.0.95_beta.ebuild
new file mode 100644
index 000000000000..d76eeed9b867
--- /dev/null
+++ b/app-accessibility/festival/festival-2.0.95_beta.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-2.0.95_beta.ebuild,v 1.1 2010/06/30 15:09:12 neurogeek Exp $
+
+EAPI="2"
+inherit eutils toolchain-funcs
+
+MY_PV=${PV/_beta/-beta}
+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}/${MY_PV%-beta}"
+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="alsa"
+
+SP_DEPEND=">=app-accessibility/speech-tools-2.0.95_beta"
+
+DEPEND="${SP_DEPEND}
+	alsa? ( media-sound/alsa-utils )"
+RDEPEND="${SP_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}-init-scm.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
+	fi
+}
+
+src_configure() {
+	econf || die "econf failed"
+}
+
+src_compile() {
+	emake PROJECT_LIBDEPS="" REQUIRED_LIBDEPS="" LOCAL_LIBDEPS="" \
+		OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}" \
+		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
+	# Sample server.scm configuration for the server
+	doins "${FILESDIR}"/server.scm
+	doins lib/site*
+
+	# Install the init script
+	newinitd "${FILESDIR}"/festival.rc festival
+
+	# 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 "    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
+}
diff --git a/app-accessibility/festival/files/festival-2.0.95_beta-init-scm.patch b/app-accessibility/festival/files/festival-2.0.95_beta-init-scm.patch
new file mode 100644
index 000000000000..efe575b0c2b7
--- /dev/null
+++ b/app-accessibility/festival/files/festival-2.0.95_beta-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