Rev bump to fix a seg fault on ppc64 for bug #163285.

(Portage version: 2.1.2.10)

4 files changed, 86 insertions, 2 deletions

diff --git a/app-accessibility/espeak/ChangeLog b/app-accessibility/espeak/ChangeLog
index cc5367bb4799..8f3a006b293e 100644
--- a/app-accessibility/espeak/ChangeLog
+++ b/app-accessibility/espeak/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-accessibility/espeak
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/ChangeLog,v 1.17 2007/06/09 02:10:02 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/ChangeLog,v 1.18 2007/06/10 02:22:49 williamh Exp $
+
+*espeak-1.26-r1 (10 Jun 2007)
+
+  10 Jun 2007; William Hubbs <williamh@gentoo.org>
+  +files/espeak-1.26-ppc64-segfault.patch, +espeak-1.26-r1.ebuild:
+  Rev bump to fix a seg fault on ppc64 for bug #163285.
 
 *espeak-1.26 (09 Jun 2007)
 
@@ -74,7 +80,7 @@
   New release, as required by the latest gnome-speech. Honour CXXFLAGS. Use
   the Makefile to install instead of doing it manually.
 
-  06 Nov 2006; Piotr Jaroszyński <peper@gentoo.org> espeak-1.16.ebuild:
+  06 Nov 2006; Piotr Jaroszyński <peper@gentoo.org> espeak-1.16.ebuild:
   Add ~amd64 wrt bug #154245.
 
 *espeak-1.16 (29 Oct 2006)
diff --git a/app-accessibility/espeak/espeak-1.26-r1.ebuild b/app-accessibility/espeak/espeak-1.26-r1.ebuild
new file mode 100644
index 000000000000..46da289642da
--- /dev/null
+++ b/app-accessibility/espeak/espeak-1.26-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/espeak-1.26-r1.ebuild,v 1.1 2007/06/10 02:22:49 williamh Exp $
+
+inherit eutils
+
+MY_P="${P}-source"
+
+DESCRIPTION="Speech synthesizer for English and other languages"
+HOMEPAGE="http://espeak.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=media-libs/portaudio-18.1-r5
+	app-arch/unzip"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# portaudio.h is by default the same as portaudio18.h, but use the version
+	# 19 API if available
+	if has_version "=media-libs/portaudio-19*" ; then
+		mv -f "${S}/src/portaudio19.h" "${S}/src/portaudio.h"
+	fi
+
+	# Add a patch for a segfault on ppc64.
+	epatch ${FILESDIR}/${P}-ppc64-segfault.patch
+}
+
+src_compile() {
+	cd src
+	emake CXXFLAGS="${CXXFLAGS}" || die "Compilation failed"
+
+	einfo "Fixing byte order of phoneme data files"
+	cd ../big_endian
+	make
+	./espeak-phoneme-data "${S}/espeak-data"
+	cp -f phondata phonindex phontab "${S}/espeak-data"
+
+	einfo "Compiling dict files"
+	cd ../dictsource
+	export HOME="${S}"
+	local lang
+	for l in *_rules; do
+		lang=${l/_rules/}
+		${S}/src/speak --compile=$lang
+	done
+}
+
+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/digest-espeak-1.26-r1 b/app-accessibility/espeak/files/digest-espeak-1.26-r1
new file mode 100644
index 000000000000..3d11813cbe73
--- /dev/null
+++ b/app-accessibility/espeak/files/digest-espeak-1.26-r1
@@ -0,0 +1,3 @@
+MD5 dd2fc77a5b4ebdb204cf73f36c62ad01 espeak-1.26-source.zip 954674
+RMD160 256c2c63b0e934b23037ce7994870b3135d6d630 espeak-1.26-source.zip 954674
+SHA256 4c915f4fe9e37fb73b2241785ff8197cd9a3e5cae79bc9218d4866322fd0c438 espeak-1.26-source.zip 954674
diff --git a/app-accessibility/espeak/files/espeak-1.26-ppc64-segfault.patch b/app-accessibility/espeak/files/espeak-1.26-ppc64-segfault.patch
new file mode 100644
index 000000000000..d27e5e8baf08
--- /dev/null
+++ b/app-accessibility/espeak/files/espeak-1.26-ppc64-segfault.patch
@@ -0,0 +1,11 @@
+--- src/speak_lib.cpp	2007-06-09 16:56:51.000000000 -0500
++++ src/speak_lib.cpp	2007-06-09 17:02:19.000000000 -0500
+@@ -264,7 +264,7 @@
+ char *Alloc(int size)
+ {//==================
+ 	char *p;
+-	if((p = (char *)malloc(size)) == NULL)
++	if((p = (char *)malloc(size+1)) == NULL)
+ 		fprintf(stderr,"Can't allocate memory\n");
+ 	return(p);
+ }