Stable on amd64, security bug #173122. Removed older vulnerable version.

Package-Manager: portage-2.1.2.3

16 files changed, 23 insertions, 1400 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index a2c02caf0e2b..2846dcc2c570 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,18 @@
 # 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.133 2007/04/05 21:24:15 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.134 2007/04/07 00:35:32 wltjr Exp $
+
+  07 Apr 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  -files/5.5.20/catalinabuild-xml.patch,
+  -files/5.5.20/jsr152_examples_build-xml.patch,
+  -files/5.5.20/mainbuild-xml.patch, -files/5.5.20/jasperbuild-xml.patch,
+  -files/5.5.20/jsr152build-xml-examples.patch,
+  -files/5.5.20/jsr154_examples_build-xml.patch,
+  -files/5.5.20/jsr154build-xml-examples.patch, -files/5.5.20/tomcat.conf,
+  -files/5.5.20/tomcat.init, -files/5.5.20/tomcat_build-xml.patch,
+  -files/5.5.20/tomcatbuild-xml.patch, -tomcat-5.5.20-r8.ebuild,
+  tomcat-5.5.23-r1.ebuild:
+  Stable on amd64, security bug #173122. Removed older vulnerable version.
 
   05 Apr 2007; William L. Thomson Jr. <wltjr@gentoo.org> ChangeLog,
   Manifest:
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index c6a1e9397569..b6b80e6ce99a 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,50 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX 5.5.20/catalinabuild-xml.patch 1149 RMD160 9622ca4f688e2c57e4bc34f08ceebb651f75deb1 SHA1 8eda11132851da5773ceb33f90515f0c8ffabdb6 SHA256 dc2d7255dd990359f765f329a04825aca18888e505b4024bb64e0dc6e348498e
-MD5 4b2dbaa2a74776229f4fffa1274d0a13 files/5.5.20/catalinabuild-xml.patch 1149
-RMD160 9622ca4f688e2c57e4bc34f08ceebb651f75deb1 files/5.5.20/catalinabuild-xml.patch 1149
-SHA256 dc2d7255dd990359f765f329a04825aca18888e505b4024bb64e0dc6e348498e files/5.5.20/catalinabuild-xml.patch 1149
-AUX 5.5.20/jasperbuild-xml.patch 463 RMD160 d042043acbaafa7b2be42f071846d5fbe970fa62 SHA1 f168e9ff231e1ccd727367a03f0fdefde3c36a1a SHA256 8c0758f6f2e556d317087389b7649bc709d738679be7965a50329b724c6e8714
-MD5 0139160e01d9f8c37007e700adc14edd files/5.5.20/jasperbuild-xml.patch 463
-RMD160 d042043acbaafa7b2be42f071846d5fbe970fa62 files/5.5.20/jasperbuild-xml.patch 463
-SHA256 8c0758f6f2e556d317087389b7649bc709d738679be7965a50329b724c6e8714 files/5.5.20/jasperbuild-xml.patch 463
-AUX 5.5.20/jsr152_examples_build-xml.patch 403 RMD160 bb9bbb7fe9656ed9b3f4f18bc8e59db0360fe56e SHA1 d8d596ce643a30429194f0003d1847c9565059c5 SHA256 481da3d09b32a3ed1da938df1e9b2a3273ff84b10dfb9a4467de614ed8dd847d
-MD5 345c4483f94ba70ccd6170ee50bdabbd files/5.5.20/jsr152_examples_build-xml.patch 403
-RMD160 bb9bbb7fe9656ed9b3f4f18bc8e59db0360fe56e files/5.5.20/jsr152_examples_build-xml.patch 403
-SHA256 481da3d09b32a3ed1da938df1e9b2a3273ff84b10dfb9a4467de614ed8dd847d files/5.5.20/jsr152_examples_build-xml.patch 403
-AUX 5.5.20/jsr152build-xml-examples.patch 812 RMD160 e9449414ef88de3e2b54c094c898d75f13e4c74e SHA1 5455201aba4cca42b000477375516a45c380c766 SHA256 36b91bb7ccb67ca31db41a8217c6762b1aff88b0611319aded08421401d7f9b0
-MD5 4c33bf7e8bd654980a11408211768a2e files/5.5.20/jsr152build-xml-examples.patch 812
-RMD160 e9449414ef88de3e2b54c094c898d75f13e4c74e files/5.5.20/jsr152build-xml-examples.patch 812
-SHA256 36b91bb7ccb67ca31db41a8217c6762b1aff88b0611319aded08421401d7f9b0 files/5.5.20/jsr152build-xml-examples.patch 812
-AUX 5.5.20/jsr154_examples_build-xml.patch 406 RMD160 7e2c286db8b0bd4df722507c889f7e2deff65302 SHA1 1bfb15ad4eaec80f16a51f2e1bf0bed31792da38 SHA256 4e98264fb26027fbae39e8c44e44bb1151a84dc3defe6373ded0fd50e6bfd98b
-MD5 4834c2eada7c9c01cf69d9d5637eae62 files/5.5.20/jsr154_examples_build-xml.patch 406
-RMD160 7e2c286db8b0bd4df722507c889f7e2deff65302 files/5.5.20/jsr154_examples_build-xml.patch 406
-SHA256 4e98264fb26027fbae39e8c44e44bb1151a84dc3defe6373ded0fd50e6bfd98b files/5.5.20/jsr154_examples_build-xml.patch 406
-AUX 5.5.20/jsr154build-xml-examples.patch 836 RMD160 5a0cf4831345c904b5f9b3f89bcbbc0243e676e6 SHA1 29a59f40743784327d8be9307c40c291141fa5bf SHA256 84a82ef51e8cd0470ea3f388c16f3323024e87b74212ffab65977b5d9792a191
-MD5 e715be19acef459dbe33804fc0d8b35c files/5.5.20/jsr154build-xml-examples.patch 836
-RMD160 5a0cf4831345c904b5f9b3f89bcbbc0243e676e6 files/5.5.20/jsr154build-xml-examples.patch 836
-SHA256 84a82ef51e8cd0470ea3f388c16f3323024e87b74212ffab65977b5d9792a191 files/5.5.20/jsr154build-xml-examples.patch 836
-AUX 5.5.20/mainbuild-xml.patch 482 RMD160 61e18d765777294144c8f6745cceee5a18d72db4 SHA1 c75ef0ca7b88fb34aacc0ec9f59aeb8f2239b469 SHA256 7a9dbb7d8a0be4399792417b6bdfd04b7a090b8d9a39b1b03050f0066a90b559
-MD5 9f2ec43ff05ee924217e510c65d8150e files/5.5.20/mainbuild-xml.patch 482
-RMD160 61e18d765777294144c8f6745cceee5a18d72db4 files/5.5.20/mainbuild-xml.patch 482
-SHA256 7a9dbb7d8a0be4399792417b6bdfd04b7a090b8d9a39b1b03050f0066a90b559 files/5.5.20/mainbuild-xml.patch 482
-AUX 5.5.20/tomcat.conf 2689 RMD160 476e33ffd9e99215fea1d44cd2bd978ea31d2c69 SHA1 65deaed8adfe8a83d1b069c5b3003e8678f2301d SHA256 286400591a4a0b80be72267c016c0b14a2878ba502a6ce2c384b49f4d51bd677
-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 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
-SHA256 9b1b9feb18d6f1dc5c2226c195f88a2f6cb9d68a2144e47e883fb57790c281f9 files/5.5.20/tomcat_build-xml.patch 13828
-AUX 5.5.20/tomcatbuild-xml.patch 12470 RMD160 e936baf49d5f1a34b5b3c5787d62fb5a06ea52a2 SHA1 4857962223dc50dbb43e9e362e53f114723ff4d6 SHA256 d76b0dcc3a6d8d60c0305d74ef980e5461bbcaef1059a306e38e5d358c2a01a4
-MD5 83d2b72b5c1c52e80492ee5199eb3625 files/5.5.20/tomcatbuild-xml.patch 12470
-RMD160 e936baf49d5f1a34b5b3c5787d62fb5a06ea52a2 files/5.5.20/tomcatbuild-xml.patch 12470
-SHA256 d76b0dcc3a6d8d60c0305d74ef980e5461bbcaef1059a306e38e5d358c2a01a4 files/5.5.20/tomcatbuild-xml.patch 12470
 AUX 5.5/catalina_build_xml.patch 1149 RMD160 9622ca4f688e2c57e4bc34f08ceebb651f75deb1 SHA1 8eda11132851da5773ceb33f90515f0c8ffabdb6 SHA256 dc2d7255dd990359f765f329a04825aca18888e505b4024bb64e0dc6e348498e
 MD5 4b2dbaa2a74776229f4fffa1274d0a13 files/5.5/catalina_build_xml.patch 1149
 RMD160 9622ca4f688e2c57e4bc34f08ceebb651f75deb1 files/5.5/catalina_build_xml.patch 1149
@@ -89,42 +42,27 @@ AUX 6/tomcat.init 3291 RMD160 b6bac4cf4ce2bac5aa0bd9dec28fa88a39c42570 SHA1 c75b
 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-5.5.23-src.tar.gz 4895919 RMD160 fe669f6b864fd7dcf4ad74dad22a0256e5417005 SHA1 59272b5eedde9c32a126679ff9e1d2a5f56265c8 SHA256 e2f7ce250643349507b511a5ea96df7364030a061a8f4d5b71d8b5a099e2b6bd
 DIST apache-tomcat-6.0.10-src.tar.gz 3221070 RMD160 64762f16606645c6ef507906f2eb8eeb102173bb SHA1 4ec1acda174ab19082c4900c293d8bc7f9544a69 SHA256 54ae6b89a3ac3e3e33a580708403ca4ea0a449f287b91e6246bb6a6550e39199
-EBUILD tomcat-5.5.20-r8.ebuild 10244 RMD160 d99fee7973616b0b7f165ccdb1d2126a7fee031c SHA1 4afb713b944a6572769183cf0b873e7ce5cdbee4 SHA256 215bb2f0f8ef97b47f2003c5c79862b54243a0decb52d965a51af45590f93ec9
-MD5 b35390dd66d703bef0d76905378f3f8c tomcat-5.5.20-r8.ebuild 10244
-RMD160 d99fee7973616b0b7f165ccdb1d2126a7fee031c tomcat-5.5.20-r8.ebuild 10244
-SHA256 215bb2f0f8ef97b47f2003c5c79862b54243a0decb52d965a51af45590f93ec9 tomcat-5.5.20-r8.ebuild 10244
-EBUILD tomcat-5.5.23-r1.ebuild 10585 RMD160 0dc6190f13c0c89a27318585d226cee81d73ea91 SHA1 0ba6b9426ffd763bfd5c5f8b24048276eda4e147 SHA256 1684f06b9e320de04a619e585db8d5c645f152a1621a965f2f829f2f12ff3978
-MD5 6630f8096fbd46a5388b857896be587f tomcat-5.5.23-r1.ebuild 10585
-RMD160 0dc6190f13c0c89a27318585d226cee81d73ea91 tomcat-5.5.23-r1.ebuild 10585
-SHA256 1684f06b9e320de04a619e585db8d5c645f152a1621a965f2f829f2f12ff3978 tomcat-5.5.23-r1.ebuild 10585
+EBUILD tomcat-5.5.23-r1.ebuild 10584 RMD160 c42b0b5268b7cc6e4047fbf8da52b0be12a783dd SHA1 58efb4c5d483e3a4bc8cb47ccbaf81607ba9e29d SHA256 744de62a876d0b2567d80aa9c1252f37c8c4ad6d0f74920693692b0ddf59000c
+MD5 367fce83dfc2e05c71de752be7dfd1e4 tomcat-5.5.23-r1.ebuild 10584
+RMD160 c42b0b5268b7cc6e4047fbf8da52b0be12a783dd tomcat-5.5.23-r1.ebuild 10584
+SHA256 744de62a876d0b2567d80aa9c1252f37c8c4ad6d0f74920693692b0ddf59000c tomcat-5.5.23-r1.ebuild 10584
 EBUILD tomcat-6.0.10-r2.ebuild 5340 RMD160 f87a307db7fd39facd71e2e618fed0ed915c707f SHA1 bc7132133f9318a4bf2fb558c00f06651bbcbda3 SHA256 e53fb16232a77c6bffcfa41719e05d9161cf4ca10a5f44df28c78ab7bf767f48
 MD5 a5bba79bbf78e8aed22f052e0ce55d98 tomcat-6.0.10-r2.ebuild 5340
 RMD160 f87a307db7fd39facd71e2e618fed0ed915c707f tomcat-6.0.10-r2.ebuild 5340
 SHA256 e53fb16232a77c6bffcfa41719e05d9161cf4ca10a5f44df28c78ab7bf767f48 tomcat-6.0.10-r2.ebuild 5340
-MISC ChangeLog 42900 RMD160 998850d9b92fb52a828fa8a44cf616155b39bc6d SHA1 7137a4f1071fd55f2f50c64735f917b29852cd88 SHA256 c77b37ce54fa1e453f32d3ce8a96d908c7107c9874f82c2b4540163d09090b73
-MD5 91921d3fedd9a6821d6ab7a8e1bafe33 ChangeLog 42900
-RMD160 998850d9b92fb52a828fa8a44cf616155b39bc6d ChangeLog 42900
-SHA256 c77b37ce54fa1e453f32d3ce8a96d908c7107c9874f82c2b4540163d09090b73 ChangeLog 42900
+MISC ChangeLog 43528 RMD160 9120d8eae33610b80d1d01fce271af88670d4ee6 SHA1 57e4fe159e1a26e4df79bac38ac75792716a0972 SHA256 556b97888ece217497b84367cee0b2fa71c5344f61f1b2a6a8717de8c76a726f
+MD5 6d33b128f7431ee6e49a4ece95dd01ed ChangeLog 43528
+RMD160 9120d8eae33610b80d1d01fce271af88670d4ee6 ChangeLog 43528
+SHA256 556b97888ece217497b84367cee0b2fa71c5344f61f1b2a6a8717de8c76a726f ChangeLog 43528
 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79
 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556
 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556
 SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79 metadata.xml 556
-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 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 5f9244a61bfa0875478e8849b6cb845e files/digest-tomcat-6.0.10-r2 277
 RMD160 3d16b85b1dcb55e6874b535c06f2a5df00b46ce1 files/digest-tomcat-6.0.10-r2 277
 SHA256 49aef00c733c574a5c8536a6e5406769105dbe0b64ad0ea9b9682ca42bff23f0 files/digest-tomcat-6.0.10-r2 277
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGFcqQ/ejvha5XGaMRAlb5AKC6K7gXSV3tHZ80Ku4AALVlPHXBMwCdHlNU
-UK1descb6ugxYWh+VPtFlfw=
-=WhoM
------END PGP SIGNATURE-----
diff --git a/www-servers/tomcat/files/5.5.20/catalinabuild-xml.patch b/www-servers/tomcat/files/5.5.20/catalinabuild-xml.patch
deleted file mode 100644
index da6b96901aab..000000000000
--- a/www-servers/tomcat/files/5.5.20/catalinabuild-xml.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- 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.20/jasperbuild-xml.patch b/www-servers/tomcat/files/5.5.20/jasperbuild-xml.patch
deleted file mode 100644
index 1f0de5f8a04f..000000000000
--- a/www-servers/tomcat/files/5.5.20/jasperbuild-xml.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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.20/jsr152_examples_build-xml.patch b/www-servers/tomcat/files/5.5.20/jsr152_examples_build-xml.patch
deleted file mode 100644
index 1e4e013b741d..000000000000
--- a/www-servers/tomcat/files/5.5.20/jsr152_examples_build-xml.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- apache-tomcat-5.5.20-src/servletapi/jsr152/build.xml	2007-01-27 00:02:27.000000000 -0500
-+++ build.xml	2007-01-27 00:02:44.000000000 -0500
-@@ -20,6 +20,7 @@
- 
-   <path id="examples.classpath">
-     <pathelement location="${jsp-api.build}/classes"/>
-+    <pathelement location="${jsp-api.jar}"/>
-     <pathelement location="${servlet-api.jar}"/>
-     <pathelement location="${mail.jar}"/>
-   </path>
diff --git a/www-servers/tomcat/files/5.5.20/jsr152build-xml-examples.patch b/www-servers/tomcat/files/5.5.20/jsr152build-xml-examples.patch
deleted file mode 100644
index 933e2aa48242..000000000000
--- a/www-servers/tomcat/files/5.5.20/jsr152build-xml-examples.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- apache-tomcat-5.5.17-src/servletapi/jsr152/build.xml	2006-07-29 14:13:41.000000000 -0400
-+++ servletapi/jsr152/build.xml	2006-07-29 14:13:17.000000000 -0400
-@@ -119,6 +119,7 @@
-                 classpath="${jsp-anttask.jar}" />
-   </target>
-   
-+  <!--
-   <target name="examples" depends="prepare,ant">
- 
-     <copy todir="${jsp-api.build}/examples">
-@@ -221,7 +222,7 @@
-            basedir="${jsp-api.build}/examples" includes="**"/>
- 
-   </target>
--
-+  -->
- 
-   <!-- ===================== Distribution Files ========================= -->
-   <target name="jar" depends="compile"
-@@ -245,7 +246,7 @@
- 
-   </target>
- 
--  <target name="dist" depends="compile,examples,javadoc,jar"
-+  <target name="dist" depends="compile,javadoc,jar"
-    description="Create binary distribution">
- 
-     <!-- Copy Javadocs -->
diff --git a/www-servers/tomcat/files/5.5.20/jsr154_examples_build-xml.patch b/www-servers/tomcat/files/5.5.20/jsr154_examples_build-xml.patch
deleted file mode 100644
index 9c7b417a3b1f..000000000000
--- a/www-servers/tomcat/files/5.5.20/jsr154_examples_build-xml.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- apache-tomcat-5.5.20-src/servletapi/jsr154/build.xml	2007-01-26 23:50:15.000000000 -0500
-+++ build.xml	2007-01-26 23:56:03.000000000 -0500
-@@ -17,6 +17,7 @@
-   <property name="servlet-api.jar" value="${servlet-api.dist}/lib/servlet-api.jar"/>
-   <path id="examples.classpath">
-     <pathelement location="${servlet-api.build}/classes"/>
-+    <pathelement location="${servlet-api.jar}"/>
-   </path>
- 
- 
diff --git a/www-servers/tomcat/files/5.5.20/jsr154build-xml-examples.patch b/www-servers/tomcat/files/5.5.20/jsr154build-xml-examples.patch
deleted file mode 100644
index 4dac35390f1d..000000000000
--- a/www-servers/tomcat/files/5.5.20/jsr154build-xml-examples.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- apache-tomcat-5.5.17-src/servletapi/jsr154/build.xml	2006-04-14 14:12:10.000000000 -0400
-+++ servletapi/jsr154/build.xml	2006-07-29 14:41:05.000000000 -0400
-@@ -99,6 +99,7 @@
- 
- 
-   <!-- ======================== Build JavaDoc =========================== -->
-+  <!--
-   <target name="examples" depends="prepare">
- 
-     <copy todir="${servlet-api.build}/examples">
-@@ -119,7 +120,7 @@
-            basedir="${servlet-api.build}/examples" includes="**"/>
- 
-   </target>
--
-+  -->
- 
-   <!-- ===================== Distribution Files ========================= -->
-   <target name="jar" depends="compile"
-@@ -144,7 +145,7 @@
- 
-   </target>
- 
--  <target name="dist" depends="compile,examples,javadoc,jar"
-+  <target name="dist" depends="compile,javadoc,jar"
-           description="Create binary distribution">
- 
-     <!-- Copy Javadocs -->
diff --git a/www-servers/tomcat/files/5.5.20/mainbuild-xml.patch b/www-servers/tomcat/files/5.5.20/mainbuild-xml.patch
deleted file mode 100644
index 7ef15860cb5c..000000000000
--- a/www-servers/tomcat/files/5.5.20/mainbuild-xml.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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.20/tomcat.conf b/www-servers/tomcat/files/5.5.20/tomcat.conf
deleted file mode 100644
index 1424e4b59660..000000000000
--- a/www-servers/tomcat/files/5.5.20/tomcat.conf
+++ /dev/null
@@ -1,75 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.5.20/tomcat.conf,v 1.1 2006/09/28 16:36:00 wltjr 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/Group
-# Change these at your own risk!!! These are not supported so if it 
-# breaks something, you are on your own.
-CATALINA_USER=tomcat
-CATALINA_GROUP=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.20/tomcat.init b/www-servers/tomcat/files/5.5.20/tomcat.init
deleted file mode 100755
index 677bdbde0b94..000000000000
--- a/www-servers/tomcat/files/5.5.20/tomcat.init
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/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.4 2007/01/28 07:26:59 wltjr Exp $
-
-init_env_vars() {
-	# Set some sane defaults
-	if [ -z "${CATALINA_TMPDIR}" ] ; then
-		CATALINA_TMPDIR="${CATALINA_BASE}"/temp
-	fi
-	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=${CATALINA_BASE}/conf/logging.properties"
-	fi
-
-	# Populate the classpath
-	CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/server/lib:${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:${CATALINA_HOME}/bin/commons-logging-api.jar"
-
-	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 "
-
-	if [ ! -f "${CATALINA_BASE}logs/catalina.out" ]; then
-		touch "${CATALINA_BASE}logs/catalina.out"
-		chown tomcat:tomcat "${CATALINA_BASE}logs/catalina.out"
-	fi
-}
-
-start-helper() {
-	local executor=${1}
-	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} ${TOMCAT_START} >> "$CATALINA_BASE"/logs/catalina.out 2>&1
-	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=${CATALINA_BASE}/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=${CATALINA_BASE}/conf/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} ${STD_OUT} stop
-	eend $?
-}
diff --git a/www-servers/tomcat/files/5.5.20/tomcat_build-xml.patch b/www-servers/tomcat/files/5.5.20/tomcat_build-xml.patch
deleted file mode 100644
index 109caf67af37..000000000000
--- a/www-servers/tomcat/files/5.5.20/tomcat_build-xml.patch
+++ /dev/null
@@ -1,367 +0,0 @@
---- apache-tomcat-5.5.20-src/build/build.xml	2007-01-26 19:10:26.000000000 -0500
-+++ build.xml	2007-01-26 19:31:49.000000000 -0500
-@@ -143,6 +143,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"/>
- 
-@@ -161,9 +162,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 =================== -->
-@@ -395,15 +396,14 @@
-   <target name="build-webapps-precompile"
-           depends="init" description="Precompile webapps" >
- 
-+    <antcall target="build-webapp-precompile-admin" />
-+    <antcall target="build-webapp-precompile-examples" />
-+
-     <!-- JSPC -->
--    <property name="admin.base" location="${tomcat.build}/server/webapps/admin" />
-     <property name="ROOT.base" location="${tomcat.build}/webapps/ROOT" />
--    <property name="jsp-examples.base" location="${tomcat.build}/webapps/jsp-examples" />
- 
--    <mkdir dir="${admin.base}/WEB-INF/src/admin" />
-     <mkdir dir="${ROOT.base}/WEB-INF/src" />
-     <mkdir dir="${ROOT.base}/WEB-INF/classes" />
--    <mkdir dir="${jsp-examples.base}/WEB-INF/src" />
- 
-     <path id="jspc.classpath">
-       <pathelement location="${java.home}/../lib/tools.jar"/>
-@@ -437,23 +437,6 @@
-              addWebXmlMappings="true"
-              outputDir="${ROOT.base}/WEB-INF/src" />
- 
--    <jasper2
--             compile="false"
--             validateXml="false"
--             uriroot="${jsp-examples.base}"
--         webXmlFragment="${jsp-examples.base}/WEB-INF/generated_web.xml"
--             addWebXmlMappings="true"
--             outputDir="${jsp-examples.base}/WEB-INF/src" />
--
--    <jasper2
--             package="admin"
--             compile="false"
--             validateXml="false"
--             uriroot="${admin.base}"
--             webXmlFragment="${admin.base}/WEB-INF/generated_web.xml"
--             addWebXmlMappings="true"
--             outputDir="${admin.base}/WEB-INF/src/admin" />
--
-     <javac destdir="${ROOT.base}/WEB-INF/classes"
-            optimize="off"
-            debug="${compile.debug}"
-@@ -475,61 +458,90 @@
-       <include name="**" />
-     </javac>
- 
--    <mkdir dir="${jsp-examples.base}/WEB-INF/src/tags"/>
--    <copy todir="${jsp-examples.base}/WEB-INF/classes">
--      <fileset dir="${jsp-examples.base}/WEB-INF/src">
--        <include name="**/*.class" />
--      </fileset>
--    </copy>
-+  </target>
- 
--    <javac destdir="${jsp-examples.base}/WEB-INF/classes"
-+  <target name="build-webapp-precompile-admin" unless="admin.precompile.notrequired">
-+    <property name="admin.base" location="${tomcat.build}/server/webapps/admin" />
-+    <mkdir dir="${admin.base}/WEB-INF/src/admin" />
-+    <taskdef classname="org.apache.jasper.JspC" name="jasper2" >
-+      <classpath refid="jspc.classpath"/>
-+    </taskdef>
-+    <jasper2
-+             package="admin"
-+             compile="false"
-+             validateXml="false"
-+             uriroot="${admin.base}"
-+             webXmlFragment="${admin.base}/WEB-INF/generated_web.xml"
-+             addWebXmlMappings="true"
-+             outputDir="${admin.base}/WEB-INF/src/admin" />
-+    <javac destdir="${admin.base}/WEB-INF/classes"
-            optimize="off"
-            debug="${compile.debug}"
-            deprecation="${compile.deprecation}"
-            source="${compile.source}"
-            failonerror="false"
--           srcdir="${jsp-examples.base}/WEB-INF/src"
-+           srcdir="${admin.base}/WEB-INF/src"
-        excludes="**/*.smap">
-       <classpath>
-         <pathelement location="${java.home}/../lib/tools.jar"/>
-         <fileset dir="${tomcat.build}/server/lib">
-           <include name="*.jar"/>
-         </fileset>
--        <fileset dir="${jsp-examples.base}/WEB-INF/lib">
-+        <fileset dir="${admin.base}/WEB-INF/lib">
-           <include name="*.jar"/>
-         </fileset>
-         <fileset dir="${tomcat.build}/common/lib">
-           <include name="*.jar"/>
-         </fileset>
-         <pathelement location="${tomcat.build}/classes"/>
--        <pathelement location="${jsp-examples.base}/WEB-INF/classes"/>
-       </classpath>
--      <include name="**" />
--      <exclude name="tags/**" />
-+      <include name="admin/**" />
-     </javac>
--
--    <javac destdir="${admin.base}/WEB-INF/classes"
-+  </target>
-+  
-+  <target name="build-webapp-precompile-examples" unless="examples.precompile.notrequired">
-+    <property name="jsp-examples.base" location="${tomcat.build}/webapps/jsp-examples" />
-+    <mkdir dir="${jsp-examples.base}/WEB-INF/src" />
-+    <taskdef classname="org.apache.jasper.JspC" name="jasper2" >
-+      <classpath refid="jspc.classpath"/>
-+    </taskdef>
-+    <jasper2
-+             compile="false"
-+             validateXml="false"
-+             uriroot="${jsp-examples.base}"
-+         webXmlFragment="${jsp-examples.base}/WEB-INF/generated_web.xml"
-+             addWebXmlMappings="true"
-+             outputDir="${jsp-examples.base}/WEB-INF/src" />
-+    <mkdir dir="${jsp-examples.base}/WEB-INF/src/tags"/>
-+    <copy todir="${jsp-examples.base}/WEB-INF/classes">
-+      <fileset dir="${jsp-examples.base}/WEB-INF/src">
-+        <include name="**/*.class" />
-+      </fileset>
-+    </copy>
-+    <javac destdir="${jsp-examples.base}/WEB-INF/classes"
-            optimize="off"
-            debug="${compile.debug}"
-            deprecation="${compile.deprecation}"
-            source="${compile.source}"
-            failonerror="false"
--           srcdir="${admin.base}/WEB-INF/src"
-+           srcdir="${jsp-examples.base}/WEB-INF/src"
-        excludes="**/*.smap">
-       <classpath>
-         <pathelement location="${java.home}/../lib/tools.jar"/>
-         <fileset dir="${tomcat.build}/server/lib">
-           <include name="*.jar"/>
-         </fileset>
--        <fileset dir="${admin.base}/WEB-INF/lib">
-+        <fileset dir="${jsp-examples.base}/WEB-INF/lib">
-           <include name="*.jar"/>
-         </fileset>
-         <fileset dir="${tomcat.build}/common/lib">
-           <include name="*.jar"/>
-         </fileset>
-         <pathelement location="${tomcat.build}/classes"/>
-+        <pathelement location="${jsp-examples.base}/WEB-INF/classes"/>
-       </classpath>
--      <include name="admin/**" />
-+      <include name="**" />
-+      <exclude name="tags/**" />
-     </javac>
-   </target>
- 
-@@ -653,28 +665,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">
-@@ -754,19 +746,11 @@
-         </jar>
-       </target>
- 
--  <target name="build-webapps" depends="init"
--          description="build  webapps">
--
--    <echo>========== Building: webapps </echo>
--
--    <mkdir dir="${tomcat.build}/webapps" />
--    <mkdir dir="${tomcat.build}/server/webapps" />
-+  <target name="build-examples" unless="examples.build.notrequired">
- 
-     <!-- The build files are far too difficult to hack - just build it and copy -->
--    <ant dir="${api.home}/jsr154" target="dist">
--    </ant>
--    <ant dir="${api.home}/jsr152" target="dist">
--    </ant>
-+    <ant dir="${api.home}/jsr154" target="examples" />
-+    <ant dir="${api.home}/jsr152" target="examples" />
- 
-     <mkdir dir="${tomcat.build}/webapps/servlets-examples"/>
-     <copy todir="${tomcat.build}/webapps/servlets-examples">
-@@ -779,6 +763,18 @@
-         <exclude name="WEB-INF/tagPlugins.xml" />
-       </fileset>
-     </copy>
-+    
-+  </target>
-+
-+  <target name="build-webapps" depends="init"
-+          description="build  webapps">
-+
-+    <echo>========== Building: webapps </echo>
-+
-+    <mkdir dir="${tomcat.build}/webapps" />
-+    <mkdir dir="${tomcat.build}/server/webapps" />
-+
-+	<antcall target="build-examples" />
- 
-     <ant dir="${catalina.home}/webapps/ROOT" target="build-main">
-         <property name="webapps.build" value="${tomcat.build}/webapps" />
-@@ -850,14 +846,7 @@
-         filtering="true" />
- 
-     <!-- Build JARs for webapps classes -->
--    <mkdir dir="${tomcat.build}/server/webapps/admin/WEB-INF/lib" />
--    <jar jarfile="${tomcat.build}/server/webapps/admin/WEB-INF/lib/catalina-admin.jar"
--         index="true">
--       <fileset dir="${tomcat.build}/server/webapps/admin/WEB-INF/classes">
--          <include name="**/*.class" />
--          <include name="**/*.properties" />
--       </fileset>
--    </jar>
-+    <antcall target="fix-admin-webapp" />
-     <mkdir dir="${tomcat.build}/server/webapps/manager/WEB-INF/lib" />
-     <jar jarfile="${tomcat.build}/server/webapps/manager/WEB-INF/lib/catalina-manager.jar"
-          index="true">
-@@ -896,9 +885,20 @@
-          todir="${tomcat.build}/conf/Catalina/localhost" />
-     <copy file="${tomcat.build}/server/webapps/host-manager/host-manager.xml"
-          todir="${tomcat.build}/conf/Catalina/localhost" />
-+
-+  </target>
-+
-+  <target name="fix-admin-webapp" unless="admin.build.notrequired">
-+    <mkdir dir="${tomcat.build}/server/webapps/admin/WEB-INF/lib" />
-+    <jar jarfile="${tomcat.build}/server/webapps/admin/WEB-INF/lib/catalina-admin.jar"
-+         index="true">
-+       <fileset dir="${tomcat.build}/server/webapps/admin/WEB-INF/classes">
-+          <include name="**/*.class" />
-+          <include name="**/*.properties" />
-+       </fileset>
-+    </jar>
-     <copy file="${tomcat.build}/server/webapps/admin/admin.xml"
-          todir="${tomcat.build}/conf/Catalina/localhost" />
--
-   </target>
- 
-   <!-- ====================== Embed target =================== -->
-@@ -1041,11 +1041,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 =================== -->
-@@ -1092,8 +1092,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"/>
-@@ -1188,10 +1189,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">
-@@ -1871,10 +1873,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}"/>
-@@ -1916,7 +1918,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>
-@@ -1937,7 +1938,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}"/>
-@@ -1948,7 +1948,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}"/>
-@@ -1976,7 +1975,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/5.5.20/tomcatbuild-xml.patch b/www-servers/tomcat/files/5.5.20/tomcatbuild-xml.patch
deleted file mode 100644
index 9be4fceb9b9b..000000000000
--- a/www-servers/tomcat/files/5.5.20/tomcatbuild-xml.patch
+++ /dev/null
@@ -1,325 +0,0 @@
---- apache-tomcat-5.5.20-src/build/build.xml	2006-10-17 21:25:39.000000000 -0400
-+++ build.xml	2006-10-17 21:59:38.000000000 -0400
-@@ -143,6 +143,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"/>
- 
-@@ -161,9 +162,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 =================== -->
-@@ -395,15 +396,14 @@
-   <target name="build-webapps-precompile"
-           depends="init" description="Precompile webapps" >
- 
-+    <antcall target="build-webapp-precompile-admin" />
-+    <antcall target="build-webapp-precompile-examples" />
-+
-     <!-- JSPC -->
--    <property name="admin.base" location="${tomcat.build}/server/webapps/admin" />
-     <property name="ROOT.base" location="${tomcat.build}/webapps/ROOT" />
--    <property name="jsp-examples.base" location="${tomcat.build}/webapps/jsp-examples" />
- 
--    <mkdir dir="${admin.base}/WEB-INF/src/admin" />
-     <mkdir dir="${ROOT.base}/WEB-INF/src" />
-     <mkdir dir="${ROOT.base}/WEB-INF/classes" />
--    <mkdir dir="${jsp-examples.base}/WEB-INF/src" />
- 
-     <path id="jspc.classpath">
-       <pathelement location="${java.home}/../lib/tools.jar"/>
-@@ -437,23 +437,6 @@
-              addWebXmlMappings="true"
-              outputDir="${ROOT.base}/WEB-INF/src" />
- 
--    <jasper2
--             compile="false"
--             validateXml="false"
--             uriroot="${jsp-examples.base}"
--         webXmlFragment="${jsp-examples.base}/WEB-INF/generated_web.xml"
--             addWebXmlMappings="true"
--             outputDir="${jsp-examples.base}/WEB-INF/src" />
--
--    <jasper2
--             package="admin"
--             compile="false"
--             validateXml="false"
--             uriroot="${admin.base}"
--             webXmlFragment="${admin.base}/WEB-INF/generated_web.xml"
--             addWebXmlMappings="true"
--             outputDir="${admin.base}/WEB-INF/src/admin" />
--
-     <javac destdir="${ROOT.base}/WEB-INF/classes"
-            optimize="off"
-            debug="${compile.debug}"
-@@ -475,61 +458,90 @@
-       <include name="**" />
-     </javac>
- 
--    <mkdir dir="${jsp-examples.base}/WEB-INF/src/tags"/>
--    <copy todir="${jsp-examples.base}/WEB-INF/classes">
--      <fileset dir="${jsp-examples.base}/WEB-INF/src">
--        <include name="**/*.class" />
--      </fileset>
--    </copy>
-+  </target>
- 
--    <javac destdir="${jsp-examples.base}/WEB-INF/classes"
-+  <target name="build-webapp-precompile-admin" unless="admin.precompile.notrequired">
-+    <property name="admin.base" location="${tomcat.build}/server/webapps/admin" />
-+    <mkdir dir="${admin.base}/WEB-INF/src/admin" />
-+    <taskdef classname="org.apache.jasper.JspC" name="jasper2" >
-+      <classpath refid="jspc.classpath"/>
-+    </taskdef>
-+    <jasper2
-+             package="admin"
-+             compile="false"
-+             validateXml="false"
-+             uriroot="${admin.base}"
-+             webXmlFragment="${admin.base}/WEB-INF/generated_web.xml"
-+             addWebXmlMappings="true"
-+             outputDir="${admin.base}/WEB-INF/src/admin" />
-+    <javac destdir="${admin.base}/WEB-INF/classes"
-            optimize="off"
-            debug="${compile.debug}"
-            deprecation="${compile.deprecation}"
-            source="${compile.source}"
-            failonerror="false"
--           srcdir="${jsp-examples.base}/WEB-INF/src"
-+           srcdir="${admin.base}/WEB-INF/src"
-        excludes="**/*.smap">
-       <classpath>
-         <pathelement location="${java.home}/../lib/tools.jar"/>
-         <fileset dir="${tomcat.build}/server/lib">
-           <include name="*.jar"/>
-         </fileset>
--        <fileset dir="${jsp-examples.base}/WEB-INF/lib">
-+        <fileset dir="${admin.base}/WEB-INF/lib">
-           <include name="*.jar"/>
-         </fileset>
-         <fileset dir="${tomcat.build}/common/lib">
-           <include name="*.jar"/>
-         </fileset>
-         <pathelement location="${tomcat.build}/classes"/>
--        <pathelement location="${jsp-examples.base}/WEB-INF/classes"/>
-       </classpath>
--      <include name="**" />
--      <exclude name="tags/**" />
-+      <include name="admin/**" />
-     </javac>
--
--    <javac destdir="${admin.base}/WEB-INF/classes"
-+  </target>
-+  
-+  <target name="build-webapp-precompile-examples" unless="examples.precompile.notrequired">
-+    <property name="jsp-examples.base" location="${tomcat.build}/webapps/jsp-examples" />
-+    <mkdir dir="${jsp-examples.base}/WEB-INF/src" />
-+    <taskdef classname="org.apache.jasper.JspC" name="jasper2" >
-+      <classpath refid="jspc.classpath"/>
-+    </taskdef>
-+    <jasper2
-+             compile="false"
-+             validateXml="false"
-+             uriroot="${jsp-examples.base}"
-+         webXmlFragment="${jsp-examples.base}/WEB-INF/generated_web.xml"
-+             addWebXmlMappings="true"
-+             outputDir="${jsp-examples.base}/WEB-INF/src" />
-+    <mkdir dir="${jsp-examples.base}/WEB-INF/src/tags"/>
-+    <copy todir="${jsp-examples.base}/WEB-INF/classes">
-+      <fileset dir="${jsp-examples.base}/WEB-INF/src">
-+        <include name="**/*.class" />
-+      </fileset>
-+    </copy>
-+    <javac destdir="${jsp-examples.base}/WEB-INF/classes"
-            optimize="off"
-            debug="${compile.debug}"
-            deprecation="${compile.deprecation}"
-            source="${compile.source}"
-            failonerror="false"
--           srcdir="${admin.base}/WEB-INF/src"
-+           srcdir="${jsp-examples.base}/WEB-INF/src"
-        excludes="**/*.smap">
-       <classpath>
-         <pathelement location="${java.home}/../lib/tools.jar"/>
-         <fileset dir="${tomcat.build}/server/lib">
-           <include name="*.jar"/>
-         </fileset>
--        <fileset dir="${admin.base}/WEB-INF/lib">
-+        <fileset dir="${jsp-examples.base}/WEB-INF/lib">
-           <include name="*.jar"/>
-         </fileset>
-         <fileset dir="${tomcat.build}/common/lib">
-           <include name="*.jar"/>
-         </fileset>
-         <pathelement location="${tomcat.build}/classes"/>
-+        <pathelement location="${jsp-examples.base}/WEB-INF/classes"/>
-       </classpath>
--      <include name="admin/**" />
-+      <include name="**" />
-+      <exclude name="tags/**" />
-     </javac>
-   </target>
- 
-@@ -653,28 +665,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">
-@@ -850,14 +842,7 @@
-         filtering="true" />
- 
-     <!-- Build JARs for webapps classes -->
--    <mkdir dir="${tomcat.build}/server/webapps/admin/WEB-INF/lib" />
--    <jar jarfile="${tomcat.build}/server/webapps/admin/WEB-INF/lib/catalina-admin.jar"
--         index="true">
--       <fileset dir="${tomcat.build}/server/webapps/admin/WEB-INF/classes">
--          <include name="**/*.class" />
--          <include name="**/*.properties" />
--       </fileset>
--    </jar>
-+    <antcall target="fix-admin-webapp" />
-     <mkdir dir="${tomcat.build}/server/webapps/manager/WEB-INF/lib" />
-     <jar jarfile="${tomcat.build}/server/webapps/manager/WEB-INF/lib/catalina-manager.jar"
-          index="true">
-@@ -896,9 +881,20 @@
-          todir="${tomcat.build}/conf/Catalina/localhost" />
-     <copy file="${tomcat.build}/server/webapps/host-manager/host-manager.xml"
-          todir="${tomcat.build}/conf/Catalina/localhost" />
-+
-+  </target>
-+
-+  <target name="fix-admin-webapp" unless="admin.build.notrequired">
-+    <mkdir dir="${tomcat.build}/server/webapps/admin/WEB-INF/lib" />
-+    <jar jarfile="${tomcat.build}/server/webapps/admin/WEB-INF/lib/catalina-admin.jar"
-+         index="true">
-+       <fileset dir="${tomcat.build}/server/webapps/admin/WEB-INF/classes">
-+          <include name="**/*.class" />
-+          <include name="**/*.properties" />
-+       </fileset>
-+    </jar>
-     <copy file="${tomcat.build}/server/webapps/admin/admin.xml"
-          todir="${tomcat.build}/conf/Catalina/localhost" />
--
-   </target>
- 
-   <!-- ====================== Embed target =================== -->
-@@ -1041,11 +1037,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 =================== -->
-@@ -1092,8 +1088,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"/>
-@@ -1188,10 +1185,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">
-@@ -1871,10 +1869,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}"/>
-@@ -1916,7 +1914,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>
-@@ -1937,7 +1934,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}"/>
-@@ -1948,7 +1944,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}"/>
-@@ -1976,7 +1971,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.20-r8 b/www-servers/tomcat/files/digest-tomcat-5.5.20-r8
deleted file mode 100644
index 25cb711a112c..000000000000
--- a/www-servers/tomcat/files/digest-tomcat-5.5.20-r8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5775bae8fac16a0e3a2c913c4768bb37 apache-tomcat-5.5.20-src.tar.gz 4796377
-RMD160 587590d2e272d1ede73501b62933f544cd969822 apache-tomcat-5.5.20-src.tar.gz 4796377
-SHA256 19f24717fb3e2db902c33e21650dfa88bbf98428c15b1ed68ecaf7a9150e4a77 apache-tomcat-5.5.20-src.tar.gz 4796377
diff --git a/www-servers/tomcat/tomcat-5.5.20-r8.ebuild b/www-servers/tomcat/tomcat-5.5.20-r8.ebuild
deleted file mode 100644
index 4b0f7c323b3f..000000000000
--- a/www-servers/tomcat/tomcat-5.5.20-r8.ebuild
+++ /dev/null
@@ -1,331 +0,0 @@
-# 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-r8.ebuild,v 1.7 2007/03/30 23:17:05 wltjr Exp $
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Tomcat 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://tomcat.apache.org/"
-KEYWORDS="amd64 -ppc -ppc64 x86 ~x86-fbsd"
-LICENSE="Apache-2.0"
-
-IUSE="admin java5 doc examples source test"
-
-RDEPEND="=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.1
-	>=dev-java/commons-io-1.1
-	>=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/log4j-1.2.9
-	~dev-java/servletapi-2.4
-	admin? ( =dev-java/struts-1.2* )
-	dev-java/sun-javamail
-	java5? ( >=virtual/jre-1.5 )
-	!java5? (
-		=virtual/jre-1.4*
-		=dev-java/commons-httpclient-2.0*
-		dev-java/sun-jaf
-		>=dev-java/junit-3.8.1
-		=dev-java/mx4j-core-3*
-		>=dev-java/saxpath-1.0
-		>=dev-java/xerces-2.7.1
-	   	=dev-java/xml-commons-external-1.3*
-	   )"
-DEPEND="java5? ( >=virtual/jdk-1.5 )
-	!java5? ( =virtual/jdk-1.4* )
-	${RDEPEND}
-	>=dev-java/java-config-2.0.31
-	dev-java/ant"
-
-S=${WORKDIR}/${MY_P}
-
-TOMCAT_NAME="${PN}-${SLOT}"
-WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps"
-
-pkg_setup() {
-	# new user for tomcat
-	enewgroup tomcat
-	enewuser tomcat -1 -1 /dev/null tomcat
-
-	java-pkg_filter-compiler ecj-3.1  ecj-3.2
-
-	if use java5; then
-		JAVA_PKG_WANT_SOURCE="1.5"
-		JAVA_PKG_WANT_TARGET="1.5"
-	fi
-}
-
-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
-	if ! use examples; then
-		epatch "${FILESDIR}/${PV}/jsr152build-xml-examples.patch"
-		epatch "${FILESDIR}/${PV}/jsr154build-xml-examples.patch"
-	fi
-
-	# 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 commons-daemon
-	if ! use java5; then
-		java-pkg_jar-from mx4j-core-3.0 mx4j.jar jmx.jar
-		java-pkg_jar-from mx4j-core-3.0 mx4j-rjmx.jar jmx-remote.jar
-	fi
-
-	if ! use java5; then
-		mkdir ${S}/build/build/common/endorsed && cd ${S}/build/build/common/endorsed
-		java-pkg_jar-from xml-commons-external-1.3 xml-apis.jar
-		java-pkg_jar-from xerces-2 xercesImpl.jar
-	fi
-
-	mkdir ${S}/build/build/common/lib && cd ${S}/build/build/common/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 ${S}/build/build/server/lib && cd ${S}/build/build/server/lib
-	java-pkg_jar-from commons-beanutils-1.7 commons-beanutils.jar
-	java-pkg_jar-from commons-digester
-	java-pkg_jar-from commons-modeler
-
-}
-
-src_compile(){
-	local antflags="-Dbase.path=${T}"
-
-	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-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} -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} -Dmail.jar=$(java-pkg_getjar sun-javamail mail.jar)"
-	if use admin; then
-		antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts-1.2 struts.jar)"
-		antflags="${antflags} -Dstruts.home=/usr/share/struts"
-	else
-		antflags="${antflags} -Dadmin.build.notrequired=true"
-		antflags="${antflags} -Dadmin.precompile.notrequired=true"
-	fi
-	if ! use examples; then
-		antflags="${antflags} -Dexamples.precompile.notrequired=true"
-	fi
-	antflags="${antflags} -Djasper.home=${S}/jasper"
-	if ! use java5; then
-		antflags="${antflags} -Dcommons-httpclient.jar=$(java-config -p commons-httpclient)"
-		antflags="${antflags} -Dactivation.jar=$(java-config -p sun-jaf)"
-		antflags="${antflags} -Djmx.jar=$(java-pkg_getjar mx4j-core-3.0 mx4j.jar)"
-		antflags="${antflags} -Djmx-remote.jar=$(java-pkg_getjar mx4j-core-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 xml-commons-external-1.3 xml-apis.jar)"
-	fi
-
-	# prevent classpath bloat with ant-1.7.0 which makes admin app fail
-	ANT_TASKS="ant-trax" eant ${antflags}
-}
-
-src_install() {
-	cd ${S}/build/build
-
-	# init.d, conf.d
-	newinitd ${FILESDIR}/${PV}/tomcat.init ${TOMCAT_NAME}
-	newconfd ${FILESDIR}/${PV}/tomcat.conf ${TOMCAT_NAME}
-
-	# 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
-
-	keepdir /usr/share/${TOMCAT_NAME}/common/lib
-
-	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
-	if use admin; then
-		cp ${S}/container/webapps/admin/admin.xml \
-			conf/Catalina/localhost
-	fi
-	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
-	if use admin; then
-		cd server/webapps/admin/WEB-INF/lib
-		rm -f struts.jar
-		java-pkg_jar-from struts-1.2 struts.jar
-		cd ${base}
-	else
-		rm -fR server/webapps/admin
-	fi
-
-	cd server/webapps/manager/WEB-INF/lib
-	java-pkg_jar-from commons-fileupload
-	java-pkg_jar-from commons-io-1
-	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 -HR bin common server ${D}/usr/share/${TOMCAT_NAME} || die "failed to copy"
-
-	keepdir               ${WEBAPPS_DIR}
-	set_webapps_perms     ${D}/${WEBAPPS_DIR}
-
-	# Copy over webapps, some controlled by use flags
-	cp -p ../RELEASE-NOTES webapps/ROOT/RELEASE-NOTES.txt
-	cp -pr webapps/ROOT ${D}${CATALINA_BASE}/webapps
-	if use doc; then
-		cp -pr webapps/tomcat-docs ${D}${CATALINA_BASE}/webapps
-	fi
-	if use examples; then
-		cp -pr webapps/{jsp-examples,servlets-examples,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}
-
-	elog
-	elog " This ebuild implements a new filesystem layout for tomcat"
-	elog " please read http://www.gentoo.org/proj/en/java/tomcat-guide.xml"
-	elog " for more information!."
-	elog
-	ewarn "naming-factory-dbcp.jar is not built at this time. Please fetch"
-	ewarn "jar from upstream binary if you need it. Gentoo Bug # 144276"
-	elog
-	elog " Please file any bugs at http://bugs.gentoo.org/ or else it"
-	elog " may not get seen.  Thank you."
-	elog
-}
-
-#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 }')"
-
-	elog "The default home directory for Tomcat is /dev/null."
-	elog "You need to change it if your applications needs it to"
-	elog "be an actual directory. Current home directory:"
-	elog "${currentdir}"
-	elog ""
-	elog "Do you want to change it [yes/no]?"
-
-	local answer
-	read answer
-
-	if [[ "${answer}" == "yes" ]]; then
-		elog ""
-		elog "Suggestions:"
-		elog "${WEBAPPS_DIR}"
-		elog ""
-		elog "If you want to suggest a directory, file a bug to"
-		elog "http://bugs.gentoo.org"
-		elog ""
-		elog "Enter home directory:"
-
-		local homedir
-		read homedir
-
-		elog ""
-		elog "Setting home directory to: ${homedir}"
-
-		/usr/sbin/usermod -d"${homedir}" tomcat
-
-		elog "You can run emerge --config =${PF}"
-		elog "again to change to homedir"
-		elog "at any time."
-	fi
-}
diff --git a/www-servers/tomcat/tomcat-5.5.23-r1.ebuild b/www-servers/tomcat/tomcat-5.5.23-r1.ebuild
index 505210a90a8e..8fd4ea72d066 100644
--- a/www-servers/tomcat/tomcat-5.5.23-r1.ebuild
+++ b/www-servers/tomcat/tomcat-5.5.23-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-5.5.23-r1.ebuild,v 1.2 2007/04/03 07:40:57 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.23-r1.ebuild,v 1.3 2007/04/07 00:35:32 wltjr Exp $
 
 #WANT_ANT_TASKS="ant-trax"
 
@@ -12,7 +12,7 @@ MY_P="apache-${P}-src"
 SLOT="5.5"
 SRC_URI="mirror://apache/${PN}/${PN}-5/v${PV}/src/${MY_P}.tar.gz"
 HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="~amd64 -ppc -ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 -ppc -ppc64 x86 ~x86-fbsd"
 LICENSE="Apache-2.0"
 
 IUSE="admin java5 doc examples source test"