Fix for bug #180474

Package-Manager: portage-2.1.2.7

8 files changed, 44 insertions, 35 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index dfedf131c985..b62daef3c494 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,15 @@
 # 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.147 2007/05/31 18:15:52 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.148 2007/05/31 23:01:57 wltjr Exp $
+
+*tomcat-6.0.13-r3 (31 May 2007)
+*tomcat-5.5.23-r6 (31 May 2007)
+
+  31 May 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  files/5.5/tomcat.conf.2, files/6/tomcat.conf, -tomcat-5.5.23-r5.ebuild,
+  +tomcat-5.5.23-r6.ebuild, -tomcat-6.0.13-r2.ebuild,
+  +tomcat-6.0.13-r3.ebuild:
+  Fix for bug #180474
 
 *tomcat-6.0.13-r2 (31 May 2007)
 
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index ee04809a893b..2abc717f1a6b 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -26,10 +26,10 @@ 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 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.conf.2 2775 RMD160 9ab105f0e57276c105fb406d5632cc2a47401c26 SHA1 cb00a622c7858a81838292200d36d7901ee9cb2e SHA256 7539da9262abd8f8b04e9589e8a733a64670f641035a1ca8a40a236e486038f2
+MD5 2414998ef3f5b7c89ed3db952803d948 files/5.5/tomcat.conf.2 2775
+RMD160 9ab105f0e57276c105fb406d5632cc2a47401c26 files/5.5/tomcat.conf.2 2775
+SHA256 7539da9262abd8f8b04e9589e8a733a64670f641035a1ca8a40a236e486038f2 files/5.5/tomcat.conf.2 2775
 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
@@ -50,10 +50,10 @@ AUX 6/catalina.policy 6956 RMD160 957ad3b5dc4aeaa5acd289cdaada0a2e48974d52 SHA1
 MD5 379187530127260974bdf88624d22d2e files/6/catalina.policy 6956
 RMD160 957ad3b5dc4aeaa5acd289cdaada0a2e48974d52 files/6/catalina.policy 6956
 SHA256 9399efda3f6cfc238fb783fb338060e67aff15d0044b31c3d0265e1f9e5769e5 files/6/catalina.policy 6956
-AUX 6/tomcat.conf 2742 RMD160 c96fda0f18942b8bffa583f08a82cea1b70430d4 SHA1 4c36744b2e7f29c2f5b8091885a79bb0ce30c7a3 SHA256 bf8a205c477605ea88a7fa1a8d9535edc0a1e1cc4d4b92e0be09e950075474a6
-MD5 fde3c467493c7a29b54eedce3d57ff94 files/6/tomcat.conf 2742
-RMD160 c96fda0f18942b8bffa583f08a82cea1b70430d4 files/6/tomcat.conf 2742
-SHA256 bf8a205c477605ea88a7fa1a8d9535edc0a1e1cc4d4b92e0be09e950075474a6 files/6/tomcat.conf 2742
+AUX 6/tomcat.conf 2756 RMD160 4679e6b1e15c3ef70b832f57f1e7f85b21d60b38 SHA1 a48eaaffb5537cf8a2756cc3d23a8306e3fa7291 SHA256 159edf302064703b7636f381d2a0e2f8a4d533bdad4f438795d1b98728785a82
+MD5 382c46c538154f839778fa56ec8efac1 files/6/tomcat.conf 2756
+RMD160 4679e6b1e15c3ef70b832f57f1e7f85b21d60b38 files/6/tomcat.conf 2756
+SHA256 159edf302064703b7636f381d2a0e2f8a4d533bdad4f438795d1b98728785a82 files/6/tomcat.conf 2756
 AUX 6/tomcat.init 3355 RMD160 169a9af752e814f7cafbfa849fb1dbc433bbbbf3 SHA1 96a474418bfe6844468ac43fd7b4ecc53e7ce942 SHA256 d53e31a221a3e78f6cc8686d7e123da10216a46851e64a2f5819f1f8147b86b8
 MD5 f6b8899fba578a03064c63fce6fcb916 files/6/tomcat.init 3355
 RMD160 169a9af752e814f7cafbfa849fb1dbc433bbbbf3 files/6/tomcat.init 3355
@@ -64,22 +64,22 @@ 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-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-5.5.23-r6.ebuild 10900 RMD160 3f37e78130e8ec4918c61db449b0333923370008 SHA1 646b903a3bd64d035330ef81d1c496da5c53fc3c SHA256 7899e88d03d27b630b601398343a760e4f6b755f1c065766faea9e0ec4887865
+MD5 0590e042b6d851605229c7beccb955e0 tomcat-5.5.23-r6.ebuild 10900
+RMD160 3f37e78130e8ec4918c61db449b0333923370008 tomcat-5.5.23-r6.ebuild 10900
+SHA256 7899e88d03d27b630b601398343a760e4f6b755f1c065766faea9e0ec4887865 tomcat-5.5.23-r6.ebuild 10900
 EBUILD tomcat-6.0.13-r1.ebuild 6074 RMD160 77ee406c7b9be25f343ad9d0bbd779540f45a47c SHA1 02f6812bf6e4ef0585e892a42ed2903fdaed00d5 SHA256 4b25228b9bcc255a04ee66afc8b5a17bd0e775b116f9e75633927e077a969f06
 MD5 a4f036b0755970f72a6f5f4f484ed67d tomcat-6.0.13-r1.ebuild 6074
 RMD160 77ee406c7b9be25f343ad9d0bbd779540f45a47c tomcat-6.0.13-r1.ebuild 6074
 SHA256 4b25228b9bcc255a04ee66afc8b5a17bd0e775b116f9e75633927e077a969f06 tomcat-6.0.13-r1.ebuild 6074
-EBUILD tomcat-6.0.13-r2.ebuild 5899 RMD160 aa0a69467970367e56e2032e87014d4dee9e381f SHA1 e9e996c62096f4ed07b7548b9c5fbe1c13f3def0 SHA256 987526e35ebb5b2d2c0553e57361e87b495531b0c7014184c1ffab745d76cbe4
-MD5 21b80bb4381509a13c80e155c344fd47 tomcat-6.0.13-r2.ebuild 5899
-RMD160 aa0a69467970367e56e2032e87014d4dee9e381f tomcat-6.0.13-r2.ebuild 5899
-SHA256 987526e35ebb5b2d2c0553e57361e87b495531b0c7014184c1ffab745d76cbe4 tomcat-6.0.13-r2.ebuild 5899
-MISC ChangeLog 46579 RMD160 e5818e3f9f42f4dd217e073a7568f39f68f768b1 SHA1 294e3dfe0e8f23304f9b352482b3d7369fef6e0a SHA256 07684ab15a201917c114971773d8f1a62f925ccc482339acef96ce9930e30ffd
-MD5 8ab5fe1c11ea31a23cfd6e6eab270ef9 ChangeLog 46579
-RMD160 e5818e3f9f42f4dd217e073a7568f39f68f768b1 ChangeLog 46579
-SHA256 07684ab15a201917c114971773d8f1a62f925ccc482339acef96ce9930e30ffd ChangeLog 46579
+EBUILD tomcat-6.0.13-r3.ebuild 5899 RMD160 581409f10913553caa1585fb5daef6140f232950 SHA1 ccce3659ccbdefd13ef9f2289a7792d83fa5bda1 SHA256 06ec336bf9b5cefca8ac5f744afccea45213fa98f322a686b346ec265f2f2021
+MD5 60383c9047b735cda0a6c8952bd4c2db tomcat-6.0.13-r3.ebuild 5899
+RMD160 581409f10913553caa1585fb5daef6140f232950 tomcat-6.0.13-r3.ebuild 5899
+SHA256 06ec336bf9b5cefca8ac5f744afccea45213fa98f322a686b346ec265f2f2021 tomcat-6.0.13-r3.ebuild 5899
+MISC ChangeLog 46880 RMD160 bf8923efb434ddd16ceccb71b6305d0f702c0028 SHA1 d073a646d625ba272d893d9a3e0bbda1492533e6 SHA256 d2fe18e8a09622458798ca432d877eaad5c6868f4c8837cadb3301fa7b5f70b4
+MD5 45f4412fd3d56ac7f2fdd5b2060db70c ChangeLog 46880
+RMD160 bf8923efb434ddd16ceccb71b6305d0f702c0028 ChangeLog 46880
+SHA256 d2fe18e8a09622458798ca432d877eaad5c6868f4c8837cadb3301fa7b5f70b4 ChangeLog 46880
 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79
 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556
 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556
@@ -87,12 +87,12 @@ 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-r5 277
-RMD160 c7a3b4f7dd1b085332606c3d6a68cc21f0ff78e2 files/digest-tomcat-5.5.23-r5 277
-SHA256 7c1430575374307e6337ec7f22b7822c2093deb36bb3e9fffaa4cf8b23f34051 files/digest-tomcat-5.5.23-r5 277
+MD5 6947c731df35ce2149f4a2f8009b575f files/digest-tomcat-5.5.23-r6 277
+RMD160 c7a3b4f7dd1b085332606c3d6a68cc21f0ff78e2 files/digest-tomcat-5.5.23-r6 277
+SHA256 7c1430575374307e6337ec7f22b7822c2093deb36bb3e9fffaa4cf8b23f34051 files/digest-tomcat-5.5.23-r6 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
-MD5 689139367c10950ec819a442eb5dd0c1 files/digest-tomcat-6.0.13-r2 277
-RMD160 ede80f760c03677d75cfabf3c000208361d6c3c0 files/digest-tomcat-6.0.13-r2 277
-SHA256 66e25a7d2aed203cbc675c9e7c247da0627936e4bb7c7f9b992e511110f2993c files/digest-tomcat-6.0.13-r2 277
+MD5 689139367c10950ec819a442eb5dd0c1 files/digest-tomcat-6.0.13-r3 277
+RMD160 ede80f760c03677d75cfabf3c000208361d6c3c0 files/digest-tomcat-6.0.13-r3 277
+SHA256 66e25a7d2aed203cbc675c9e7c247da0627936e4bb7c7f9b992e511110f2993c files/digest-tomcat-6.0.13-r3 277
diff --git a/www-servers/tomcat/files/5.5/tomcat.conf.2 b/www-servers/tomcat/files/5.5/tomcat.conf.2
index 8e33bfc34103..ea32decf3cc2 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.2 2007/05/20 23:24:56 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.5/tomcat.conf.2,v 1.3 2007/05/31 23:01:57 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: GENTOO_VM="sun-jdk-1.5"
+# Example: export GENTOO_VM="sun-jdk-1.5"
 
-#GENTOO_VM="sun-jdk-1.5"
+#export 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/6/tomcat.conf b/www-servers/tomcat/files/6/tomcat.conf
index b3648894ab4e..0e270c6345d7 100644
--- a/www-servers/tomcat/files/6/tomcat.conf
+++ b/www-servers/tomcat/files/6/tomcat.conf
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.conf,v 1.3 2007/05/15 04:37:21 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.conf,v 1.4 2007/05/31 23:01:57 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: GENTOO_VM="sun-jdk-1.6"
+# Example: export GENTOO_VM="sun-jdk-1.6"
 
-#GENTOO_VM="sun-jdk-1.6"
+#export GENTOO_VM="sun-jdk-1.6"
 
 # (Optional) Java runtime options used when the "start", "stop", or "run"
 # commands are executed.
diff --git a/www-servers/tomcat/files/digest-tomcat-5.5.23-r5 b/www-servers/tomcat/files/digest-tomcat-5.5.23-r6
index e0e59f68fbb2..e0e59f68fbb2 100644
--- a/www-servers/tomcat/files/digest-tomcat-5.5.23-r5
+++ b/www-servers/tomcat/files/digest-tomcat-5.5.23-r6
diff --git a/www-servers/tomcat/files/digest-tomcat-6.0.13-r2 b/www-servers/tomcat/files/digest-tomcat-6.0.13-r3
index d9bfd1fdd00f..d9bfd1fdd00f 100644
--- a/www-servers/tomcat/files/digest-tomcat-6.0.13-r2
+++ b/www-servers/tomcat/files/digest-tomcat-6.0.13-r3
diff --git a/www-servers/tomcat/tomcat-5.5.23-r5.ebuild b/www-servers/tomcat/tomcat-5.5.23-r6.ebuild
index 3b67324404cd..56f1eba06f65 100644
--- a/www-servers/tomcat/tomcat-5.5.23-r5.ebuild
+++ b/www-servers/tomcat/tomcat-5.5.23-r6.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-r5.ebuild,v 1.1 2007/05/20 23:24:56 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.23-r6.ebuild,v 1.1 2007/05/31 23:01:57 wltjr Exp $
 
 #WANT_ANT_TASKS="ant-trax"
 
diff --git a/www-servers/tomcat/tomcat-6.0.13-r2.ebuild b/www-servers/tomcat/tomcat-6.0.13-r3.ebuild
index c86b78e6dd4c..abc722ffb0e6 100644
--- a/www-servers/tomcat/tomcat-6.0.13-r2.ebuild
+++ b/www-servers/tomcat/tomcat-6.0.13-r3.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-6.0.13-r2.ebuild,v 1.1 2007/05/31 18:15:52 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.13-r3.ebuild,v 1.1 2007/05/31 23:01:57 wltjr Exp $
 
 WANT_ANT_TASKS="ant-trax"