Change the location in which we search for mbrola.

As of app-accessibility/freetts-1.2.1-r2, it is expected
in /usr/share/mbrola.

Package-Manager: portage-2.1.9.44/cvs/Linux i686

4 files changed, 85 insertions, 17 deletions

diff --git a/app-accessibility/freetts/ChangeLog b/app-accessibility/freetts/ChangeLog
index 6bb0c0d6acdd..b877374a565d 100644
--- a/app-accessibility/freetts/ChangeLog
+++ b/app-accessibility/freetts/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-accessibility/freetts
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/freetts/ChangeLog,v 1.31 2008/07/17 20:43:15 cardoe Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/freetts/ChangeLog,v 1.32 2011/03/23 17:15:06 cbrannon Exp $
+
+*freetts-1.2.1-r2 (23 Mar 2011)
+
+  23 Mar 2011; Christopher Brannon <cbrannon@gentoo.org>
+  freetts-1.2.1-r1.ebuild, +freetts-1.2.1-r2.ebuild:
+  Change the directory in which we look for mbrola.
+  This requires a revbump. The new revision depends on
+  app-accessibility/mbrola-3.01h-r6.
+  app-accessibility/freetts-1.2.1-r1's dependencies 
+were adjusted, since it will not work with
+app-accessibility/mbrola-3.01h-r6.
 
   17 Jul 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/app-accessibility/freetts/Manifest b/app-accessibility/freetts/Manifest
index 77881453b490..6b733f630fd1 100644
--- a/app-accessibility/freetts/Manifest
+++ b/app-accessibility/freetts/Manifest
@@ -1,15 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX jsapi-gentoo.diff 10444 RMD160 4cf8848814b9364d59c1d9949a5c9a292e3c7445 SHA1 311bec5e204e224a883900bfda4b3d0f8719eb8d SHA256 18b37ac9b844edd9de353992551e897ffa81fd3456bb42802967a1d422210280
 DIST freetts-1.2.1-src.zip 14100414 RMD160 be2bff99b950268eb826a35dd3b508299e60f59b SHA1 e6369ad7d971a0900998061d635d5b17b882b144 SHA256 e21421f3b6bd4364f4310e273128f20b63a6b885e8f17d9a441df20d4c455280
-EBUILD freetts-1.2.1-r1.ebuild 1662 RMD160 ccef661330038e58463be561a3f5e7872f635206 SHA1 1762d1a48be5bbef85e3501b7630eb989fc370c6 SHA256 569b19aa1b810ce5e812f07e7089cf2b9c5a449446b71902c7722527dcb8709a
-MISC ChangeLog 3738 RMD160 7588a351d754df1bd759040d0ec632ff65e01746 SHA1 ea252c48d7e0b15b6cd618b1b6beb6a83bcdb424 SHA256 3e50b3d09dcd5ac00af22a8ba5a521014adeca2ac6b6eb6a2c154865c080c797
+EBUILD freetts-1.2.1-r1.ebuild 1664 RMD160 45045418758aaba2206a7158f8e242fa4e756085 SHA1 bab2b107b8a0c2b84f9b561f93c7827a7c0cb061 SHA256 46be0528b4541e432a91474f2b365234d5bdf9588d58d2dd209d021380111977
+EBUILD freetts-1.2.1-r2.ebuild 1680 RMD160 c80ef4abdb79c5d3944874abad2c75025fb53eb8 SHA1 2fd2160be18bad4ecb0f96ba2f944282608637b0 SHA256 9ccf5a6b77f3de539d7a52de3e41400d6da0ee1b895492e116473424c39f00bc
+MISC ChangeLog 4159 RMD160 439ada66a2a67f6527685129d1dd7fe5ab8ac086 SHA1 2bd9f1bcbc3319fc5b5f3c2b45536dc350af2883 SHA256 1a33800278ef9dd28681686320fefdcda385a89e4c2a925257abb84da8f05bfe
 MISC metadata.xml 319 RMD160 90e2dc304680ab6aecfba2968d578f845fbc2852 SHA1 376c396e658179046361635b17de71f4ecb5c40c SHA256 6c1e3f8fe2437d2109c67b068a6aa59ae5b186d0a6e559c880a540b5bbb534a5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkh/ruwACgkQoeSe8B0zEfzRTgCfaeEVBecRcGyPmNBB6UvU0MBW
-ZAkAn3+QwqiclW0fGebNPHrBgr6ncIIP
-=47F7
------END PGP SIGNATURE-----
diff --git a/app-accessibility/freetts/freetts-1.2.1-r1.ebuild b/app-accessibility/freetts/freetts-1.2.1-r1.ebuild
index cbd8f5613c13..1091234f66b5 100644
--- a/app-accessibility/freetts/freetts-1.2.1-r1.ebuild
+++ b/app-accessibility/freetts/freetts-1.2.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 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-r1.ebuild,v 1.5 2007/09/14 21:45:45 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/freetts/freetts-1.2.1-r1.ebuild,v 1.6 2011/03/23 17:15:06 cbrannon Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -9,7 +9,7 @@ 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 )"
+	mbrola? ( <=app-accessibility/mbrola-3.0.1h-r5 ) "
 DEPEND=">=virtual/jdk-1.4
 	${RDEPEND}
 	jsapi? ( app-arch/sharutils )
diff --git a/app-accessibility/freetts/freetts-1.2.1-r2.ebuild b/app-accessibility/freetts/freetts-1.2.1-r2.ebuild
new file mode 100644
index 000000000000..42b55093836d
--- /dev/null
+++ b/app-accessibility/freetts/freetts-1.2.1-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2011 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-r2.ebuild,v 1.1 2011/03/23 17:15:06 cbrannon Exp $
+
+inherit eutils java-pkg-2 java-ant-2
+
+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-r6 ) "
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}
+	jsapi? ( app-arch/sharutils )
+	app-arch/unzip"
+
+LICENSE="jsapi? ( sun-bcla-jsapi ) freetts"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc jsapi mbrola"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}/lib"
+
+	chmod 0755 jsapi.sh
+	epatch "${FILESDIR}/jsapi-gentoo.diff"
+
+	use mbrola && echo "mbrola.base=/usr/share/mbrola/" >> "${S}/speech.properties"
+}
+
+src_compile() {
+	cd "${S}/lib"
+	if use jsapi; then
+		./jsapi.sh || die "jsapi.sh failed"
+	fi
+	cd "${S}"
+	eant jars
+}
+
+# Tests dont' seem included
+# http://freetts.sourceforge.net/docs/index.php#how_test
+#src_test() {
+#	ANT_TASKS="ant-junit" eant junit
+#}
+
+src_install() {
+	java-pkg_dojar lib/*.jar mbrola/*.jar
+
+	use mbrola && local jflags="--java_args -Dmbrola.base=/usr/share/mbrola"
+	java-pkg_dolauncher ${PN} --main com.sun.speech.freetts.FreeTTS ${jflags}
+
+	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 || die
+	if use doc; then
+		insinto /usr/share/doc/${PF}/html
+		doins -r "${S}"/docs/*
+		java-pkg_dojavadoc "${S}/javadoc"
+	fi
+}