Version bump.

Package-Manager: portage-2.1.1_pre1

11 files changed, 719 insertions, 26 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 6071ca238c44..0cd58c68480a 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.50 2006/04/27 23:41:52 antarus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.51 2006/07/03 02:13:09 nichoj Exp $
+
+  03 Jul 2006; Joshua Nichols <nichoj@gentoo.org>
+  +files/5.5.17/catalinabuild-xml.patch,
+  +files/5.5.17/jasperbuild-xml.patch, +files/5.5.17/mainbuild-xml.patch,
+  +files/5.5.17/tomcat.conf, +files/5.5.17/tomcat.env,
+  +files/5.5.17/tomcat.init, +files/5.5.17/tomcatbuild-xml.patch:
+  Version bump.
 
   27 Apr 2006; Alec Warner <antarus@gentoo.org>
   files/digest-tomcat-5.0.27-r6, files/digest-tomcat-5.0.28-r12, Manifest:
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 7c55733941df..5627192d9c08 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,82 +1,115 @@
-AUX 5.0.27/gentoo.diff 463 RMD160 ace3fcd5d4d42e987840a0ba46c2f2e5db545dfc SHA1 2cac8406125e5bd360fed919eeb0d4685969462b SHA256 d8c9da161ae1274479f88f69821be780bd70ebfe7ad9c2f92db0f03f4b4c9401 size 463
+AUX 5.0.27/gentoo.diff 463 RMD160 ace3fcd5d4d42e987840a0ba46c2f2e5db545dfc SHA1 2cac8406125e5bd360fed919eeb0d4685969462b SHA256 d8c9da161ae1274479f88f69821be780bd70ebfe7ad9c2f92db0f03f4b4c9401
 MD5 cbb635ed31e3b7ddabe1db851a8b471e files/5.0.27/gentoo.diff 463
 RMD160 ace3fcd5d4d42e987840a0ba46c2f2e5db545dfc files/5.0.27/gentoo.diff 463
 SHA256 d8c9da161ae1274479f88f69821be780bd70ebfe7ad9c2f92db0f03f4b4c9401 files/5.0.27/gentoo.diff 463
-AUX 5.0.27/jikes.diff 510 RMD160 9bf6b575d5ad4fab71f92c2bd9f56c7017dfaa47 SHA1 a07bb349210ac13ee154b2d3cf5330065d9f24e5 SHA256 7f7c9a4e2fa9d47ade9b79baad8e54c8aa24d6daccc1d6e075028dcec37c012b size 510
+AUX 5.0.27/jikes.diff 510 RMD160 9bf6b575d5ad4fab71f92c2bd9f56c7017dfaa47 SHA1 a07bb349210ac13ee154b2d3cf5330065d9f24e5 SHA256 7f7c9a4e2fa9d47ade9b79baad8e54c8aa24d6daccc1d6e075028dcec37c012b
 MD5 c19b85e130d0e0a565eebc406d699965 files/5.0.27/jikes.diff 510
 RMD160 9bf6b575d5ad4fab71f92c2bd9f56c7017dfaa47 files/5.0.27/jikes.diff 510
 SHA256 7f7c9a4e2fa9d47ade9b79baad8e54c8aa24d6daccc1d6e075028dcec37c012b files/5.0.27/jikes.diff 510
-AUX 5.0.27/tomcat.conf 2660 RMD160 14ee13b69aa4227f3410c9294bdcdcd4ad88fa9a SHA1 0c80c0ee2de38fdef311e550a90e0ef2c3f22b2f SHA256 5d6a6bf47ba2869c37c3b1282b04faa03f6e98640c38ff4b381659ed8b4935ea size 2660
+AUX 5.0.27/tomcat.conf 2660 RMD160 14ee13b69aa4227f3410c9294bdcdcd4ad88fa9a SHA1 0c80c0ee2de38fdef311e550a90e0ef2c3f22b2f SHA256 5d6a6bf47ba2869c37c3b1282b04faa03f6e98640c38ff4b381659ed8b4935ea
 MD5 bf74c2bd8c21359ada1793cddfa95f37 files/5.0.27/tomcat.conf 2660
 RMD160 14ee13b69aa4227f3410c9294bdcdcd4ad88fa9a files/5.0.27/tomcat.conf 2660
 SHA256 5d6a6bf47ba2869c37c3b1282b04faa03f6e98640c38ff4b381659ed8b4935ea files/5.0.27/tomcat.conf 2660
-AUX 5.0.27/tomcat.env 27 RMD160 87a8ae9985fd42aa37c92f87ca538e5999e4fe96 SHA1 e8b260e424cfc59e018e76bba45cbaa7ff51cd83 SHA256 2af636ed9c158dab7655f6655b2ae74d0ba5c2e62ca512bf657661c1e67575c5 size 27
+AUX 5.0.27/tomcat.env 27 RMD160 87a8ae9985fd42aa37c92f87ca538e5999e4fe96 SHA1 e8b260e424cfc59e018e76bba45cbaa7ff51cd83 SHA256 2af636ed9c158dab7655f6655b2ae74d0ba5c2e62ca512bf657661c1e67575c5
 MD5 38c130772e7d43dcdff78b3d94f96efd files/5.0.27/tomcat.env 27
 RMD160 87a8ae9985fd42aa37c92f87ca538e5999e4fe96 files/5.0.27/tomcat.env 27
 SHA256 2af636ed9c158dab7655f6655b2ae74d0ba5c2e62ca512bf657661c1e67575c5 files/5.0.27/tomcat.env 27
-AUX 5.0.27/tomcat.init 636 RMD160 2af90f31927bcdadfc808cef5b3fdc280c2aa213 SHA1 0543aac20e770fb97710dff20648154939851bbe SHA256 cab11b93cfe9a7193f0fdc89db42d4be4cf3d7673963da5dbf8865867d99ddd1 size 636
+AUX 5.0.27/tomcat.init 636 RMD160 2af90f31927bcdadfc808cef5b3fdc280c2aa213 SHA1 0543aac20e770fb97710dff20648154939851bbe SHA256 cab11b93cfe9a7193f0fdc89db42d4be4cf3d7673963da5dbf8865867d99ddd1
 MD5 d6b2ebda71fd769327f49bcb51f92db2 files/5.0.27/tomcat.init 636
 RMD160 2af90f31927bcdadfc808cef5b3fdc280c2aa213 files/5.0.27/tomcat.init 636
 SHA256 cab11b93cfe9a7193f0fdc89db42d4be4cf3d7673963da5dbf8865867d99ddd1 files/5.0.27/tomcat.init 636
-AUX 5.0.28/build.xml-01.patch 623 RMD160 1031f5476c8bdbfce9708ec901ac7fe56b322729 SHA1 e9c2f9d3e8a68990b7cc5cf5d82c65d3b933275e SHA256 4bf6ddac793a2cd4abc4fdaa0b8424af9d68a5ea7ed36357931799b579944e01 size 623
+AUX 5.0.28/build.xml-01.patch 623 RMD160 1031f5476c8bdbfce9708ec901ac7fe56b322729 SHA1 e9c2f9d3e8a68990b7cc5cf5d82c65d3b933275e SHA256 4bf6ddac793a2cd4abc4fdaa0b8424af9d68a5ea7ed36357931799b579944e01
 MD5 6eaf54e60fd0b74ae37ec1dbd8540598 files/5.0.28/build.xml-01.patch 623
 RMD160 1031f5476c8bdbfce9708ec901ac7fe56b322729 files/5.0.28/build.xml-01.patch 623
 SHA256 4bf6ddac793a2cd4abc4fdaa0b8424af9d68a5ea7ed36357931799b579944e01 files/5.0.28/build.xml-01.patch 623
-AUX 5.0.28/build.xml-02.patch 3177 RMD160 d107f502d71ab9749ff86705e1a41b38c1d268af SHA1 38eb5069be2ac0379b2078b988bbdf4f6c7bc50b SHA256 d9a5b32bb6c78110b5fc684ea101095528ac10813a20db915f4b2d6f1bd7339d size 3177
+AUX 5.0.28/build.xml-02.patch 3177 RMD160 d107f502d71ab9749ff86705e1a41b38c1d268af SHA1 38eb5069be2ac0379b2078b988bbdf4f6c7bc50b SHA256 d9a5b32bb6c78110b5fc684ea101095528ac10813a20db915f4b2d6f1bd7339d
 MD5 744a9ce174144fc5689c1fabee527e55 files/5.0.28/build.xml-02.patch 3177
 RMD160 d107f502d71ab9749ff86705e1a41b38c1d268af files/5.0.28/build.xml-02.patch 3177
 SHA256 d9a5b32bb6c78110b5fc684ea101095528ac10813a20db915f4b2d6f1bd7339d files/5.0.28/build.xml-02.patch 3177
-AUX 5.0.28/gentoo.diff 541 RMD160 cf94b54c05721db4e991095c2aab838152eee6c1 SHA1 7d7b7620cfaa3481e51bea14e388cdba001f32d2 SHA256 1e3da99d94b75a62495a3b133efd7539c3a561642c81fe1a048015d782d72196 size 541
+AUX 5.0.28/gentoo.diff 541 RMD160 cf94b54c05721db4e991095c2aab838152eee6c1 SHA1 7d7b7620cfaa3481e51bea14e388cdba001f32d2 SHA256 1e3da99d94b75a62495a3b133efd7539c3a561642c81fe1a048015d782d72196
 MD5 987ddee3c5a93ccaa4311c85f5dfceb3 files/5.0.28/gentoo.diff 541
 RMD160 cf94b54c05721db4e991095c2aab838152eee6c1 files/5.0.28/gentoo.diff 541
 SHA256 1e3da99d94b75a62495a3b133efd7539c3a561642c81fe1a048015d782d72196 files/5.0.28/gentoo.diff 541
-AUX 5.0.28/jikes.diff 584 RMD160 f72d6481b8162c04f5f31230d06da5a28e5577aa SHA1 a942637322cd30895f3e4454629d9c170b7bf0fb SHA256 f3ca19f62624c314522dc790e57079dbf21aac6dbe392ad86b5329bae77d9f05 size 584
+AUX 5.0.28/jikes.diff 584 RMD160 f72d6481b8162c04f5f31230d06da5a28e5577aa SHA1 a942637322cd30895f3e4454629d9c170b7bf0fb SHA256 f3ca19f62624c314522dc790e57079dbf21aac6dbe392ad86b5329bae77d9f05
 MD5 98a29b32de00d97f156dc31dfe3cf472 files/5.0.28/jikes.diff 584
 RMD160 f72d6481b8162c04f5f31230d06da5a28e5577aa files/5.0.28/jikes.diff 584
 SHA256 f3ca19f62624c314522dc790e57079dbf21aac6dbe392ad86b5329bae77d9f05 files/5.0.28/jikes.diff 584
-AUX 5.0.28/log4j.properties 401 RMD160 86af01ef0aa8b7e6728c2b5d941bc0f9282d2051 SHA1 c63449477440813a14283713a67c5b258ada3fd9 SHA256 9948e1a7e9506f3761a263f9f00ec72c28002cbdb97d5d35233a43b8eb3a9deb size 401
+AUX 5.0.28/log4j.properties 401 RMD160 86af01ef0aa8b7e6728c2b5d941bc0f9282d2051 SHA1 c63449477440813a14283713a67c5b258ada3fd9 SHA256 9948e1a7e9506f3761a263f9f00ec72c28002cbdb97d5d35233a43b8eb3a9deb
 MD5 4a887877fb26ce5a6a1d58c66578bd7f files/5.0.28/log4j.properties 401
 RMD160 86af01ef0aa8b7e6728c2b5d941bc0f9282d2051 files/5.0.28/log4j.properties 401
 SHA256 9948e1a7e9506f3761a263f9f00ec72c28002cbdb97d5d35233a43b8eb3a9deb files/5.0.28/log4j.properties 401
-AUX 5.0.28/scripts.patch 823 RMD160 12f7477389211d3b72ed7712a6bb0ac80e2c0f93 SHA1 1e1472efcfb4a9dc674a3d0da3019ebc888d8e2d SHA256 7a1b9781b1ddbbefc16f8ab0f948bb2d7ad69380a32185e3b433edec36ff3510 size 823
+AUX 5.0.28/scripts.patch 823 RMD160 12f7477389211d3b72ed7712a6bb0ac80e2c0f93 SHA1 1e1472efcfb4a9dc674a3d0da3019ebc888d8e2d SHA256 7a1b9781b1ddbbefc16f8ab0f948bb2d7ad69380a32185e3b433edec36ff3510
 MD5 0990cfa870b64034e742297c6be3634b files/5.0.28/scripts.patch 823
 RMD160 12f7477389211d3b72ed7712a6bb0ac80e2c0f93 files/5.0.28/scripts.patch 823
 SHA256 7a1b9781b1ddbbefc16f8ab0f948bb2d7ad69380a32185e3b433edec36ff3510 files/5.0.28/scripts.patch 823
-AUX 5.0.28/setclasspath.patch 652 RMD160 9ac071e8750358eaf4ad0a4ad879dfc74db42081 SHA1 6981a38c58867a3a5d9061121d6233bb14ab622f SHA256 962eecbac7eb433b5b19d2027328bd78aa3b6348b5809b1617dc3d15bde72e35 size 652
+AUX 5.0.28/setclasspath.patch 652 RMD160 9ac071e8750358eaf4ad0a4ad879dfc74db42081 SHA1 6981a38c58867a3a5d9061121d6233bb14ab622f SHA256 962eecbac7eb433b5b19d2027328bd78aa3b6348b5809b1617dc3d15bde72e35
 MD5 e27a41dfeb80703ec4a3433942541b7d files/5.0.28/setclasspath.patch 652
 RMD160 9ac071e8750358eaf4ad0a4ad879dfc74db42081 files/5.0.28/setclasspath.patch 652
 SHA256 962eecbac7eb433b5b19d2027328bd78aa3b6348b5809b1617dc3d15bde72e35 files/5.0.28/setclasspath.patch 652
-AUX 5.0.28/tomcat.conf 2707 RMD160 0df8bc479a09f908d681e800572b0c03805dc04f SHA1 7e41463f9eccc52fb2141901a98f7c5209e5469f SHA256 5a90e14f18d0ed11bf9bb7b0f0fcfaa4311dce775a452e16672824734a90c5f3 size 2707
+AUX 5.0.28/tomcat.conf 2707 RMD160 0df8bc479a09f908d681e800572b0c03805dc04f SHA1 7e41463f9eccc52fb2141901a98f7c5209e5469f SHA256 5a90e14f18d0ed11bf9bb7b0f0fcfaa4311dce775a452e16672824734a90c5f3
 MD5 a4df0ce5b57f2bcaa707ff3b5858bee4 files/5.0.28/tomcat.conf 2707
 RMD160 0df8bc479a09f908d681e800572b0c03805dc04f files/5.0.28/tomcat.conf 2707
 SHA256 5a90e14f18d0ed11bf9bb7b0f0fcfaa4311dce775a452e16672824734a90c5f3 files/5.0.28/tomcat.conf 2707
-AUX 5.0.28/tomcat.conf-r1 2837 RMD160 b9efd9d61d9a97f777d92d9a22b6842f92b261b7 SHA1 a382b8c481062be7d5988487ce2b073b714a7810 SHA256 9c185c41ead0e07acb07bcb07e52ab4631613ecdbefcdd0b795a368f045faa88 size 2837
+AUX 5.0.28/tomcat.conf-r1 2837 RMD160 b9efd9d61d9a97f777d92d9a22b6842f92b261b7 SHA1 a382b8c481062be7d5988487ce2b073b714a7810 SHA256 9c185c41ead0e07acb07bcb07e52ab4631613ecdbefcdd0b795a368f045faa88
 MD5 a279252c639b232107c83c6cb981c261 files/5.0.28/tomcat.conf-r1 2837
 RMD160 b9efd9d61d9a97f777d92d9a22b6842f92b261b7 files/5.0.28/tomcat.conf-r1 2837
 SHA256 9c185c41ead0e07acb07bcb07e52ab4631613ecdbefcdd0b795a368f045faa88 files/5.0.28/tomcat.conf-r1 2837
-AUX 5.0.28/tomcat.env 34 RMD160 8a7d78c3d0289e43e1ad1c4be1d586feb2f99946 SHA1 825d27532217124006f5c567a5c3a8c1dac14a0b SHA256 390292b910cca172d660b71bb4fe0bf3ac0bd3cb7d08b1a1bb9b72272be22d84 size 34
+AUX 5.0.28/tomcat.env 34 RMD160 8a7d78c3d0289e43e1ad1c4be1d586feb2f99946 SHA1 825d27532217124006f5c567a5c3a8c1dac14a0b SHA256 390292b910cca172d660b71bb4fe0bf3ac0bd3cb7d08b1a1bb9b72272be22d84
 MD5 286d3dcf80a376b72913412cec25e496 files/5.0.28/tomcat.env 34
 RMD160 8a7d78c3d0289e43e1ad1c4be1d586feb2f99946 files/5.0.28/tomcat.env 34
 SHA256 390292b910cca172d660b71bb4fe0bf3ac0bd3cb7d08b1a1bb9b72272be22d84 files/5.0.28/tomcat.env 34
-AUX 5.0.28/tomcat.init 766 RMD160 3707c1d282f10d2aa6c3fabde14d670d71210b07 SHA1 4d531bddce0ed71d604b040ed01e66794a2004aa SHA256 8cf86bad1b667774aa89c0f63facd1aafdea45ff0f117a7879208bee92337763 size 766
+AUX 5.0.28/tomcat.init 766 RMD160 3707c1d282f10d2aa6c3fabde14d670d71210b07 SHA1 4d531bddce0ed71d604b040ed01e66794a2004aa SHA256 8cf86bad1b667774aa89c0f63facd1aafdea45ff0f117a7879208bee92337763
 MD5 c84cd76463e0c773cc3c58f9d6ea7e92 files/5.0.28/tomcat.init 766
 RMD160 3707c1d282f10d2aa6c3fabde14d670d71210b07 files/5.0.28/tomcat.init 766
 SHA256 8cf86bad1b667774aa89c0f63facd1aafdea45ff0f117a7879208bee92337763 files/5.0.28/tomcat.init 766
-DIST jakarta-tomcat-5.0.27.tar.gz 10298374 RMD160 a333fcb531bb98af20db6e0a10d3e8b2c72ee1fa SHA256 873fc94b4316235091e69bca926bd66a0fb9fab542016e582a03323ed6777d78 size 10298374
-DIST jakarta-tomcat-5.0.28-src.tar.gz 3565766 RMD160 22c5e60b2c5009dc33a62edcefa6760d82da859b SHA256 bbf584b3c376d23d92b1a0d306eb8f3729cea244c7a850f81d2527a7df6d20fc size 3565766
-EBUILD tomcat-5.0.27-r6.ebuild 3907 RMD160 470077caf9ebe247c9a19ac69f2f3d4c777202e7 SHA1 d920683831af6848973d09ae98bf5f2e812c8b2b SHA256 9ca756c1e82f2f8a693a64fa154e58b2ce03f04697ac165d2f8b74374e734f23 size 3907
+AUX 5.5.17/catalinabuild-xml.patch 1149 RMD160 9622ca4f688e2c57e4bc34f08ceebb651f75deb1 SHA1 8eda11132851da5773ceb33f90515f0c8ffabdb6 SHA256 dc2d7255dd990359f765f329a04825aca18888e505b4024bb64e0dc6e348498e
+MD5 4b2dbaa2a74776229f4fffa1274d0a13 files/5.5.17/catalinabuild-xml.patch 1149
+RMD160 9622ca4f688e2c57e4bc34f08ceebb651f75deb1 files/5.5.17/catalinabuild-xml.patch 1149
+SHA256 dc2d7255dd990359f765f329a04825aca18888e505b4024bb64e0dc6e348498e files/5.5.17/catalinabuild-xml.patch 1149
+AUX 5.5.17/jasperbuild-xml.patch 463 RMD160 d042043acbaafa7b2be42f071846d5fbe970fa62 SHA1 f168e9ff231e1ccd727367a03f0fdefde3c36a1a SHA256 8c0758f6f2e556d317087389b7649bc709d738679be7965a50329b724c6e8714
+MD5 0139160e01d9f8c37007e700adc14edd files/5.5.17/jasperbuild-xml.patch 463
+RMD160 d042043acbaafa7b2be42f071846d5fbe970fa62 files/5.5.17/jasperbuild-xml.patch 463
+SHA256 8c0758f6f2e556d317087389b7649bc709d738679be7965a50329b724c6e8714 files/5.5.17/jasperbuild-xml.patch 463
+AUX 5.5.17/mainbuild-xml.patch 482 RMD160 61e18d765777294144c8f6745cceee5a18d72db4 SHA1 c75ef0ca7b88fb34aacc0ec9f59aeb8f2239b469 SHA256 7a9dbb7d8a0be4399792417b6bdfd04b7a090b8d9a39b1b03050f0066a90b559
+MD5 9f2ec43ff05ee924217e510c65d8150e files/5.5.17/mainbuild-xml.patch 482
+RMD160 61e18d765777294144c8f6745cceee5a18d72db4 files/5.5.17/mainbuild-xml.patch 482
+SHA256 7a9dbb7d8a0be4399792417b6bdfd04b7a090b8d9a39b1b03050f0066a90b559 files/5.5.17/mainbuild-xml.patch 482
+AUX 5.5.17/tomcat.conf 2548 RMD160 640e02b4c902b67f67889ad7fbd8e4256334ad48 SHA1 fdaa3c2bc5babb48b596caa2493e0d61d68b1736 SHA256 e52d2fcd9ca90979a57a8effc06962d9b5b3f1cf764f1974474a6046742be5a2
+MD5 f8bc22035f2323963d9463be31b731db files/5.5.17/tomcat.conf 2548
+RMD160 640e02b4c902b67f67889ad7fbd8e4256334ad48 files/5.5.17/tomcat.conf 2548
+SHA256 e52d2fcd9ca90979a57a8effc06962d9b5b3f1cf764f1974474a6046742be5a2 files/5.5.17/tomcat.conf 2548
+AUX 5.5.17/tomcat.env 36 RMD160 2d6488d26696ec0624b7774d3a31cb02afeaeea0 SHA1 1c9ad9ffa7dcaa5f071631d8a1bc65519b2eec15 SHA256 c2aa217a92fb637fb81a77c98cd769932923bbe65e72c25295993f7cf4982fef
+MD5 f41b77c0652379c5cfbe0f04bf99b4c2 files/5.5.17/tomcat.env 36
+RMD160 2d6488d26696ec0624b7774d3a31cb02afeaeea0 files/5.5.17/tomcat.env 36
+SHA256 c2aa217a92fb637fb81a77c98cd769932923bbe65e72c25295993f7cf4982fef files/5.5.17/tomcat.env 36
+AUX 5.5.17/tomcat.init 2997 RMD160 4787ef0c876662dbd3170a1d78c55018d43ec000 SHA1 2df9e6ce30c111c32370d2245e8720cc2c589cbe SHA256 993b9589226743593c15e7b688f2d03cd817969e17c59a9a6e636742cb771f23
+MD5 c8102af8111a57cbf191709ddb19dd79 files/5.5.17/tomcat.init 2997
+RMD160 4787ef0c876662dbd3170a1d78c55018d43ec000 files/5.5.17/tomcat.init 2997
+SHA256 993b9589226743593c15e7b688f2d03cd817969e17c59a9a6e636742cb771f23 files/5.5.17/tomcat.init 2997
+AUX 5.5.17/tomcatbuild-xml.patch 5235 RMD160 b82aae53ac882e5914aea8dfc8f80283bee7f9b1 SHA1 7a97a4e3ab76228c3d6964355dd3b5a9b3bce33a SHA256 d5f621c8d3972a88a057db3c028baedf4affab4333c3f1c6117461d3dd0b6cec
+MD5 276495751102b4c1e19aa944043055e6 files/5.5.17/tomcatbuild-xml.patch 5235
+RMD160 b82aae53ac882e5914aea8dfc8f80283bee7f9b1 files/5.5.17/tomcatbuild-xml.patch 5235
+SHA256 d5f621c8d3972a88a057db3c028baedf4affab4333c3f1c6117461d3dd0b6cec files/5.5.17/tomcatbuild-xml.patch 5235
+DIST apache-tomcat-5.5.17-src.tar.gz 4282022 RMD160 004d87bc64b32eee42f9979d2fdbb36836b69015 SHA1 d59994d06608fe13eb42a65484ccb1fdcca325e2 SHA256 295c9fa64d9aa81d5c836b694804d8d57fcfdbc76b9889a044852aa73f2c3ad8
+DIST jakarta-tomcat-5.0.27.tar.gz 10298374 RMD160 a333fcb531bb98af20db6e0a10d3e8b2c72ee1fa SHA256 873fc94b4316235091e69bca926bd66a0fb9fab542016e582a03323ed6777d78
+DIST jakarta-tomcat-5.0.28-src.tar.gz 3565766 RMD160 22c5e60b2c5009dc33a62edcefa6760d82da859b SHA256 bbf584b3c376d23d92b1a0d306eb8f3729cea244c7a850f81d2527a7df6d20fc
+EBUILD tomcat-5.0.27-r6.ebuild 3907 RMD160 470077caf9ebe247c9a19ac69f2f3d4c777202e7 SHA1 d920683831af6848973d09ae98bf5f2e812c8b2b SHA256 9ca756c1e82f2f8a693a64fa154e58b2ce03f04697ac165d2f8b74374e734f23
 MD5 749387e4f40a08f338295901aa1ccd60 tomcat-5.0.27-r6.ebuild 3907
 RMD160 470077caf9ebe247c9a19ac69f2f3d4c777202e7 tomcat-5.0.27-r6.ebuild 3907
 SHA256 9ca756c1e82f2f8a693a64fa154e58b2ce03f04697ac165d2f8b74374e734f23 tomcat-5.0.27-r6.ebuild 3907
-EBUILD tomcat-5.0.28-r12.ebuild 11138 RMD160 7e7a04d273cec10955f8db35da0b39d946a3904a SHA1 f6aba37979417b8bb2f85cfaa827bc2df65376ff SHA256 0cbc5ef6348aa322b258bc63c5db3efbaad54ce9d8b8e487bff3599ca55d4cf1 size 11138
+EBUILD tomcat-5.0.28-r12.ebuild 11138 RMD160 7e7a04d273cec10955f8db35da0b39d946a3904a SHA1 f6aba37979417b8bb2f85cfaa827bc2df65376ff SHA256 0cbc5ef6348aa322b258bc63c5db3efbaad54ce9d8b8e487bff3599ca55d4cf1
 MD5 935b85f96588785ea578042c3984ef28 tomcat-5.0.28-r12.ebuild 11138
 RMD160 7e7a04d273cec10955f8db35da0b39d946a3904a tomcat-5.0.28-r12.ebuild 11138
 SHA256 0cbc5ef6348aa322b258bc63c5db3efbaad54ce9d8b8e487bff3599ca55d4cf1 tomcat-5.0.28-r12.ebuild 11138
-MISC ChangeLog 20382 RMD160 4895c3288b805f491cdd08a730e7c4c7c8609def SHA1 b03f84335d87c31c1548d65ed8fd22d1c3201939 SHA256 c27f724b98dd3885f753da843baa426a8df092c063ce05a4ad6ed83fb7dff3a2 size 20382
-MD5 90d6c22aa29cea5c89632bd390ef1222 ChangeLog 20382
-RMD160 4895c3288b805f491cdd08a730e7c4c7c8609def ChangeLog 20382
-SHA256 c27f724b98dd3885f753da843baa426a8df092c063ce05a4ad6ed83fb7dff3a2 ChangeLog 20382
-MISC metadata.xml 454 RMD160 c40a7fbdb01b9716f9d163e051184ddfc386e880 SHA1 e2ad202de8a8a9c7f43dd30451310fdee4531ab6 SHA256 c8affe406c8353e5ba4a811a2ea2016dfa0626858ef3413dade2a266f78ee82c size 454
+EBUILD tomcat-5.5.17.ebuild 9042 RMD160 fa88460b31af6c5a8d083af3d0029b2f3b503008 SHA1 7ff76a94a1414a6a864c5d930ce93233c9b8db06 SHA256 ade857101f5a8f20ad3619fd19d9ecd7d643c2443a621381839de2de4e5ee922
+MD5 e8553017d001f52e29f85845c2774ed8 tomcat-5.5.17.ebuild 9042
+RMD160 fa88460b31af6c5a8d083af3d0029b2f3b503008 tomcat-5.5.17.ebuild 9042
+SHA256 ade857101f5a8f20ad3619fd19d9ecd7d643c2443a621381839de2de4e5ee922 tomcat-5.5.17.ebuild 9042
+MISC ChangeLog 20684 RMD160 917687ef7ac512e9f476a131e59268b03a23bbe4 SHA1 7301bb2faa2edb1f204252f9ce058d97ac460e1d SHA256 1f7352e1e3a559bbdd73693a5a8f61c298b8aec67322d4240a1969dd0c7c0559
+MD5 c0d48c77c509a67cdea55e2a489c3ff8 ChangeLog 20684
+RMD160 917687ef7ac512e9f476a131e59268b03a23bbe4 ChangeLog 20684
+SHA256 1f7352e1e3a559bbdd73693a5a8f61c298b8aec67322d4240a1969dd0c7c0559 ChangeLog 20684
+MISC metadata.xml 454 RMD160 c40a7fbdb01b9716f9d163e051184ddfc386e880 SHA1 e2ad202de8a8a9c7f43dd30451310fdee4531ab6 SHA256 c8affe406c8353e5ba4a811a2ea2016dfa0626858ef3413dade2a266f78ee82c
 MD5 f994107ba9a296c7de72d951eb9ddb29 metadata.xml 454
 RMD160 c40a7fbdb01b9716f9d163e051184ddfc386e880 metadata.xml 454
 SHA256 c8affe406c8353e5ba4a811a2ea2016dfa0626858ef3413dade2a266f78ee82c metadata.xml 454
@@ -86,3 +119,6 @@ SHA256 8adce6bec0e657beb514e68dc8196cca8650ec0f2b5d1e421106ccc9fe954531 files/di
 MD5 d942ea8b8317ba352e744aed2d284d01 files/digest-tomcat-5.0.28-r12 280
 RMD160 7283323e161ab5dd3a94549def34af040891e49a files/digest-tomcat-5.0.28-r12 280
 SHA256 2c09d3ad89eb04ab24e5c95a9492d7f461e1935bdb076100010cd3d4f7cb8796 files/digest-tomcat-5.0.28-r12 280
+MD5 b8576467d4d99bc9c4862c31d5839d56 files/digest-tomcat-5.5.17 277
+RMD160 6a37c8c24770ea3fdb63334615303b56350f1cf9 files/digest-tomcat-5.5.17 277
+SHA256 99d72ea7a66a7df313d7f01eeb4bd0d7e6e0325601affc35142b9df1371398e7 files/digest-tomcat-5.5.17 277
diff --git a/www-servers/tomcat/files/5.5.17/catalinabuild-xml.patch b/www-servers/tomcat/files/5.5.17/catalinabuild-xml.patch
new file mode 100644
index 000000000000..da6b96901aab
--- /dev/null
+++ b/www-servers/tomcat/files/5.5.17/catalinabuild-xml.patch
@@ -0,0 +1,30 @@
+--- apache-tomcat-5.5.15-src/container/catalina/build.xml	2006-01-03 10:15:07.000000000 -0500
++++ container/catalina/build.xml	2006-01-28 11:57:25.000000000 -0500
+@@ -60,6 +60,7 @@
+     <pathelement location="${jaas.jar}"/>
+     <pathelement location="${javagroups.jar}"/>
+     <pathelement location="${jcert.jar}"/>
++    <pathelement location="${jdt.jar}"/>
+     <pathelement location="${jmx.jar}"/>
+     <pathelement location="${jmx-remote.jar}"/>
+     <pathelement location="${jndi.jar}"/>
+@@ -91,6 +92,7 @@
+     <pathelement location="${commons-modeler.jar}"/>
+     <pathelement location="${jaas.jar}"/>
+     <pathelement location="${jcert.jar}"/>
++    <pathelement location="${jdt.jar}"/>
+     <pathelement location="${jmx.jar}"/>
+     <pathelement location="${jndi.jar}"/>
+     <pathelement location="${jnet.jar}"/>
+@@ -548,9 +550,10 @@
+ <!--
+     <copy todir="${catalina.build}/common/lib" file="${servlet-api.jar}"/>
+ -->
++    <!--
+     <copy todir="${catalina.build}/common/lib"
+            file="${tomcat-dbcp.jar}" />
+-
++    -->
+     <!-- Configuration Files -->
+     <copy todir="${catalina.build}/conf">
+       <fileset dir="src/conf">
diff --git a/www-servers/tomcat/files/5.5.17/jasperbuild-xml.patch b/www-servers/tomcat/files/5.5.17/jasperbuild-xml.patch
new file mode 100644
index 000000000000..1f0de5f8a04f
--- /dev/null
+++ b/www-servers/tomcat/files/5.5.17/jasperbuild-xml.patch
@@ -0,0 +1,10 @@
+--- jasper/build.xml	2005-02-13 19:28:36.000000000 +0100
++++ jasper/build.xml	2005-02-13 20:46:15.554972064 +0100
+@@ -30,6 +30,7 @@
+     <pathelement location="${jsp-api.jar}"/>
+     <pathelement location="${tools.jar}"/>
+     <pathelement location="${jasper-compiler-jdt.jar}"/>
++    <pathelement location="${jdt.jar}"/>
+     <pathelement location="${xerces.jar}"/>
+     <pathelement location="${xercesImpl.jar}"/>
+     <pathelement location="${xml-apis.jar}"/>
diff --git a/www-servers/tomcat/files/5.5.17/mainbuild-xml.patch b/www-servers/tomcat/files/5.5.17/mainbuild-xml.patch
new file mode 100644
index 000000000000..7ef15860cb5c
--- /dev/null
+++ b/www-servers/tomcat/files/5.5.17/mainbuild-xml.patch
@@ -0,0 +1,19 @@
+--- apache-tomcat-5.5.15-src/build.xml 
++++ build.xml
+@@ -64,13 +64,14 @@
+   <target name="checkout"
+           description="Update or checkout required sources from SVN">
+ 
++    <!--
+     <echo level="info"
+         message="If the checkout fails, - todo - " />
+ 
+     <exec dir="${basedir}" executable="svn">
+          <arg line="checkout ${svnroot}/${current.loc} ${basedir}" />
+     </exec>
+-
++    -->
+   </target>
+ 
+   <!-- *************** UTILITY TARGETS *************** -->
+
diff --git a/www-servers/tomcat/files/5.5.17/tomcat.conf b/www-servers/tomcat/files/5.5.17/tomcat.conf
new file mode 100644
index 000000000000..d52a0660672f
--- /dev/null
+++ b/www-servers/tomcat/files/5.5.17/tomcat.conf
@@ -0,0 +1,72 @@
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.5.17/tomcat.conf,v 1.1 2006/07/03 02:13:09 nichoj Exp $
+
+# JVM Runtime
+# Using the default setting, it will determine your JVM from the system-vm
+# set using java-config.
+# 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
+
+JAVA_HOME=`java-config --jre-home`
+
+# (Optional) Java runtime options used when the "start", "stop", or "run"
+# commands are executed.
+# JAVA_OPTS=""
+
+# Where your web applications are located
+CATALINA_HOME=/usr/share/tomcat-5.5
+CATALINA_BASE=/var/lib/tomcat-5.5
+
+# Tomcat's User
+CATALINA_USER=tomcat
+
+# Location of the Tomcat JARs and classes
+CATALINA_LIBDIR=/usr/share/tomcat-5.5/server/lib
+
+# The CLASSPATH for Tomcat to use, plus any others you need.
+CLASSPATH=${CATALINA_LIBDIR}
+
+# (Optional) Directory path location of temporary directory the JVM should 
+# use (java.io.tmpdir).  Defaults to $CATALINA_BASE/temp.
+CATALINA_TMPDIR="/var/tmp/tomcat-5.5"
+
+# TOMCAT STARTUP/SHUTDOWN
+# 	debug             Start Catalina in a debugger
+# 	debug -security   Debug Catalina with a security manager
+# 	jpda start        Start Catalina under JPDA debugger
+# 	start             Start Catalina in a separate window
+# 	start -security   Start in a separate window with security manager
+# 	stop              Stop Catalina"
+#
+# NOTE: -security requires JSSE (see below)
+# NOTE: jpda requires JPDA (see below)
+TOMCAT_START="start"
+TOMCAT_STOP="stop"
+
+# (Optional) Java runtime options used when the "start", "stop", or "run" 
+# commands are executed.
+# CATALINA_OPTS=""
+
+# Java Platform Debugger Architecture (JPDA)
+# http://java.sun.com/products/jpda/
+# Included with Java SDK 1.3 and later.  No need to specify location.
+#
+#   JPDA_TRANSPORT  (Optional) JPDA transport used when the "jpda start"
+#                   command is executed. The default is "dt_socket".
+#
+#   JPDA_ADDRESS    (Optional) Java runtime options used when the "jpda start"
+#                   command is executed. The default is 8000.
+#
+# JPDA_TRANSPORT="dt_socket"
+# JPDA_ADDRESS="8000"
+
+# Java Secure Socket Extension (JSSE)
+# http://java.sun.com/products/jsse/
+# Included with Java SDK 1.4 and later.
+#
+#   JSSE_HOME       (Optional) May point at your Java Secure Sockets Extension
+#                   (JSSE) installation, whose JAR files will be added to the
+#                   system class path used to start Tomcat.
+#
+# JSSE_HOME="/opt/sun-jdk-1.4.1.02/jre/lib/"
diff --git a/www-servers/tomcat/files/5.5.17/tomcat.env b/www-servers/tomcat/files/5.5.17/tomcat.env
new file mode 100644
index 000000000000..8afb01ff1d8e
--- /dev/null
+++ b/www-servers/tomcat/files/5.5.17/tomcat.env
@@ -0,0 +1 @@
+CATALINA_HOME=/usr/share/tomcat-5.5
diff --git a/www-servers/tomcat/files/5.5.17/tomcat.init b/www-servers/tomcat/files/5.5.17/tomcat.init
new file mode 100755
index 000000000000..e9180fa841e2
--- /dev/null
+++ b/www-servers/tomcat/files/5.5.17/tomcat.init
@@ -0,0 +1,83 @@
+#!/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.17/tomcat.init,v 1.1 2006/07/03 02:13:09 nichoj Exp $
+
+init_env_vars() {
+	# Set some sane defaults
+	JPDA_TRANSPORT=${JPDA_TRANSPORT:="dt_socket"}
+	JPDA_ADDRESS=${JPDA_ADDRESS:="8000"}
+	JPDA_OPTS=${JPDA_OPTS="-Xdebug -Xrunjdwp:transport=${JPDA_TRANSPORT},address=${JPDA_ADDRESS},server=y,suspend=n"}
+
+	# Activate Logging
+	if [[ -r "${CATALINA_HOME}"/bin/tomcat-juli.jar ]]; then
+		JAVA_OPTS="${JAVA_OPTS} -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager \
+								-Djava.util.logging.config.file=/etc/tomcat-5.5/logging.properties"
+	fi
+
+	# Populate the classpath
+	CLASSPATH="${CLASSPATH}:$JAVA_HOME/lib/tools.jar"
+	if [[ -n "${JSSE_HOME}" ]]; then
+		CLASSPATH="${CLASSPATH}:${JSSE_HOME}/lib/jcert.jar:${JSSE_HOME}/lib/jnet.jar:${JSSE_HOME}/lib/jsse.jar"
+	fi
+	CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar:$(java-config -p commons-logging)"
+
+	OPTS_CP="${JAVA_OPTS} ${CATALINA_OPTS} \
+			 -Djava.endorsed.dirs=${CATALINA_HOME}/common/endorsed \
+			 -classpath ${CLASSPATH}"
+
+	CATALINA_ARGS="-Dcatalina.base=${CATALINA_BASE} \
+				   -Dcatalina.home=${CATALINA_HOME} \
+				   -Djava.io.tmpdir=${CATALINA_TMPDIR} \
+				   org.apache.catalina.startup.Bootstrap "
+}
+
+start-helper() {
+	local executor=${1}
+	shift
+	local arguments="--start --quiet --background --chuid tomcat:tomcat \
+		--make-pidfile --pidfile /var/run/tomcat.pid"
+	start-stop-daemon ${arguments} --exec ${executor} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${TOMCAT_START}
+	return $?
+}
+
+depend() {
+	use dns logger net
+}
+
+start()	{
+	ebegin "Starting Tomcat"
+	init_env_vars
+	# Figure out what arguments to pass start-helper based on TOMCAT_START
+	if [[ "${TOMCAT_START}" == "debug" ]] ; then
+		start-helper $JAVA_HOME/bin/jdb \
+			-sourcepath ${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share
+	elif [[ "${TOMCAT_START}" == "debug -security" ]] ; then
+		start-helper $JAVA_HOME/bin/jdb \
+			-sourcepath ${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share \
+			-Djava.security.manager \
+			-Djava.security.policy=/etc/tomcat-5.5/conf/catalina.policy
+	elif [[ "${TOMCAT_START}" == "jpda start" ]] ; then
+		start-helper $JAVA_HOME/bin/java ${JPDA_OPTS}
+	elif [[ "${TOMCAT_START}" == "start" ]] ; then
+		start-helper $JAVA_HOME/bin/java
+	elif [[ "${TOMCAT_START}" == "start -security" ]] ; then
+		start-helper $JAVA_HOME/bin/java \
+			-Djava.security.manager \
+			-Djava.security.policy=/etc/tomcat-5.5/catalina.policy
+	else
+		eerror "Invalid TOMCAT_START variable value, or one is not set"
+		eerror "Please see /etc/conf.d/tomcat-5.5 for more information"
+		eend 1
+	fi
+	eend $?
+}
+
+stop()	{
+	ebegin "Stopping Tomcat"
+	init_env_vars
+	start-stop-daemon --stop --quiet \
+	       	--make-pidfile --pidfile /var/run/tomcat.pid \
+			--exec $JAVA_HOME/bin/java -- ${OPTS_CP} ${CATALINA_ARGS} stop
+	eend $?
+}
diff --git a/www-servers/tomcat/files/5.5.17/tomcatbuild-xml.patch b/www-servers/tomcat/files/5.5.17/tomcatbuild-xml.patch
new file mode 100644
index 000000000000..73f56dad7742
--- /dev/null
+++ b/www-servers/tomcat/files/5.5.17/tomcatbuild-xml.patch
@@ -0,0 +1,148 @@
+--- apache-tomcat-5.5.15-src/build/build.xml	2006-01-03 10:15:03.000000000 -0500
++++ build/build.xml	2006-01-28 13:12:39.000000000 -0500
+@@ -140,6 +140,7 @@
+ 
+   <!-- ====================== DEPLOY: Copy Static Files =================== -->
+   <target name="deploy-static" depends="init">
++  <!--
+     <copy file="${jsp-api.jar}"  todir="${tomcat.build}/common/lib"/>
+     <copy file="${servlet-api.jar}" todir="${tomcat.build}/common/lib"/>
+ 
+@@ -158,9 +159,9 @@
+     <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
+             file="${tomcat-native.tar.gz}" />
+ 
+-    <!-- <copy todir="${tomcat.build}/common/lib" file="${ant.jar}"/>
+-    <copy todir="${tomcat.build}/common/lib" file="${ant-launcher.jar}"/> -->
++    <copy todir="${tomcat.build}/common/lib" file="${ant-launcher.jar}"/>
+     <copy todir="${tomcat.build}/common/lib" file="${jasper-compiler-jdt.jar}"/>
++    -->
+   </target>
+ 
+   <!-- ====================== Build all components =================== -->
+@@ -650,28 +651,8 @@
+ 
+     <!-- <antcall target="build-commons-modeler" /> -->
+     <!-- <antcall target="build-commons-daemon"  /> -->
+-
+-    <antcall target="downloadgz">
+-      <param name="sourcefile" value="${commons-collections-src.loc}"/>
+-      <param name="destfile" value="${tomcat-dbcp.jar}" />
+-    </antcall>
+-    <antcall target="downloadgz">
+-      <param name="sourcefile" value="${commons-pool-src.loc}"/>
+-      <param name="destfile" value="${tomcat-dbcp.jar}" />
+-    </antcall>
+-    <antcall target="downloadgz">
+-      <param name="sourcefile" value="${commons-dbcp-src.loc}"/>
+-      <param name="destfile" value="${tomcat-dbcp.jar}" />
+-    </antcall>
+-
+-    <antcall target="build-tomcat-dbcp" />
+-
+-    <antcall target="downloadzip">
+-      <param name="sourcefile" value="${jdt.loc}"/>
+-      <param name="destfile" value="${jdt.jar}"/>
+-      <param name="destdir" value="${base.path}"/>
+-    </antcall>
+-    <antcall target="build-jasper-compiler-jdt" />
++    <!-- <antcall target="build-tomcat-dbcp" /> -->
++    <!-- <antcall target="build-jasper-compiler-jdt" /> -->
+   </target>
+ 
+   <target name="build-tomcat-dbcp">
+@@ -824,9 +805,10 @@
+     </ant>
+ 
+     <!-- Precompiling and fixing webapps -->
++    <!--
+     <antcall target="build-webapps-precompile" />
+     <antcall target="fix-webapps" />
+-
++    -->
+   </target>
+ 
+   <target name="fix-webapps" depends="init" >
+@@ -1038,11 +1020,11 @@
+   <!-- ====================== Compat target =================== -->
+ 
+   <target name="compat" description="Create compatibility binaries for JREs before 1.5" >
+-
++    <!--
+     <copy todir="${tomcat.compat}/common/endorsed" file="${xercesImpl.jar}"/>
+     <copy todir="${tomcat.compat}/common/endorsed" file="${xml-apis.jar}"/>
+     <copy tofile="${tomcat.compat}/bin/jmx.jar" file="${jmx.jar}"/>
+-
++    -->
+   </target>
+ 
+   <!-- ====================== DEPLOY: Deploy Components =================== -->
+@@ -1089,8 +1071,9 @@
+     <!-- Copy Unix JSVC from commons-daemon -->
+     <copy file="${commons-daemon.jsvc.tar.gz}"
+         tofile="${tomcat.dist}/bin/jsvc.tar.gz" />
++    <!--
+     <copy todir="${tomcat.build}/bin" file="${commons-daemon.jar}" />
+-
++    -->
+     <echo>Target: Webapps precompilation ...</echo>
+ 
+     <antcall target="build-admin"/>
+@@ -1185,10 +1168,11 @@
+    description="Catalina Tests" depends="dist-tester">
+ 
+     <!-- For Java 1.4 -->
++    <!--
+     <copy file="${jmx.jar}" tofile="${tomcat.build}/bin/jmx.jar" />
+     <copy todir="${tomcat.build}/common/endorsed" file="${xercesImpl.jar}"/>
+     <copy todir="${tomcat.build}/common/endorsed" file="${xml-apis.jar}"/>
+-
++    -->
+     <parallel>
+ 
+         <java classname="LauncherBootstrap" fork="yes">
+@@ -1827,10 +1811,10 @@
+ 
+     <!-- commons-digester needs ../LICENSE -->
+     <!-- That is ugly XXX needs a review -->
++    <!--
+     <copy file="LICENSE" tofile="../LICENSE"/>
+     <copy file="LICENSE" tofile="${base.path}/LICENSE"/>
+ 
+-    <!-- Downdown any sub package or tools needed. -->
+     <antcall target="downloadgz">
+       <param name="sourcefile" value="${commons-beanutils.loc}"/>
+       <param name="destfile" value="${commons-beanutils.jar}"/>
+@@ -1872,7 +1856,6 @@
+     </antcall>
+ 
+     <antcall target="downloadgz">
+-      <!-- xerces2 brings 2 files, test for one of them -->
+       <param name="sourcefile" value="${xerces.loc}"/>
+       <param name="destfile" value="${xml-apis.jar}"/>
+     </antcall>
+@@ -1893,7 +1876,6 @@
+       <param name="destfile" value="${commons-launcher.jar}"/>
+     </antcall>
+ 
+-    <!--
+     <antcall target="downloadgz">
+       <param name="sourcefile" value="${commons-pool.loc}"/>
+       <param name="destfile" value="${commons-pool.jar}"/>
+@@ -1904,7 +1886,6 @@
+       <param name="destfile" value="${commons-dbcp.jar}"/>
+       <param name="destdir" value="${base.path}"/>
+     </antcall>
+-    -->
+ 
+     <antcall target="downloadgz">
+       <param name="sourcefile" value="${commons-httpclient.loc}"/>
+@@ -1932,7 +1913,7 @@
+       <param name="destfile" value="${tomcat-native.tar.gz}"/>
+       <param name="destdir" value="${tomcat-native.home}"/>
+     </antcall>
+-
++    -->
+     <!-- Build the dependencies that are not yet released -->
+     <antcall target="build-depends"/>
+ 
diff --git a/www-servers/tomcat/files/digest-tomcat-5.5.17 b/www-servers/tomcat/files/digest-tomcat-5.5.17
new file mode 100644
index 000000000000..51d603367aa1
--- /dev/null
+++ b/www-servers/tomcat/files/digest-tomcat-5.5.17
@@ -0,0 +1,3 @@
+MD5 afedf090888029b19a1bebc471264105 apache-tomcat-5.5.17-src.tar.gz 4282022
+RMD160 004d87bc64b32eee42f9979d2fdbb36836b69015 apache-tomcat-5.5.17-src.tar.gz 4282022
+SHA256 295c9fa64d9aa81d5c836b694804d8d57fcfdbc76b9889a044852aa73f2c3ad8 apache-tomcat-5.5.17-src.tar.gz 4282022
diff --git a/www-servers/tomcat/tomcat-5.5.17.ebuild b/www-servers/tomcat/tomcat-5.5.17.ebuild
new file mode 100644
index 000000000000..3e39363ca518
--- /dev/null
+++ b/www-servers/tomcat/tomcat-5.5.17.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.17.ebuild,v 1.1 2006/07/03 02:13:09 nichoj Exp $
+
+inherit eutils java-pkg
+
+DESCRIPTION="Apache Servlet-2.4/JSP-2.0 Container"
+
+MY_P="apache-${P}-src"
+SLOT="5.5"
+SRC_URI="mirror://apache/${PN}/${PN}-5/v${PV}/src/${MY_P}.tar.gz"
+HOMEPAGE="http://jakarta.apache.org/tomcat"
+KEYWORDS="~amd64 ~x86"
+LICENSE="Apache-2.0"
+
+RDEPEND=">=virtual/jdk-1.4
+		=dev-java/eclipse-ecj-3.1*
+		=dev-java/commons-beanutils-1.7*
+		>=dev-java/commons-collections-3.1
+		>=dev-java/commons-daemon-1.0.1
+		>=dev-java/commons-dbcp-1.2.1
+		>=dev-java/commons-digester-1.7
+		>=dev-java/commons-fileupload-1.0
+		>=dev-java/commons-httpclient-2.0
+		>=dev-java/commons-el-1.0
+		>=dev-java/commons-launcher-0.9
+		>=dev-java/commons-logging-1.0.4
+		>=dev-java/commons-modeler-1.1
+		>=dev-java/commons-pool-1.2
+		~dev-java/jaxen-1.0
+		>=dev-java/junit-3.8.1
+		=dev-java/mx4j-3*
+		>=dev-java/log4j-1.2.9
+		>=dev-java/saxpath-1.0
+		~dev-java/servletapi-2.4
+		=dev-java/struts-1.2*
+		=dev-java/gnu-jaf-1*
+		>=dev-java/xerces-2.7.1"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}
+	sys-apps/sed
+	dev-java/ant"
+IUSE="doc examples source test"
+
+S="${WORKDIR}/${MY_P}"
+
+TOMCAT_HOME="/usr/share/${PN}-${SLOT}"
+TOMCAT_NAME="${PN}-${SLOT}"
+WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps"
+
+pkg_setup() {
+	enewgroup tomcat
+	enewuser tomcat -1 -1 /dev/null tomcat
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	local PATCHES="
+		mainbuild-xml.patch
+		tomcatbuild-xml.patch
+		catalinabuild-xml.patch
+		jasperbuild-xml.patch
+	"
+	for patch in ${PATCHES}; do
+		epatch "${FILESDIR}/${PV}/${patch}"
+	done
+
+	# avoid packed jars :-)
+	mkdir -p ${S}/build/build/common
+	cd ${S}/build/build
+
+	mkdir ./bin && cd ./bin
+	java-pkg_jar-from commons-logging commons-logging-api.jar
+	java-pkg_jar-from mx4j-3.0 mx4j.jar jmx.jar
+	java-pkg_jar-from mx4j-3.0 mx4j-rjmx.jar jmx-remote.jar
+	java-pkg_jar-from commons-daemon
+
+	mkdir ../common/endorsed && cd ../common/endorsed
+	java-pkg_jar-from xerces-2 xml-apis.jar
+	java-pkg_jar-from xerces-2 xercesImpl.jar
+
+	mkdir ../lib && cd ../lib
+	java-pkg_jar-from ant-core
+	java-pkg_jar-from commons-collections
+	java-pkg_jar-from commons-dbcp
+	java-pkg_jar-from commons-el
+	java-pkg_jar-from commons-pool
+	java-pkg_jar-from servletapi-2.4
+
+	mkdir -p ../../server/lib && cd ../../server/lib
+	java-pkg_jar-from commons-beanutils-1.7 commons-beanutils.jar
+	java-pkg_jar-from commons-digester
+	java-pkg_jar-from commons-fileupload
+	java-pkg_jar-from commons-modeler
+}
+
+src_compile(){
+	local antflags="-Dbase.path=${T}"
+
+	antflags="${antflags} -Dactivation.jar=$(java-config -p gnu-jaf-1)"
+	antflags="${antflags} -Dcommons-collections.jar=$(java-config -p commons-collections)"
+	antflags="${antflags} -Dcommons-daemon.jar=$(java-config -p commons-daemon)"
+	antflags="${antflags} -Dcommons-digester.jar=$(java-config -p commons-digester)"
+	antflags="${antflags} -Dcommons-dbcp.jar=$(java-config -p commons-dbcp)"
+	antflags="${antflags} -Dcommons-el.jar=$(java-config -p commons-el)"
+	antflags="${antflags} -Dcommons-httpclient.jar=$(java-config -p commons-httpclient)"
+	antflags="${antflags} -Dcommons-pool.jar=$(java-config -p commons-pool)"
+	antflags="${antflags} -Dcommons-fileupload.jar=$(java-config -p commons-fileupload)"
+	antflags="${antflags} -Dcommons-launcher.jar=$(java-config -p commons-launcher)"
+	antflags="${antflags} -Dcommons-modeler.jar=$(java-config -p commons-modeler)"
+	antflags="${antflags} -Djunit.jar=$(java-config -p junit)"
+	antflags="${antflags} -Djdt.jar=$(java-pkg_getjar eclipse-ecj-3.1 ecj.jar)"
+	antflags="${antflags} -Dlog4j.jar=$(java-config -p log4j)"
+	antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts-1.2 struts.jar)"
+	antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.7 commons-beanutils.jar)"
+	antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)"
+	antflags="${antflags} -Dcommons-logging-api.jar=$(java-pkg_getjar commons-logging commons-logging-api.jar)"
+	antflags="${antflags} -Djaxen.jar=$(java-pkg_getjar jaxen jaxen-full.jar)"
+	antflags="${antflags} -Djmx.jar=$(java-pkg_getjar mx4j-3.0 mx4j.jar)"
+	antflags="${antflags} -Djmx-remote.jar=$(java-pkg_getjar mx4j-3.0 mx4j-rjmx.jar)"
+	antflags="${antflags} -Dsaxpath.jar=$(java-pkg_getjar saxpath saxpath.jar)"
+	antflags="${antflags} -DxercesImpl.jar=$(java-pkg_getjar xerces-2 xercesImpl.jar)"
+	antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xerces-2 xml-apis.jar)"
+	antflags="${antflags} -Dstruts.home=/usr/share/struts"
+	antflags="${antflags} -Djasper.home=${S}/jasper"
+
+	ant ${antflags} || die "compile failed"
+
+}
+src_install() {
+	cd ${S}/build/build
+
+	# init.d, env.d, conf.d
+	newinitd ${FILESDIR}/${PV}/tomcat.init ${TOMCAT_NAME}
+	newconfd ${FILESDIR}/${PV}/tomcat.conf ${TOMCAT_NAME}
+	newenvd ${FILESDIR}/${PV}/${PN}.env 21${PN}
+
+	# create dir structure
+	diropts -m755 -o tomcat -g tomcat
+	dodir /usr/share/${TOMCAT_NAME}
+	keepdir /var/log/${TOMCAT_NAME}/
+	keepdir /var/tmp/${TOMCAT_NAME}/
+	keepdir /var/run/${TOMCAT_NAME}/
+
+	local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/
+	dodir   ${CATALINA_BASE}
+	keepdir ${CATALINA_BASE}/shared/lib
+	keepdir ${CATALINA_BASE}/shared/classes
+
+	dodir   /etc/${TOMCAT_NAME}
+	fperms  750 /etc/${TOMCAT_NAME}
+
+	diropts -m0755
+
+	# we don't need dos scripts	
+	rm -f bin/*.bat
+
+	# copy the manager and admin context's to the right position
+	mkdir -p conf/Catalina/localhost
+	cp ${S}/container/webapps/admin/admin.xml \
+		conf/Catalina/localhost
+	cp ${S}/container/webapps/manager/manager.xml \
+		conf/Catalina/localhost
+
+	# make the jars available via java-config -p and jar-from, etc
+	base=$(pwd)
+	libdirs="common/lib server/lib"
+	for dir in ${libdirs}
+	do
+		cd ${dir}
+
+		for jar in *.jar;
+		do
+			# replace the file with a symlink
+			if [ ! -L ${jar} ]; then
+				java-pkg_dojar ${jar}
+				rm -f ${jar}
+				ln -s ${DESTTREE}/share/${TOMCAT_NAME}/lib/${jar} ${jar}
+			fi
+		done
+
+		cd ${base}
+	done
+
+	# replace a packed struts.jar
+	cd server/webapps/admin/WEB-INF/lib
+	rm -f struts.jar
+	java-pkg_jar-from struts-1.2 struts.jar
+	cd ${base}
+
+	# replace the default pw with a random one, see #92281 
+	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
+	sed -e s:SHUTDOWN:${randpw}: -i conf/{server,server-minimal}.xml
+
+	# copy over the directories	
+	chown -R tomcat:tomcat webapps/* conf/*
+	cp -pR conf/* ${D}/etc/${TOMCAT_NAME} || die "failed to copy conf"
+	cp -R bin common server shared ${D}/usr/share/${TOMCAT_NAME} || die "failed to copy"
+
+	keepdir               ${WEBAPPS_DIR}
+	set_webapps_perms     ${D}/${WEBAPPS_DIR}
+
+	# if the useflag is set, copy over the examples
+	if use examples; then
+		cp -p ../RELEASE-NOTES webapps/ROOT/RELEASE-NOTES.txt
+		cp -pr webapps/{tomcat-docs,jsp-examples,servlets-examples,ROOT,webdav} \
+			${D}${CATALINA_BASE}/webapps
+	fi
+
+	# symlink the directories to make CATALINA_BASE possible
+	dosym /etc/${TOMCAT_NAME} ${CATALINA_BASE}/conf
+	dosym /var/log/${TOMCAT_NAME} ${CATALINA_BASE}/logs
+	dosym /var/tmp/${TOMCAT_NAME} ${CATALINA_BASE}/temp
+	dosym /var/run/${TOMCAT_NAME} ${CATALINA_BASE}/work
+
+	dodoc  ${S}/build/{RELEASE-NOTES,RUNNING.txt}
+	fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
+}
+
+pkg_postinst() {
+	# due to previous ebuild bloopers, make sure everything is correct
+	chown root:root /etc/init.d/${TOMCAT_NAME}
+	chown root:root /etc/conf.d/${TOMCAT_NAME}
+
+	einfo
+	ewarn " This ebuild implements a new filesystem layout for tomcat"
+	ewarn " please read http://www.gentoo.org/proj/en/java/tomcat-guide.xml"
+	ewarn " for more information!."
+	einfo
+	einfo " Please file any bugs at http://bugs.gentoo.org/ or else it"
+	einfo " may not get seen.  Thank you."
+	einfo
+
+# This may be a comeback, so it's here for convienence
+#	einfo "Run emerge --config =${PF}"
+#	einfo "to configure Tomcat if you need to for example"
+#	einfo "change the home directory of the Tomcat user."
+}
+
+# helpers
+set_webapps_perms() {
+	chown  tomcat:tomcat ${1} || die "Failed to change owner off ${1}."
+	chmod  750           ${1} || die "Failed to change permissions off ${1}."
+}
+
+pkg_config() {
+	# Better suggestions are welcome
+	local currentdir="$(getent passwd tomcat | gawk -F':' '{ print $6 }')"
+
+	einfo "The default home directory for Tomcat is /dev/null."
+	einfo "You need to change it if your applications needs it to"
+	einfo "be an actual directory. Current home directory:"
+	einfo "${currentdir}"
+	einfo ""
+	einfo "Do you want to change it [yes/no]?"
+
+	local answer
+	read answer
+
+	if [[ "${answer}" == "yes" ]]; then
+		einfo ""
+		einfo "Suggestions:"
+		einfo "${WEBAPPS_DIR}"
+		einfo ""
+		einfo "If you want to suggest a directory, file a bug to"
+		einfo "http://bugs.gentoo.org"
+		einfo ""
+		einfo "Enter home directory:"
+
+		local homedir
+		read homedir
+
+		einfo ""
+		einfo "Setting home directory to: ${homedir}"
+
+		/usr/sbin/usermod -d"${homedir}" tomcat
+
+		einfo "You can run emerge --config =${PF}"
+		einfo "again to change to homedir"
+		einfo "at any time."
+	fi
+}