Removed java gen1 ebuilds, and older versions, quoted vars

Package-Manager: portage-2.1.3.15

12 files changed, 27 insertions, 384 deletions

diff --git a/app-accessibility/gnome-speech/ChangeLog b/app-accessibility/gnome-speech/ChangeLog
index 794c1af61a03..ee2ed5d2b4dd 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-speech/ChangeLog,v 1.100 2007/10/03 05:59:57 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-speech/ChangeLog,v 1.101 2007/10/23 23:58:43 wltjr Exp $
+
+  23 Oct 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  -gnome-speech-0.4.0.ebuild, -gnome-speech-0.4.4.ebuild,
+  -gnome-speech-0.4.6.ebuild, gnome-speech-0.4.11.ebuild,
+  -gnome-speech-0.4.15.ebuild, gnome-speech-0.4.16.ebuild:
+  Removed java gen1 ebuilds, and older versions, quoted vars
 
   02 Oct 2007; Tom Gall <tgall@gentoo.org> gnome-speech-0.4.16.ebuild:
   stable on ppc64
diff --git a/app-accessibility/gnome-speech/Manifest b/app-accessibility/gnome-speech/Manifest
index 05b1816c04c2..d3f98d25ff6e 100644
--- a/app-accessibility/gnome-speech/Manifest
+++ b/app-accessibility/gnome-speech/Manifest
@@ -1,56 +1,24 @@
-DIST gnome-speech-0.4.0.tar.bz2 307108 RMD160 35c69c26364601f92ab445315ba26711a60584ed SHA1 c46fb5928098852875fcfa57c08f1f87287c4550 SHA256 793dfc13fdb3ab010c4f891a6766569f49507d76410f5a111177c234672bdfcf
 DIST gnome-speech-0.4.11.tar.bz2 326719 RMD160 547feb2a1bc3559a3cfdda14b4e99df64a93dd77 SHA1 29880f68a26b8b54c78678a40f2344be030f1452 SHA256 87f6d115e412a1a777cc5977b3aada81eb5154c280e856ac649d94d31d0effbc
-DIST gnome-speech-0.4.15.tar.bz2 331723 RMD160 249a3d528f30e989b8dfec87787f60d90ff371ae SHA1 6d386e3c32a14ed31581b2126c228741399aa91b SHA256 e1f3d16bcdd833397e16c8df4f1a12cd06168cd29555cfeaa141e3d9e59cabe7
 DIST gnome-speech-0.4.16.tar.bz2 308969 RMD160 16866a06cc071091b80ac8bbefeb206839083f7c SHA1 3412b42ecbc0b0d7dcd4bfa4ef255fa8327d7de4 SHA256 df7f687ccb7c7c60c939abaef05ee2a6638b33b147c0edeb9b42c18a7d48b965
-DIST gnome-speech-0.4.4.tar.bz2 309806 RMD160 c3efb407ca06149c67f6b4eb04d38c018b31ecc3 SHA1 9c46dadfa765891481e442aaa74994f29c7e5679 SHA256 318ebf3a3f4bd05d534202839ce779f1c823f26305b625703b9615c803d74e6c
-DIST gnome-speech-0.4.6.tar.bz2 311080 RMD160 4e6ca040f590492aa58b40ed6cd8b690b05fcde7 SHA1 e2896cb05f0247a3aa444a585b8847fb06623f46 SHA256 eef3e578ef6d1614a2793cfbac28c345b673bfc1e2219841977a8c1b8f892b19
-EBUILD gnome-speech-0.4.0.ebuild 1942 RMD160 99caeb543a0fab0581e150554893f997cf9fbe5e SHA1 f78d384e68417e1837c0505d076afceb225e1395 SHA256 564215e6ae6d83251acf992e1407ad97457ec48b13bafb0bbd0f7e11eec4f948
-MD5 d9486dbd6752a8a44c9c308a8ff97893 gnome-speech-0.4.0.ebuild 1942
-RMD160 99caeb543a0fab0581e150554893f997cf9fbe5e gnome-speech-0.4.0.ebuild 1942
-SHA256 564215e6ae6d83251acf992e1407ad97457ec48b13bafb0bbd0f7e11eec4f948 gnome-speech-0.4.0.ebuild 1942
-EBUILD gnome-speech-0.4.11.ebuild 2019 RMD160 7e212eac07ca73b10fc0cad1cc93ce3c11123bd7 SHA1 58346254a6d9c4762f5332dc31af0947e9d7f130 SHA256 b26a366a27b3b4d74ca79c31d6d935b13a1c155e955cf44fd696f63721b7d9b8
-MD5 b7aa77316a5b1976d0cb7f782e210624 gnome-speech-0.4.11.ebuild 2019
-RMD160 7e212eac07ca73b10fc0cad1cc93ce3c11123bd7 gnome-speech-0.4.11.ebuild 2019
-SHA256 b26a366a27b3b4d74ca79c31d6d935b13a1c155e955cf44fd696f63721b7d9b8 gnome-speech-0.4.11.ebuild 2019
-EBUILD gnome-speech-0.4.15.ebuild 2022 RMD160 0f0cbee3d3b394d789d93a12dfbed70e6cc39614 SHA1 0d8e5000120b48e146373e75587207cec4e7f175 SHA256 3a454d88f16969cd609a2d8c3c48b26d6a898e12c1e71476197f8f6b22298541
-MD5 a2ff0981bd5417acfd67c7d4f2256a1d gnome-speech-0.4.15.ebuild 2022
-RMD160 0f0cbee3d3b394d789d93a12dfbed70e6cc39614 gnome-speech-0.4.15.ebuild 2022
-SHA256 3a454d88f16969cd609a2d8c3c48b26d6a898e12c1e71476197f8f6b22298541 gnome-speech-0.4.15.ebuild 2022
-EBUILD gnome-speech-0.4.16.ebuild 2017 RMD160 12bce62b22411689d0786f4835ee86607f053166 SHA1 744bfcbcd02df061acc98341cdfaa8c5005e20ae SHA256 cb9b855114316a61d4939f2c958718f65ddf984d7505203a999d282459ad8c6d
-MD5 7f9e6c5a2fe254c3eaf9485758f1ce72 gnome-speech-0.4.16.ebuild 2017
-RMD160 12bce62b22411689d0786f4835ee86607f053166 gnome-speech-0.4.16.ebuild 2017
-SHA256 cb9b855114316a61d4939f2c958718f65ddf984d7505203a999d282459ad8c6d gnome-speech-0.4.16.ebuild 2017
-EBUILD gnome-speech-0.4.4.ebuild 1947 RMD160 6ea4aec7b8366b194e349ee2785eecc3833ed8e3 SHA1 c4064427e63b6be89f02dfb232d73bb1ec8299e5 SHA256 d30d12777b92112426abd7c73b50b06acaa6da6a07d54dcc2cb43dfb6187c940
-MD5 5ad54a6ef4af60b9aba972caa5abb0f9 gnome-speech-0.4.4.ebuild 1947
-RMD160 6ea4aec7b8366b194e349ee2785eecc3833ed8e3 gnome-speech-0.4.4.ebuild 1947
-SHA256 d30d12777b92112426abd7c73b50b06acaa6da6a07d54dcc2cb43dfb6187c940 gnome-speech-0.4.4.ebuild 1947
-EBUILD gnome-speech-0.4.6.ebuild 1944 RMD160 ee5dff86c70db1aa5db1f3f2dcab7a910262bb45 SHA1 bc172e325b0c7b9fb51782016386299eca76bf97 SHA256 baff870699c57970c682fb13f27870f2129f569eef75c3acb8ce4c6550e8d4d5
-MD5 6c8b9d44949dfaf18cd18804843154d7 gnome-speech-0.4.6.ebuild 1944
-RMD160 ee5dff86c70db1aa5db1f3f2dcab7a910262bb45 gnome-speech-0.4.6.ebuild 1944
-SHA256 baff870699c57970c682fb13f27870f2129f569eef75c3acb8ce4c6550e8d4d5 gnome-speech-0.4.6.ebuild 1944
-MISC ChangeLog 15010 RMD160 f99ab1845257bb73dac5530925f29c098fbcd984 SHA1 d05cade277db2a129faf82dc0d752154c3e53030 SHA256 501c558ded48315b9f746d9f11236e732f2a85502caf03aecf84c7cddb32da0e
-MD5 14747d2aae42ee38d4c8f3737e9b4aba ChangeLog 15010
-RMD160 f99ab1845257bb73dac5530925f29c098fbcd984 ChangeLog 15010
-SHA256 501c558ded48315b9f746d9f11236e732f2a85502caf03aecf84c7cddb32da0e ChangeLog 15010
+EBUILD gnome-speech-0.4.11.ebuild 2023 RMD160 d558d0326902deb611864164114baddaa3c215f0 SHA1 1ea707c6d21f7524a295d7f7aab2d4060d77eb61 SHA256 3ce764a443c7d7e36123ed5f6d406853b6aad9923d6a7f0b8a5994e339143475
+MD5 6f23be68a347df4efc9555affb835bb6 gnome-speech-0.4.11.ebuild 2023
+RMD160 d558d0326902deb611864164114baddaa3c215f0 gnome-speech-0.4.11.ebuild 2023
+SHA256 3ce764a443c7d7e36123ed5f6d406853b6aad9923d6a7f0b8a5994e339143475 gnome-speech-0.4.11.ebuild 2023
+EBUILD gnome-speech-0.4.16.ebuild 2023 RMD160 72a78018cf91024e3bfc699d36f7d94a10ef8360 SHA1 1a6a627f9ad88b6c736be878a2d2d5afc3f094ef SHA256 c957ea87c721f31c143966c1a42e909bd032c018069fd5db2c2be434b36d2b17
+MD5 fb9ea7187bf340e88a38883410606c21 gnome-speech-0.4.16.ebuild 2023
+RMD160 72a78018cf91024e3bfc699d36f7d94a10ef8360 gnome-speech-0.4.16.ebuild 2023
+SHA256 c957ea87c721f31c143966c1a42e909bd032c018069fd5db2c2be434b36d2b17 gnome-speech-0.4.16.ebuild 2023
+MISC ChangeLog 15304 RMD160 0966056d0894e10e6d1100e5ea89612ccbff60c8 SHA1 a793ceafbff7793f5bc1dd81b5cad9b4260e45e0 SHA256 a93ddd2c72fbd76b047abbf1b4f5abf736ee7877bd9c1115f2f25cc43bd03b22
+MD5 3b4227ff4b947bbbc514170e0f48e35a ChangeLog 15304
+RMD160 0966056d0894e10e6d1100e5ea89612ccbff60c8 ChangeLog 15304
+SHA256 a93ddd2c72fbd76b047abbf1b4f5abf736ee7877bd9c1115f2f25cc43bd03b22 ChangeLog 15304
 MISC metadata.xml 192 RMD160 98f696faa3b26ed7ddd7aadd47617dfbb6258c86 SHA1 c2562866ab17c3fcb564c7d9c3efb16b8140cfe8 SHA256 f9e1f3bc277c8d6083790462312f938b6f5189910a5e1719785343067796e1ec
 MD5 0cbaca6d8a9544b8fd3b75b6f6a9fae3 metadata.xml 192
 RMD160 98f696faa3b26ed7ddd7aadd47617dfbb6258c86 metadata.xml 192
 SHA256 f9e1f3bc277c8d6083790462312f938b6f5189910a5e1719785343067796e1ec metadata.xml 192
-MD5 07512d154890bc87da07c9c492c72967 files/digest-gnome-speech-0.4.0 259
-RMD160 c545a391dbca8fd544d1cc8305d2262d7475e70d files/digest-gnome-speech-0.4.0 259
-SHA256 1325fd83721b9dc4b22f816de038664cf78b10d6d0a215cbd6acf7761a8e6ef2 files/digest-gnome-speech-0.4.0 259
 MD5 df1a8b3d914201f49c2c8d1a72d4e4e3 files/digest-gnome-speech-0.4.11 262
 RMD160 22443f4a6c2d2b073d5bb6e4fca8ded91105f779 files/digest-gnome-speech-0.4.11 262
 SHA256 19e860c0ec22fbb32285007cdb5afc9a2bf4057db273c9ca0e5670f3639aabf9 files/digest-gnome-speech-0.4.11 262
-MD5 19af97a0b8b714b19223e3ae89e8553a files/digest-gnome-speech-0.4.15 262
-RMD160 f67cd22a780099cd4676c09e0cc20a431747f195 files/digest-gnome-speech-0.4.15 262
-SHA256 8c055253c07084e4093c453604161f745b334f73c4104de9b56d638cbc23be1b files/digest-gnome-speech-0.4.15 262
 MD5 b7be691241d2657fbdb3bea02b6ad451 files/digest-gnome-speech-0.4.16 262
 RMD160 38569f5d6a91c80a1733c94c877795e3d8dfaa8a files/digest-gnome-speech-0.4.16 262
 SHA256 f0fe978e7729026e883227e5bb0b599f55ec449630ac210a4393d1ae23a476cf files/digest-gnome-speech-0.4.16 262
-MD5 18129d3c1d647dd37d3218a33d410cf3 files/digest-gnome-speech-0.4.4 259
-RMD160 a69b571c1e12deb628c61414cee96566c04957db files/digest-gnome-speech-0.4.4 259
-SHA256 d2d417653ea719000068a68bd9aca8c2e8a45bd3c5836bc49b6364b75128b4d5 files/digest-gnome-speech-0.4.4 259
-MD5 b91b978510d587bc609977f8182c7bf1 files/digest-gnome-speech-0.4.6 259
-RMD160 d2eb9eab98e6c953cfeb9220c526d02c5535316d files/digest-gnome-speech-0.4.6 259
-SHA256 6300a202784cb60a72dbb45b4fea4e2b6a9320bdec283fcc67ca86731141e7c7 files/digest-gnome-speech-0.4.6 259
diff --git a/app-accessibility/gnome-speech/files/digest-gnome-speech-0.4.0 b/app-accessibility/gnome-speech/files/digest-gnome-speech-0.4.0
deleted file mode 100644
index 19a400d5c2bc..000000000000
--- a/app-accessibility/gnome-speech/files/digest-gnome-speech-0.4.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c27f3eb262b8a66a756872d25c716517 gnome-speech-0.4.0.tar.bz2 307108
-RMD160 35c69c26364601f92ab445315ba26711a60584ed gnome-speech-0.4.0.tar.bz2 307108
-SHA256 793dfc13fdb3ab010c4f891a6766569f49507d76410f5a111177c234672bdfcf gnome-speech-0.4.0.tar.bz2 307108
diff --git a/app-accessibility/gnome-speech/files/digest-gnome-speech-0.4.15 b/app-accessibility/gnome-speech/files/digest-gnome-speech-0.4.15
deleted file mode 100644
index 18fd321cf41d..000000000000
--- a/app-accessibility/gnome-speech/files/digest-gnome-speech-0.4.15
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7db55b99e668418dc5d49caeae8fe9e5 gnome-speech-0.4.15.tar.bz2 331723
-RMD160 249a3d528f30e989b8dfec87787f60d90ff371ae gnome-speech-0.4.15.tar.bz2 331723
-SHA256 e1f3d16bcdd833397e16c8df4f1a12cd06168cd29555cfeaa141e3d9e59cabe7 gnome-speech-0.4.15.tar.bz2 331723
diff --git a/app-accessibility/gnome-speech/files/digest-gnome-speech-0.4.4 b/app-accessibility/gnome-speech/files/digest-gnome-speech-0.4.4
deleted file mode 100644
index a9841b5de33b..000000000000
--- a/app-accessibility/gnome-speech/files/digest-gnome-speech-0.4.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c26dde244c969d7a00b229f256e77546 gnome-speech-0.4.4.tar.bz2 309806
-RMD160 c3efb407ca06149c67f6b4eb04d38c018b31ecc3 gnome-speech-0.4.4.tar.bz2 309806
-SHA256 318ebf3a3f4bd05d534202839ce779f1c823f26305b625703b9615c803d74e6c gnome-speech-0.4.4.tar.bz2 309806
diff --git a/app-accessibility/gnome-speech/files/digest-gnome-speech-0.4.6 b/app-accessibility/gnome-speech/files/digest-gnome-speech-0.4.6
deleted file mode 100644
index 3cf0798ca5de..000000000000
--- a/app-accessibility/gnome-speech/files/digest-gnome-speech-0.4.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4abb15089e20edeccbe2edbac6572f4e gnome-speech-0.4.6.tar.bz2 311080
-RMD160 4e6ca040f590492aa58b40ed6cd8b690b05fcde7 gnome-speech-0.4.6.tar.bz2 311080
-SHA256 eef3e578ef6d1614a2793cfbac28c345b673bfc1e2219841977a8c1b8f892b19 gnome-speech-0.4.6.tar.bz2 311080
diff --git a/app-accessibility/gnome-speech/gnome-speech-0.4.0.ebuild b/app-accessibility/gnome-speech/gnome-speech-0.4.0.ebuild
deleted file mode 100644
index 6b42ada14e57..000000000000
--- a/app-accessibility/gnome-speech/gnome-speech-0.4.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2007 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.0.ebuild,v 1.12 2007/07/11 02:34:03 leio Exp $
-
-inherit java-pkg 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"
-IUSE="freetts"
-
-COMMON_DEPEND=">=gnome-base/libbonobo-1.97
-	>=gnome-base/orbit-2.3.94
-	>=dev-libs/glib-2
-	freetts? (
-		=app-accessibility/freetts-1.2*
-		>=app-accessibility/java-access-bridge-1.4.6 )"
-
-RDEPEND="$COMMON_DEPEND
-	freetts? ( virtual/jre )
-	app-accessibility/festival"
-
-DEPEND="$COMMON_DEPEND
-	freetts? (
-		virtual/jdk
-		dev-java/java-config )
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="--with-festival --with-speech-dispatcher"
-
-	if use freetts; then
-		java-pkg_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() {
-	unpack "${A}"
-	cd "${S}"
-
-	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.11.ebuild b/app-accessibility/gnome-speech/gnome-speech-0.4.11.ebuild
index 6e060476edcf..6f25df0b42a0 100644
--- a/app-accessibility/gnome-speech/gnome-speech-0.4.11.ebuild
+++ b/app-accessibility/gnome-speech/gnome-speech-0.4.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.11.ebuild,v 1.11 2007/07/25 21:42:22 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-speech/gnome-speech-0.4.11.ebuild,v 1.12 2007/10/23 23:58:43 wltjr Exp $
 
 JAVA_PKG_OPT_USE="freetts"
 
@@ -60,15 +60,15 @@ src_unpack() {
 	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
+		"${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
+		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.4.15.ebuild b/app-accessibility/gnome-speech/gnome-speech-0.4.15.ebuild
deleted file mode 100644
index f90538ab347f..000000000000
--- a/app-accessibility/gnome-speech/gnome-speech-0.4.15.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2007 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.15.ebuild,v 1.1 2007/07/24 22:01:42 eva 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="--with-festival --with-speech-dispatcher"
-
-	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.16.ebuild b/app-accessibility/gnome-speech/gnome-speech-0.4.16.ebuild
index dd0a7f212afa..8927b7a829eb 100644
--- a/app-accessibility/gnome-speech/gnome-speech-0.4.16.ebuild
+++ b/app-accessibility/gnome-speech/gnome-speech-0.4.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.16.ebuild,v 1.7 2007/10/03 05:59:57 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-speech/gnome-speech-0.4.16.ebuild,v 1.8 2007/10/23 23:58:43 wltjr Exp $
 
 JAVA_PKG_OPT_USE="freetts"
 
@@ -60,15 +60,15 @@ src_unpack() {
 	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
+		"${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
+		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.4.4.ebuild b/app-accessibility/gnome-speech/gnome-speech-0.4.4.ebuild
deleted file mode 100644
index 9f8fc7f83aca..000000000000
--- a/app-accessibility/gnome-speech/gnome-speech-0.4.4.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2007 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.4.ebuild,v 1.3 2007/07/11 02:34:03 leio Exp $
-
-inherit java-pkg 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"
-IUSE="freetts"
-
-COMMON_DEPEND=">=gnome-base/libbonobo-1.97
-	>=gnome-base/orbit-2.3.94
-	>=dev-libs/glib-2
-	freetts? (
-		=app-accessibility/freetts-1.2*
-		>=app-accessibility/java-access-bridge-1.4.6 )"
-
-RDEPEND="$COMMON_DEPEND
-	freetts? ( virtual/jre )
-	app-accessibility/festival"
-
-DEPEND="$COMMON_DEPEND
-	freetts? (
-		virtual/jdk
-		dev-java/java-config )
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="--with-festival --with-speech-dispatcher"
-
-	if use freetts; then
-		java-pkg_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() {
-	unpack "${A}"
-	cd "${S}"
-
-	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.6.ebuild b/app-accessibility/gnome-speech/gnome-speech-0.4.6.ebuild
deleted file mode 100644
index b92ec8123316..000000000000
--- a/app-accessibility/gnome-speech/gnome-speech-0.4.6.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2007 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.6.ebuild,v 1.11 2007/07/11 02:34:03 leio Exp $
-
-inherit java-pkg 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"
-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-java/java-config )
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="--with-festival --with-speech-dispatcher"
-
-	if use freetts; then
-		java-pkg_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
-}