Removed java gen1 ebuilds, and older versions, quoted vars

(Portage version: 2.1.3.15)

11 files changed, 15 insertions, 340 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/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
-}