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

Package-Manager: portage-2.2_rc15/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64

4 files changed, 33 insertions, 92 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/Manifest b/app-accessibility/gnome-speech/Manifest
index 5ce35171bce4..37f84eb1a21d 100644
--- a/app-accessibility/gnome-speech/Manifest
+++ b/app-accessibility/gnome-speech/Manifest
@@ -1,11 +1,19 @@
-DIST gnome-speech-0.4.17.tar.bz2 319772 RMD160 e6b968d36b81767d6a1b61453c686c50bf76069f SHA1 d9dc96ffac1d16a86580ae45d60da22999fa1c98 SHA256 3c5577330c6440b52eb68a560c8e723a20ab8915d4aee5237c243240c53bc89e
-DIST gnome-speech-0.4.18.tar.bz2 319616 RMD160 2e881a235e8985d7eaed67ce628565e9228042ac SHA1 c50e86fff5fe9656a5839c11b648998323a8adb7 SHA256 2ea96ab427d48a95b535ea986fd06415e7160b60f60e08429fc26191eaedc971
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST gnome-speech-0.4.20.tar.bz2 319380 RMD160 25d5db2fc1db7069ef53da4c1ae71bf156fbc6f6 SHA1 9d25e04b4d6059dd9a15a2e2370f884a68134d5c SHA256 b6d0f18ac49088ca56449d3c016b316272af5853cc274450199442ce0739d8bc
 DIST gnome-speech-0.4.21.tar.bz2 319353 RMD160 7aba72d85cd6a5260c91f3db6f2f1c2125ff8925 SHA1 d77d932ff45ab8d5ea82c8038d80cce7688e1f19 SHA256 3f4db651be82ffefa98a92aece805f39b8b592ac45f41430d3ddf4b7161f6dd6
-EBUILD gnome-speech-0.4.17.ebuild 2051 RMD160 f638849199899007e806eadcb86a0fcde61507ba SHA1 173da98dccdf86bba9f0bc5f2fc4607c5fe9900d SHA256 937836ab961b3182efe659f396ba633f8053c2942e2181f062fd472e2904d4b0
-EBUILD gnome-speech-0.4.18.ebuild 2044 RMD160 107a123825adaa4f4bf120e1f787de49428657b8 SHA1 e037700c21d77b9cea573c1a306d431814799a52 SHA256 d41d1261d05b485fe38949956981c89e401312131ecc3a6d5389c2377ce8424d
+DIST gnome-speech-0.4.22.tar.bz2 309401 RMD160 23d3ac4bc75083174c7614a882ecc561eaf064c5 SHA1 73c9d7ce1082274a1d1084e9d2ea049bc1e1ad74 SHA256 127d76b7e0cbc8a364d467a3b126dd1c038c5d265170f82eac90f0b0dbdfe3cd
 EBUILD gnome-speech-0.4.20-r1.ebuild 2190 RMD160 4cdd0a3005acf6b6c2bd243b82712321efb90902 SHA1 05ddb462d36c64aeb4f973a4d6478ca89c3b7650 SHA256 4907ba8f8f61b9233b6d0990410d0837446cd1d8b7616f13caf36f66da517a33
 EBUILD gnome-speech-0.4.20.ebuild 2047 RMD160 3d7e34c3120eed38c9e40535d9debf7ebac55719 SHA1 61db3696789326c061e42205fd156dae9365a514 SHA256 8e537c90ec64582080c1727c0ebe0dc3ec6b993fbe5161957712c0fb85d07bf3
 EBUILD gnome-speech-0.4.21.ebuild 2140 RMD160 e2bdd45538779f60b2d530e5c517cb94a2c22bec SHA1 3f68ef52381919cd9f8ab94733f53b1e72b96583 SHA256 d3638d6387f31f54207e38eed1f3abd9788a87082841f6166c260fc55ea4e9ef
-MISC ChangeLog 18660 RMD160 0645bb03eca9ed891196aa577f2782fbecfc2e53 SHA1 381aae765feba94b237d115f059e8cc6afbe2adf SHA256 cc405b50f567d8faeb8fc0307eaa76b3cea0141f3738f7f30e815d75c926b6db
+EBUILD gnome-speech-0.4.22.ebuild 2140 RMD160 a884f7040c18ce98f063ebdb8381830a737fe973 SHA1 5e48356b992c6b18c4e6ff6761a5b8113574d75f SHA256 97b2f840504bdc6408427a4320789dd38e89d89668d9fd32ea5153b58fafbb23
+MISC ChangeLog 18913 RMD160 3f918b885c4d8be82387d0622c8c2b135746bdbc SHA1 3e2dda5bb5d95982d709762efad7b3d3f726f7d1 SHA256 c3a964f53ed7033303fe35e8c89538f8b0d3698aa6592d27659df52eaf3e4962
 MISC metadata.xml 436 RMD160 c34b9639afc771b6996afcc45e5cd84cb05ce6a4 SHA1 d4f19b6deaa873b709f853b1b2784488bcc43703 SHA256 21ab4cf12e9c0716576f8b2291497df573100c6734dd342598e872e408f4db42
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkkrEWsACgkQ1fmVwcYIWAZ8ewCfQHTRXyYIIFcQ22ZJroQNT56W
+1x8AnjddTI5X4R2nkSlob7RIR+nEVpLB
+=3+oP
+-----END PGP SIGNATURE-----
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