another fix for 281130.

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

5 files changed, 74 insertions, 6 deletions

diff --git a/app-accessibility/speech-dispatcher/ChangeLog b/app-accessibility/speech-dispatcher/ChangeLog
index 166000f6e541..78609a4957c5 100644
--- a/app-accessibility/speech-dispatcher/ChangeLog
+++ b/app-accessibility/speech-dispatcher/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-accessibility/speech-dispatcher
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/ChangeLog,v 1.47 2009/09/06 20:32:06 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/ChangeLog,v 1.48 2009/09/07 19:34:48 williamh Exp $
+
+  07 Sep 2009; William Hubbs <williamh@gentoo.org>
+  speech-dispatcher-0.6.7.ebuild,
+  +files/speech-dispatcher-0.6.7-getline.patch,
+  +files/speech-dispatcher-0.6.7-gnu-src-modules.patch:
+  Another update for bug #281130.
+  This fixes the compile warnings on a glibc 2.9 system and should fix the
+  build
+  for glibc 2.10 systems.
 
   06 Sep 2009; William Hubbs <williamh@gentoo.org>
   speech-dispatcher-0.6.7.ebuild:
diff --git a/app-accessibility/speech-dispatcher/Manifest b/app-accessibility/speech-dispatcher/Manifest
index 0a3dd61e69f5..43389905b5f7 100644
--- a/app-accessibility/speech-dispatcher/Manifest
+++ b/app-accessibility/speech-dispatcher/Manifest
@@ -1,11 +1,13 @@
 AUX speech-dispatcher 670 RMD160 ed69fcbfad2cd63dd41b6ef6077eea6aede14483 SHA1 029059d50e6b0b55120d1bb393abec33fca181c4 SHA256 754aa3810c448804b1693036a46c31375165d7d37abd654a23b85c18c9d78adb
 AUX speech-dispatcher-0.6.6-festival-fix-formats.patch 649 RMD160 b0a6b499fcff625076b6a487ce140cc93f85ce8b SHA1 543edd3935539be4e3434015e42ac0a6d7ccb500 SHA256 b4c6e0a8af70001e234086d9494a32a3d76f53f642cf163f722454cf5ae2a575
+AUX speech-dispatcher-0.6.7-getline.patch 1152 RMD160 562fb1ad3b7eb5e1fdfe49bab941536bf474e793 SHA1 00fc67e39af4c2c2066b8c38df6060ad7be1d444 SHA256 0766f4b9e2c9d8f0ca0443ca03a733b4a719876c951e99508a55565c23483271
+AUX speech-dispatcher-0.6.7-gnu-src-modules.patch 914 RMD160 c0dfe39b367a557414b3efd94a0907634c925c9a SHA1 5a500cbfa0c89a97fccc07281db7233a4c0a52a7 SHA256 3a31a78903ca08733433c1168d009f95c1cd49c001763b44ea2d85cee92beec3
 DIST speech-dispatcher-0.6.5.tar.gz 1025229 RMD160 0f7cfd00c24e01b83ae6d51594bca965a7aaca62 SHA1 5f2cd4964bf96e49e41bc6fe908f8f482f9ea0e7 SHA256 e57a42094002c39a733b66198d4fcb869845614842f02275c2984e29c4d9654d
 DIST speech-dispatcher-0.6.6.tar.gz 1038719 RMD160 2925de539cfb59f9eaa0095188166623bc65e15c SHA1 e78bbe8f70ffe95dbe75f99b96c8a47a563d879a SHA256 c664ee801d1bc0500ae75739fa98bcc8ad410474c98a6757d3d1ee24a8241462
 DIST speech-dispatcher-0.6.7.tar.gz 1186677 RMD160 8527d83927c7827e67c91938a28a15084c693d99 SHA1 00fe5051930a00c2bcdf67683410beedfa066d4e SHA256 3b5c8b9df90f8e2069c92e1e0d9760c9b940aaec9994491a9e255c892e62434b
 EBUILD speech-dispatcher-0.6.5.ebuild 1527 RMD160 48d556189049167d5371ad629860b6fb9a0aa10a SHA1 030ffcd7558552f04c03f566b3db0ea2e8a9c567 SHA256 e91c3ca2ce625257b6c27001ccc3de4e5a3bfe4071c5be128cea5f3dcff41e06
 EBUILD speech-dispatcher-0.6.6-r1.ebuild 1585 RMD160 1c1f331ffc8a3b864b90ef793f7f0d4bb40d80e4 SHA1 a102bfbfc6f4760bb7ab4044d5586ec74f98abfc SHA256 bac2b8ecf7e79831cb1b4a427af580b40b0aa8b483c8c5bf97fe8912af86918a
 EBUILD speech-dispatcher-0.6.6.ebuild 1522 RMD160 18db70181df317fecb75aaa3421aa81afc5b1a86 SHA1 81ccf637a6a7ad488420b20e8fdf5a6892044685 SHA256 bf426e7e1f0f2a5a0b4ace32b276faa87d8a2b74e0ac98ce5e9b471b2e60f7c7
-EBUILD speech-dispatcher-0.6.7.ebuild 1806 RMD160 9b9c72abb57a5f239e1f12c5a51aff831d5cf1e3 SHA1 29f0b91ca37cf9f40a23146346f605279a9d7ee6 SHA256 6584ff9f843594a5b3d6ac2b841d5256b4bc204025990e1f388d1c5695ac8272
-MISC ChangeLog 8208 RMD160 a942a74d4c019a599f2867336de05c4a14369e15 SHA1 86a6c484fe81a9418845a96ed2a1dced7a7c0ec9 SHA256 bb9462e2238fe0abc9a6b6b744af9c430cbc6d3c10ac1910cbddbba64a7b705b
+EBUILD speech-dispatcher-0.6.7.ebuild 1897 RMD160 39fe4ae498ff52f628c96327026dcef4abe7d229 SHA1 7cacdb3863c2f44b8a96827f1fd8b7f71705c58b SHA256 746ef255285a7b0b45d6930880f2d0dd542890956ff59d89e3ce65890fa101fc
+MISC ChangeLog 8541 RMD160 e1c5e64e1ae5746fa24583357109bd003cdb5b06 SHA1 d03e5bc979f5f775782e493dad5e848ac82d3c26 SHA256 112a5859885c98462948067153273d2e702e6ef525d49a70019c449fe4bc8f7f
 MISC metadata.xml 391 RMD160 470dc37d4b091c32417820c9e60dd4a8646423c2 SHA1 b7f5b0ecdd4f5f6799676d34a56703bf924cf1a2 SHA256 189a78287c14ae09d0badf2a576e0d4830d0d55c1b6d343b378cf2f77d7f73f7
diff --git a/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.6.7-getline.patch b/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.6.7-getline.patch
new file mode 100644
index 000000000000..e81f695cf6fa
--- /dev/null
+++ b/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.6.7-getline.patch
@@ -0,0 +1,41 @@
+From f0c490dc160f04cb9f258e0639944cffc1df9a40 Mon Sep 17 00:00:00 2001
+From: root <root@christoph.(none)>
+Date: Tue, 11 Aug 2009 20:39:24 +0200
+Subject: [PATCH] Fix build with recent gcc
+
+---
+ src/modules/module_main.c  |    3 ---
+ src/modules/module_utils.h |    3 ---
+ 2 files changed, 0 insertions(+), 6 deletions(-)
+
+diff --git a/src/modules/module_main.c b/src/modules/module_main.c
+index 2732cff..5bb5769 100644
+--- a/src/modules/module_main.c
++++ b/src/modules/module_main.c
+@@ -21,9 +21,6 @@
+  * $Id: speech-dispatcher-0.6.7-getline.patch,v 1.1 2009/09/07 19:34:47 williamh Exp $
+  */
+ 
+-/* So that gcc doesn't comply */
+-int getline(char**, size_t*, FILE*);
+-
+ #define PROCESS_CMD(command, function) \
+ if (!strcmp(cmd_buf, #command"\n")){ \
+  char *msg; \
+diff --git a/src/modules/module_utils.h b/src/modules/module_utils.h
+index e33865a..70e6241 100644
+--- a/src/modules/module_utils.h
++++ b/src/modules/module_utils.h
+@@ -420,9 +420,6 @@ void module_report_event_pause(void);
+ 
+ 
+ 
+-/* So that gcc doesn't complain */
+-int getline(char**, size_t*, FILE*);
+-
+ pthread_mutex_t module_stdout_mutex;
+ 
+ int module_utils_init(void);
+-- 
+1.6.4
+
diff --git a/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.6.7-gnu-src-modules.patch b/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.6.7-gnu-src-modules.patch
new file mode 100644
index 000000000000..e13f6b9136b1
--- /dev/null
+++ b/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.6.7-gnu-src-modules.patch
@@ -0,0 +1,13 @@
+diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
+index 579dbb8..06e3e16 100644
+--- a/src/modules/Makefile.am
++++ b/src/modules/Makefile.am
+@@ -7,7 +7,7 @@ SNDFILE_LIBS = @SNDFILE_LIBS@
+ 
+ EXTRA_DIST = module_main.c module_utils_addvoice.c festival_client.c festival_client.h ivona_client.c dummy.c dummy-message.wav
+ 
+-AM_CFLAGS = -Wall -DLOCALEDIR=\"$(localedir)\" -DDATADIR=\"$(snddatadir)\" -I/usr/include/ $(inc_local) @glib_include@ -L$(top_srcdir)/src/audio -I$(top_srcdir)/src/audio -I../../intl/ $(ibmtts_include) @SNDFILE_CFLAGS@ -Wl,--rpath -Wl,$(spdlibdir)
++AM_CFLAGS = -Wall -DLOCALEDIR=\"$(localedir)\" -DDATADIR=\"$(snddatadir)\" -I/usr/include/ $(inc_local) @glib_include@ -L$(top_srcdir)/src/audio -I$(top_srcdir)/src/audio -I../../intl/ $(ibmtts_include) @SNDFILE_CFLAGS@ -Wl,--rpath -Wl,$(spdlibdir) -D_GNU_SOURCE
+ 
+ modulebin_PROGRAMS = sd_dummy sd_generic sd_festival sd_cicero
+ 
diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.7.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.7.ebuild
index 67310ba4baae..a6207f95c1cf 100644
--- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.7.ebuild
+++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.7.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.7.ebuild,v 1.7 2009/09/06 20:32:06 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.7.ebuild,v 1.8 2009/09/07 19:34:48 williamh Exp $
 
 EAPI="2"
 
-inherit eutils flag-o-matic
+inherit autotools eutils
 
 DESCRIPTION="speech-dispatcher speech synthesis interface"
 HOMEPAGE="http://www.freebsoft.org/speechd"
@@ -27,19 +27,22 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-getline.patch
+	epatch "${FILESDIR}"/${P}-gnu-src-modules.patch
+	eautoreconf
 	sed -i -e 's/\(SUBDIRS.*\)python/\1/' src/Makefile.in
 }
 
 src_configure() {
 	econf \
 	$(use_with alsa) \
+	$(use_with espeak) \
 	$(use_with flite) \
 	$(use_with pulseaudio pulse) \
 	$(use_with nas) || die "configure failed"
 }
 
 src_compile() {
-	append-cppflags -D_GNU_SOURCE
 	make all || die "make failed"
 }