Fix building with glibc-2.10+ wrt #271607, thanks to hirakendu.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 37 insertions, 10 deletions

diff --git a/app-accessibility/speech-tools/ChangeLog b/app-accessibility/speech-tools/ChangeLog
index 50036488d0ec..5bd35045c171 100644
--- a/app-accessibility/speech-tools/ChangeLog
+++ b/app-accessibility/speech-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-accessibility/speech-tools
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/ChangeLog,v 1.63 2009/05/12 17:14:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/ChangeLog,v 1.64 2009/07/23 16:49:06 ssuominen Exp $
+
+  23 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  speech-tools-1.2.96_beta.ebuild,
+  +files/speech-tools-1.2.96_beta-gcc44.patch:
+  Fix building with glibc-2.10+ wrt #271607, thanks to hirakendu.
 
   12 May 2009; Samuli Suominen <ssuominen@gentoo.org>
   speech-tools-1.2.96_beta.ebuild:
diff --git a/app-accessibility/speech-tools/Manifest b/app-accessibility/speech-tools/Manifest
index d4eb9a44df48..0c0a705b01da 100644
--- a/app-accessibility/speech-tools/Manifest
+++ b/app-accessibility/speech-tools/Manifest
@@ -1,6 +1,7 @@
 AUX speech-tools-1.2.96_beta-gcc42.patch 2203 RMD160 c2bb3d7cec0c9449b4480a45675057acc4a8ef8c SHA1 3cf29f9dcb9fdfd90249003b7eca9d71a88b8219 SHA256 4bc724774e4223448bb1bbd202fe6055580abd62d11ffab470843e1351c45e9e
 AUX speech-tools-1.2.96_beta-gcc43-include.patch 878 RMD160 fb89c84949548cfdc49ddff50a7129ea63dc9b2d SHA1 afb2ecfacc123411acb7e82ae9b7c707bd32b922 SHA256 dd050d6556b484ecd494dd080c8b917fcc08c264260c4850d5392986f492febe
+AUX speech-tools-1.2.96_beta-gcc44.patch 579 RMD160 389950e6e9e8444acfaa7c647519cf488d38e89c SHA1 3389cad0757b5239be7caba00d412c625e3e49d0 SHA256 720cb246c3845779291038e945e09024370b3478d3e84416886efb9263f490bf
 DIST speech_tools-1.2.96-beta.tar.gz 1275015 RMD160 3d2acc841a8b14e0bff66c9bb08293206f501a7a SHA1 7f208863833a7e7ea4838e0f0f04a4881b32cf56 SHA256 fa1ce5698e1253ee21e67629f394733ef6ad578af671e3a90ea8b73898a12428
-EBUILD speech-tools-1.2.96_beta.ebuild 2793 RMD160 809f8514e24f8ccac5d59bf635cccb110ecad107 SHA1 175049e5a1a1faf8913e25f1d614dcb14f8a55f8 SHA256 d98d7e6bf25005e52c2ad94ea3c642ba619b52f5c4b41834ed0ddd4b4b25eca7
-MISC ChangeLog 10085 RMD160 9a76bea97effd069f6848b1d822d7d25ad225ab7 SHA1 6e9d6f144e128d7e3e5802610a37f0fe0847dc63 SHA256 84f024bd74fb249afc2513d4394eab0c933355e09ade4311ed2885cf1334491e
+EBUILD speech-tools-1.2.96_beta.ebuild 2801 RMD160 4d69f662118f44891e82e5a1d9baae38b3b074aa SHA1 4e366f2228e6892b370d5444913c5fd527e7c567 SHA256 9f87ae7a32433603744490de14c1bba8ae2fd2289d779a9b47e6eccc98caa297
+MISC ChangeLog 10288 RMD160 a4a7c448300209240d63374f3f766d1968ffe414 SHA1 a14eb25f4ea5c42b65e11fa5a6addbc11f5336c5 SHA256 33c0c6e6035d53b24e534578fc7c11226b9685933cc93757cd5ccb40753eac2f
 MISC metadata.xml 249 RMD160 b4704f1b46f70badf05ac1549e9feaf260041a08 SHA1 901e48e020cb6dcb722212410e1ac34212e87cf0 SHA256 7bce1abcec735751c95b28394f348e421b525ead1ba86638fc5f884217cdb49a
diff --git a/app-accessibility/speech-tools/files/speech-tools-1.2.96_beta-gcc44.patch b/app-accessibility/speech-tools/files/speech-tools-1.2.96_beta-gcc44.patch
new file mode 100644
index 000000000000..98f8fda2f7ca
--- /dev/null
+++ b/app-accessibility/speech-tools/files/speech-tools-1.2.96_beta-gcc44.patch
@@ -0,0 +1,21 @@
+--- speech_tools/speech_class/EST_wave_io.cc.orig	2009-05-26 03:49:24.000000000 -0700
++++ speech_tools/speech_class/EST_wave_io.cc	2009-05-26 03:54:01.000000000 -0700
+@@ -68,7 +68,7 @@
+ 
+ int nist_get_param_int(const char *hdr, const char *field, int def_val)
+ {
+-    char *p;
++    const char *p;
+     int val;
+ 
+     if (((p=strstr(hdr,field)) != NULL) &&
+@@ -84,7 +84,8 @@
+ 
+ char *nist_get_param_str(const char *hdr, const char *field, const char *def_val)
+ {
+-    char *p,*val;
++    const char *p;
++    char *val;
+     int size;
+ 
+     if (((p=strstr(hdr,field)) != NULL) &&
diff --git a/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild b/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild
index 1d55940c53f2..b7205e637b37 100644
--- a/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild,v 1.13 2009/05/12 17:14:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild,v 1.14 2009/07/23 16:49:06 ssuominen Exp $
 
 inherit eutils toolchain-funcs
 
@@ -15,23 +15,23 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="esd nas X"
 
-DEPEND="esd? ( media-sound/esound )
+RDEPEND="esd? ( media-sound/esound )
 	nas? ( media-libs/nas )
 	X? ( x11-libs/libX11
 		x11-libs/libXt )
 	!<app-accessibility/festival-1.96_beta
 	!sys-power/powerman"
+DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/speech_tools"
+S=${WORKDIR}/speech_tools
 
 src_unpack() {
 	local CONFIG=${S}/config/config.in
-
 	unpack ${A}
 
-	# apply patches for gcc 4.2 and gcc 4.3
-	epatch "${FILESDIR}"/${P}-gcc42.patch
-	epatch "${FILESDIR}"/${P}-gcc43-include.patch
+	epatch "${FILESDIR}"/${P}-gcc42.patch \
+		"${FILESDIR}"/${P}-gcc43-include.patch \
+		"${FILESDIR}"/${P}-gcc44.patch
 
 # set compiler flags for base_class
 	sed -i -e "s:-O3:\$(OPTIMISE_CXXFLAGS):" "${S}"/base_class/Makefile