House cleaning, removed 5.0.28 and 5.5.20-r10 since 5.5.23/6.0.10 will be stabilized next.

Package-Manager: portage-2.1.2.2

17 files changed, 16 insertions, 1099 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index dd53157e20ea..9188c87e2329 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,17 @@
 # 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.127 2007/03/20 04:35:11 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.128 2007/03/29 15:27:58 wltjr Exp $
+
+  29 Mar 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  -files/5.0.28/build.xml-01.patch, -files/5.0.28/gentoo.diff,
+  -files/5.0.28/setclasspath.patch, -files/5.0.28/build.xml-02.patch,
+  -files/5.0.28/jikes.diff, -files/5.0.28/tomcat.conf,
+  -files/5.0.28/log4j.properties, -files/5.0.28/tomcat.conf-r1,
+  -files/5.0.28/scripts.patch, -files/5.0.28/tomcat.env,
+  -files/5.0.28/tomcat.init, -tomcat-5.0.28-r14.ebuild,
+  -tomcat-5.5.20-r10.ebuild:
+  House cleaning, removed 5.0.28 and 5.5.20-r10 since 5.5.23/6.0.10 will be
+  stabilized next.
 
 *tomcat-6.0.10-r1 (20 Mar 2007)
 
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index c469b13c0fc3..820c577166e6 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,47 +1,3 @@
-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
-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
-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
-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
-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
-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
-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 2543 RMD160 ce3b811fff1be4bad4a1edcfdad4ba7fbfe49ac6 SHA1 5d8d25970f368168366538d33f280b9320135c3e SHA256 500239635621b0cd06d49765e39edaa5e02b976a6524cfe35983b9e0262ac811
-MD5 9903b7aa822fccd115c921a3031a0758 files/5.0.28/tomcat.conf 2543
-RMD160 ce3b811fff1be4bad4a1edcfdad4ba7fbfe49ac6 files/5.0.28/tomcat.conf 2543
-SHA256 500239635621b0cd06d49765e39edaa5e02b976a6524cfe35983b9e0262ac811 files/5.0.28/tomcat.conf 2543
-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
-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 3013 RMD160 360df30bb9bf5b78b7ed0bb159e37c5af1898956 SHA1 ba45943177fc46c1e68958e435c3efc9063a1b9d SHA256 083b5bd790a43c4f161dcce01e75bfc8927aa8f293aad26fe0e2cfba1f918815
-MD5 197b154fc7a14fcd433e86700f082252 files/5.0.28/tomcat.init 3013
-RMD160 360df30bb9bf5b78b7ed0bb159e37c5af1898956 files/5.0.28/tomcat.init 3013
-SHA256 083b5bd790a43c4f161dcce01e75bfc8927aa8f293aad26fe0e2cfba1f918815 files/5.0.28/tomcat.init 3013
 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
@@ -133,15 +89,6 @@ SHA256 5f06449e261300a0f6ba6cb67f0908ddceb8c0ea06178ac41c791055068ec72b files/6/
 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
-DIST jakarta-tomcat-5.0.28-src.tar.gz 3565766 RMD160 22c5e60b2c5009dc33a62edcefa6760d82da859b SHA1 a4ac2ad52f8b8db8ae8c38979f5f50713e242e36 SHA256 bbf584b3c376d23d92b1a0d306eb8f3729cea244c7a850f81d2527a7df6d20fc
-EBUILD tomcat-5.0.28-r14.ebuild 9331 RMD160 e88ac9bae92fc262ad9b7c37ef692629943167d9 SHA1 ce01158f8823dd521a5a4fadc7cfbd09e4f59a97 SHA256 b92c98a7411e5c80ea220a9245727c528440670fa7c29a025f71b18f97529c49
-MD5 2729d48603266ae1654d7f6823109afb tomcat-5.0.28-r14.ebuild 9331
-RMD160 e88ac9bae92fc262ad9b7c37ef692629943167d9 tomcat-5.0.28-r14.ebuild 9331
-SHA256 b92c98a7411e5c80ea220a9245727c528440670fa7c29a025f71b18f97529c49 tomcat-5.0.28-r14.ebuild 9331
-EBUILD tomcat-5.5.20-r10.ebuild 10530 RMD160 8ba27231c1e3bc34fe3e5d15fc15a20c6be41108 SHA1 93e3a8c8cb706c9afe5130e9c9d30233d5331b17 SHA256 33f4b3dcfc9f04614c8df2f4cc2d8a5262da46840a2625233cf868f1496b4d17
-MD5 abb7b70eefece5af78abdbde12a94dcf tomcat-5.5.20-r10.ebuild 10530
-RMD160 8ba27231c1e3bc34fe3e5d15fc15a20c6be41108 tomcat-5.5.20-r10.ebuild 10530
-SHA256 33f4b3dcfc9f04614c8df2f4cc2d8a5262da46840a2625233cf868f1496b4d17 tomcat-5.5.20-r10.ebuild 10530
 EBUILD tomcat-5.5.20-r8.ebuild 10247 RMD160 8c2386f42e6114487cae1b200a42a5b2fa5d11e6 SHA1 bd5a1f59dec4cecdfff22da90ea877a8322e8d1b SHA256 594ad49a012319f082ce18bc1db4c74647ae010d24db21a3b6522e834b89e2c8
 MD5 ecdb33ec17baffd1b08a8cb0a0a84926 tomcat-5.5.20-r8.ebuild 10247
 RMD160 8c2386f42e6114487cae1b200a42a5b2fa5d11e6 tomcat-5.5.20-r8.ebuild 10247
@@ -154,20 +101,14 @@ EBUILD tomcat-6.0.10-r1.ebuild 4878 RMD160 5098ffd69ef3338c3d2e4626edbc92c0ee94d
 MD5 fac9f173878df0cd2efcc7626ef7de79 tomcat-6.0.10-r1.ebuild 4878
 RMD160 5098ffd69ef3338c3d2e4626edbc92c0ee94da3d tomcat-6.0.10-r1.ebuild 4878
 SHA256 bd075832d3b7cc5d7df03956675045ddf739989502ef1781ecba93d393bb489a tomcat-6.0.10-r1.ebuild 4878
-MISC ChangeLog 41087 RMD160 f22940ef41dc38149b18da55d846960a389069da SHA1 cf30890202a07d4de20aaa82debdbf3f9957f3dd SHA256 235aad82bf3a18df47238f5b855aede7479e403cdd872ea70ad48fde4e06eeb2
-MD5 42726853caebad803997b5aa0d50448b ChangeLog 41087
-RMD160 f22940ef41dc38149b18da55d846960a389069da ChangeLog 41087
-SHA256 235aad82bf3a18df47238f5b855aede7479e403cdd872ea70ad48fde4e06eeb2 ChangeLog 41087
+MISC ChangeLog 41634 RMD160 55be0d95c767d0c148685dcc831c5c531bb7a0fb SHA1 db82a03313d6d980c7206998e73cb470e0dd1022 SHA256 3a8d4485caa6ac1ca8e8718b1a32b6f8e16e1fe2fead356865901e4e2f1ee200
+MD5 db2b1a1889c2116abc11960e31ba8ebd ChangeLog 41634
+RMD160 55be0d95c767d0c148685dcc831c5c531bb7a0fb ChangeLog 41634
+SHA256 3a8d4485caa6ac1ca8e8718b1a32b6f8e16e1fe2fead356865901e4e2f1ee200 ChangeLog 41634
 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 d942ea8b8317ba352e744aed2d284d01 files/digest-tomcat-5.0.28-r14 280
-RMD160 7283323e161ab5dd3a94549def34af040891e49a files/digest-tomcat-5.0.28-r14 280
-SHA256 2c09d3ad89eb04ab24e5c95a9492d7f461e1935bdb076100010cd3d4f7cb8796 files/digest-tomcat-5.0.28-r14 280
-MD5 8adc14a8534e1c6f8d5f96b371e1895f files/digest-tomcat-5.5.20-r10 277
-RMD160 b9c5deac84bf5acd7a65ad80bdfaca9f7e343f3f files/digest-tomcat-5.5.20-r10 277
-SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/digest-tomcat-5.5.20-r10 277
 MD5 8adc14a8534e1c6f8d5f96b371e1895f files/digest-tomcat-5.5.20-r8 277
 RMD160 b9c5deac84bf5acd7a65ad80bdfaca9f7e343f3f files/digest-tomcat-5.5.20-r8 277
 SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/digest-tomcat-5.5.20-r8 277
diff --git a/www-servers/tomcat/files/5.0.28/build.xml-01.patch b/www-servers/tomcat/files/5.0.28/build.xml-01.patch
deleted file mode 100644
index 1caa16c04181..000000000000
--- a/www-servers/tomcat/files/5.0.28/build.xml-01.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- build.xml	2004-10-05 22:19:36.837810480 +1000
-+++ build.xml	2004-10-05 22:19:51.448589304 +1000
-@@ -77,14 +77,14 @@
- 
-   <target name="checkout.depends"
-           description="Update or checkout dependent sources from CVS">
--
-+<!--
-     <cvs cvsroot="${cvsroot}" quiet="true"
-          command="checkout -P jakarta-commons/LICENSE" 
-          dest="${basedir}" compression="true" />
-     <cvs cvsroot="${cvsroot}" quiet="true"
-          command="checkout -P ${commons-daemon.project}" 
-          dest="${basedir}" compression="true" />
--
-+-->
-   </target>
- 
-   <!-- *************** UTILITY TARGETS *************** -->
diff --git a/www-servers/tomcat/files/5.0.28/build.xml-02.patch b/www-servers/tomcat/files/5.0.28/build.xml-02.patch
deleted file mode 100644
index 60dd70513349..000000000000
--- a/www-servers/tomcat/files/5.0.28/build.xml-02.patch
+++ /dev/null
@@ -1,97 +0,0 @@
---- ../jakarta-tomcat-5.0.28-src.orig/jakarta-tomcat-5/build.xml	2005-02-12 13:54:09.000000000 +0100
-+++ jakarta-tomcat-5/build.xml	2005-02-13 00:29:52.167830424 +0100
-@@ -129,6 +129,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"/>
- 
-@@ -147,7 +148,8 @@
- 
-     <copy todir="${tomcat.build}/common/lib" file="${ant.jar}"/>
-     <copy todir="${tomcat.build}/common/lib" file="${ant-launcher.jar}"/>
--  </target>
-+   -->
-+</target>
- 
-   <!-- ====================== Build all components =================== -->
-   <target name="build-servletapi" unless="servletapi.build.notrequired" description="Build servlet API">
-@@ -393,6 +395,7 @@
-       </classpath>
-       <include name="admin/**" />
-     </javac>
-+
-   </target>
- 
-   <target name="build-catalina" depends="init"
-@@ -439,9 +442,10 @@
- 
-   <target name="build" depends="init"
-           description="Builds all components">
-+     <!--	  
-     <copy file="${commons-digester.jar}" todir="${tomcat.build}/server/lib"/>
-     <copy file="${commons-collections.jar}" todir="${tomcat.build}/common/lib"/>
--
-+     -->
-     <antcall target="build-tomcatutil"/>
-     <antcall target="build-tomcatcoyote"/>
-     <antcall target="build-catalina"/>
-@@ -563,9 +567,10 @@
-     </ant>
- 
-     <!-- Precompiling and fixing webapps -->
-+    <!--
-     <antcall target="build-webapps-precompile" /> 
-     <antcall target="fix-webapps" />
--
-+    -->
-   </target>
- 
-   <target name="fix-webapps" depends="init" >
-@@ -798,10 +803,10 @@
-   <!-- ====================== Compat target =================== -->
- 
-   <target name="compat" description="Create compatibility binaries for JREs before 1.4" >
--
-+    <!--
-     <copy todir="${tomcat.compat}/common/endorsed" file="${xercesImpl.jar}"/>
-     <copy todir="${tomcat.compat}/common/endorsed" file="${xml-apis.jar}"/>
--
-+    -->
-   </target>
- 
-   <!-- ====================== DEPLOY: Deploy Components =================== -->
-@@ -1547,6 +1552,7 @@
-     <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}"/>
-@@ -1593,7 +1599,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>
-@@ -1655,14 +1660,12 @@
-       <param name="sourcefile" value="${saxpath.loc}"/>
-       <param name="destfile" value="${saxpath.jar}"/>
-     </antcall>
--
--    <!-- Build the dependencies that are not yet released -->
-+	-->
-     <antcall target="build-depends"/>
- 
-   </target>
- 
-   <target name="proxyflags">
--    <!-- check proxy parameters. -->
-     <condition property="useproxy">
-       <equals arg1="${proxy.use}" arg2="on" />
-     </condition>
diff --git a/www-servers/tomcat/files/5.0.28/gentoo.diff b/www-servers/tomcat/files/5.0.28/gentoo.diff
deleted file mode 100644
index 82458fbfeb6b..000000000000
--- a/www-servers/tomcat/files/5.0.28/gentoo.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- jakarta-tomcat-catalina/catalina/src/bin/catalina.sh	2004-05-19 02:25:07.000000000 -0400
-+++ jakarta-tomcat-catalina/catalina/src/bin/catalina.sh	2004-05-19 02:23:20.128089696 -0400
-@@ -38,6 +38,10 @@
- # $Id: gentoo.diff,v 1.2 2005/02/13 19:52:06 luckyduck Exp $
- # -----------------------------------------------------------------------------
- 
-+# source the appropriate files right away
-+source /etc/profile
-+source /etc/conf.d/tomcat-5
-+
- # OS specific support.  $var _must_ be set to either true or false.
- cygwin=false
- os400=false
diff --git a/www-servers/tomcat/files/5.0.28/jikes.diff b/www-servers/tomcat/files/5.0.28/jikes.diff
deleted file mode 100644
index 60f56ec5a31f..000000000000
--- a/www-servers/tomcat/files/5.0.28/jikes.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- jakarta-tomcat-catalina/catalina/src/conf/web.xml	2004-06-18 03:10:14.000000000 +0200
-+++ jakarta-tomcat-catalina/catalina/src/conf/web.xml	2004-07-28 18:51:39.192165664 +0200
-@@ -186,6 +186,10 @@
-     <servlet>
-         <servlet-name>jsp</servlet-name>
-         <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
-+        <init-param>
-+            <param-name>compiler</param-name>
-+            <param-value>jikes</param-value>
-+        </init-param>
-         <init-param>
-             <param-name>fork</param-name>
-             <param-value>false</param-value>
diff --git a/www-servers/tomcat/files/5.0.28/log4j.properties b/www-servers/tomcat/files/5.0.28/log4j.properties
deleted file mode 100755
index f78e2b9f1d26..000000000000
--- a/www-servers/tomcat/files/5.0.28/log4j.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-### direct messages to file catalina.log ###
-log4j.appender.file=org.apache.log4j.FileAppender
-log4j.appender.file.File=/var/log/tomcat-5/catalina.log
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
-
-### set log levels - for more verbose logging change 'warn' or 'info' to 'debug' ###
-log4j.rootLogger=info, file
diff --git a/www-servers/tomcat/files/5.0.28/scripts.patch b/www-servers/tomcat/files/5.0.28/scripts.patch
deleted file mode 100644
index 9ec832192c75..000000000000
--- a/www-servers/tomcat/files/5.0.28/scripts.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uprN ../jakarta-tomcat-5.0.28-src.orig/jakarta-tomcat-catalina/catalina/src/bin/catalina.sh jakarta-tomcat-catalina/catalina/src/bin/catalina.sh
---- ../jakarta-tomcat-5.0.28-src.orig/jakarta-tomcat-catalina/catalina/src/bin/catalina.sh	2005-02-12 13:54:09.755358496 +0100
-+++ jakarta-tomcat-catalina/catalina/src/bin/catalina.sh	2005-02-12 18:47:07.925070512 +0100
-@@ -104,7 +104,7 @@ fi
- 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
-+CLASSPATH="$CLASSPATH":"$CATALINA_HOME"/bin/bootstrap.jar:`java-config -p commons-logging`:`java-config -p log4j`
- 
- if [ -z "$CATALINA_BASE" ] ; then
-   CATALINA_BASE="$CATALINA_HOME"
diff --git a/www-servers/tomcat/files/5.0.28/setclasspath.patch b/www-servers/tomcat/files/5.0.28/setclasspath.patch
deleted file mode 100644
index 105417c71aca..000000000000
--- a/www-servers/tomcat/files/5.0.28/setclasspath.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur jakarta-tomcat-5.0.28-src.old/jakarta-tomcat-catalina/catalina/src/bin/setclasspath.sh jakarta-tomcat-5.0.28-src/jakarta-tomcat-catalina/catalina/src/bin/setclasspath.sh
---- jakarta-tomcat-5.0.28-src.old/jakarta-tomcat-catalina/catalina/src/bin/setclasspath.sh	2005-12-06 22:12:03.288738608 +0200
-+++ jakarta-tomcat-5.0.28-src/jakarta-tomcat-catalina/catalina/src/bin/setclasspath.sh	2005-12-06 22:13:15.632740648 +0200
-@@ -40,7 +40,7 @@
- JAVA_ENDORSED_DIRS="$BASEDIR"/common/endorsed
- 
- # Set standard CLASSPATH
--CLASSPATH="$JAVA_HOME"/lib/tools.jar
-+CLASSPATH="${CLASSPATH}":"$JAVA_HOME"/lib/tools.jar
- 
- # OSX hack to CLASSPATH
- JIKESPATH=
diff --git a/www-servers/tomcat/files/5.0.28/tomcat.conf b/www-servers/tomcat/files/5.0.28/tomcat.conf
deleted file mode 100644
index 8aef879d0cd8..000000000000
--- a/www-servers/tomcat/files/5.0.28/tomcat.conf
+++ /dev/null
@@ -1,72 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.0.28/tomcat.conf,v 1.5 2006/09/09 21:20:21 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/
-CATALINA_BASE=/var/lib/tomcat-5/
-
-# Tomcat's User
-CATALINA_USER=tomcat
-
-# Location of the Tomcat JARs and classes
-CATALINA_LIBDIR=/usr/share/tomcat-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/"
-
-# 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.0.28/tomcat.conf-r1 b/www-servers/tomcat/files/5.0.28/tomcat.conf-r1
deleted file mode 100644
index f44cdbc42506..000000000000
--- a/www-servers/tomcat/files/5.0.28/tomcat.conf-r1
+++ /dev/null
@@ -1,79 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.0.28/tomcat.conf-r1,v 1.2 2005/11/14 20:17:58 betelgeuse Exp $
-
-# This file is also sourced by the catalina.sh script so all the variables you 
-# declare here are available for that script
-
-# 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 -O`
-
-# (Optional) Java runtime options used when the "start", "stop", or "run"
-# commands are executed.
-# JAVA_OPTS=""
-
-# profile
-PROFILE=default
-
-# Where your web applications are located
-CATALINA_HOME=/usr/share/tomcat-5
-CATALINA_BASE=/var/lib/tomcat-5/${PROFILE}
-
-# Tomcat's User
-CATALINA_USER=tomcat
-
-# Location of the Tomcat JARs and classes
-CATALINA_LIBDIR=/usr/share/tomcat-5/server/lib
-
-# The CLASSPATH for Tomcat to use, plus any others you need.
-#CLASSPATH=${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/${PROFILE}"
-
-# TOMCAT STARTUP/SHUTDOWN
-# 	debug             Start Catalina in a debugger
-# 	debug -security   Debug Catalina with a security manager
-# 	embedded          Start Catalina in embedded mode
-# 	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="-Dlog4j.configuration=file:/etc/tomcat-5/log4j.properties"
-
-# 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.0.28/tomcat.env b/www-servers/tomcat/files/5.0.28/tomcat.env
deleted file mode 100644
index 78ff04318116..000000000000
--- a/www-servers/tomcat/files/5.0.28/tomcat.env
+++ /dev/null
@@ -1 +0,0 @@
-CATALINA_HOME=/usr/share/tomcat-5
diff --git a/www-servers/tomcat/files/5.0.28/tomcat.init b/www-servers/tomcat/files/5.0.28/tomcat.init
deleted file mode 100644
index 48ca4e1ed6a8..000000000000
--- a/www-servers/tomcat/files/5.0.28/tomcat.init
+++ /dev/null
@@ -1,83 +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.0.28/tomcat.init,v 1.8 2006/09/20 21:01:49 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
-	CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar:${CATALINA_HOME}/bin/commons-logging-api.jar"
-
-	# 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 "
-}
-
-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=${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 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/digest-tomcat-5.0.28-r14 b/www-servers/tomcat/files/digest-tomcat-5.0.28-r14
deleted file mode 100644
index 6d150362b56a..000000000000
--- a/www-servers/tomcat/files/digest-tomcat-5.0.28-r14
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8115f86558aef8a17543397e7f9d9469 jakarta-tomcat-5.0.28-src.tar.gz 3565766
-RMD160 22c5e60b2c5009dc33a62edcefa6760d82da859b jakarta-tomcat-5.0.28-src.tar.gz 3565766
-SHA256 bbf584b3c376d23d92b1a0d306eb8f3729cea244c7a850f81d2527a7df6d20fc jakarta-tomcat-5.0.28-src.tar.gz 3565766
diff --git a/www-servers/tomcat/files/digest-tomcat-5.5.20-r10 b/www-servers/tomcat/files/digest-tomcat-5.5.20-r10
deleted file mode 100644
index 25cb711a112c..000000000000
--- a/www-servers/tomcat/files/digest-tomcat-5.5.20-r10
+++ /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.0.28-r14.ebuild b/www-servers/tomcat/tomcat-5.0.28-r14.ebuild
deleted file mode 100644
index cdc08181148a..000000000000
--- a/www-servers/tomcat/tomcat-5.0.28-r14.ebuild
+++ /dev/null
@@ -1,291 +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.0.28-r14.ebuild,v 1.7 2007/02/04 01:41:46 wltjr Exp $
-
-inherit eutils java-pkg
-
-DESCRIPTION="Tomcat Servlet-2.4/JSP-2.0 Container"
-
-SLOT="${PV/.*}"
-SRC_URI="mirror://apache/tomcat/tomcat-${SLOT}/v${PV}/src/jakarta-${P}-src.tar.gz"
-HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="~x86 ~amd64 -ppc -ppc64"
-LICENSE="Apache-2.0"
-#only one accepted revision of struts to force upgrading because of slot changes
-RDEPEND=">=virtual/jdk-1.4
-	=dev-java/commons-beanutils-1.7*
-	>=dev-java/commons-collections-3.1
-	>=dev-java/commons-daemon-1.0
-	>=dev-java/commons-dbcp-1.2.1
-	>=dev-java/commons-digester-1.5
-	>=dev-java/commons-fileupload-1.0
-	=dev-java/commons-httpclient-2*
-	>=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/sun-jmx
-	>=dev-java/log4j-1.2.8
-	=dev-java/jakarta-regexp-1.3*
-	>=dev-java/saxpath-1.0
-	~dev-java/servletapi-2.4
-	=dev-java/struts-1.1-r4
-	dev-java/sun-jaf-bin
-	>=dev-java/xerces-2.7
-	=dev-java/xml-commons-external-1.3*
-	jikes? ( dev-java/jikes )"
-DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}
-	dev-java/ant"
-IUSE="doc examples source jikes"
-
-S=${WORKDIR}/jakarta-${P}-src
-
-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_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	local PATCHES="
-		build.xml-01.patch
-		build.xml-02.patch
-	"
-	for patch in ${PATCHES}; do
-		epatch "${FILESDIR}/${PV}/${patch}"
-	done
-
-	use jikes && epatch ${FILESDIR}/${PV}/jikes.diff
-
-	# avoid packed jars :-)
-	mkdir -p ${S}/jakarta-tomcat-5/build/common
-	cd ${S}/jakarta-tomcat-5/build
-
-	mkdir ./bin && cd ./bin
-	java-pkg_jar-from commons-logging commons-logging-api.jar
-	java-pkg_jar-from sun-jmx jmxri.jar jmx.jar
-	java-pkg_jar-from commons-daemon
-
-	mkdir ../common/endorsed && cd ../common/endorsed
-	java-pkg_jar-from xml-commons-external-1.3 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
-	java-pkg_jar-from jakarta-regexp-1.3
-}
-
-src_compile(){
-	local antflags="-Dbase.path=${T}"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-
-	antflags="${antflags} -Dactivation.jar=$(java-config -p sun-jaf-bin)"
-	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} -Dlog4j.jar=$(java-config -p log4j)"
-	antflags="${antflags} -Dregexp.jar=$(java-config -p jakarta-regexp-1.3)"
-	antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts-1.1 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_getjars jaxen)"
-	antflags="${antflags} -Djmx.jar=$(java-pkg_getjar sun-jmx jmxri.jar)"
-	antflags="${antflags} -Djmx-tools.jar=$(java-pkg_getjar sun-jmx jmxtools.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)"
-	antflags="${antflags} -Dstruts.home=/usr/share/struts-1.1/"
-
-	ant ${antflags}
-
-}
-src_install() {
-	cd ${S}/jakarta-tomcat-5/build
-
-	# init.d, conf.d
-	newinitd ${FILESDIR}/${PV}/tomcat.init ${TOMCAT_NAME}
-	newconfd ${FILESDIR}/${PV}/tomcat.conf ${TOMCAT_NAME}
-
-	if use jikes; then
-		sed -e "\cCATALINA_OPTScaCATALINA_OPTS=\"-Dbuild.compiler.emacs=true\"" \
-			-i ${D}/etc/conf.d/${TOMCAT_NAME}
-	fi
-
-	# 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}/jakarta-tomcat-catalina/webapps/admin/admin.xml \
-		conf/Catalina/localhost
-	cp ${S}/jakarta-tomcat-catalina/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.1 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 ${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
-
-	cp ${FILESDIR}/${PV}/log4j.properties ${D}/etc/${TOMCAT_NAME}/
-	chown tomcat:tomcat ${D}/etc/${TOMCAT_NAME}/log4j.properties
-
-	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}
-
-	ewarn
-	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!."
-	elog
-	elog " Please file any bugs at http://bugs.gentoo.org/ or else it"
-	elog " may not get seen.  Thank you."
-	elog
-
-#	elog "Run emerge --config =${PF}"
-#	elog "to configure Tomcat if you need to for example"
-#	elog "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 }')"
-
-	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.20-r10.ebuild b/www-servers/tomcat/tomcat-5.5.20-r10.ebuild
deleted file mode 100644
index f399c7b0d45c..000000000000
--- a/www-servers/tomcat/tomcat-5.5.20-r10.ebuild
+++ /dev/null
@@ -1,329 +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-r10.ebuild,v 1.6 2007/03/13 00:06:53 wltjr Exp $
-
-WANT_ANT_TASKS="ant-trax"
-
-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-httpclient-2.0*
-	>=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/junit-3.8.1
-	>=dev-java/log4j-1.2.9
-	>=dev-java/saxpath-1.0
-	~dev-java/tomcat-servlet-api-${PV}
-	admin? ( =dev-java/struts-1.2* )
-	dev-java/sun-javamail
-	java5? ( >=virtual/jre-1.5 )
-	!java5? (
-		=virtual/jre-1.4*
-		dev-java/sun-jaf
-		=dev-java/mx4j-core-3*
-		>=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}"
-
-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
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	local PATCHES="
-		mainbuild-xml.patch
-		tomcat_build-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}/jsr152_examples_build-xml.patch"
-		epatch "${FILESDIR}/${PV}/jsr154_examples_build-xml.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
-		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 tomcat-servlet-api-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} -Dservletapi.build.notrequired=true"
-	antflags="${antflags} -Djspapi.build.notrequired=true"
-	antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.7 commons-beanutils.jar)"
-	antflags="${antflags} -Dcommons-collections.jar=$(java-pkg_getjars commons-collections)"
-	antflags="${antflags} -Dcommons-daemon.jar=$(java-pkg_getjars commons-daemon)"
-	antflags="${antflags} -Dcommons-digester.jar=$(java-pkg_getjars commons-digester)"
-	antflags="${antflags} -Dcommons-dbcp.jar=$(java-pkg_getjars commons-dbcp)"
-	antflags="${antflags} -Dcommons-el.jar=$(java-pkg_getjars commons-el)"
-	antflags="${antflags} -Dcommons-fileupload.jar=$(java-pkg_getjars commons-fileupload)"
-	antflags="${antflags} -Dcommons-httpclient.jar=$(java-pkg_getjars commons-httpclient)"
-	antflags="${antflags} -Dcommons-launcher.jar=$(java-pkg_getjars commons-launcher)"
-	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} -Dcommons-pool.jar=$(java-pkg_getjars commons-pool)"
-	antflags="${antflags} -Dcommons-modeler.jar=$(java-pkg_getjars commons-modeler)"
-	antflags="${antflags} -Djdt.jar=$(java-pkg_getjar eclipse-ecj-3.1 ecj.jar)"
-	antflags="${antflags} -Djsp-api.jar=$(java-pkg_getjar tomcat-servlet-api-2.4 jsp-api.jar)"
-	antflags="${antflags} -Djunit.jar=$(java-pkg_getjars junit)"
-	antflags="${antflags} -Dlog4j.jar=$(java-pkg_getjars log4j)"
-	antflags="${antflags} -Dmail.jar=$(java-pkg_getjar sun-javamail mail.jar)"
-	antflags="${antflags} -Dsaxpath.jar=$(java-pkg_getjar saxpath saxpath.jar)"
-	antflags="${antflags} -Dservlet-api.jar=$(java-pkg_getjar tomcat-servlet-api-2.4 servlet-api.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.build.notrequired=true"
-		antflags="${antflags} -Dexamples.precompile.notrequired=true"
-	fi
-	antflags="${antflags} -Djasper.home=${S}/jasper"
-	if ! use java5; then
-		antflags="${antflags} -Dactivation.jar=$(java-pkg_getjars 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} -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-pkg_getjar 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}
-
-	ewarn
-	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!."
-	elog
-	elog " Please file any bugs at http://bugs.gentoo.org/ or else it"
-	elog " may not get seen.  Thank you."
-	elog
-
-#	elog "Run emerge --config =${PF}"
-#	elog "to configure Tomcat if you need to for example"
-#	elog "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 }')"
-
-	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
-}