8 files changed, 44 insertions, 35 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 3bfc08e77b89..6d53a1bc6804 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.140 2007/05/15 17:04:37 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.141 2007/05/17 21:15:05 wltjr Exp $
+
+*tomcat-6.0.13-r1 (17 May 2007)
+*tomcat-5.5.23-r3 (17 May 2007)
+
+  17 May 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  files/5.5/tomcat.init.2, files/6/tomcat.init, -tomcat-5.5.23-r2.ebuild,
+  +tomcat-5.5.23-r3.ebuild, -tomcat-6.0.13.ebuild, +tomcat-6.0.13-r1.ebuild:
+  Fixed init scripts to capture stdout/stderr. Work around for s-s-d lack of
+  --stdout/--stderr.
 
 *tomcat-6.0.13 (15 May 2007)
 
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 233252df3f64..39b9403a4b54 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 3398 RMD160 0838025a8769419812fed44b61a86e27bf132dd9 SHA1 fd07978711a7a2ccf3aba0a6c13a2b12e01adb6a SHA256 f0648672f511cbef26dc924ceadc4ef068fa93d03bfcd647d76810b7700ac658
-MD5 ea282cc0c9693e916afa1966673f0717 files/5.5/tomcat.init.2 3398
-RMD160 0838025a8769419812fed44b61a86e27bf132dd9 files/5.5/tomcat.init.2 3398
-SHA256 f0648672f511cbef26dc924ceadc4ef068fa93d03bfcd647d76810b7700ac658 files/5.5/tomcat.init.2 3398
+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_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
@@ -54,28 +54,28 @@ AUX 6/tomcat.conf 2742 RMD160 c96fda0f18942b8bffa583f08a82cea1b70430d4 SHA1 4c36
 MD5 fde3c467493c7a29b54eedce3d57ff94 files/6/tomcat.conf 2742
 RMD160 c96fda0f18942b8bffa583f08a82cea1b70430d4 files/6/tomcat.conf 2742
 SHA256 bf8a205c477605ea88a7fa1a8d9535edc0a1e1cc4d4b92e0be09e950075474a6 files/6/tomcat.conf 2742
-AUX 6/tomcat.init 3366 RMD160 d0b9365fd46b165ecd55ebc5518c9b63ca294fd3 SHA1 fcbcbbabe9f0ba8a95968b6e85a7326324ea0ae4 SHA256 ed61a204a312b56641e52e9e6c910c6b350e1e40b31b2e197ed300816e7b2738
-MD5 5ca14d034cc9c2eac4944a247d1958b0 files/6/tomcat.init 3366
-RMD160 d0b9365fd46b165ecd55ebc5518c9b63ca294fd3 files/6/tomcat.init 3366
-SHA256 ed61a204a312b56641e52e9e6c910c6b350e1e40b31b2e197ed300816e7b2738 files/6/tomcat.init 3366
+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
+SHA256 d53e31a221a3e78f6cc8686d7e123da10216a46851e64a2f5819f1f8147b86b8 files/6/tomcat.init 3355
 DIST apache-tomcat-5.5.23-src.tar.gz 4895919 RMD160 fe669f6b864fd7dcf4ad74dad22a0256e5417005 SHA1 59272b5eedde9c32a126679ff9e1d2a5f56265c8 SHA256 e2f7ce250643349507b511a5ea96df7364030a061a8f4d5b71d8b5a099e2b6bd
 DIST apache-tomcat-6.0.13-src.tar.gz 3454302 RMD160 2ef73ec380736661969f28c231a4a0c9fbd6d29c SHA1 8a60e80b878609dc207a357fede749c67857dd54 SHA256 273c6d56283677c0c7033e6ecce53ba7f1fac6930e20e83acccfe2ac88c6a6ff
 EBUILD tomcat-5.5.23-r1.ebuild 10630 RMD160 a164f36224fb766d6f10092d84b953dc5930b5a0 SHA1 d731665a2123e5d73952c48dce272e94334bbd4e SHA256 97454d3a2e93b87c86d52b29b075842e6e80d77b948e777fac7b9db4d8a7ca2b
 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-r2.ebuild 10900 RMD160 e45b52fd95e15716f9065f96d140fe3ffa344c2a SHA1 4fc30c9e8844f0f6928e5b093e0618a27df659e6 SHA256 02f9e36e0e7da42eefc5f49ac027a994a02b7f6172d16b29d3953661d915711c
-MD5 351096c6975a777f81f7d3d8c01c8701 tomcat-5.5.23-r2.ebuild 10900
-RMD160 e45b52fd95e15716f9065f96d140fe3ffa344c2a tomcat-5.5.23-r2.ebuild 10900
-SHA256 02f9e36e0e7da42eefc5f49ac027a994a02b7f6172d16b29d3953661d915711c tomcat-5.5.23-r2.ebuild 10900
-EBUILD tomcat-6.0.13.ebuild 5918 RMD160 284791dc8c32b579b5c6e85a16ef0cec602d1ec5 SHA1 619d918681fda29b6f85fcceea56087fb2622304 SHA256 13dc319e556f6713912bf763cc240a0920afe89ae73fadc4083e94faa6f78c6f
-MD5 a7d1f4ee8bbe8ea75a1622857bce0dd6 tomcat-6.0.13.ebuild 5918
-RMD160 284791dc8c32b579b5c6e85a16ef0cec602d1ec5 tomcat-6.0.13.ebuild 5918
-SHA256 13dc319e556f6713912bf763cc240a0920afe89ae73fadc4083e94faa6f78c6f tomcat-6.0.13.ebuild 5918
-MISC ChangeLog 44932 RMD160 4860dad00c02efdedb576b84331f646a84093917 SHA1 3be8346e5dcb79e695c1bb8c3dba117d163e5f9a SHA256 a15fdf2ac8906a49709d0be458a19ab074605b1af83e849704e1102b8aead6eb
-MD5 092fa5efbbdeb5eb395fb4337fdffddb ChangeLog 44932
-RMD160 4860dad00c02efdedb576b84331f646a84093917 ChangeLog 44932
-SHA256 a15fdf2ac8906a49709d0be458a19ab074605b1af83e849704e1102b8aead6eb ChangeLog 44932
+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-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 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-r2 277
-RMD160 c7a3b4f7dd1b085332606c3d6a68cc21f0ff78e2 files/digest-tomcat-5.5.23-r2 277
-SHA256 7c1430575374307e6337ec7f22b7822c2093deb36bb3e9fffaa4cf8b23f34051 files/digest-tomcat-5.5.23-r2 277
-MD5 689139367c10950ec819a442eb5dd0c1 files/digest-tomcat-6.0.13 277
-RMD160 ede80f760c03677d75cfabf3c000208361d6c3c0 files/digest-tomcat-6.0.13 277
-SHA256 66e25a7d2aed203cbc675c9e7c247da0627936e4bb7c7f9b992e511110f2993c files/digest-tomcat-6.0.13 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 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 f7ef4e2087f7..274138eeb9fe 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.2 2007/05/15 04:50:31 wltjr Exp $
+# $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 $
 
 init_env_vars() {
 	# Set some sane defaults
@@ -43,12 +43,12 @@ init_env_vars() {
 start_helper() {
 	local executor=${1}
 	shift
-	local arguments="--start --quiet --background \
+	local arguments="--start --quiet \
 		--chdir "${CATALINA_TMPDIR}" \
 		--chuid ${CATALINA_USER}:${CATALINA_GROUP} \
 		--make-pidfile --pidfile /var/run/tomcat-5.5.pid"
 	start-stop-daemon ${arguments} --exec ${executor} -- ${OPTS_CP} "$@" \
-		${CATALINA_ARGS} ${TOMCAT_START} >> "${CATALINA_BASE}"/logs/catalina.out 2>&1
+		${CATALINA_ARGS} ${TOMCAT_START} >> "${CATALINA_BASE}"/logs/catalina.out 2>&1 &
 	return $?
 }
 
diff --git a/www-servers/tomcat/files/6/tomcat.init b/www-servers/tomcat/files/6/tomcat.init
index b8a77144442f..24fbea7901c5 100755
--- a/www-servers/tomcat/files/6/tomcat.init
+++ b/www-servers/tomcat/files/6/tomcat.init
@@ -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/6/tomcat.init,v 1.7 2007/05/15 04:50:31 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.init,v 1.8 2007/05/17 21:15:05 wltjr Exp $
 
 init_env_vars() {
 	# Populate JAVA_HOME
@@ -44,12 +44,12 @@ init_env_vars() {
 start_helper() {
 	local executor=${1}
 	shift
-	local arguments="--start --quiet --background \
+	local arguments="--start --quiet \
 		--chdir "${CATALINA_TMPDIR}" \
 		--chuid ${CATALINA_USER}:${CATALINA_GROUP} \
 		--make-pidfile --pidfile /var/run/tomcat-6.pid"
 	start-stop-daemon ${arguments} --exec ${executor} -- ${OPTS_CP} "$@" \
-		${CATALINA_ARGS} ${TOMCAT_START} >> "${CATALINA_BASE}"/logs/catalina.out 2>&1
+		${CATALINA_ARGS} ${TOMCAT_START} >> "${CATALINA_BASE}"/logs/catalina.out 2>&1 &
 	return $?
 }
 
diff --git a/www-servers/tomcat/files/digest-tomcat-5.5.23-r2 b/www-servers/tomcat/files/digest-tomcat-5.5.23-r3
index e0e59f68fbb2..e0e59f68fbb2 100644
--- a/www-servers/tomcat/files/digest-tomcat-5.5.23-r2
+++ b/www-servers/tomcat/files/digest-tomcat-5.5.23-r3
diff --git a/www-servers/tomcat/files/digest-tomcat-6.0.13 b/www-servers/tomcat/files/digest-tomcat-6.0.13-r1
index d9bfd1fdd00f..d9bfd1fdd00f 100644
--- a/www-servers/tomcat/files/digest-tomcat-6.0.13
+++ b/www-servers/tomcat/files/digest-tomcat-6.0.13-r1
diff --git a/www-servers/tomcat/tomcat-5.5.23-r2.ebuild b/www-servers/tomcat/tomcat-5.5.23-r3.ebuild
index c26176961751..e2a44b4adad7 100644
--- a/www-servers/tomcat/tomcat-5.5.23-r2.ebuild
+++ b/www-servers/tomcat/tomcat-5.5.23-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-5.5.23-r2.ebuild,v 1.1 2007/05/15 04:37:21 wltjr Exp $
+# $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 $
 
 #WANT_ANT_TASKS="ant-trax"
 
diff --git a/www-servers/tomcat/tomcat-6.0.13.ebuild b/www-servers/tomcat/tomcat-6.0.13-r1.ebuild
index bd4f983416a3..8ac2de83bfb3 100644
--- a/www-servers/tomcat/tomcat-6.0.13.ebuild
+++ b/www-servers/tomcat/tomcat-6.0.13-r1.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.ebuild,v 1.1 2007/05/15 17:04:37 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.13-r1.ebuild,v 1.1 2007/05/17 21:15:05 wltjr Exp $
 
 WANT_ANT_TASKS="ant-trax"