From ca5491665cd9e9d047f7ce511c630650ac191888 Mon Sep 17 00:00:00 2001 From: William Thomson Date: Sun, 28 Jan 2007 07:26:59 +0000 Subject: [PATCH] Updated init script to capture std out per bug# 162379 Package-Manager: portage-2.1.2-r1 --- www-servers/tomcat/ChangeLog | 13 +++- www-servers/tomcat/Manifest | 66 +++++++++---------- www-servers/tomcat/files/5.5.20/tomcat.init | 6 +- www-servers/tomcat/files/6/tomcat.init | 6 +- ...cat-5.5.20-r9 => digest-tomcat-5.5.20-r10} | 0 ....7_beta-r4 => digest-tomcat-6.0.7_beta-r5} | 0 ..._alpha-r1 => digest-tomcat-6.0.8_alpha-r2} | 0 ....20-r9.ebuild => tomcat-5.5.20-r10.ebuild} | 2 +- ...-r4.ebuild => tomcat-6.0.7_beta-r5.ebuild} | 2 +- ...r1.ebuild => tomcat-6.0.8_alpha-r2.ebuild} | 2 +- 10 files changed, 52 insertions(+), 45 deletions(-) rename www-servers/tomcat/files/{digest-tomcat-5.5.20-r9 => digest-tomcat-5.5.20-r10} (100%) rename www-servers/tomcat/files/{digest-tomcat-6.0.7_beta-r4 => digest-tomcat-6.0.7_beta-r5} (100%) rename www-servers/tomcat/files/{digest-tomcat-6.0.8_alpha-r1 => digest-tomcat-6.0.8_alpha-r2} (100%) rename www-servers/tomcat/{tomcat-5.5.20-r9.ebuild => tomcat-5.5.20-r10.ebuild} (99%) rename www-servers/tomcat/{tomcat-6.0.7_beta-r4.ebuild => tomcat-6.0.7_beta-r5.ebuild} (98%) rename www-servers/tomcat/{tomcat-6.0.8_alpha-r1.ebuild => tomcat-6.0.8_alpha-r2.ebuild} (98%) diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index 9a0c02a39589..50a43330c12d 100644 --- a/www-servers/tomcat/ChangeLog +++ b/www-servers/tomcat/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for www-servers/tomcat # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.109 2007/01/27 05:16:11 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.110 2007/01/28 07:26:59 wltjr Exp $ + +*tomcat-6.0.8_alpha-r2 (28 Jan 2007) +*tomcat-6.0.7_beta-r5 (28 Jan 2007) +*tomcat-5.5.20-r10 (28 Jan 2007) + + 28 Jan 2007; William L. Thomson Jr. + files/5.5.20/tomcat.init, files/6/tomcat.init, -tomcat-5.5.20-r9.ebuild, + +tomcat-5.5.20-r10.ebuild, -tomcat-6.0.7_beta-r4.ebuild, + +tomcat-6.0.7_beta-r5.ebuild, -tomcat-6.0.8_alpha-r1.ebuild, + +tomcat-6.0.8_alpha-r2.ebuild: + Updated init script to capture std out per bug# 162379 *tomcat-5.5.20-r9 (27 Jan 2007) diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index cfb2a29b7b23..d91093c927b1 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -94,10 +94,10 @@ AUX 5.5.20/tomcat.conf 2689 RMD160 476e33ffd9e99215fea1d44cd2bd978ea31d2c69 SHA1 MD5 8b018a037f70ee95ea823e42356aaeb5 files/5.5.20/tomcat.conf 2689 RMD160 476e33ffd9e99215fea1d44cd2bd978ea31d2c69 files/5.5.20/tomcat.conf 2689 SHA256 286400591a4a0b80be72267c016c0b14a2878ba502a6ce2c384b49f4d51bd677 files/5.5.20/tomcat.conf 2689 -AUX 5.5.20/tomcat.init 3402 RMD160 e5a519f5ceaf1ce2bda3a5b3c498371839dbd7a8 SHA1 e0a2fd0323c032ac8a4745cb9b1ed339a2414fb0 SHA256 c0de2947fa3a6f3d5c30a9e283de5aa99914f287b036faa7c509af0533144e52 -MD5 0721156789c9c4e8a8dba6a0bbbac990 files/5.5.20/tomcat.init 3402 -RMD160 e5a519f5ceaf1ce2bda3a5b3c498371839dbd7a8 files/5.5.20/tomcat.init 3402 -SHA256 c0de2947fa3a6f3d5c30a9e283de5aa99914f287b036faa7c509af0533144e52 files/5.5.20/tomcat.init 3402 +AUX 5.5.20/tomcat.init 3379 RMD160 f22bfe7c23eb991aa76584e901379b492d308179 SHA1 0c666bcfabda3186d4f74238d1cbeda51c7b2444 SHA256 a1ff08d0989096910833122ea0415393a5611062fd8a400c463bbf9f2ced672b +MD5 f2c31d8033a29747cd54ffae26656d97 files/5.5.20/tomcat.init 3379 +RMD160 f22bfe7c23eb991aa76584e901379b492d308179 files/5.5.20/tomcat.init 3379 +SHA256 a1ff08d0989096910833122ea0415393a5611062fd8a400c463bbf9f2ced672b files/5.5.20/tomcat.init 3379 AUX 5.5.20/tomcat_build-xml.patch 13828 RMD160 3add8fb7d26bef7df205d3ec43e1a55cd6b739d4 SHA1 3a8ae3d686046f1938c71bd790d6f9ecf4339556 SHA256 9b1b9feb18d6f1dc5c2226c195f88a2f6cb9d68a2144e47e883fb57790c281f9 MD5 47210f9a3e6b7c1809b34cfdab7fdb9b files/5.5.20/tomcat_build-xml.patch 13828 RMD160 3add8fb7d26bef7df205d3ec43e1a55cd6b739d4 files/5.5.20/tomcat_build-xml.patch 13828 @@ -114,10 +114,10 @@ AUX 6/tomcat.conf 2669 RMD160 0f0b660670f1a5fd43aba9bac75d40ee33e902fe SHA1 53bf MD5 87c3a871a5f81aa03cec06fe5b195bed files/6/tomcat.conf 2669 RMD160 0f0b660670f1a5fd43aba9bac75d40ee33e902fe files/6/tomcat.conf 2669 SHA256 ae15a874568a888d5998db3ddbcc6469ceab1e1dcd72239b441e924ceb0465cb files/6/tomcat.conf 2669 -AUX 6/tomcat.init 3314 RMD160 93cf9482ae26be1fae13ba2102f57b91f1c0022c SHA1 73f2157d52a27cf90aa1649c996e88b5d2c727b3 SHA256 1ba56d52b64ad7a7bd66fd2b7a40599f60e16cb6306812cbc5129d628ccf358c -MD5 d1a15665d1ca4b8ce87f4193cf4cdf68 files/6/tomcat.init 3314 -RMD160 93cf9482ae26be1fae13ba2102f57b91f1c0022c files/6/tomcat.init 3314 -SHA256 1ba56d52b64ad7a7bd66fd2b7a40599f60e16cb6306812cbc5129d628ccf358c files/6/tomcat.init 3314 +AUX 6/tomcat.init 3291 RMD160 b6bac4cf4ce2bac5aa0bd9dec28fa88a39c42570 SHA1 c75b09aee3831a58715500215d1d914391c1d783 SHA256 5f06449e261300a0f6ba6cb67f0908ddceb8c0ea06178ac41c791055068ec72b +MD5 f6cfbfe83a55a5700ad52d43483be852 files/6/tomcat.init 3291 +RMD160 b6bac4cf4ce2bac5aa0bd9dec28fa88a39c42570 files/6/tomcat.init 3291 +SHA256 5f06449e261300a0f6ba6cb67f0908ddceb8c0ea06178ac41c791055068ec72b files/6/tomcat.init 3291 DIST apache-tomcat-5.5.20-src.tar.gz 4796377 RMD160 587590d2e272d1ede73501b62933f544cd969822 SHA1 cc416242d8c9e1978702a207e305ca97afe53d4d SHA256 19f24717fb3e2db902c33e21650dfa88bbf98428c15b1ed68ecaf7a9150e4a77 DIST apache-tomcat-6.0.7-src.tar.gz 3210405 RMD160 830485c5e25926da950e6b2148aa8baae263b351 SHA1 6883fbed7840c20d0967c435deafc0260609200f SHA256 a76be3230db0a3363835916f14afcccce6f18509577c2999f5491c0fb861e4f3 DIST apache-tomcat-6.0.8-src.tar.gz 3215835 RMD160 678f6a5c6a8709774735c07618512c6fe651d84b SHA1 757cd847d7a2c7de8f121cb99e4a9f6f48310168 SHA256 132d82dc169ce0de9ca9eba2891e7b3b6182ea7080bc41c160335da06e017ba8 @@ -131,6 +131,10 @@ EBUILD tomcat-5.0.28-r14.ebuild 9331 RMD160 443c26d31df8fbd41e2f3e84f14cd47fc4f1 MD5 1325b1a3c64afbb14284b913313073d9 tomcat-5.0.28-r14.ebuild 9331 RMD160 443c26d31df8fbd41e2f3e84f14cd47fc4f14d4e tomcat-5.0.28-r14.ebuild 9331 SHA256 995765389ab7fda0cf3a628f6da919ca1e0c51b4cc7afd9aa371b094e45581d6 tomcat-5.0.28-r14.ebuild 9331 +EBUILD tomcat-5.5.20-r10.ebuild 10685 RMD160 f312a8df76c90823628aee3b491d986074b09db8 SHA1 7ed14284948ac035e08447bb0134d37fc29b64c8 SHA256 d2c97805122aeb7a982dc680b8ace28d6df7859d5463128069957836e89a472d +MD5 2330dabf6d664703aebf634ea2d4db64 tomcat-5.5.20-r10.ebuild 10685 +RMD160 f312a8df76c90823628aee3b491d986074b09db8 tomcat-5.5.20-r10.ebuild 10685 +SHA256 d2c97805122aeb7a982dc680b8ace28d6df7859d5463128069957836e89a472d tomcat-5.5.20-r10.ebuild 10685 EBUILD tomcat-5.5.20-r7.ebuild 10291 RMD160 aaf7a2b12c342ac1e392fda1a195321ae0e6750a SHA1 784828253df6bf9ab255508bd4b26459944305b0 SHA256 34f7363841d54cdf41c40427d371ca87ffada6641da38539fe50d512bff1b237 MD5 282ae855ad7148064e6422ef941cc9b1 tomcat-5.5.20-r7.ebuild 10291 RMD160 aaf7a2b12c342ac1e392fda1a195321ae0e6750a tomcat-5.5.20-r7.ebuild 10291 @@ -139,22 +143,18 @@ EBUILD tomcat-5.5.20-r8.ebuild 10299 RMD160 dd99a6649a603e8262aeb33ae75a13466a3e MD5 8af16e1d4381d7656ed93be48867ad03 tomcat-5.5.20-r8.ebuild 10299 RMD160 dd99a6649a603e8262aeb33ae75a13466a3e36aa tomcat-5.5.20-r8.ebuild 10299 SHA256 9873ddf7870807f4bf6701a9f00ccc0202ae273c859a7c0c05a0e7c4c59a5601 tomcat-5.5.20-r8.ebuild 10299 -EBUILD tomcat-5.5.20-r9.ebuild 10684 RMD160 bad5ac8824257cd764ff80b6e04855293c1b3d56 SHA1 232cea50261278bad777be81735997c4db49474e SHA256 91468c5b06ded16921bbedf9e4b3cd4772d180b78f0c361a63bd8adc67778b1b -MD5 ffd2beb748b95a45f34b63657059f6db tomcat-5.5.20-r9.ebuild 10684 -RMD160 bad5ac8824257cd764ff80b6e04855293c1b3d56 tomcat-5.5.20-r9.ebuild 10684 -SHA256 91468c5b06ded16921bbedf9e4b3cd4772d180b78f0c361a63bd8adc67778b1b tomcat-5.5.20-r9.ebuild 10684 -EBUILD tomcat-6.0.7_beta-r4.ebuild 4808 RMD160 7bf6a14a724fe51a2926a27b517d268a09f9bc68 SHA1 738bb7511d1101af370c925b97e49de8bfdd4f5c SHA256 4f6b583033ffbe5be1f4a21d8dbbb31c76704a71f41481df1955f063f2df1139 -MD5 f05d9679890ac85f616689b20071ff0d tomcat-6.0.7_beta-r4.ebuild 4808 -RMD160 7bf6a14a724fe51a2926a27b517d268a09f9bc68 tomcat-6.0.7_beta-r4.ebuild 4808 -SHA256 4f6b583033ffbe5be1f4a21d8dbbb31c76704a71f41481df1955f063f2df1139 tomcat-6.0.7_beta-r4.ebuild 4808 -EBUILD tomcat-6.0.8_alpha-r1.ebuild 4810 RMD160 b4ffe5308cd1db6d532f11ccab18e3493558e052 SHA1 672ed1f41ce0a029a6830a5ae5dcaaa36195c087 SHA256 888252d67cea0f9a3b0851a46b5cb27d384b3bb36c92c508865e668ae3ab3d9a -MD5 2ee8317bb2ac19ebdb7091bf9f627539 tomcat-6.0.8_alpha-r1.ebuild 4810 -RMD160 b4ffe5308cd1db6d532f11ccab18e3493558e052 tomcat-6.0.8_alpha-r1.ebuild 4810 -SHA256 888252d67cea0f9a3b0851a46b5cb27d384b3bb36c92c508865e668ae3ab3d9a tomcat-6.0.8_alpha-r1.ebuild 4810 -MISC ChangeLog 35583 RMD160 6865fd930e79fc8495ec730c9d395b0780a5ba5a SHA1 e933518825ed7974c253450f5071790bbc21f1c2 SHA256 c5f36ba216aaaf03edab613a9386e3feb6761f80f19afedee67fde6695fddfec -MD5 32ac7af50dde4584bebf4e8b800d6133 ChangeLog 35583 -RMD160 6865fd930e79fc8495ec730c9d395b0780a5ba5a ChangeLog 35583 -SHA256 c5f36ba216aaaf03edab613a9386e3feb6761f80f19afedee67fde6695fddfec ChangeLog 35583 +EBUILD tomcat-6.0.7_beta-r5.ebuild 4808 RMD160 ee4ceeb8c7fafb6615ed9aef9a9c2995614da21f SHA1 7a6b84d8b7cffb5abe8156bd7da9c235443c0dd2 SHA256 27cc71e71a27e2de33881e20228fc32b5197ec56b7e3b16da4edfd3ca93c32df +MD5 83ef9ef94cd2c66234a4f0b3b8e95953 tomcat-6.0.7_beta-r5.ebuild 4808 +RMD160 ee4ceeb8c7fafb6615ed9aef9a9c2995614da21f tomcat-6.0.7_beta-r5.ebuild 4808 +SHA256 27cc71e71a27e2de33881e20228fc32b5197ec56b7e3b16da4edfd3ca93c32df tomcat-6.0.7_beta-r5.ebuild 4808 +EBUILD tomcat-6.0.8_alpha-r2.ebuild 4810 RMD160 3c9c5b304374cab2203a9ccd49a718aa593a811d SHA1 f4718e65928e81164a6f0845e14d107a40547456 SHA256 da7d0ca7d42c9a935f91550d8d00ef4fbf34d937e1249896ab3ba459c3d8e3cc +MD5 a2638d7f714be80b91a5280cc9ba4df3 tomcat-6.0.8_alpha-r2.ebuild 4810 +RMD160 3c9c5b304374cab2203a9ccd49a718aa593a811d tomcat-6.0.8_alpha-r2.ebuild 4810 +SHA256 da7d0ca7d42c9a935f91550d8d00ef4fbf34d937e1249896ab3ba459c3d8e3cc tomcat-6.0.8_alpha-r2.ebuild 4810 +MISC ChangeLog 36035 RMD160 370027a6a4656c27bbb2314ea4981622826fc009 SHA1 eaff72faa21bd6a3a0742db6901aeb69bc16cf31 SHA256 05ace11dd0461fa71f7b51c9c6f42697950745ecdc3464e8f3b6169a6e0e28c1 +MD5 e8cc25e1fd76834d46def35e6afda0fa ChangeLog 36035 +RMD160 370027a6a4656c27bbb2314ea4981622826fc009 ChangeLog 36035 +SHA256 05ace11dd0461fa71f7b51c9c6f42697950745ecdc3464e8f3b6169a6e0e28c1 ChangeLog 36035 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556 @@ -165,18 +165,18 @@ SHA256 8adce6bec0e657beb514e68dc8196cca8650ec0f2b5d1e421106ccc9fe954531 files/di MD5 d942ea8b8317ba352e744aed2d284d01 files/digest-tomcat-5.0.28-r14 280 RMD160 7283323e161ab5dd3a94549def34af040891e49a files/digest-tomcat-5.0.28-r14 280 SHA256 2c09d3ad89eb04ab24e5c95a9492d7f461e1935bdb076100010cd3d4f7cb8796 files/digest-tomcat-5.0.28-r14 280 +MD5 8adc14a8534e1c6f8d5f96b371e1895f files/digest-tomcat-5.5.20-r10 277 +RMD160 b9c5deac84bf5acd7a65ad80bdfaca9f7e343f3f files/digest-tomcat-5.5.20-r10 277 +SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/digest-tomcat-5.5.20-r10 277 MD5 8adc14a8534e1c6f8d5f96b371e1895f files/digest-tomcat-5.5.20-r7 277 RMD160 b9c5deac84bf5acd7a65ad80bdfaca9f7e343f3f files/digest-tomcat-5.5.20-r7 277 SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/digest-tomcat-5.5.20-r7 277 MD5 8adc14a8534e1c6f8d5f96b371e1895f files/digest-tomcat-5.5.20-r8 277 RMD160 b9c5deac84bf5acd7a65ad80bdfaca9f7e343f3f files/digest-tomcat-5.5.20-r8 277 SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/digest-tomcat-5.5.20-r8 277 -MD5 8adc14a8534e1c6f8d5f96b371e1895f files/digest-tomcat-5.5.20-r9 277 -RMD160 b9c5deac84bf5acd7a65ad80bdfaca9f7e343f3f files/digest-tomcat-5.5.20-r9 277 -SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/digest-tomcat-5.5.20-r9 277 -MD5 ae090639fc2a4b844084020e9fd68796 files/digest-tomcat-6.0.7_beta-r4 274 -RMD160 887290424c340b8a024770ae6ee2adeb0252b5ea files/digest-tomcat-6.0.7_beta-r4 274 -SHA256 8c88ae20979c83fd4529d2493cf5bfc63d86ff37cb46af296db58166d2e0ad3d files/digest-tomcat-6.0.7_beta-r4 274 -MD5 d42fe3d19844276dfb1df24bd3d29897 files/digest-tomcat-6.0.8_alpha-r1 274 -RMD160 831d3266c513184c82d467da6933a289798935b6 files/digest-tomcat-6.0.8_alpha-r1 274 -SHA256 74cd7a38575a75a9f68d2e6da21d94ec2ae7c729431ab90b89716d6a5dcf7374 files/digest-tomcat-6.0.8_alpha-r1 274 +MD5 ae090639fc2a4b844084020e9fd68796 files/digest-tomcat-6.0.7_beta-r5 274 +RMD160 887290424c340b8a024770ae6ee2adeb0252b5ea files/digest-tomcat-6.0.7_beta-r5 274 +SHA256 8c88ae20979c83fd4529d2493cf5bfc63d86ff37cb46af296db58166d2e0ad3d files/digest-tomcat-6.0.7_beta-r5 274 +MD5 d42fe3d19844276dfb1df24bd3d29897 files/digest-tomcat-6.0.8_alpha-r2 274 +RMD160 831d3266c513184c82d467da6933a289798935b6 files/digest-tomcat-6.0.8_alpha-r2 274 +SHA256 74cd7a38575a75a9f68d2e6da21d94ec2ae7c729431ab90b89716d6a5dcf7374 files/digest-tomcat-6.0.8_alpha-r2 274 diff --git a/www-servers/tomcat/files/5.5.20/tomcat.init b/www-servers/tomcat/files/5.5.20/tomcat.init index 3b083cd2d844..677bdbde0b94 100755 --- a/www-servers/tomcat/files/5.5.20/tomcat.init +++ b/www-servers/tomcat/files/5.5.20/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/5.5.20/tomcat.init,v 1.3 2007/01/10 21:06:33 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.5.20/tomcat.init,v 1.4 2007/01/28 07:26:59 wltjr Exp $ init_env_vars() { # Set some sane defaults @@ -38,8 +38,6 @@ init_env_vars() { touch "${CATALINA_BASE}logs/catalina.out" chown tomcat:tomcat "${CATALINA_BASE}logs/catalina.out" fi - - STD_OUT=" 2<&1 >> ${CATALINA_BASE}logs/catalina.out" } start-helper() { @@ -47,7 +45,7 @@ start-helper() { shift local arguments="--start --quiet --background --chuid ${CATALINA_USER}:${CATALINA_GROUP} \ --make-pidfile --pidfile /var/run/tomcat.pid" - start-stop-daemon ${arguments} --exec ${executor} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${STD_OUT} ${TOMCAT_START} + start-stop-daemon ${arguments} --exec ${executor} -- ${OPTS_CP} "$@" ${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 6b32e6b32e31..c4e863f61d0f 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.3 2007/01/10 21:06:33 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.init,v 1.4 2007/01/28 07:26:59 wltjr Exp $ init_env_vars() { # Set some sane defaults @@ -36,8 +36,6 @@ init_env_vars() { touch "${CATALINA_BASE}logs/catalina.out" chown tomcat:tomcat "${CATALINA_BASE}logs/catalina.out" fi - - STD_OUT=" 2<&1 >> ${CATALINA_BASE}logs/catalina.out" } start-helper() { @@ -45,7 +43,7 @@ start-helper() { shift local arguments="--start --quiet --background --chuid ${CATALINA_USER}:${CATALINA_GROUP} \ --make-pidfile --pidfile /var/run/tomcat.pid" - start-stop-daemon ${arguments} --exec ${executor} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${STD_OUT} ${TOMCAT_START} + start-stop-daemon ${arguments} --exec ${executor} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${TOMCAT_START} >> "$CATALINA_BASE"/logs/catalina.out 2>&1 return $? } diff --git a/www-servers/tomcat/files/digest-tomcat-5.5.20-r9 b/www-servers/tomcat/files/digest-tomcat-5.5.20-r10 similarity index 100% rename from www-servers/tomcat/files/digest-tomcat-5.5.20-r9 rename to www-servers/tomcat/files/digest-tomcat-5.5.20-r10 diff --git a/www-servers/tomcat/files/digest-tomcat-6.0.7_beta-r4 b/www-servers/tomcat/files/digest-tomcat-6.0.7_beta-r5 similarity index 100% rename from www-servers/tomcat/files/digest-tomcat-6.0.7_beta-r4 rename to www-servers/tomcat/files/digest-tomcat-6.0.7_beta-r5 diff --git a/www-servers/tomcat/files/digest-tomcat-6.0.8_alpha-r1 b/www-servers/tomcat/files/digest-tomcat-6.0.8_alpha-r2 similarity index 100% rename from www-servers/tomcat/files/digest-tomcat-6.0.8_alpha-r1 rename to www-servers/tomcat/files/digest-tomcat-6.0.8_alpha-r2 diff --git a/www-servers/tomcat/tomcat-5.5.20-r9.ebuild b/www-servers/tomcat/tomcat-5.5.20-r10.ebuild similarity index 99% rename from www-servers/tomcat/tomcat-5.5.20-r9.ebuild rename to www-servers/tomcat/tomcat-5.5.20-r10.ebuild index 61c333826e6d..15541a5306d4 100644 --- a/www-servers/tomcat/tomcat-5.5.20-r9.ebuild +++ b/www-servers/tomcat/tomcat-5.5.20-r10.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.20-r9.ebuild,v 1.1 2007/01/27 05:16:11 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.20-r10.ebuild,v 1.1 2007/01/28 07:26:59 wltjr Exp $ inherit eutils java-pkg-2 java-ant-2 diff --git a/www-servers/tomcat/tomcat-6.0.7_beta-r4.ebuild b/www-servers/tomcat/tomcat-6.0.7_beta-r5.ebuild similarity index 98% rename from www-servers/tomcat/tomcat-6.0.7_beta-r4.ebuild rename to www-servers/tomcat/tomcat-6.0.7_beta-r5.ebuild index 774e32534814..1b693a826af2 100644 --- a/www-servers/tomcat/tomcat-6.0.7_beta-r4.ebuild +++ b/www-servers/tomcat/tomcat-6.0.7_beta-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-6.0.7_beta-r4.ebuild,v 1.2 2007/01/27 05:16:11 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.7_beta-r5.ebuild,v 1.1 2007/01/28 07:26:59 wltjr Exp $ inherit eutils java-pkg-2 java-ant-2 diff --git a/www-servers/tomcat/tomcat-6.0.8_alpha-r1.ebuild b/www-servers/tomcat/tomcat-6.0.8_alpha-r2.ebuild similarity index 98% rename from www-servers/tomcat/tomcat-6.0.8_alpha-r1.ebuild rename to www-servers/tomcat/tomcat-6.0.8_alpha-r2.ebuild index 7f201203846c..72485f99adfd 100644 --- a/www-servers/tomcat/tomcat-6.0.8_alpha-r1.ebuild +++ b/www-servers/tomcat/tomcat-6.0.8_alpha-r2.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.8_alpha-r1.ebuild,v 1.2 2007/01/27 05:16:11 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.8_alpha-r2.ebuild,v 1.1 2007/01/28 07:26:59 wltjr Exp $ inherit eutils java-pkg-2 java-ant-2 -- 2.26.2