From be9170cad2ec4f632323cf45d87144af97a74c1f Mon Sep 17 00:00:00 2001
From: William Thomson <wltjr@gentoo.org>
Date: Sun, 20 May 2007 23:24:56 +0000
Subject: Switched init/conf.d file to use GENTOO_VM instead of JAVA_HOME.
 (Portage version: 2.1.2.7)

---
 www-servers/tomcat/files/5.5/tomcat.conf.2       | 6 +++---
 www-servers/tomcat/files/5.5/tomcat.init.2       | 5 ++++-
 www-servers/tomcat/files/digest-tomcat-5.5.23-r4 | 3 ---
 www-servers/tomcat/files/digest-tomcat-5.5.23-r5 | 3 +++
 4 files changed, 10 insertions(+), 7 deletions(-)
 delete mode 100644 www-servers/tomcat/files/digest-tomcat-5.5.23-r4
 create mode 100644 www-servers/tomcat/files/digest-tomcat-5.5.23-r5

(limited to 'www-servers/tomcat/files')

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-r4
deleted file mode 100644
index e0e59f68fbb2..000000000000
--- a/www-servers/tomcat/files/digest-tomcat-5.5.23-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 362d1d8b15dc09882440dcab8c592dd7 apache-tomcat-5.5.23-src.tar.gz 4895919
-RMD160 fe669f6b864fd7dcf4ad74dad22a0256e5417005 apache-tomcat-5.5.23-src.tar.gz 4895919
-SHA256 e2f7ce250643349507b511a5ea96df7364030a061a8f4d5b71d8b5a099e2b6bd apache-tomcat-5.5.23-src.tar.gz 4895919
diff --git a/www-servers/tomcat/files/digest-tomcat-5.5.23-r5 b/www-servers/tomcat/files/digest-tomcat-5.5.23-r5
new file mode 100644
index 000000000000..e0e59f68fbb2
--- /dev/null
+++ b/www-servers/tomcat/files/digest-tomcat-5.5.23-r5
@@ -0,0 +1,3 @@
+MD5 362d1d8b15dc09882440dcab8c592dd7 apache-tomcat-5.5.23-src.tar.gz 4895919
+RMD160 fe669f6b864fd7dcf4ad74dad22a0256e5417005 apache-tomcat-5.5.23-src.tar.gz 4895919
+SHA256 e2f7ce250643349507b511a5ea96df7364030a061a8f4d5b71d8b5a099e2b6bd apache-tomcat-5.5.23-src.tar.gz 4895919
-- 
cgit v1.2.3-65-gdbad