version bump for #299032, thanks to Chris Bruner.

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

4 files changed, 124 insertions, 2 deletions

diff --git a/app-accessibility/flite/ChangeLog b/app-accessibility/flite/ChangeLog
index 1439d180b426..a49275795bb7 100644
--- a/app-accessibility/flite/ChangeLog
+++ b/app-accessibility/flite/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-accessibility/flite
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/ChangeLog,v 1.32 2009/12/26 16:31:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/ChangeLog,v 1.33 2009/12/31 21:31:39 williamh Exp $
+
+*flite-1.4 (31 Dec 2009)
+
+  31 Dec 2009; William Hubbs <williamh@gentoo.org> +flite-1.4.ebuild,
+  +files/flite-1.4-respect-destdir.patch:
+  version bump for #299032, thanks to Chris Bruner.
 
   26 Dec 2009; Raúl Porcel <armin76@gentoo.org> flite-1.3.ebuild:
   sparc stable wrt #289439
diff --git a/app-accessibility/flite/Manifest b/app-accessibility/flite/Manifest
index 8338e2c40b79..33734965e93c 100644
--- a/app-accessibility/flite/Manifest
+++ b/app-accessibility/flite/Manifest
@@ -1,10 +1,13 @@
 AUX const.patch 466 RMD160 1e904127dbd32b3de46c224022330b9406dd79b5 SHA1 91d4f78f1a08e952e9f3890b6a0f851ee342a05b SHA256 31df1356f8ada98927f786903c3f69ca45c46d810cb6c1971a029296ccbff4f3
 AUX flite-1.3-alsa-support.patch 11007 RMD160 bfa1bcc6c9ff713f289944ff7b5400cd1ef07ff3 SHA1 a8a90225fb9f5cfded5943c8ab22a92208b0b07f SHA256 f43266bc5c70c12512be6a8e1980d5d5551d7624bd27a678431d53df695cf01d
 AUX flite-1.3-shared-libs.patch 7663 RMD160 d5b73272ed794b3b8b1a83d041eb6c3d9f81178c SHA1 b07a01729607805dea2c13c3990adc31be866600 SHA256 b7cc0a8fe5f4e71a8bc83dd6e4442d641fb909fd812826dc66e9c3749c65027b
+AUX flite-1.4-respect-destdir.patch 1902 RMD160 01ff0c79ff294f4108432c56cbf205f5103e82c7 SHA1 a146918a4cafc95b8b881beb6c1a79ce0380868f SHA256 093538c3a7cd2b9b9edd1f0956a34c4261c3ccdd4feb55e8ecedc338562495f3
 DIST flite-1.2-release.tar.bz2 7817919 RMD160 e261cda8212590d1c3edb66826d404e5ad0f4c2f SHA1 ed80430a2098f780b0fd145555ce8f437d7415b2 SHA256 10ff42ce08a628c7fd84d26b5228d549e9eecb1eb03cb158e87d8be66bc58ae2
 DIST flite-1.3-release.tar.gz 10663835 RMD160 a908acfd196754783ee4665ac84ea860d54bcf80 SHA1 233144a772de72741ae1aa2292f672c30224afb3 SHA256 922225f7001e57a0fbace8833b0a48790a68f6c7b491f2d47c78ad537ab78a8b
+DIST flite-1.4-release.tar.bz2 15163897 RMD160 d821c45aa8d0c4ce8fef28c7bcead70b5a81f7c9 SHA1 5370eebe917ba2b57dfdbaf15013b99bbe748631 SHA256 45c662160aeca6560589f78daf42ab62c6111dd4d244afc28118c4e6f553cd0c
 DIST flite_lexfix.tar.gz 2857920 RMD160 fea1ad471b22d47f802951824f28b79baa6b16fd SHA1 8647b3925b1d2340394f15c712fb28576934f4ff SHA256 caa81ffa962b31dbbc0211bc20506a2bb02c707695b286f072c8ec264e32252c
 EBUILD flite-1.2-r1.ebuild 1727 RMD160 9f558bcda554e565b00dd4c942b9dd02f281cda6 SHA1 5ccfe230de572bcc42991ab7192c10174752dcce SHA256 225d508baab31c9a22baf02e9f59758d0bda6458ed94ade0f503004d67ca115b
 EBUILD flite-1.3.ebuild 1576 RMD160 075433dceca6da37f5850e89ac05c33d1c5f38a9 SHA1 a0db2654ea791da35b8a3f9ae5ba0ced33a26846 SHA256 a225dae1b897ae224c166bae272ab129f8a1e6af4112b8dbc1932168d3ccedc8
-MISC ChangeLog 4025 RMD160 38d83e945dc81510a4bf9540dff4b4d9cbcbae03 SHA1 256672e644af78c884796822a8cd933944d47314 SHA256 3dd552a2f3754c9487c7f245e37a3ae4ada8f081215326e123b1eee1c43c169d
+EBUILD flite-1.4.ebuild 1226 RMD160 ea27cc19c9498d70928eaebe50964b32a3196b85 SHA1 278ff5bd2157114a618406a696098ec8c4b481b7 SHA256 b6f762e839171665192ae45d2a9ddd5a57cc3db2eb2f800056036e536750215e
+MISC ChangeLog 4217 RMD160 df09f8e5e8a8ff941d9b7dbeb56863a271535c75 SHA1 605f2122d15ae27e857f7022be0b9a70314da5cb SHA256 efe801310ea7b389e558d6a279b11eac7d67827a3d9999a470f17eb31f342880
 MISC metadata.xml 185 RMD160 75382db82e4c69d70f2d53f63363adec302720e5 SHA1 90563c269eff265fbd369095c606bc383cc07232 SHA256 b6de40518e01d3ef5447352b3f476c1f5b8e6ae53d5e654a2fb9e4ee7fdbe135
diff --git a/app-accessibility/flite/files/flite-1.4-respect-destdir.patch b/app-accessibility/flite/files/flite-1.4-respect-destdir.patch
new file mode 100644
index 000000000000..d54771423e1f
--- /dev/null
+++ b/app-accessibility/flite/files/flite-1.4-respect-destdir.patch
@@ -0,0 +1,59 @@
+From a0ae616d84e9f051ae8536574a9d1289e5f0c060 Mon Sep 17 00:00:00 2001
+From: William Hubbs <w.d.hubbs@gmail.com>
+Date: Thu, 31 Dec 2009 12:57:18 -0600
+Subject: [PATCH] respect destdir
+
+---
+ Makefile      |   10 +++++-----
+ main/Makefile |   10 +++++-----
+ 2 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 2d3ff09..26b2386 100644
+--- a/Makefile
++++ b/Makefile
+@@ -106,11 +106,11 @@ tags:
+ 
+ install:
+ 	@echo Installing 
+-	mkdir -p $(INSTALLBINDIR)
+-	mkdir -p $(INSTALLLIBDIR)
+-	mkdir -p $(INSTALLINCDIR)
+-	$(INSTALL) -m 644 include/*.h $(INSTALLINCDIR)
+-	@ $(MAKE) -C main --no-print-directory install
++	mkdir -p $(DESTDIR)$(INSTALLBINDIR)
++	mkdir -p $(DESTDIR)$(INSTALLLIBDIR)
++	mkdir -p $(DESTDIR)$(INSTALLINCDIR)
++	$(INSTALL) -m 644 include/*.h $(DESTDIR)$(INSTALLINCDIR)
++	@ $(MAKE) -C main --no-print-directory DESTDIR=$(DESTDIR) install
+ 
+ time-stamp :
+ 	@ echo $(PROJECT_NAME) >.time-stamp
+diff --git a/main/Makefile b/main/Makefile
+index 8163e40..0513e59 100644
+--- a/main/Makefile
++++ b/main/Makefile
+@@ -111,15 +111,15 @@ $(BINDIR)/flite_${VOICE}: flite_main.o $(flite_LIBS_deps)
+ 
+ install:
+ #       The basic binaries
+-	@ $(INSTALL) -m 755 $(BINDIR)/flite $(INSTALLBINDIR)
++	@ $(INSTALL) -m 755 $(BINDIR)/flite $(DESTDIR)$(INSTALLBINDIR)
+ 	@ for i in $(VOICES) ; \
+ 	do \
+-	   $(INSTALL) $(BINDIR)/flite_$$i $(INSTALLBINDIR); \
++	   $(INSTALL) $(BINDIR)/flite_$$i $(DESTDIR)$(INSTALLBINDIR); \
+ 	done
+-	$(INSTALL) -m 755 $(BINDIR)/flite_time $(INSTALLBINDIR)
++	$(INSTALL) -m 755 $(BINDIR)/flite_time $(DESTDIR)$(INSTALLBINDIR)
+ #       The libraries: static and shared (if built)
+-	cp -pd $(flite_LIBS_deps) $(INSTALLLIBDIR)
++	cp -pd $(flite_LIBS_deps) $(DESTDIR)$(INSTALLLIBDIR)
+ ifdef SHFLAGS
+-	cp -pd $(SHAREDLIBS) $(VERSIONSHAREDLIBS) $(INSTALLLIBDIR)
++	cp -pd $(SHAREDLIBS) $(VERSIONSHAREDLIBS) $(DESTDIR)$(INSTALLLIBDIR)
+ endif
+ 
+-- 
+1.6.4.4
+
diff --git a/app-accessibility/flite/flite-1.4.ebuild b/app-accessibility/flite/flite-1.4.ebuild
new file mode 100644
index 000000000000..2e783a28519f
--- /dev/null
+++ b/app-accessibility/flite/flite-1.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/flite-1.4.ebuild,v 1.1 2009/12/31 21:31:39 williamh Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="Flite text to speech engine"
+HOMEPAGE="http://www.speech.cs.cmu.edu/flite/index.html"
+SRC_URI=" http://www.speech.cs.cmu.edu/${PN}/packed/${P}/${P}-release.tar.bz2"
+
+LICENSE="BSD as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa oss"
+
+S=${WORKDIR}/${P}-release
+
+get_audio() {
+	if use alsa; then
+		echo alsa
+	elif use oss; then
+		echo oss
+	else
+		echo none
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-respect-destdir.patch
+}
+
+src_configure() {
+	econf \
+		--with-audio=$(get_audio) || die "configuration failed"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "Failed compilation"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "installation failed"
+	dodoc ACKNOWLEDGEMENTS README
+}
+
+pkg_postinst() {
+	if [ "$(get_audio)" = "none" ]; then
+		ewarn "you have built flite without audio support."
+		ewarn "If you want audio support for flite, you need"
+		ewarn "alsa or oss in your use flags."
+	fi
+}