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

Package-Manager: portage-2.1.2.10

5 files changed, 101 insertions, 6 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/Manifest b/app-accessibility/espeak/Manifest
index 00710e2c114d..cfd49d3c977d 100644
--- a/app-accessibility/espeak/Manifest
+++ b/app-accessibility/espeak/Manifest
@@ -18,6 +18,10 @@ AUX espeak-1.22-makefile.patch 463 RMD160 83ce4fcfe3d5bba083481d4c73dc7793779d57
 MD5 ebe5c5f7a31e5b55de32409d25543aae files/espeak-1.22-makefile.patch 463
 RMD160 83ce4fcfe3d5bba083481d4c73dc7793779d57aa files/espeak-1.22-makefile.patch 463
 SHA256 f6ecd6298e5e6a8228dd60170e45f27b6877bb9823e032c31a21a77471f547cc files/espeak-1.22-makefile.patch 463
+AUX espeak-1.26-ppc64-segfault.patch 339 RMD160 9c6beec017cc25db37a4b7414833f03caa59a036 SHA1 5f81dbaf375b0d70897cedc4af32a3a72aa11ef1 SHA256 ecbdd55d58a4f4d6dceb315ed82d0ba64de76582417662909b45143059d0e566
+MD5 56e4e885f112684eb3d95c4588fff1e2 files/espeak-1.26-ppc64-segfault.patch 339
+RMD160 9c6beec017cc25db37a4b7414833f03caa59a036 files/espeak-1.26-ppc64-segfault.patch 339
+SHA256 ecbdd55d58a4f4d6dceb315ed82d0ba64de76582417662909b45143059d0e566 files/espeak-1.26-ppc64-segfault.patch 339
 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
@@ -40,14 +44,18 @@ EBUILD espeak-1.25.ebuild 1430 RMD160 96cda6c30d937e33472ea36396720cfca2690228 S
 MD5 db17025dc0cdced46dd2138bd7e34a78 espeak-1.25.ebuild 1430
 RMD160 96cda6c30d937e33472ea36396720cfca2690228 espeak-1.25.ebuild 1430
 SHA256 727e1cb535d1952a8ab0b741b4388f594dc2f0434659c6deeba34abbfbf2b3c2 espeak-1.25.ebuild 1430
+EBUILD espeak-1.26-r1.ebuild 1503 RMD160 18ffd2a337598adaccfe885a05820d7b33c5df33 SHA1 85ae00851fe09e351d03b295e08282e9bce20e28 SHA256 60d56c3a49dd8628d22936902589552d2f04586c6ea59547e127fd9d79457940
+MD5 bc3e7e1d68f8084f91e85ca65bd570ff espeak-1.26-r1.ebuild 1503
+RMD160 18ffd2a337598adaccfe885a05820d7b33c5df33 espeak-1.26-r1.ebuild 1503
+SHA256 60d56c3a49dd8628d22936902589552d2f04586c6ea59547e127fd9d79457940 espeak-1.26-r1.ebuild 1503
 EBUILD espeak-1.26.ebuild 1433 RMD160 ad7051defdee78c28afd991297d35de18077884a SHA1 b07daa5ee490a4eba16c24f4d79583da09303977 SHA256 f06a3869dbf6cbe01dd1807ce11e49265f9404da7be7dfdefd060ed27e467890
 MD5 09c1211e2d60fa82f362e345331e9c30 espeak-1.26.ebuild 1433
 RMD160 ad7051defdee78c28afd991297d35de18077884a espeak-1.26.ebuild 1433
 SHA256 f06a3869dbf6cbe01dd1807ce11e49265f9404da7be7dfdefd060ed27e467890 espeak-1.26.ebuild 1433
-MISC ChangeLog 3009 RMD160 b00973298fb24dd96168ad239f17b52ed0d03f0c SHA1 13b0999c1146ae1784f16411c880ddcef83de5d4 SHA256 0697f1d211f483edacb9aa1dcde43ef18f017f8c5bcb93b6b8dc54736cae232c
-MD5 5c010be65414f5dbe8de7b767017034a ChangeLog 3009
-RMD160 b00973298fb24dd96168ad239f17b52ed0d03f0c ChangeLog 3009
-SHA256 0697f1d211f483edacb9aa1dcde43ef18f017f8c5bcb93b6b8dc54736cae232c ChangeLog 3009
+MISC ChangeLog 3217 RMD160 f7eee20aac63d913974fe44826743186faad933b SHA1 9f6f75c25837009b7112b4732bea71928d989175 SHA256 f55687972cc20691e66950f772e2b4aa6a118c667f828d9a289b3007bed1ec1d
+MD5 985cf05c3cf97bdf35d3b0cecf33ba51 ChangeLog 3217
+RMD160 f7eee20aac63d913974fe44826743186faad933b ChangeLog 3217
+SHA256 f55687972cc20691e66950f772e2b4aa6a118c667f828d9a289b3007bed1ec1d ChangeLog 3217
 MISC metadata.xml 229 RMD160 7f8d6a0235529eccff705022803122c9534628d7 SHA1 2295356b566d60c8eb979db0e598de9d1d8ccf49 SHA256 b128d301356b3f98f1d6093b4401c36143ff55fc62636612567b0995739b9e66
 MD5 82235b237bf37d432e6987e3be2235d1 metadata.xml 229
 RMD160 7f8d6a0235529eccff705022803122c9534628d7 metadata.xml 229
@@ -67,3 +75,6 @@ SHA256 dde8018b417345565018839fc4abe30de02fd3274b76bf483ad2292e0b50e897 files/di
 MD5 82bb2067c5eb0e1695947a8df7a165f3 files/digest-espeak-1.26 247
 RMD160 e82d2d3af1f5baccaa667f1743cfc9f141aef9e7 files/digest-espeak-1.26 247
 SHA256 734bbc867abf1f29a8cdd87aab016d061ea4e435f075244ed59d1dd6ab4c1265 files/digest-espeak-1.26 247
+MD5 82bb2067c5eb0e1695947a8df7a165f3 files/digest-espeak-1.26-r1 247
+RMD160 e82d2d3af1f5baccaa667f1743cfc9f141aef9e7 files/digest-espeak-1.26-r1 247
+SHA256 734bbc867abf1f29a8cdd87aab016d061ea4e435f075244ed59d1dd6ab4c1265 files/digest-espeak-1.26-r1 247
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);
+ }