added patch for gcc-3.3.3-r5 (#52466); better voice (#47635); cleanups

7 files changed, 102 insertions, 26 deletions

diff --git a/app-accessibility/flite/ChangeLog b/app-accessibility/flite/ChangeLog
index 6232729f971d..c0d9f03e7235 100644
--- a/app-accessibility/flite/ChangeLog
+++ b/app-accessibility/flite/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-accessibility/flite
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/ChangeLog,v 1.9 2004/04/22 17:54:06 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/ChangeLog,v 1.10 2004/05/31 16:44:48 squinky86 Exp $
+
+*flite-1.2-r1 (30 May 2004)
+
+  30 May 2004; Jon Hood <squinky86@gentoo.org> -flite-1.0.ebuild,
+  +flite-1.2-r1.ebuild, files/const.patch:
+  remove old versions, use a higher quality voice thanks to Ingo Bormuth
+  <ingo@bormuth.org> (#47635); added patch from Michael Gorse
+  <mgorse@alum.wpi.edu> (#52466)
 
   22 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> flite-1.2.ebuild:
   Stable x86.
diff --git a/app-accessibility/flite/Manifest b/app-accessibility/flite/Manifest
index dae41392cf1a..3a0590e2c8b3 100644
--- a/app-accessibility/flite/Manifest
+++ b/app-accessibility/flite/Manifest
@@ -1,6 +1,7 @@
-MD5 2b58ffb8eb82cb68b6e25be0e97765da flite-1.0.ebuild 567
-MD5 8160e35de9f7fe4ec5f3ac98a7fc17cf ChangeLog 1448
+MD5 e0db924dda3306f02207630867fac7d4 flite-1.2-r1.ebuild 1741
+MD5 3608b85d726a55c6a782f67255eab260 ChangeLog 1755
 MD5 4f5d797c455932135181f0c31b5e71b2 metadata.xml 185
 MD5 68a527d97e89aaa3245e0132f31d87db flite-1.2.ebuild 1637
-MD5 174d10871c0102f325aa06478c76e1da files/digest-flite-1.0 68
+MD5 ef87fb0bdde5622c0ee9200d14bc683c files/const.patch 466
 MD5 c5214c4d79e701e6750fdff2be9d56a8 files/digest-flite-1.2 136
+MD5 c5214c4d79e701e6750fdff2be9d56a8 files/digest-flite-1.2-r1 136
diff --git a/app-accessibility/flite/files/const.patch b/app-accessibility/flite/files/const.patch
new file mode 100644
index 000000000000..cf5510f47f22
--- /dev/null
+++ b/app-accessibility/flite/files/const.patch
@@ -0,0 +1,14 @@
+diff -Naur flite-1.2-release.orig/tools/find_sts_main.c flite-1.2-release/tools/find_sts_main.c
+--- tools/find_sts_main.c	2002-12-26 17:18:30.000000000 +0000
++++ tools/find_sts_main.c	2004-05-31 10:28:14.399281736 +0000
+@@ -40,6 +40,10 @@
+ #include <stdio.h>
+ #include <math.h>
+ #include <string.h>
++
++/* to allow some normally const fields to be manipulated during building */
++#define const
++
+ #include "cst_wave.h"
+ #include "cst_track.h"
+ #include "cst_sigpr.h"
diff --git a/app-accessibility/flite/files/digest-flite-1.0 b/app-accessibility/flite/files/digest-flite-1.0
deleted file mode 100644
index 3a08ac58c78e..000000000000
--- a/app-accessibility/flite/files/digest-flite-1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 711ec40f505073dbcf86037371ecb71b flite-1.0-beta.tar.gz 12010937
diff --git a/app-accessibility/flite/files/digest-flite-1.2-r1 b/app-accessibility/flite/files/digest-flite-1.2-r1
new file mode 100644
index 000000000000..afaf0e7180f6
--- /dev/null
+++ b/app-accessibility/flite/files/digest-flite-1.2-r1
@@ -0,0 +1,2 @@
+MD5 24c1576f5b3eb23ecedf4bebde96710f flite-1.2-release.tar.bz2 7817919
+MD5 f52718d2635c52604747bc935fbddc34 flite_lexfix.tar.gz 2857920
diff --git a/app-accessibility/flite/flite-1.0.ebuild b/app-accessibility/flite/flite-1.0.ebuild
deleted file mode 100644
index 8fb564bbd8c6..000000000000
--- a/app-accessibility/flite/flite-1.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/flite-1.0.ebuild,v 1.4 2004/03/24 17:18:27 eradicator Exp $
-
-S=${WORKDIR}/${PN}
-DESCRIPTION="Flite text to speech engine"
-HOMEPAGE="http://www.speech.cs.cmu.edu/flite/index.html"
-SRC_URI="http://www.speech.cs.cmu.edu/flite/packed/flite-1.0/${P}-beta.tar.gz"
-
-IUSE=""
-
-SLOT="0"
-LICENSE="X11"
-KEYWORDS="x86 ~ppc"
-
-DEPEND="virtual/glibc"
-
-src_install () {
-	cd ${S}/bin
-	dobin flite flite_time
-}
diff --git a/app-accessibility/flite/flite-1.2-r1.ebuild b/app-accessibility/flite/flite-1.2-r1.ebuild
new file mode 100644
index 000000000000..c96c96aca4ae
--- /dev/null
+++ b/app-accessibility/flite/flite-1.2-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/flite-1.2-r1.ebuild,v 1.1 2004/05/31 16:44:48 squinky86 Exp $
+
+inherit eutils
+
+IUSE="static"
+
+DESCRIPTION="Flite text to speech engine"
+HOMEPAGE="http://www.speech.cs.cmu.edu/flite/index.html"
+SRC_URI="http://www.speech.cs.cmu.edu/flite/packed/${P}/${P}-release.tar.bz2
+	 http://www.speech.cs.cmu.edu/flite/packed/${P}/${PN}_lexfix.tar.gz"
+
+SLOT="0"
+LICENSE="BSD as-is"
+KEYWORDS="~x86 ~ppc ~amd64"
+
+RDEPEND="virtual/glibc"
+
+S=${WORKDIR}/${P}-release
+
+src_unpack() {
+	unpack ${P}-release.tar.bz2
+	unpack ${PN}_lexfix.tar.gz
+
+	# Move the update into ${S}
+	cd ${PN}
+	tar -cf - . | (cd ${S}; tar -xf -)
+	cd ${S}
+	epatch ${FILESDIR}/const.patch
+}
+
+src_compile() {
+	local myconf;
+	if ! use static; then
+		myconf="${myconf} --enable-shared"
+	fi
+	myconf="${myconf} --with-vox=cmu_us_kal16"
+
+	econf ${myconf} || die "Failed configuration"
+	# -j2 borks when we make the shared libs
+	emake -j1 || die "Failed compilation"
+}
+
+src_install () {
+	dobin bin/*
+	dodoc ACKNOWLEDGEMENTS README COPYING
+
+	if use static; then
+		dolib.a lib/*.a
+	else
+		for lib in lib/*.so*; do
+			if [ -f ${lib} ]; then
+				dolib.so ${lib}
+				lib=`basename ${lib}`
+				majlib=`echo ${lib} | sed 's:\(\.so\.[0-9]\)\(\.[0-9]*\)*$:\1:'`
+				noverlib=`echo ${lib} | sed 's:\(\.so\)\(\.[0-9]*\)*$:\1:'`
+
+				dosym ${lib} /usr/lib/${majlib}
+				dosym ${lib} /usr/lib/${noverlib}
+			fi
+		done
+	fi
+
+	insinto /usr/include/flite
+	cd ${S}/include
+	for file in *.h; do
+		doins ${file}
+		dosed 's:#include "\(.*\)":#include <flite/\1>:g' /usr/include/flite/${file}
+	done
+
+	dosym flite/flite.h /usr/include/flite.h
+}