Added java support.

7 files changed, 67 insertions, 43 deletions

diff --git a/app-accessibility/gnome-speech/ChangeLog b/app-accessibility/gnome-speech/ChangeLog
index b851fe0e31e1..b14e02a1573b 100644
--- a/app-accessibility/gnome-speech/ChangeLog
+++ b/app-accessibility/gnome-speech/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for app-accessibility/gnome-speech
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-speech/ChangeLog,v 1.2 2004/03/18 00:21:05 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-speech/ChangeLog,v 1.3 2004/03/23 02:50:58 leonardop Exp $
 
+*gnome-speech-0.3.2-r1 (22 Mar 2004)
+
+  22 Mar 2004; L. Boshell <leonardop@gentoo.org> gnome-speech-0.3.2-r1.ebuild:
+  Added java support via the `java' USE flag.
+  
   17 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org>
   gnome-speech-0.3.1.ebuild:
   sparc keyword again
diff --git a/app-accessibility/gnome-speech/Manifest b/app-accessibility/gnome-speech/Manifest
index 906938ac4993..8ebff3e74387 100644
--- a/app-accessibility/gnome-speech/Manifest
+++ b/app-accessibility/gnome-speech/Manifest
@@ -1,10 +1,10 @@
-MD5 f669e3173973d5dfa516f3661f8ac845 ChangeLog 1893
-MD5 813ad8aea3e659aa685bb665971ecb4f gnome-speech-0.2.7.ebuild 1018
+MD5 4cf9d1f582c3f78b3a071a0761306d31 ChangeLog 2060
+MD5 357ee799845a0b207f4c47e73f31947e gnome-speech-0.3.2-r1.ebuild 1291
 MD5 da07b97c170eb339001ef1f547b6846b gnome-speech-0.2.8.ebuild 810
-MD5 6dbe6c887f6a70f04a963eedb54a3684 gnome-speech-0.3.2.ebuild 823
-MD5 5253659a4a0e45baa9f1788dcb705895 metadata.xml 172
 MD5 fae82455d62ad962c030660c10584854 gnome-speech-0.3.1.ebuild 819
-MD5 4673eca7c792b33d0f3328f265b59f5b files/digest-gnome-speech-0.2.7 71
+MD5 890ebd0c8f171d7af5953cae206a552a gnome-speech-0.3.2.ebuild 683
+MD5 5253659a4a0e45baa9f1788dcb705895 metadata.xml 172
 MD5 438fb9ac10764fefa2628912468db103 files/digest-gnome-speech-0.2.8 71
 MD5 133cc62f1099b5775a1dc5a27173d5c8 files/digest-gnome-speech-0.3.1 71
 MD5 fbbe039fc02132832a628d53470e36ca files/digest-gnome-speech-0.3.2 71
+MD5 fbbe039fc02132832a628d53470e36ca files/digest-gnome-speech-0.3.2-r1 71
diff --git a/app-accessibility/gnome-speech/files/digest-gnome-speech-0.2.7 b/app-accessibility/gnome-speech/files/digest-gnome-speech-0.2.7
deleted file mode 100644
index a18045eb0307..000000000000
--- a/app-accessibility/gnome-speech/files/digest-gnome-speech-0.2.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 63669571096af17e495abbde890d19c6 gnome-speech-0.2.7.tar.bz2 220901
diff --git a/app-accessibility/gnome-speech/files/digest-gnome-speech-0.3.2-r1 b/app-accessibility/gnome-speech/files/digest-gnome-speech-0.3.2-r1
new file mode 100644
index 000000000000..3f2f50e8af87
--- /dev/null
+++ b/app-accessibility/gnome-speech/files/digest-gnome-speech-0.3.2-r1
@@ -0,0 +1 @@
+MD5 d1c3ad83c3c6f42db0f8ad3cb61c4671 gnome-speech-0.3.2.tar.bz2 224719
diff --git a/app-accessibility/gnome-speech/gnome-speech-0.2.7.ebuild b/app-accessibility/gnome-speech/gnome-speech-0.2.7.ebuild
deleted file mode 100644
index c50845f38e3c..000000000000
--- a/app-accessibility/gnome-speech/gnome-speech-0.2.7.ebuild
+++ /dev/null
@@ -1,31 +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/gnome-speech/gnome-speech-0.2.7.ebuild,v 1.1 2004/03/17 22:15:32 leonardop Exp $
-
-inherit gnome2
-
-DESCRIPTION="Simple general API for producing text-to-speech output"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2"
-SLOT="1"
-KEYWORDS="x86"
-
-IUSE=""
-
-# FIXME: This package depends on bonobo-activation, which is included in
-# recent versions of libbonobo. However, if one were to use slightly older
-# versions of these packages, we would have to rely on
-# gnome-base/bonobo-activation.
-RDEPEND=">=gnome-base/libbonobo-1.97
-	>=gnome-base/ORBit2-2.3.94"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-DOCS="AUTHORS ChangeLog COPYING NEWS README"
-
-# The Java support for this package seems to be somewhat brain-damaged,
-# and although it would be nice to implement it via the "java" USE flag,
-# we will have to disable it entirely for now.
-export JAVAC=no
diff --git a/app-accessibility/gnome-speech/gnome-speech-0.3.2-r1.ebuild b/app-accessibility/gnome-speech/gnome-speech-0.3.2-r1.ebuild
new file mode 100644
index 000000000000..2f4d8ce5f48e
--- /dev/null
+++ b/app-accessibility/gnome-speech/gnome-speech-0.3.2-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-speech/gnome-speech-0.3.2-r1.ebuild,v 1.1 2004/03/23 02:50:58 leonardop Exp $
+
+inherit java-pkg gnome2
+
+IUSE="java"
+
+DESCRIPTION="Simple general API for producing text-to-speech output"
+HOMEPAGE="http://www.gnome.org/"
+
+SLOT="1"
+
+KEYWORDS="~x86 ~hppa ~alpha ~ia64"
+LICENSE="LGPL-2"
+
+
+RDEPEND=">=gnome-base/libbonobo-1.97
+	>=gnome-base/ORBit2-2.3.94
+	java? ( virtual/jdk
+		app-accessibility/java-access-bridge )"
+# Support for freetts still pending, since the tarball doesn't actually
+# include the driver...
+# See http://bugs.gnome.org/show_bug.cgi?id=137337
+#	freetts? ( app-accessibility/freetts
+#		!java? ( virtual/jdk
+#			app-accessibility/java-access-bridge ) )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	java? ( dev-java/java-config )"
+
+DOCS="AUTHORS ChangeLog COPYING NEWS README"
+
+
+if [ `use java` ]
+then
+	G2CONF="${G2CONF} --with-java-home=$(java-config --jdk-home)"
+	G2CONF="${G2CONF} --with-jab-dir=${ROOT}/usr/share/java-access-bridge/lib"
+else
+	export JAVAC=no
+fi
+
+
+src_install() {
+	gnome2_src_install
+
+	if [ `use java` ]
+	then
+		java-pkg_dojar ${D}/usr/share/jar/*.jar
+		rm -rf ${D}/usr/share/jar
+	fi
+}
diff --git a/app-accessibility/gnome-speech/gnome-speech-0.3.2.ebuild b/app-accessibility/gnome-speech/gnome-speech-0.3.2.ebuild
index 5ba33d6956ca..8ae296c48b86 100644
--- a/app-accessibility/gnome-speech/gnome-speech-0.3.2.ebuild
+++ b/app-accessibility/gnome-speech/gnome-speech-0.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-speech/gnome-speech-0.3.2.ebuild,v 1.1 2004/03/17 22:15:32 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-speech/gnome-speech-0.3.2.ebuild,v 1.2 2004/03/23 02:50:58 leonardop Exp $
 
 inherit gnome2
 
@@ -21,8 +21,5 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog COPYING NEWS README"
 
-# The Java support for this package seems to be somewhat brain-damaged,
-# and although it would be nice to implement it via the "java" USE flag,
-# we will have to disable it entirely for now.
+# Check out >=gnome-speech-0.3.2-r1 for java support
 export JAVAC=no
-