Version bump.

6 files changed, 78 insertions, 48 deletions

diff --git a/app-accessibility/flite/ChangeLog b/app-accessibility/flite/ChangeLog
index 507fb3ecc89b..3318bb957f15 100644
--- a/app-accessibility/flite/ChangeLog
+++ b/app-accessibility/flite/ChangeLog
@@ -1,6 +1,12 @@
 # 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.5 2004/03/18 07:03:29 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/ChangeLog,v 1.6 2004/03/19 16:27:33 eradicator Exp $
+
+*flite-1.2 (19 Mar 2004)
+
+  19 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> flite-1.0-r1.ebuild,
+  flite-1.2.ebuild:
+  Version bump.
 
 *flite-1.0-r1 (17 Mar 2004)
 
diff --git a/app-accessibility/flite/Manifest b/app-accessibility/flite/Manifest
index dae178fee3a8..1bbe3fcf77aa 100644
--- a/app-accessibility/flite/Manifest
+++ b/app-accessibility/flite/Manifest
@@ -1,6 +1,6 @@
 MD5 f15ef515739fbdf9c8be076ad5be03df flite-1.0.ebuild 553
-MD5 6d0562a216f4524d881d482aff488153 flite-1.0-r1.ebuild 981
 MD5 c7d31eb3f322a255a6dcaf53fd66eb2f ChangeLog 1027
 MD5 4f5d797c455932135181f0c31b5e71b2 metadata.xml 185
+MD5 36cc1463a8a5edc8ce6e556e557bd334 flite-1.2.ebuild 1261
 MD5 174d10871c0102f325aa06478c76e1da files/digest-flite-1.0 68
-MD5 174d10871c0102f325aa06478c76e1da files/digest-flite-1.0-r1 68
+MD5 c5214c4d79e701e6750fdff2be9d56a8 files/digest-flite-1.2 136
diff --git a/app-accessibility/flite/files/digest-flite-1.0-r1 b/app-accessibility/flite/files/digest-flite-1.0-r1
deleted file mode 100644
index 3a08ac58c78e..000000000000
--- a/app-accessibility/flite/files/digest-flite-1.0-r1
+++ /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 b/app-accessibility/flite/files/digest-flite-1.2
new file mode 100644
index 000000000000..afaf0e7180f6
--- /dev/null
+++ b/app-accessibility/flite/files/digest-flite-1.2
@@ -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-r1.ebuild b/app-accessibility/flite/flite-1.0-r1.ebuild
deleted file mode 100644
index 238d4ae1cf71..000000000000
--- a/app-accessibility/flite/flite-1.0-r1.ebuild
+++ /dev/null
@@ -1,44 +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-r1.ebuild,v 1.1 2004/03/18 07:03:29 eradicator Exp $
-
-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/flite-1.0/${P}-beta.tar.gz"
-
-SLOT="0"
-LICENSE="X11"
-KEYWORDS="~x86 ~ppc"
-
-DEPEND="virtual/glibc"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	econf || die "Failed configuration"
-	emake || die "Failed compilation"
-
-	if ! use static; then
-		cd ${S}/lib;
-		for lib in lib*.a; do
-			soname="${lib/.a/.so}"
-			ld -shared --whole-archive -o ${soname} -soname ${soname} ${lib}
-		done
-	fi
-}
-
-src_install () {
-	if use static; then
-		dolib.a lib/lib*.a
-	else
-		dolib.so lib/lib*.so
-	fi
-
-	dobin bin/flite bin/flite_time
-	dodoc ACKNOWLEDGEMENTS README
-
-	insinto /usr/include
-	doins include/*.h
-}
diff --git a/app-accessibility/flite/flite-1.2.ebuild b/app-accessibility/flite/flite-1.2.ebuild
new file mode 100644
index 000000000000..14048391d3b3
--- /dev/null
+++ b/app-accessibility/flite/flite-1.2.ebuild
@@ -0,0 +1,67 @@
+# 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.ebuild,v 1.1 2004/03/19 16:27:33 eradicator Exp $
+
+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"
+
+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 -)
+}
+
+src_compile() {
+	local myconf;
+	if ! use static; then
+		myconf="${myconf} --enable-shared"
+	fi
+
+	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}
+				majlib=`basename ${lib} | sed 's:\(\.so\.[0-9]\)\(\.[0-9]*\)*$:\1:'`
+				noverlib=`basename ${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
+}