Fixed the patchset for bug #307287.

This also includes the correct fixfor bug #307341.
Package-Manager: portage-2.2_rc63/cvs/Linux i686

5 files changed, 15 insertions, 38 deletions

diff --git a/app-accessibility/speech-dispatcher/ChangeLog b/app-accessibility/speech-dispatcher/ChangeLog
index 220d5b74f447..e4a26a56ed19 100644
--- a/app-accessibility/speech-dispatcher/ChangeLog
+++ b/app-accessibility/speech-dispatcher/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-accessibility/speech-dispatcher
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/ChangeLog,v 1.63 2010/03/01 22:12:37 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/ChangeLog,v 1.64 2010/03/02 05:15:02 williamh Exp $
+
+  02 Mar 2010; William Hubbs <williamh@gentoo.org>
+  speech-dispatcher-0.6.7.ebuild, speech-dispatcher-0.6.7-r1.ebuild,
+  -files/speech-dispatcher-mutils.patch:
+  Fixed the patchset for bug #307287.
+  This also includes the correct fixfor bug #307341.
 
   01 Mar 2010; Patrick Lauer <patrick@gentoo.org>
   speech-dispatcher-0.6.7-r1.ebuild:
diff --git a/app-accessibility/speech-dispatcher/Manifest b/app-accessibility/speech-dispatcher/Manifest
index 41987ed9bb81..ae1764e04489 100644
--- a/app-accessibility/speech-dispatcher/Manifest
+++ b/app-accessibility/speech-dispatcher/Manifest
@@ -1,14 +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-mutils.patch 788 RMD160 1da253a01055f61c386b7a4635bb352a70a3876b SHA1 f13ec5fe921b97e8251d0afc24ef4fb2bbf39d74 SHA256 966430a7ac84272f2b96aab816f8e338feebcdc617c96b54d2ddc5f20fe9ca78
 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-patches-1.tar.gz 1785 RMD160 d71fc375249b74dd10a45775a0426640727db97c SHA1 c34eca01fd5c0495051dc4f183338ddd049a665c SHA256 4c914c348cd46bc64f21d5b310c1873c4af7a0e633a96c35e4276cc921c9d3ae
+DIST speech-dispatcher-0.6.7-patches-2.tar.gz 2622 RMD160 128229772400a37f3afd8da7e7726139526beff9 SHA1 c90118c94a94f4017f76d5b9bf93235a1520a17e SHA256 4d356b3a23c386ec15d50acf6b5d7ce4a2994d2df08bd3521f6382a826010997
 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-r1.ebuild 1930 RMD160 5abdc973445cf1e015ce79b9b14c7f20b16d3bd5 SHA1 da831d5e79dfa93dbf5c819835eb71fb8791efc5 SHA256 cca4043cbb35961218a1d82baf350dece4502e1d63619f35217b12ffa6e19db7
-EBUILD speech-dispatcher-0.6.7.ebuild 1900 RMD160 2283c1c579204cbaf0597a8795122cbf9d5eebd6 SHA1 a438d7b53090389a0da02b5b0450ed7158e0f90f SHA256 0e4ef8f2cbec8918aa5f2e000f8d2b327fc73323f27c84b6425775bca5b469d9
-MISC ChangeLog 10704 RMD160 c0d32202367435375de18ac2e006ac969c08eb7b SHA1 1b69d947e7d63b5b045c29d9c0f6ae2a118768b4 SHA256 0b24bc46020acc26cbec881834465074c5a589f73065787d4afb5cddd80331c8
+EBUILD speech-dispatcher-0.6.7-r1.ebuild 1931 RMD160 3cea6706c5f8b8f0d148db3665a4d85593b35927 SHA1 183965a0f031c9f7537d3541b20b1fe3656b0c08 SHA256 a83bc16939cfb7d7a0adc7a1792a09b5e450dcfc00483df029b448bcb896c391
+EBUILD speech-dispatcher-0.6.7.ebuild 1900 RMD160 f42429a83e48ff488f2205850f94d36bc2461e2f SHA1 6d76521f8d348efd7226a2f6b126fe692cd7c5e5 SHA256 30d3ca813b1321af6544fc5e05c3f567fbf14c4888fc15294fb252dca433ab04
+MISC ChangeLog 10958 RMD160 eab2f1ab197fc287fc0232c8d272ab2231293bf3 SHA1 2cb409e75dffd133d12e94fa79f6bb21b99f5f85 SHA256 1b18364f1c5438f690e67da3403895463827d22579c8147209582a591b78969f
 MISC metadata.xml 391 RMD160 470dc37d4b091c32417820c9e60dd4a8646423c2 SHA1 b7f5b0ecdd4f5f6799676d34a56703bf924cf1a2 SHA256 189a78287c14ae09d0badf2a576e0d4830d0d55c1b6d343b378cf2f77d7f73f7
diff --git a/app-accessibility/speech-dispatcher/files/speech-dispatcher-mutils.patch b/app-accessibility/speech-dispatcher/files/speech-dispatcher-mutils.patch
deleted file mode 100644
index 517c1b753fc6..000000000000
--- a/app-accessibility/speech-dispatcher/files/speech-dispatcher-mutils.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/modules/module_utils.h  2008-07-30 10:53:07.000000000 +0200
-+++ src/modules/module_utils.h.new      2010-03-01 18:28:08.000000000 +0100
-@@ -420,9 +420,9 @@
-
-
-
--/* So that gcc doesn't complain */
-+/* So that gcc doesn't complain
- int getline(char**, size_t*, FILE*);
--
-+*/
- pthread_mutex_t module_stdout_mutex;
-
- int module_utils_init(void);
-
---- src/modules/module_main.c   2008-06-27 14:29:26.000000000 +0200
-+++ src/modules/module_main.c.new       2010-03-01 18:32:16.000000000 +0100
-@@ -21,8 +21,9 @@
-  * $Id: speech-dispatcher-mutils.patch,v 1.1 2010/03/01 21:05:52 patrick Exp $
-  */
-
--/* So that gcc doesn't comply */
-+/* So that gcc doesn't comply
- int getline(char**, size_t*, FILE*);
-+*/
-
- #define PROCESS_CMD(command, function) \
- if (!strcmp(cmd_buf, #command"\n")){ \
diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.7-r1.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.7-r1.ebuild
index 4e4b8d1a0d81..93b3edce879d 100644
--- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.7-r1.ebuild
+++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.7-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 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-r1.ebuild,v 1.6 2010/03/01 22:12:37 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.7-r1.ebuild,v 1.7 2010/03/02 05:15:02 williamh Exp $
 
 EAPI="3"
-PATCHVER=1
+PATCHVER=2
 
 inherit autotools eutils
 
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 f649e4e7ade0..86e453412f5f 100644
--- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.7.ebuild
+++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.7.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 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.19 2010/02/28 23:50:31 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.7.ebuild,v 1.20 2010/03/02 05:15:02 williamh Exp $
 
 EAPI="2"
-PATCHVER=1
+PATCHVER=2
 
 inherit autotools eutils