New release: 0.3.3

8 files changed, 81 insertions, 60 deletions

diff --git a/app-accessibility/gnome-speech/ChangeLog b/app-accessibility/gnome-speech/ChangeLog
index 680cf79d828e..8cae369413ec 100644
--- a/app-accessibility/gnome-speech/ChangeLog
+++ b/app-accessibility/gnome-speech/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-accessibility/gnome-speech
 # Copyright 1999-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-speech/ChangeLog,v 1.10 2004/05/25 22:39:39 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-speech/ChangeLog,v 1.11 2004/06/11 13:06:05 leonardop Exp $
+
+*gnome-speech-0.3.3 (11 Jun 2004)
+
+  11 Jun 2004; L. Boshell <leonardop@gentoo.org> gnome-speech-0.3.3.ebuild:
+  New release. Adds support for the freetts driver through the local
+  `freetts' USE flag.
 
   25 May 2004; Guy Martin <gmsoft@gentoo.org> gnome-speech-0.3.2-r1.ebuild:
   Marked stable on hppa.
@@ -32,14 +38,14 @@
 
   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
 
   16 Mar 2004; L. Boshell <leonardop@gentoo.org> gnome-speech-0.3.1.ebuild:
   Marking stable on x86.
-  
+
   13 Mar 2004; foser <foser@gentoo.org> metadata.xml :
   Maintainership to gnome-accessibility
 
diff --git a/app-accessibility/gnome-speech/Manifest b/app-accessibility/gnome-speech/Manifest
index 9a8878c1d9e9..926f5d22d7bc 100644
--- a/app-accessibility/gnome-speech/Manifest
+++ b/app-accessibility/gnome-speech/Manifest
@@ -1,10 +1,8 @@
-MD5 fbbe039fc02132832a628d53470e36ca files/digest-gnome-speech-0.3.2-r1 71
-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 264c7c01cc603cf258c14f3a82a8776c ChangeLog 2957
 MD5 38c52d8803a526f926cc7fea35bbbf9d gnome-speech-0.2.8.ebuild 797
-MD5 f86eb3b721a915a3d0749c382fbcb2db gnome-speech-0.3.1.ebuild 804
-MD5 c1edf8889485902f2bedb56b107c03cb gnome-speech-0.3.2.ebuild 667
 MD5 5253659a4a0e45baa9f1788dcb705895 metadata.xml 172
-MD5 0f44e7bee76b5f9dfcea92d439d5b23d gnome-speech-0.3.2-r1.ebuild 1628
+MD5 a7a4ca141f9b3f97b5804c9f431fa610 gnome-speech-0.3.2-r1.ebuild 1623
+MD5 402d7da2735ce57f2c3e2971e767c691 gnome-speech-0.3.3.ebuild 1856
+MD5 6be7d1c2ed911a3e5c0d5719f9a9c714 files/digest-gnome-speech-0.3.3 71
+MD5 438fb9ac10764fefa2628912468db103 files/digest-gnome-speech-0.2.8 71
+MD5 fbbe039fc02132832a628d53470e36ca files/digest-gnome-speech-0.3.2-r1 71
diff --git a/app-accessibility/gnome-speech/files/digest-gnome-speech-0.3.1 b/app-accessibility/gnome-speech/files/digest-gnome-speech-0.3.1
deleted file mode 100644
index 18b665db1944..000000000000
--- a/app-accessibility/gnome-speech/files/digest-gnome-speech-0.3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c3f047ea5171a3726cdd11a8c23912a7 gnome-speech-0.3.1.tar.bz2 224185
diff --git a/app-accessibility/gnome-speech/files/digest-gnome-speech-0.3.2 b/app-accessibility/gnome-speech/files/digest-gnome-speech-0.3.2
deleted file mode 100644
index 3f2f50e8af87..000000000000
--- a/app-accessibility/gnome-speech/files/digest-gnome-speech-0.3.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d1c3ad83c3c6f42db0f8ad3cb61c4671 gnome-speech-0.3.2.tar.bz2 224719
diff --git a/app-accessibility/gnome-speech/files/digest-gnome-speech-0.3.3 b/app-accessibility/gnome-speech/files/digest-gnome-speech-0.3.3
new file mode 100644
index 000000000000..132ac0e63bba
--- /dev/null
+++ b/app-accessibility/gnome-speech/files/digest-gnome-speech-0.3.3
@@ -0,0 +1 @@
+MD5 8ee8cb9196da9971ff7d497e88f4eadd gnome-speech-0.3.3.tar.bz2 253310
diff --git a/app-accessibility/gnome-speech/gnome-speech-0.3.1.ebuild b/app-accessibility/gnome-speech/gnome-speech-0.3.1.ebuild
deleted file mode 100644
index cf07bcf774c1..000000000000
--- a/app-accessibility/gnome-speech/gnome-speech-0.3.1.ebuild
+++ /dev/null
@@ -1,25 +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.3.1.ebuild,v 1.5 2004/05/31 18:45:21 vapier 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 ppc sparc ~alpha hppa amd64 ~ia64"
-IUSE=""
-
-RDEPEND=">=gnome-base/libbonobo-1.97
-	>=gnome-base/ORBit2-2.3.94"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-DOCS="AUTHORS ChangeLog 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.ebuild b/app-accessibility/gnome-speech/gnome-speech-0.3.2.ebuild
deleted file mode 100644
index f9ce75ec45d7..000000000000
--- a/app-accessibility/gnome-speech/gnome-speech-0.3.2.ebuild
+++ /dev/null
@@ -1,23 +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.3.2.ebuild,v 1.6 2004/05/31 18:45:21 vapier 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 ppc ~sparc ~alpha hppa ~amd64 ~ia64"
-IUSE=""
-
-RDEPEND=">=gnome-base/libbonobo-1.97
-	>=gnome-base/ORBit2-2.3.94"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-# Check out >=gnome-speech-0.3.2-r1 for java support
-export JAVAC=no
diff --git a/app-accessibility/gnome-speech/gnome-speech-0.3.3.ebuild b/app-accessibility/gnome-speech/gnome-speech-0.3.3.ebuild
new file mode 100644
index 000000000000..ec635e9554f5
--- /dev/null
+++ b/app-accessibility/gnome-speech/gnome-speech-0.3.3.ebuild
@@ -0,0 +1,66 @@
+# 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.3.ebuild,v 1.1 2004/06/11 13:06:05 leonardop Exp $
+
+inherit java-pkg gnome2
+
+IUSE="${IUSE} java freetts"
+
+DESCRIPTION="Simple general API for producing text-to-speech output"
+HOMEPAGE="http://www.gnome.org/"
+
+SLOT="1"
+
+KEYWORDS="~x86 ~ppc ~hppa ~alpha ~ia64 ~sparc ~amd64"
+LICENSE="LGPL-2"
+
+RDEPEND=">=gnome-base/libbonobo-1.97
+	>=gnome-base/ORBit2-2.3.94
+	java? ( virtual/jdk
+		app-accessibility/java-access-bridge )
+	freetts? ( =app-accessibility/freetts-1.2*
+		!java? ( virtual/jdk
+			app-accessibility/java-access-bridge ) )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_compile() {
+	if [ `use java` ] || [ `use freetts` ]
+	then
+		if [ -z "${JDK_HOME}" ] || [ ! -d "${JDK_HOME}" ]
+		then
+			eerror "In order to compile java sources you have to set the"
+			eerror "\$JDK_HOME environment properly."
+			eerror ""
+			eerror "You can achieve this by using the java-config tool:"
+			eerror "  emerge java-config"
+			die "Couldn't find a valid JDK home"
+		fi
+
+		local JABDIR="${ROOT}/usr/share/java-access-bridge/lib"
+		G2CONF="${G2CONF} --with-java-home=${JDK_HOME}"
+		G2CONF="${G2CONF} --with-jab-dir=${JABDIR}"
+	else
+		export JAVAC=no
+	fi
+
+	if [ `use freetts` ]
+	then
+		G2CONF="${G2CONF} --with-freetts-dir=${ROOT}/usr/share/freetts/lib"
+	fi
+
+	gnome2_src_compile
+}
+
+src_install() {
+	gnome2_src_install
+
+	if [ `use java` ]
+	then
+		java-pkg_dojar ${D}/usr/share/jar/*.jar
+		rm -rf ${D}/usr/share/jar
+	fi
+}