Bump to 0.4.22. Fix for swift synthesis driver. Clean up old revisions.

(Portage version: 2.2_rc15/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64)

3 files changed, 20 insertions, 87 deletions

diff --git a/app-accessibility/gnome-speech/ChangeLog b/app-accessibility/gnome-speech/ChangeLog
index 0f997749437e..c24dde0d5169 100644
--- a/app-accessibility/gnome-speech/ChangeLog
+++ b/app-accessibility/gnome-speech/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-accessibility/gnome-speech
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-speech/ChangeLog,v 1.127 2008/11/13 19:57:59 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-speech/ChangeLog,v 1.128 2008/11/24 20:41:09 eva Exp $
+
+*gnome-speech-0.4.22 (24 Nov 2008)
+
+  24 Nov 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-speech-0.4.17.ebuild, -gnome-speech-0.4.18.ebuild,
+  +gnome-speech-0.4.22.ebuild:
+  Bump to 0.4.22. Fix for swift synthesis driver. Clean up old revisions.
 
   13 Nov 2008; Brent Baude <ranger@gentoo.org> gnome-speech-0.4.20.ebuild:
   Marking gnome-speech-0.4.20 ppc64 for bug 236971
diff --git a/app-accessibility/gnome-speech/gnome-speech-0.4.17.ebuild b/app-accessibility/gnome-speech/gnome-speech-0.4.17.ebuild
deleted file mode 100644
index 756d33fcec89..000000000000
--- a/app-accessibility/gnome-speech/gnome-speech-0.4.17.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-speech/gnome-speech-0.4.17.ebuild,v 1.8 2008/02/04 03:49:06 jer Exp $
-
-JAVA_PKG_OPT_USE="freetts"
-
-inherit java-pkg-opt-2 gnome2
-
-DESCRIPTION="Simple general API for producing text-to-speech output"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2"
-SLOT="1"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-# espeak not added; it needs tons of keywords
-IUSE="freetts"
-
-COMMON_DEPEND=">=gnome-base/orbit-2.3.94
-	>=gnome-base/libbonobo-1.97
-	>=dev-libs/glib-2
-	freetts? (
-		=app-accessibility/freetts-1.2*
-		>=app-accessibility/java-access-bridge-1.4.6 )"
-
-RDEPEND="$COMMON_DEPEND
-	freetts? ( >=virtual/jre-1.4 )
-	app-accessibility/festival"
-
-DEPEND="$COMMON_DEPEND
-	freetts? ( >=virtual/jdk-1.4 )
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --with-festival --with-speech-dispatcher --without-espeak-dir"
-
-	if use freetts; then
-		java-pkg-opt-2_pkg_setup
-
-		local JABDIR="${ROOT}usr/share/java-access-bridge/lib"
-
-		G2CONF="${G2CONF} --with-java-home=${JAVA_HOME} \
-			--with-jab-dir=${JABDIR} \
-			--with-freetts-dir=${ROOT}usr/share/freetts/lib"
-	else
-		export JAVAC=no
-	fi
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	if use freetts; then
-		sed -i -e \
-			's/@GNOME_SPEECH_INSTALLED_CLASSPATH@/$(java-config -p gnome-speech-1,java-access-bridge)/' \
-			drivers/freetts/freetts-synthesis-driver.in || die "sed error"
-	fi
-
-	sed -i \
-		-e 's:\(GNOME_SPEECH_JAR_DIR=\).*:\1"/usr/share/java-access-bridge/lib/":' \
-		-e 's:\(FREETTS_DRIVER_JAR_DIR=\).*:\1"/usr/share/java-access-bridge/lib/":' \
-		"${S}"/configure
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use freetts; then
-		java-pkg_dojar "${D}"/usr/share/jar/*.jar
-		rm -rf "${D}"/usr/share/jar
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog "Gnome Speech has been successfully installed. You may now use the"
-	elog "speech interface using app-accessibility/gnopernicus."
-	elog
-}
diff --git a/app-accessibility/gnome-speech/gnome-speech-0.4.18.ebuild b/app-accessibility/gnome-speech/gnome-speech-0.4.22.ebuild
index 56ac65bc18fb..202e1badbac3 100644
--- a/app-accessibility/gnome-speech/gnome-speech-0.4.18.ebuild
+++ b/app-accessibility/gnome-speech/gnome-speech-0.4.22.ebuild
@@ -1,30 +1,32 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-speech/gnome-speech-0.4.18.ebuild,v 1.8 2008/06/03 01:39:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-speech/gnome-speech-0.4.22.ebuild,v 1.1 2008/11/24 20:41:09 eva Exp $
 
 JAVA_PKG_OPT_USE="freetts"
 
 inherit java-pkg-opt-2 gnome2
 
+EAPI="1"
+
 DESCRIPTION="Simple general API for producing text-to-speech output"
 HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="LGPL-2"
 SLOT="1"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-# espeak not added; it needs tons of keywords
-IUSE="freetts"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="+espeak festival freetts"
 
 COMMON_DEPEND=">=gnome-base/orbit-2.3.94
 	>=gnome-base/libbonobo-1.97
 	>=dev-libs/glib-2
+	espeak? ( app-accessibility/espeak )
 	freetts? (
 		=app-accessibility/freetts-1.2*
 		>=app-accessibility/java-access-bridge-1.4.6 )"
 
 RDEPEND="$COMMON_DEPEND
 	freetts? ( >=virtual/jre-1.4 )
-	app-accessibility/festival"
+	festival? ( app-accessibility/festival )"
 
 DEPEND="$COMMON_DEPEND
 	freetts? ( >=virtual/jdk-1.4 )
@@ -33,7 +35,11 @@ DEPEND="$COMMON_DEPEND
 DOCS="AUTHORS ChangeLog NEWS README"
 
 pkg_setup() {
-	G2CONF="${G2CONF} --with-festival --with-speech-dispatcher --without-espeak-dir"
+	G2CONF="${G2CONF} $(use_with festival) --with-speech-dispatcher"
+
+	if ! use espeak; then
+		 G2CONF="${G2CONF} --without-espeak-dir"
+	fi
 
 	if use freetts; then
 		java-pkg-opt-2_pkg_setup