Version bump, cleanup, and mbrola support updates thanks to Thomas Matthijs <axxo@gentoo.org> in bug #100237. Restricting the version of mbrola that 1.2 will work with as well, so remember to bump this when mbrola is bumped as well otherwise we'll get an update/downgrade loop.

(Portage version: 2.0.51.22-r2)

5 files changed, 81 insertions, 18 deletions

diff --git a/app-accessibility/freetts/ChangeLog b/app-accessibility/freetts/ChangeLog
index 3a95526d3391..b62fbe8f2b7a 100644
--- a/app-accessibility/freetts/ChangeLog
+++ b/app-accessibility/freetts/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-accessibility/freetts
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/freetts/ChangeLog,v 1.19 2005/07/21 19:50:38 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/freetts/ChangeLog,v 1.20 2005/07/26 07:50:25 eradicator Exp $
+
+*freetts-1.2.1 (25 Jul 2005)
+
+  25 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +freetts-1.2.1.ebuild:
+  Version bump, cleanup, and mbrola support thanks to Thomas Matthijs
+  <axxo@gentoo.org> in bug #100237.
 
   21 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org> freetts-1.2.ebuild:
   Stable amd64.
diff --git a/app-accessibility/freetts/Manifest b/app-accessibility/freetts/Manifest
index 334cdb9d7fa2..0f2c016b8592 100644
--- a/app-accessibility/freetts/Manifest
+++ b/app-accessibility/freetts/Manifest
@@ -1,15 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b518ced9c81616c47ea332f67b859baf ChangeLog 2204
+MD5 55068d3400343c62c1b69fe9228b57e4 ChangeLog 2423
 MD5 e206f7cd655afe2644bb78cc9d15bd7f metadata.xml 166
-MD5 a930623a170987f568f0afd5bfd68227 freetts-1.2.ebuild 1594
+MD5 463444686eacd4fc03e6214e2e009a53 freetts-1.2.ebuild 1640
+MD5 ab0d301c828fe707b3aa235d4f436959 freetts-1.2.1.ebuild 1672
+MD5 91b50bbd6d78736d5dfaf57eddf0dee9 files/digest-freetts-1.2.1 68
 MD5 7636ad68d9f8c572439c1beda2e3551b files/jsapi-gentoo.diff 10444
 MD5 f1e87dcb2c28189d1f2b57540311be81 files/digest-freetts-1.2 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC3/yxArHZZzCEUG0RAv8UAJ98Mfu7EEDROg6Aasewex8YuGckxQCeKTFL
-+ZYBzaso1RnA/uGqlOKgqzU=
-=Xoqd
------END PGP SIGNATURE-----
diff --git a/app-accessibility/freetts/files/digest-freetts-1.2.1 b/app-accessibility/freetts/files/digest-freetts-1.2.1
new file mode 100644
index 000000000000..71d3a1571471
--- /dev/null
+++ b/app-accessibility/freetts/files/digest-freetts-1.2.1
@@ -0,0 +1 @@
+MD5 f3e3ceae5b8cb5e175b50931f2e350e8 freetts-1.2.1-src.zip 14100414
diff --git a/app-accessibility/freetts/freetts-1.2.1.ebuild b/app-accessibility/freetts/freetts-1.2.1.ebuild
new file mode 100644
index 000000000000..8c7e157d4ab0
--- /dev/null
+++ b/app-accessibility/freetts/freetts-1.2.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/freetts/freetts-1.2.1.ebuild,v 1.1 2005/07/26 07:50:25 eradicator Exp $
+
+inherit java-pkg eutils
+
+DESCRIPTION="A speech synthesis system written entirely in Java"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
+HOMEPAGE="http://freetts.sourceforge.net/"
+
+RDEPEND=">=virtual/jre-1.4
+	mbrola? ( >=app-accessibility/mbrola-3.0.1h-r3 )"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}
+	app-arch/sharutils
+	>=dev-java/ant-core-1.6.0
+	app-arch/unzip
+	jikes? ( dev-java/jikes )"
+
+LICENSE="sun-bcla-jsapi freetts"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc jikes mbrola"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}/lib
+
+	chmod 0755 jsapi.sh
+	epatch ${FILESDIR}/jsapi-gentoo.diff
+
+	use mbrola && echo "mbrola.base=/opt/mbrola/" >> ${S}/speech.properties
+}
+
+src_compile() {
+	local antflags="jars"
+
+	cd ${S}/lib
+	./jsapi.sh && cd ${S}
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	ant ${antflags} || die "Compilation failed"
+}
+
+src_install() {
+	java-pkg_dojar lib/*.jar mbrola/*.jar
+
+	echo "#!/bin/bash" > ${PN}
+	if use mbrola; then
+		echo "java -Dmbrola.base=/opt/mbrola/ -jar /usr/share/freetts/lib/freetts.jar \${@}" >> ${PN}
+	else
+		echo "java -jar /usr/share/freetts/lib/freetts.jar \${@}" >> ${PN}
+	fi
+
+	dobin ${PN}
+
+	insinto /usr/share/${PN}
+	doins speech.properties
+
+	cp -R ${S}/demo ${D}/usr/share/${PN}
+	cp -R ${S}/tools ${D}/usr/share/${PN}
+
+	dodoc README.txt RELEASE_NOTES acknowledgments.txt
+	use doc && cp -R ${S}/docs ${D}/usr/share/doc/${P} && cp -R ${S}/javadoc ${D}/usr/share/doc/${P}/api
+}
diff --git a/app-accessibility/freetts/freetts-1.2.ebuild b/app-accessibility/freetts/freetts-1.2.ebuild
index a1bd2b2314d2..269d5d5c10c7 100644
--- a/app-accessibility/freetts/freetts-1.2.ebuild
+++ b/app-accessibility/freetts/freetts-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/freetts/freetts-1.2.ebuild,v 1.7 2005/07/21 19:50:38 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/freetts/freetts-1.2.ebuild,v 1.8 2005/07/26 07:50:25 eradicator Exp $
 
 inherit java-pkg eutils
 
@@ -12,17 +12,16 @@ DEPEND=">=virtual/jdk-1.3
 	>=dev-java/ant-1.6.0
 	app-arch/sharutils
 	app-arch/unzip
-	mbrola? ( app-accessibility/mbrola )
+	mbrola? ( =app-accessibility/mbrola-3.0.1h-r1 )
 	jikes? ( dev-java/jikes )"
-RDEPEND=">=virtual/jdk-1.3"
+RDEPEND=">=virtual/jre-1.3
+	 mbrola? ( =app-accessibility/mbrola-3.0.1h-r1 )"
 
 LICENSE="sun-bcla-jsapi freetts"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="doc jikes mbrola"
 
-#S=${WORKDIR}
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}/lib