Added code to init script to check VM version, fix for bug #179119

Package-Manager: portage-2.1.2.7

5 files changed, 32 insertions, 18 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 6d53a1bc6804..04fefd8c6084 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.141 2007/05/17 21:15:05 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.142 2007/05/20 21:42:12 wltjr Exp $
+
+*tomcat-5.5.23-r4 (20 May 2007)
+
+  20 May 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  files/5.5/tomcat.init.2, -tomcat-5.5.23-r3.ebuild,
+  +tomcat-5.5.23-r4.ebuild:
+  Added code to init script to check VM version, fix for bug #179119
 
 *tomcat-6.0.13-r1 (17 May 2007)
 *tomcat-5.5.23-r3 (17 May 2007)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 39b9403a4b54..9198fd77824c 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -34,10 +34,10 @@ AUX 5.5/tomcat.init 3376 RMD160 bde20b2d738174fda5792531037b36ed27db8280 SHA1 5f
 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 3387 RMD160 ee9b2a4f824eaf225d69762b3a0b7601805c3816 SHA1 52144cf5d6997be3b56fe08a97221da412110dc9 SHA256 bf6375bbd085ea4976b018d2152d91d7fc2e8e2169aafdd1458a57466a0d43aa
-MD5 62ceb7346b3bb1b248996553ae888c1c files/5.5/tomcat.init.2 3387
-RMD160 ee9b2a4f824eaf225d69762b3a0b7601805c3816 files/5.5/tomcat.init.2 3387
-SHA256 bf6375bbd085ea4976b018d2152d91d7fc2e8e2169aafdd1458a57466a0d43aa files/5.5/tomcat.init.2 3387
+AUX 5.5/tomcat.init.2 3617 RMD160 f365992be0dcad9a6fa8980fd7f746cbfc482f1b SHA1 8c1bf0138ee56fdd80432064bbb480028b4d5cf0 SHA256 fb5bacccb74ee32f9c39adc975ce6ad087ae9d1ceed2ba5d293496b1c9a496cc
+MD5 5561a910d85b338628d0041d51c95448 files/5.5/tomcat.init.2 3617
+RMD160 f365992be0dcad9a6fa8980fd7f746cbfc482f1b files/5.5/tomcat.init.2 3617
+SHA256 fb5bacccb74ee32f9c39adc975ce6ad087ae9d1ceed2ba5d293496b1c9a496cc files/5.5/tomcat.init.2 3617
 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-r3.ebuild 10900 RMD160 e0997e912d0c553c16dd79a4f57c2e41318fe3f4 SHA1 e6b7fb2da67e66a137b7c0403fe0859f87fe9f32 SHA256 560508ccb155c1b986d83a17d957f46381f9dd35b472cdf1a712156fb081896d
-MD5 ce3b0ed33e6227012a91962573efaab4 tomcat-5.5.23-r3.ebuild 10900
-RMD160 e0997e912d0c553c16dd79a4f57c2e41318fe3f4 tomcat-5.5.23-r3.ebuild 10900
-SHA256 560508ccb155c1b986d83a17d957f46381f9dd35b472cdf1a712156fb081896d tomcat-5.5.23-r3.ebuild 10900
+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-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 45304 RMD160 68ccb0118914719d327141f6cb15b5c7f5368ce5 SHA1 779d415065fedc29fd1e442e2ced2175579eef2b SHA256 43ae2c9e2fc0044bd5dc68e2e6868dcae772ca86f7e78ba293bc3757a624eb99
-MD5 b31a9c06066829a5bad2c5007cda187c ChangeLog 45304
-RMD160 68ccb0118914719d327141f6cb15b5c7f5368ce5 ChangeLog 45304
-SHA256 43ae2c9e2fc0044bd5dc68e2e6868dcae772ca86f7e78ba293bc3757a624eb99 ChangeLog 45304
+MISC ChangeLog 45545 RMD160 8f0435b4fb604f66c4f3c5c6ff285f65ce8cf468 SHA1 4e735801bc2497c114a355948a80f1b8d8e13a84 SHA256 5ff9d848041fee512ae2b14f6707f381088087a6ea221f6cba3aa24e07c9c710
+MD5 3e20b9d9700e85f1374bd453f33cc90c ChangeLog 45545
+RMD160 8f0435b4fb604f66c4f3c5c6ff285f65ce8cf468 ChangeLog 45545
+SHA256 5ff9d848041fee512ae2b14f6707f381088087a6ea221f6cba3aa24e07c9c710 ChangeLog 45545
 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-r3 277
-RMD160 c7a3b4f7dd1b085332606c3d6a68cc21f0ff78e2 files/digest-tomcat-5.5.23-r3 277
-SHA256 7c1430575374307e6337ec7f22b7822c2093deb36bb3e9fffaa4cf8b23f34051 files/digest-tomcat-5.5.23-r3 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 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.init.2 b/www-servers/tomcat/files/5.5/tomcat.init.2
index 274138eeb9fe..33b55921d8f8 100755
--- a/www-servers/tomcat/files/5.5/tomcat.init.2
+++ b/www-servers/tomcat/files/5.5/tomcat.init.2
@@ -1,9 +1,16 @@
 #!/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.3 2007/05/17 21:15:05 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.5/tomcat.init.2,v 1.4 2007/05/20 21:42:12 wltjr Exp $
 
 init_env_vars() {
+	if [ "$(gjl -p tomcat-5.5 --get-vm)" ] ; then
+		error "Tomcat has been compiled with java5 USE flag set."
+		error "Tomcat now requires a VM >=1.5 to run."
+		error "Please check your VM version, and restart Tomcat."
+		eend 1
+	fi
+
 	# 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-r3 b/www-servers/tomcat/files/digest-tomcat-5.5.23-r4
index e0e59f68fbb2..e0e59f68fbb2 100644
--- a/www-servers/tomcat/files/digest-tomcat-5.5.23-r3
+++ b/www-servers/tomcat/files/digest-tomcat-5.5.23-r4
diff --git a/www-servers/tomcat/tomcat-5.5.23-r3.ebuild b/www-servers/tomcat/tomcat-5.5.23-r4.ebuild
index e2a44b4adad7..9a7b0cce2279 100644
--- a/www-servers/tomcat/tomcat-5.5.23-r3.ebuild
+++ b/www-servers/tomcat/tomcat-5.5.23-r4.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-r3.ebuild,v 1.1 2007/05/17 21:15:05 wltjr Exp $
+# $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 $
 
 #WANT_ANT_TASKS="ant-trax"