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

Package-Manager: portage-2.1.2.7

6 files changed, 35 insertions, 25 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/Manifest b/www-servers/tomcat/Manifest
index 397788c1f903..dcaf4fd17fa9 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -26,18 +26,18 @@ AUX 5.5/tomcat.conf 2686 RMD160 37658c50dfc468fd446327e22db290aec2160403 SHA1 6e
 MD5 e466bcc62d074cc60b2d0e508da5a0d7 files/5.5/tomcat.conf 2686
 RMD160 37658c50dfc468fd446327e22db290aec2160403 files/5.5/tomcat.conf 2686
 SHA256 d95cbcfc5e23911755b11807868e64622e1e0c5b473d77db7ff758aa999a5f6c files/5.5/tomcat.conf 2686
-AUX 5.5/tomcat.conf.2 2779 RMD160 bfbc38408d9f78c8a75962f7ccb54338080bedea SHA1 a08e5906db3e110f1992570e3813eefe53660716 SHA256 cd975e26d76482f338fc9f3ff39ddf933171bf1ce7b1f4a2b446ed8727ef306a
-MD5 36bc5deec110ccc04307d6dc2500a0df files/5.5/tomcat.conf.2 2779
-RMD160 bfbc38408d9f78c8a75962f7ccb54338080bedea files/5.5/tomcat.conf.2 2779
-SHA256 cd975e26d76482f338fc9f3ff39ddf933171bf1ce7b1f4a2b446ed8727ef306a files/5.5/tomcat.conf.2 2779
+AUX 5.5/tomcat.conf.2 2761 RMD160 799f26a0db74c3d675314e234faf9acb442f8362 SHA1 8725ca7f9390b1cc2e6394f2af856c2eed2f9681 SHA256 c257ed7462faf479bd4b8657967460bdf09f2d41b984ce7ce8eb1eb13aa972c3
+MD5 0ead6fc77951db8823f3fafd878e4ccb files/5.5/tomcat.conf.2 2761
+RMD160 799f26a0db74c3d675314e234faf9acb442f8362 files/5.5/tomcat.conf.2 2761
+SHA256 c257ed7462faf479bd4b8657967460bdf09f2d41b984ce7ce8eb1eb13aa972c3 files/5.5/tomcat.conf.2 2761
 AUX 5.5/tomcat.init 3376 RMD160 bde20b2d738174fda5792531037b36ed27db8280 SHA1 5f3986a35e3046ffd81b839780f81322210fe879 SHA256 421ca1e7e4ab413e30ea708b0cacad398d472b857425b0d7a2963a4a4ce99e62
 MD5 19e200c22e63a7ce3b20ca5f6ba35eb4 files/5.5/tomcat.init 3376
 RMD160 bde20b2d738174fda5792531037b36ed27db8280 files/5.5/tomcat.init 3376
 SHA256 421ca1e7e4ab413e30ea708b0cacad398d472b857425b0d7a2963a4a4ce99e62 files/5.5/tomcat.init 3376
-AUX 5.5/tomcat.init.2 3620 RMD160 34cd444acbf78a711a2b29f90c267dabb6581a1b SHA1 4a2b45d6c1141653e620c8bfabc9130bca913e7a SHA256 2e11788c8da2194a1c0b78a01e00ab129810f7cae9a039d459d13d4fb8388ffe
-MD5 64b5c9ae5daa052ce06c234349e00937 files/5.5/tomcat.init.2 3620
-RMD160 34cd444acbf78a711a2b29f90c267dabb6581a1b files/5.5/tomcat.init.2 3620
-SHA256 2e11788c8da2194a1c0b78a01e00ab129810f7cae9a039d459d13d4fb8388ffe files/5.5/tomcat.init.2 3620
+AUX 5.5/tomcat.init.2 3679 RMD160 48068f010cb0f0fd4bf54384485faa8791b0d00d SHA1 a37bd7ba46d4fd25ee719b1e0d6042778be5f999 SHA256 e0f64f1e1b104c9cd9807308809e6e09a99b2fff235e4c1c7923fa64d9326e80
+MD5 ad04646bf2b9928dcb02b11e65429743 files/5.5/tomcat.init.2 3679
+RMD160 48068f010cb0f0fd4bf54384485faa8791b0d00d files/5.5/tomcat.init.2 3679
+SHA256 e0f64f1e1b104c9cd9807308809e6e09a99b2fff235e4c1c7923fa64d9326e80 files/5.5/tomcat.init.2 3679
 AUX 5.5/tomcat_build_xml.patch 13828 RMD160 3add8fb7d26bef7df205d3ec43e1a55cd6b739d4 SHA1 3a8ae3d686046f1938c71bd790d6f9ecf4339556 SHA256 9b1b9feb18d6f1dc5c2226c195f88a2f6cb9d68a2144e47e883fb57790c281f9
 MD5 47210f9a3e6b7c1809b34cfdab7fdb9b files/5.5/tomcat_build_xml.patch 13828
 RMD160 3add8fb7d26bef7df205d3ec43e1a55cd6b739d4 files/5.5/tomcat_build_xml.patch 13828
@@ -64,18 +64,18 @@ EBUILD tomcat-5.5.23-r1.ebuild 10630 RMD160 a164f36224fb766d6f10092d84b953dc5930
 MD5 ddc708762bdbc5648c2bbd2363e8996d tomcat-5.5.23-r1.ebuild 10630
 RMD160 a164f36224fb766d6f10092d84b953dc5930b5a0 tomcat-5.5.23-r1.ebuild 10630
 SHA256 97454d3a2e93b87c86d52b29b075842e6e80d77b948e777fac7b9db4d8a7ca2b tomcat-5.5.23-r1.ebuild 10630
-EBUILD tomcat-5.5.23-r4.ebuild 10900 RMD160 1772ba26b544455a33727d69a8b769b140ea2c28 SHA1 8e0bbe5e2e74bf76225618d2fe14d91ebdacc584 SHA256 3fe3c734cc072a68aee37cc17bc7cce66b036287e9f701215197e4f0d698abfc
-MD5 a9869da604fa5bb45de49885ce9a3b95 tomcat-5.5.23-r4.ebuild 10900
-RMD160 1772ba26b544455a33727d69a8b769b140ea2c28 tomcat-5.5.23-r4.ebuild 10900
-SHA256 3fe3c734cc072a68aee37cc17bc7cce66b036287e9f701215197e4f0d698abfc tomcat-5.5.23-r4.ebuild 10900
+EBUILD tomcat-5.5.23-r5.ebuild 10900 RMD160 33ebb6f474682f9f873afe58ce036f6c3ac71379 SHA1 01fbf71ff57a725c4f7f5e015a1cc5fa316afe8f SHA256 7c0ab84917d2dda736f3a52c4adb4269fccf8a3470b1c763a3064636d987e74e
+MD5 02b8dbee383270eb57271a8dcc4109ac tomcat-5.5.23-r5.ebuild 10900
+RMD160 33ebb6f474682f9f873afe58ce036f6c3ac71379 tomcat-5.5.23-r5.ebuild 10900
+SHA256 7c0ab84917d2dda736f3a52c4adb4269fccf8a3470b1c763a3064636d987e74e tomcat-5.5.23-r5.ebuild 10900
 EBUILD tomcat-6.0.13-r1.ebuild 5921 RMD160 83b4d0b71ffc9b2ba467e2c55d693271787d6670 SHA1 6d64525ee01618b6d8a7fc5d11f80631ab245ee6 SHA256 c7ac545cbd10d3d205fcba15db728c3b7c2607c71dac8d7516bfcbd48cdb13f5
 MD5 290cdbafb47f0017c1c2bcd46abfd15f tomcat-6.0.13-r1.ebuild 5921
 RMD160 83b4d0b71ffc9b2ba467e2c55d693271787d6670 tomcat-6.0.13-r1.ebuild 5921
 SHA256 c7ac545cbd10d3d205fcba15db728c3b7c2607c71dac8d7516bfcbd48cdb13f5 tomcat-6.0.13-r1.ebuild 5921
-MISC ChangeLog 45667 RMD160 23f1a60085a5b105f31babe87f2fa313775783c8 SHA1 9ab34371d25ac28cdc1a429d415dadc8d4f04313 SHA256 ef9a86374deb974977152b8deb09ee7f2832f0bc5266600eb242462d0b039343
-MD5 4b3f72d9f9c1d16148677a534f25fdf1 ChangeLog 45667
-RMD160 23f1a60085a5b105f31babe87f2fa313775783c8 ChangeLog 45667
-SHA256 ef9a86374deb974977152b8deb09ee7f2832f0bc5266600eb242462d0b039343 ChangeLog 45667
+MISC ChangeLog 45931 RMD160 6764b66f09f0b6fe43e742449940cfd7d689aa1f SHA1 443dec8e4b5b51433c2ea12942b8107992682743 SHA256 825970535d7aa8bbb64501a276b146e869be9ee37a8bb99283854da62c5de558
+MD5 4ee8deb23cf02b899de9a579f628380d ChangeLog 45931
+RMD160 6764b66f09f0b6fe43e742449940cfd7d689aa1f ChangeLog 45931
+SHA256 825970535d7aa8bbb64501a276b146e869be9ee37a8bb99283854da62c5de558 ChangeLog 45931
 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79
 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556
 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556
@@ -83,9 +83,9 @@ SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79 metadata
 MD5 6947c731df35ce2149f4a2f8009b575f files/digest-tomcat-5.5.23-r1 277
 RMD160 c7a3b4f7dd1b085332606c3d6a68cc21f0ff78e2 files/digest-tomcat-5.5.23-r1 277
 SHA256 7c1430575374307e6337ec7f22b7822c2093deb36bb3e9fffaa4cf8b23f34051 files/digest-tomcat-5.5.23-r1 277
-MD5 6947c731df35ce2149f4a2f8009b575f files/digest-tomcat-5.5.23-r4 277
-RMD160 c7a3b4f7dd1b085332606c3d6a68cc21f0ff78e2 files/digest-tomcat-5.5.23-r4 277
-SHA256 7c1430575374307e6337ec7f22b7822c2093deb36bb3e9fffaa4cf8b23f34051 files/digest-tomcat-5.5.23-r4 277
+MD5 6947c731df35ce2149f4a2f8009b575f files/digest-tomcat-5.5.23-r5 277
+RMD160 c7a3b4f7dd1b085332606c3d6a68cc21f0ff78e2 files/digest-tomcat-5.5.23-r5 277
+SHA256 7c1430575374307e6337ec7f22b7822c2093deb36bb3e9fffaa4cf8b23f34051 files/digest-tomcat-5.5.23-r5 277
 MD5 689139367c10950ec819a442eb5dd0c1 files/digest-tomcat-6.0.13-r1 277
 RMD160 ede80f760c03677d75cfabf3c000208361d6c3c0 files/digest-tomcat-6.0.13-r1 277
 SHA256 66e25a7d2aed203cbc675c9e7c247da0627936e4bb7c7f9b992e511110f2993c files/digest-tomcat-6.0.13-r1 277
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"