version bump.

Package-Manager: portage-2.1.4.4

4 files changed, 114 insertions, 2 deletions

diff --git a/app-accessibility/espeak/ChangeLog b/app-accessibility/espeak/ChangeLog
index 45b0d2e424b5..b2419e78f88c 100644
--- a/app-accessibility/espeak/ChangeLog
+++ b/app-accessibility/espeak/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-accessibility/espeak
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/ChangeLog,v 1.31 2008/03/08 10:08:11 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/ChangeLog,v 1.32 2008/03/08 18:28:56 williamh Exp $
+
+*espeak-1.35 (08 Mar 2008)
+
+  08 Mar 2008; William Hubbs <williamh@gentoo.org>
+  +files/espeak-1.35-makefile.patch, +espeak-1.35.ebuild:
+  Version bump.
 
   08 Mar 2008; Markus Rothe <corsair@gentoo.org> espeak-1.34.ebuild:
   Added ~ppc64; bug #163285
diff --git a/app-accessibility/espeak/Manifest b/app-accessibility/espeak/Manifest
index 0e7564517fad..4f4452b7eaa4 100644
--- a/app-accessibility/espeak/Manifest
+++ b/app-accessibility/espeak/Manifest
@@ -5,6 +5,7 @@ AUX espeak-1.20-ppc64-segfault.patch 354 RMD160 b29461b997a41043f2b28a8e48fa0ee8
 AUX espeak-1.22-makefile.patch 463 RMD160 83ce4fcfe3d5bba083481d4c73dc7793779d57aa SHA1 4c1e3cd20d44921d694becc78324e708cc712ef7 SHA256 f6ecd6298e5e6a8228dd60170e45f27b6877bb9823e032c31a21a77471f547cc
 AUX espeak-1.26-ppc64-segfault.patch 339 RMD160 9c6beec017cc25db37a4b7414833f03caa59a036 SHA1 5f81dbaf375b0d70897cedc4af32a3a72aa11ef1 SHA256 ecbdd55d58a4f4d6dceb315ed82d0ba64de76582417662909b45143059d0e566
 AUX espeak-1.27-ppc64-segfault.patch 339 RMD160 9c6beec017cc25db37a4b7414833f03caa59a036 SHA1 5f81dbaf375b0d70897cedc4af32a3a72aa11ef1 SHA256 ecbdd55d58a4f4d6dceb315ed82d0ba64de76582417662909b45143059d0e566
+AUX espeak-1.35-makefile.patch 911 RMD160 694533f26b7e0aacaa107a81dc79b81fd36961c2 SHA1 dcbb3dbe89ddf0f77d75a2eca2034374dc343942 SHA256 59fb22f87371be1c728ba6107410b47e8dc18af73b925fc2744f8815ba64c83b
 DIST espeak-1.19-source.zip 669628 RMD160 a544181d60561e9f2ed8948b31e47b733562e121 SHA1 0f5ed89c99acadd04f664819f986f04b734f0e47 SHA256 32ded8994f317b9f5f12a2ee5fff621acc4770d5906aaccde6d6d97b06568c79
 DIST espeak-1.20-source.zip 669313 RMD160 233f896de684a743313f70e0d953f90a29f76119 SHA1 a3bd1e3873b53ba8b060330b3cc6898b77f25dc2 SHA256 36933cb231081a4ce1053daf9cfc7a43767aeac2e278760e96888550446d2dc9
 DIST espeak-1.22-source.zip 835112 RMD160 86dbcba4e5eaab56820ad51cd9b2ee6909af3e82 SHA1 c477a9dc8fc70970925130c9c93c1af82bd7cf92 SHA256 3de077fc0397d8b63488a6c7cdb53aafb7808b4446fc5f9f3dd3cb5abc83151e
@@ -16,6 +17,7 @@ DIST espeak-1.29-source.zip 1065925 RMD160 729f6978f1971263adbc5eaf28df90631cef5
 DIST espeak-1.30-source.zip 1182969 RMD160 46a5ba1953fa76faf8693245b9841fc81b78d186 SHA1 a4ca233c18b7b558a41880d666456e6daabb5ff3 SHA256 4a6f5ff64e7f5c980176c90e43bdcb6ffa7a9cc26aaae0431ee1c31ea4475407
 DIST espeak-1.31-source.zip 1204202 RMD160 a26596f25d8897848238d81fe5e5d179d47f01a6 SHA1 e33291b29153d0fc179da11ac4a61cc85fba679a SHA256 5b77557ecc56a9367dfa4e946206b87cbfba0ed037287b124289f1f9d756ce8e
 DIST espeak-1.34-source.zip 1253646 RMD160 f49b80ef95b33f9fb074a553c6c745f330663200 SHA1 446e2772cb914cf309fd439e95a4781737fc04ef SHA256 7989ac6f39c94d9a4f18e2084af14b24a3b7112bf6eea9d502f9bd57c22c1c8b
+DIST espeak-1.35-source.zip 1253271 RMD160 daf5ab2f9cd694e04a980caef31f44e6c4314124 SHA1 147641bd99e25f4fa13a8fa8190c17b8179c6c30 SHA256 34b94f9542aed5710cb5303baeabafbb1d2a708dbf3cca0fcf84355ecdb832bb
 DIST espeak-utils-1.22.tar.bz2 8226 RMD160 a4725e2172fa5ef730b34277bec5b2adf51091cc SHA1 b94e627bf0d8eb8ead739b6798180e030bcf50f4 SHA256 227083ed33a42803b01ff0e2383204f9f063eededf3bfdb859970e4852942299
 EBUILD espeak-1.19.ebuild 1208 RMD160 a27125b7ee7f26ba1c9644656350da3aba811801 SHA1 fbba4ac2b847785d07ab119d24ef5a3213dd5cdb SHA256 72ebb3a4ee70d6f45a3454a35b136fc7533a7ff0e977f71b2c84d0a59a7138ad
 EBUILD espeak-1.20-r1.ebuild 1240 RMD160 37ac6b14ccdcca3854ae15f7d12bf5cf5ec72a61 SHA1 bc98657ba48ce4bdba7a2595bd0ff009371b3394 SHA256 990ad42730b5a5a96b079e68bf954eb8eb7f62261176a9fa3980deae86d231b8
@@ -29,5 +31,6 @@ EBUILD espeak-1.29.ebuild 1518 RMD160 0e357f0e271213f45900413281bf9751fbc5dece S
 EBUILD espeak-1.30.ebuild 1520 RMD160 24f87535613a4567cc5d66db82a5ff43b40ad15b SHA1 a135dea0b3bd852d537b07cd2c2b86308f2dd1a4 SHA256 b8010fc4208c01cae8d518624b18c0212cb4b6c48b7b391b98a38ae991150677
 EBUILD espeak-1.31.ebuild 1520 RMD160 aeec34d22d1983ce5b5b364f0fe71c877422ffac SHA1 6e430a006206cb606c9947e12d67111b290aed9e SHA256 a6a074d87a03b91924526465ea00233954176131297c1761473cd2a95f5f4b03
 EBUILD espeak-1.34.ebuild 1444 RMD160 89a0a076a2f29f7ec527483de104d2dd2a5924e5 SHA1 b544e649da200d5419106484abc4ecb545a6ff00 SHA256 b6d1672ebc161a0b4388f8e54804279eebeac723e3c223de0089de4525de073c
-MISC ChangeLog 4647 RMD160 a88f0b65f6f20e5e42f52e2323b60cd9bdd2fd14 SHA1 1ada8a9364016a4786420544bc53e6e9277aa4fb SHA256 77191a9e0469f07684044e4744355cb7bb4be26ea33fd1fb1200f72d84ad3e02
+EBUILD espeak-1.35.ebuild 1879 RMD160 aee8689dd9dff6be5c224e19a8c58df3ea5043b0 SHA1 e2cbb4c2b57cd07d8b5d8ae65aba8c8ad4a66e74 SHA256 fb415f3bc0133c3629cd4eb1626e5b3dab8269b63cf3b89ab305b3a80c26a699
+MISC ChangeLog 4802 RMD160 29a09c943f78ee8e2fd2b8b79fd7dfacf7e095ca SHA1 af416778d45ba17bc32f0541affe9d1bc71cbcdb SHA256 152fad4204fe9e0c32f8325a831d3e88fead02892062e2daf5792bff2e0ff982
 MISC metadata.xml 229 RMD160 7f8d6a0235529eccff705022803122c9534628d7 SHA1 2295356b566d60c8eb979db0e598de9d1d8ccf49 SHA256 b128d301356b3f98f1d6093b4401c36143ff55fc62636612567b0995739b9e66
diff --git a/app-accessibility/espeak/espeak-1.35.ebuild b/app-accessibility/espeak/espeak-1.35.ebuild
new file mode 100644
index 000000000000..2871f5dbdbb6
--- /dev/null
+++ b/app-accessibility/espeak/espeak-1.35.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/espeak-1.35.ebuild,v 1.1 2008/03/08 18:28:56 williamh Exp $
+
+inherit eutils
+
+MY_P="${P}-source"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
+DESCRIPTION="Speech synthesizer for English and other languages"
+HOMEPAGE="http://espeak.sourceforge.net/"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="portaudio pulseaudio"
+DEPEND="portaudio? ( >=media-libs/portaudio-18.1-r5 )
+	pulseaudio? ( media-sound/pulseaudio )
+	app-arch/unzip"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if ! use portaudio -a ! ! use pulseaudio; then
+		ewarn
+		ewarn Since portaudio and pulseaudio are not in your use flags, espeak
+		ewarn will only bbe able to create wav files.
+		ewarn If this is not what you want, press ctrl-c and put either
+		ewarn portaudio or pulseaudio in your use flags.
+		ebeep
+		epause 10
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	epatch "${FILESDIR}"/${P}-makefile.patch
+
+	# portaudio.h is by default the same as portaudio18.h, but use the version
+	# 19 API if available
+	if use portaudio; then
+		if has_version "=media-libs/portaudio-19*" ; then
+			mv -f "${S}/src/portaudio19.h" "${S}/src/portaudio.h"
+		fi
+	fi
+}
+
+src_compile() {
+	local MY_AUDIO
+
+	cd src
+
+	if use portaudio; then
+		MY_AUDIO=portaudio
+	elif use pulseaudio; then
+		MY_AUDIO=pulseaudio
+	fi
+
+	emake AUDIO="${MY_AUDIO}" CXXFLAGS="${CXXFLAGS}" || die "Compilation failed"
+
+	einfo "Fixing byte order of phoneme data files"
+	cd "${S}/platforms/big_endian"
+	make
+	./espeak-phoneme-data "${S}/espeak-data"
+	cp -f phondata phonindex phontab "${S}/espeak-data"
+}
+
+src_install() {
+	cd src
+	make DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)" install || die "Installation failed"
+
+	cd ..
+	dodoc ChangeLog ReadMe
+	dohtml -r docs/*
+}
diff --git a/app-accessibility/espeak/files/espeak-1.35-makefile.patch b/app-accessibility/espeak/files/espeak-1.35-makefile.patch
new file mode 100644
index 000000000000..85c43cf3bb1e
--- /dev/null
+++ b/app-accessibility/espeak/files/espeak-1.35-makefile.patch
@@ -0,0 +1,29 @@
+--- espeak-1.35-source/src/Makefile.orig	2008-03-08 12:05:29.000000000 -0600
++++ espeak-1.35-source/src/Makefile	2008-03-08 12:09:43.000000000 -0600
+@@ -61,14 +61,15 @@
+ OBJS3=$(patsubst %.cpp,%.o,$(SRCS3))
+ LIBS3=-lstdc++ -L . -lespeak
+ 
+-CXXFLAGS=-O2 -D$(USE_AUDIO)
++AUDIOFLAGS=-D$(USE_AUDIO)
++CXXFLAGS=-O2
+ 
+ 
+ all: $(BIN_NAME) $(LIB_NAME) $(STATIC_LIB_NAME) $(BIN2_NAME)
+ 	mv $(LIB_NAME) $(LIB_NAME).$(LIBTAG)
+ 
+ .cpp.o:
+-	$(CXX) $(CXXFLAGS) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -pedantic -I. -c -fno-exceptions  $<
++	$(CXX) $(CXXFLAGS) $(AUDIOFLAGS) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -pedantic -I. -c -fno-exceptions  $<
+ 
+ $(BIN_NAME): $(OBJS1)
+ 	$(CXX) -o $@ $(OBJS1) $(LIBS1)
+@@ -79,7 +80,7 @@
+ 
+ 
+ x_%.o: %.cpp
+-	$(CXX) $(CXXFLAGS) -Wall -fpic -pedantic \
++	$(CXX) $(CXXFLAGS) $(AUDIOFLAGS) -Wall -fpic -pedantic \
+ 	-I. -D LIBRARY -c -fno-exceptions  $<  -o x_$*.o
+ 
+ $(LIB_NAME): $(OBJS2)