update for bug 281130.

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

4 files changed, 33 insertions, 14 deletions

diff --git a/app-accessibility/speech-dispatcher/ChangeLog b/app-accessibility/speech-dispatcher/ChangeLog
index bee38c24a7d3..1dc6dfe4d918 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/ChangeLog,v 1.45 2009/09/04 13:56:54 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/ChangeLog,v 1.46 2009/09/06 19:35:28 williamh Exp $
+
+  06 Sep 2009; William Hubbs <williamh@gentoo.org>
+  speech-dispatcher-0.6.7.ebuild, metadata.xml:
+  Update for bug #281130.
+  - I added -D_GNU_SOURCE to the cppflags as suggested by vapier.
+  - I also added support for the espeak use flag.
 
   04 Sep 2009; William Hubbs <williamh@gentoo.org>
   -files/speech-dispatcher-0.6.7-glibc-2.10.patch:
diff --git a/app-accessibility/speech-dispatcher/Manifest b/app-accessibility/speech-dispatcher/Manifest
index 83d717bf16ff..d28e46b42fe1 100644
--- a/app-accessibility/speech-dispatcher/Manifest
+++ b/app-accessibility/speech-dispatcher/Manifest
@@ -6,6 +6,6 @@ DIST speech-dispatcher-0.6.7.tar.gz 1186677 RMD160 8527d83927c7827e67c91938a28a1
 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 1541 RMD160 d60b91a0bb4f43432531d69f666b76d24ac33ed1 SHA1 62cc2aa4008456586fac629722ce0dd54768ac5e SHA256 04b0d031565f391ec3f9998a2e31c4a850f372ec77255f120b4dcef1d7cb5339
-MISC ChangeLog 7855 RMD160 7813e5a06c6942c25aac4b239a8861dd5a377f16 SHA1 3b9fe0e154309848d9c5740cd97ac7cea1d9e0f8 SHA256 04c79a2567144e0306519cd4bbff4eea4c31af8c055500502ddad5f1dcb80bb6
-MISC metadata.xml 325 RMD160 3a322d53f836e09fc3105967dcc0a14c750dd302 SHA1 6845001c43b41645a4e7598572a277b80cf3dbb6 SHA256 68705cf9e114020bf761facbfb8e6bcacf1a8ac32c4d7f65a82c349b5e834426
+EBUILD speech-dispatcher-0.6.7.ebuild 1850 RMD160 7faeeefa833461696f7729ff0e135767fc9ba618 SHA1 bb326dc1699adb607f7ef16389ffbe123eac7129 SHA256 e5e4378f3aacb4550013494fd1b6cb0f264e0fcd58d486faae87cde52f1c641e
+MISC ChangeLog 8097 RMD160 4b87303a9f6ee4c80d4a1d17d0da2eb0de0becaa SHA1 730bfaa339eeb87b603bbf7225584b1acacf36ad SHA256 7bd0de30939def14886c0121e4d30c3e76e96e593759ca8bdcc5a3cdeeeb006a
+MISC metadata.xml 391 RMD160 470dc37d4b091c32417820c9e60dd4a8646423c2 SHA1 b7f5b0ecdd4f5f6799676d34a56703bf924cf1a2 SHA256 189a78287c14ae09d0badf2a576e0d4830d0d55c1b6d343b378cf2f77d7f73f7
diff --git a/app-accessibility/speech-dispatcher/metadata.xml b/app-accessibility/speech-dispatcher/metadata.xml
index b9b5ca12307f..64fdbe0bae0d 100644
--- a/app-accessibility/speech-dispatcher/metadata.xml
+++ b/app-accessibility/speech-dispatcher/metadata.xml
@@ -7,6 +7,7 @@
 	<email>williamh@gentoo.org</email>
 </maintainer>
 <use>
+	<flag name='espeak'>Adds support for espeak speech engine</flag>
 	<flag name='flite'>Adds support for flite speech engine</flag>
 </use>
 </pkgmetadata>
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 9365de6d18b3..7833b2977f75 100644
--- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.7.ebuild
+++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.7.ebuild
@@ -1,8 +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.5 2009/09/04 13:54:51 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.7.ebuild,v 1.6 2009/09/06 19:35:28 williamh Exp $
 
-inherit eutils
+EAPI="2"
+
+inherit eutils flag-o-matic
 
 DESCRIPTION="speech-dispatcher speech synthesis interface"
 HOMEPAGE="http://www.freebsoft.org/speechd"
@@ -11,31 +13,34 @@ SRC_URI="http://www.freebsoft.org/pub/projects/speechd/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc x86"
-IUSE="alsa flite nas pulseaudio python"
+IUSE="alsa +espeak flite nas pulseaudio python"
 
 RDEPEND="dev-libs/dotconf
 	>=dev-libs/glib-2
 	alsa? ( media-libs/alsa-lib )
+	espeak? ( app-accessibility/espeak )
 	flite? ( app-accessibility/flite )
 	nas? ( media-libs/nas )
 	pulseaudio? ( media-sound/pulseaudio )
-	python? ( dev-lang/python )
-	app-accessibility/espeak"
+	python? ( dev-lang/python )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e 's/\(SUBDIRS.*\)python/\1/' src/Makefile.in || die
+src_prepare() {
+	sed -i -e 's/\(SUBDIRS.*\)python/\1/' src/Makefile.in
+	epatch "${FILESDIR}"/${P}-getline-ss.patch
 }
 
-src_compile() {
+src_configure() {
 	econf \
 	$(use_with alsa) \
 	$(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"
 }
 
@@ -56,5 +61,12 @@ src_install() {
 }
 
 pkg_postinst() {
+	if ! use espeak; then
+		ewarn
+		ewarn "You have disabled espeak, which is speech-dispatcher's"
+		ewarn "default speech synthesizer."
+		ewarn "You must edit ${ROOT}etc/speechd/speechd.conf"
+	fi
+	elog
 	elog "To enable Festival support, you must install app-accessibility/festival-freebsoft-utils."
 }