Switched init/conf.d file to use GENTOO_VM instead of JAVA_HOME.

(Portage version: 2.1.2.7)

5 files changed, 16 insertions, 6 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index a29cc2669ba8..1ff7d0a2a504 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.143 2007/05/20 23:11:45 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.144 2007/05/20 23:24:56 wltjr Exp $
+
+*tomcat-5.5.23-r5 (20 May 2007)
+
+  20 May 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  files/5.5/tomcat.conf.2, files/5.5/tomcat.init.2,
+  -tomcat-5.5.23-r4.ebuild, +tomcat-5.5.23-r5.ebuild:
+  Switched init/conf.d file to use GENTOO_VM instead of JAVA_HOME.
 
   20 May 2007; William L. Thomson Jr. <wltjr@gentoo.org>
   files/5.5/tomcat.init.2:
diff --git a/www-servers/tomcat/files/5.5/tomcat.conf.2 b/www-servers/tomcat/files/5.5/tomcat.conf.2
index b1cb95d3bc37..8e33bfc34103 100644
--- a/www-servers/tomcat/files/5.5/tomcat.conf.2
+++ b/www-servers/tomcat/files/5.5/tomcat.conf.2
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.5/tomcat.conf.2,v 1.1 2007/05/15 04:37:21 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.5/tomcat.conf.2,v 1.2 2007/05/20 23:24:56 wltjr Exp $
 
 # JVM Runtime
 # Using the default setting, it will determine your JVM from the system-vm
@@ -6,9 +6,9 @@
 # See java-config(1) manual page for assistance in determining this value.
 #
 # You can override this value with whatever path you wish.  
-# Example: JAVA_HOME=/opt/sun-jdk-1.4.2.05
+# Example: GENTOO_VM="sun-jdk-1.5"
 
-JAVA_HOME=`java-config --jre-home`
+#GENTOO_VM="sun-jdk-1.5"
 
 # (Optional) Java runtime options used when the "start", "stop", or "run"
 # commands are executed.
diff --git a/www-servers/tomcat/files/5.5/tomcat.init.2 b/www-servers/tomcat/files/5.5/tomcat.init.2
index a97dc5a3d7be..43cf79b0d665 100755
--- a/www-servers/tomcat/files/5.5/tomcat.init.2
+++ b/www-servers/tomcat/files/5.5/tomcat.init.2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.5/tomcat.init.2,v 1.5 2007/05/20 23:11:45 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.5/tomcat.init.2,v 1.6 2007/05/20 23:24:56 wltjr Exp $
 
 init_env_vars() {
 	if [ "$(gjl -p tomcat-5.5 --get-vm)" ] ; then
@@ -11,6 +11,9 @@ init_env_vars() {
 		eend 1
 	fi
 
+	# Populate JAVA_HOME
+	JAVA_HOME=`java-config --jre-home`
+
 	# Set some sane defaults
 	if [ -z "${CATALINA_TMPDIR}" ] ; then
 		CATALINA_TMPDIR="${CATALINA_BASE}"/temp
diff --git a/www-servers/tomcat/files/digest-tomcat-5.5.23-r4 b/www-servers/tomcat/files/digest-tomcat-5.5.23-r5
index e0e59f68fbb2..e0e59f68fbb2 100644
--- a/www-servers/tomcat/files/digest-tomcat-5.5.23-r4
+++ b/www-servers/tomcat/files/digest-tomcat-5.5.23-r5
diff --git a/www-servers/tomcat/tomcat-5.5.23-r4.ebuild b/www-servers/tomcat/tomcat-5.5.23-r5.ebuild
index 9a7b0cce2279..3b67324404cd 100644
--- a/www-servers/tomcat/tomcat-5.5.23-r4.ebuild
+++ b/www-servers/tomcat/tomcat-5.5.23-r5.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/www-servers/tomcat/tomcat-5.5.23-r4.ebuild,v 1.1 2007/05/20 21:42:12 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.23-r5.ebuild,v 1.1 2007/05/20 23:24:56 wltjr Exp $
 
 #WANT_ANT_TASKS="ant-trax"