Chris Brannon, from upstream, provided a fix for bug #305347.

Also, I reverted the prefix changes since they
should have been done in an eapi bump/rev bump.
Package-Manager: portage-2.2_rc63/cvs/Linux i686

3 files changed, 15 insertions, 20 deletions

diff --git a/app-accessibility/speech-dispatcher/ChangeLog b/app-accessibility/speech-dispatcher/ChangeLog
index 40243f74e607..dfa4a22db59f 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.57 2010/02/23 15:08:46 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/ChangeLog,v 1.58 2010/02/28 22:31:53 williamh Exp $
+
+  28 Feb 2010; William Hubbs <williamh@gentoo.org>
+  speech-dispatcher-0.6.7.ebuild:
+  Chris Brannon, from upstream, provided a fix for bug #305347.
+  Also, I reverted the prefix changes.
+  These need to be done via an eapi bump and revbump.
 
   23 Feb 2010; Joseph Jezak <josejx@gentoo.org>
   speech-dispatcher-0.6.7.ebuild:
diff --git a/app-accessibility/speech-dispatcher/Manifest b/app-accessibility/speech-dispatcher/Manifest
index 64e3ac2964f5..3eef18c3fdf0 100644
--- a/app-accessibility/speech-dispatcher/Manifest
+++ b/app-accessibility/speech-dispatcher/Manifest
@@ -1,22 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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
 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.tar.gz 1148 RMD160 4f7acc4f84d49baf8c98fbf083425e2e2b942875 SHA1 cee28bdc2beb948eb9e1d90fc2d7226b01eabd36 SHA256 bbf6cef610a4b072f771316666c59629e4e54fd0282a24add0903ee873b0478c
+DIST speech-dispatcher-0.6.7-patches-1.tar.gz 1785 RMD160 d71fc375249b74dd10a45775a0426640727db97c SHA1 c34eca01fd5c0495051dc4f183338ddd049a665c SHA256 4c914c348cd46bc64f21d5b310c1873c4af7a0e633a96c35e4276cc921c9d3ae
 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 1936 RMD160 d86b8748357f380170a19fa1c3d39a87bb4d73d4 SHA1 7541b4127b90064c02a5c62eddbc4d8a93437648 SHA256 e444b819dcd908a3a786b4e4f0da47f19a6f81b7b13e29ef78f82413bfc2be57
-MISC ChangeLog 9818 RMD160 5bd5b1e19edeadc247044dc980c98844dfb28c89 SHA1 2e6c000ee55eae7eaab526c0a414eb193389da31 SHA256 7a6cb2c04810b1dd37043e8f46b18f5e8472646f3bd402a52f9c38592cd42bb0
+EBUILD speech-dispatcher-0.6.7.ebuild 1899 RMD160 0fdd8ce9bcfe359aef72b27e9a720385e27c3702 SHA1 7ea6f971dc790070ae29902766b6dce96cf6b8fa SHA256 a2beb6042a72b423bb95c7cf50de32ad7058fafa6848283275210729958f2681
+MISC ChangeLog 10063 RMD160 45be1d5879766bc6e2199781b3d1abf6393b62c2 SHA1 a1101951d342f7b36820de32caba9f620e4b5316 SHA256 3955b46aa605b1f46b0812364b00de1eaed85035913c2f9351b461812fe404ae
 MISC metadata.xml 391 RMD160 470dc37d4b091c32417820c9e60dd4a8646423c2 SHA1 b7f5b0ecdd4f5f6799676d34a56703bf924cf1a2 SHA256 189a78287c14ae09d0badf2a576e0d4830d0d55c1b6d343b378cf2f77d7f73f7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuD7zkACgkQcsIHjyDViGRdmwCbBf1RjqV3ANmnj7IYHGYtITYJ
-StoAoI0QIlDJLtjRgdpuK9qsl40Doeoa
-=tgQ3
------END PGP SIGNATURE-----
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 31608beea413..cf5357a2106e 100644
--- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.7.ebuild
+++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.7.ebuild
@@ -1,19 +1,20 @@
 # 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.17 2010/02/23 15:08:46 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.7.ebuild,v 1.18 2010/02/28 22:31:53 williamh Exp $
 
 EAPI="2"
+PATCHVER=1
 
 inherit autotools eutils
 
 DESCRIPTION="speech-dispatcher speech synthesis interface"
 HOMEPAGE="http://www.freebsoft.org/speechd"
 SRC_URI="http://www.freebsoft.org/pub/projects/speechd/${P}.tar.gz
-	mirror://gentoo/${P}-patches.tar.gz"
+	mirror://gentoo/${P}-patches-${PATCHVER}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~hppa ppc ~ppc64 sparc x86"
 IUSE="alsa +espeak flite nas pulseaudio python"
 
 RDEPEND="dev-libs/dotconf
@@ -64,13 +65,11 @@ src_install() {
 }
 
 pkg_postinst() {
-	use prefix || EPREFIX=
-
 	if ! use espeak; then
 		ewarn
 		ewarn "You have disabled espeak, which is speech-dispatcher's"
 		ewarn "default speech synthesizer."
-		ewarn "You must edit ${ROOT%/}${EPREFIX}/etc/speechd/speechd.conf"
+		ewarn "You must edit ${ROOT}etc/speechd/speechd.conf"
 	fi
 	elog
 	elog "To enable Festival support, you must install app-accessibility/festival-freebsoft-utils."