Avoid global-scope commands. Marked 0.3.2-r1 stable (x86).

3 files changed, 32 insertions, 14 deletions

diff --git a/app-accessibility/gnome-speech/ChangeLog b/app-accessibility/gnome-speech/ChangeLog
index 79fd6d5b7931..ea01630ed11c 100644
--- a/app-accessibility/gnome-speech/ChangeLog
+++ b/app-accessibility/gnome-speech/ChangeLog
@@ -1,7 +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.7 2004/04/18 16:29:23 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-speech/ChangeLog,v 1.8 2004/04/22 04:57:16 leonardop Exp $
 
+  21 Apr 2004; L. Boshell <leonardop@gentoo.org> gnome-speech-0.3.2-r1.ebuild:
+  Remove java-config dependency and avoid global-scope commands. Resolves
+  bug #48384. Added java-related logic based on the JDK_HOME env variable.
+  Marked stable on x86.
+  
   18 Apr 2004; L. Boshell <leonardop@gentoo.org> gnome-speech-0.3.2.ebuild:
   Marked stable on x86.
   
diff --git a/app-accessibility/gnome-speech/Manifest b/app-accessibility/gnome-speech/Manifest
index 121b9b3c7c6b..6763a8badbb5 100644
--- a/app-accessibility/gnome-speech/Manifest
+++ b/app-accessibility/gnome-speech/Manifest
@@ -1,5 +1,5 @@
-MD5 2a15cf05819aa3ac37dc1bcd239a5826 ChangeLog 2497
-MD5 153510533099dbfe9ce95106449bfe5d gnome-speech-0.3.2-r1.ebuild 1298
+MD5 afd2e72bea3fc25c0338d2cb2db07515 ChangeLog 2752
+MD5 854207278a1720eaa5554c45d2616337 gnome-speech-0.3.2-r1.ebuild 1655
 MD5 da07b97c170eb339001ef1f547b6846b gnome-speech-0.2.8.ebuild 810
 MD5 4e36274fd4842aa259884cf5e8e13137 gnome-speech-0.3.1.ebuild 812
 MD5 5253659a4a0e45baa9f1788dcb705895 metadata.xml 172
diff --git a/app-accessibility/gnome-speech/gnome-speech-0.3.2-r1.ebuild b/app-accessibility/gnome-speech/gnome-speech-0.3.2-r1.ebuild
index 797da03d7af3..b5a289c37073 100644
--- a/app-accessibility/gnome-speech/gnome-speech-0.3.2-r1.ebuild
+++ b/app-accessibility/gnome-speech/gnome-speech-0.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.3 2004/04/04 19:19:01 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-speech/gnome-speech-0.3.2-r1.ebuild,v 1.4 2004/04/22 04:57:16 leonardop Exp $
 
 inherit java-pkg gnome2
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 SLOT="1"
 
-KEYWORDS="~x86 ~hppa ~alpha ~ia64 ~sparc ~amd64"
+KEYWORDS="x86 ~hppa ~alpha ~ia64 ~sparc ~amd64"
 LICENSE="LGPL-2"
 
 
@@ -27,19 +27,32 @@ RDEPEND=">=gnome-base/libbonobo-1.97
 #			app-accessibility/java-access-bridge ) )"
 
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	java? ( dev-java/java-config )"
+	dev-util/pkgconfig"
 
 DOCS="AUTHORS ChangeLog COPYING NEWS README"
 
 
-if [ `use java` ]
-then
-	G2CONF="${G2CONF} --with-java-home=$(java-config --jdk-home)"
-	G2CONF="${G2CONF} --with-jab-dir=${ROOT}/usr/share/java-access-bridge/lib"
-else
-	export JAVAC=no
-fi
+src_compile() {
+	if [ `use java` ]
+	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
+	gnome2_src_compile
+}
 
 
 src_install() {