New 0 day ebuild for Tomcat 5.5.20. Introduce admin use flag that will control the struts dep and if the admin webapp will be present.

15 files changed, 1031 insertions, 1 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 0547cb944424..c515a0d11dd3 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.68 2006/09/27 16:54:26 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.69 2006/09/28 16:36:00 wltjr Exp $
+
+*tomcat-5.5.20 (28 Sep 2006)
+
+  28 Sep 2006; William L. Thomson Jr. <wltjr@gentoo.org>
+  +files/5.5.20/catalinabuild-xml.patch,
+  +files/5.5.20/jasperbuild-xml.patch,
+  +files/5.5.20/jsr152build-xml-examples.patch,
+  +files/5.5.20/jsr154build-xml-examples.patch,
+  +files/5.5.20/mainbuild-xml.patch, +files/5.5.20/tomcat.conf,
+  +files/5.5.20/tomcat.env, +files/5.5.20/tomcat.init,
+  +files/5.5.20/tomcatbuild-xml.patch,
+  +files/5.5.20/tomcatbuild-xml-docs.patch,
+  +files/5.5.20/tomcatbuild-xml-examples.patch, +tomcat-5.5.20.ebuild:
+  New 0 day ebuild for Tomcat 5.5.20. Introduce admin use flag that will
+  control the struts dep and if the admin webapp will be present.
 
   27 Sep 2006; William L. Thomson Jr. <wltjr@gentoo.org>
   tomcat-5.5.17-r7.ebuild:
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index f555b3e7fd3a..d4c93b89e572 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -106,7 +106,52 @@ AUX 5.5.17/tomcatbuild-xml.patch 5235 RMD160 b82aae53ac882e5914aea8dfc8f80283bee
 MD5 276495751102b4c1e19aa944043055e6 files/5.5.17/tomcatbuild-xml.patch 5235
 RMD160 b82aae53ac882e5914aea8dfc8f80283bee7f9b1 files/5.5.17/tomcatbuild-xml.patch 5235
 SHA256 d5f621c8d3972a88a057db3c028baedf4affab4333c3f1c6117461d3dd0b6cec files/5.5.17/tomcatbuild-xml.patch 5235
+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/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/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 323c013f3a7775a506c5219d7820db7080854c2a SHA1 79bfd12c3f3bcd5ab11369b8b8edc3e127342104 SHA256 9405a9082df9a211fac6458a73021be760f84c168a039503cd1498d6c8f8fb8a
+MD5 5bbfdbdf58e61c6b4888d2a01846fe72 files/5.5.20/tomcat.conf 2689
+RMD160 323c013f3a7775a506c5219d7820db7080854c2a files/5.5.20/tomcat.conf 2689
+SHA256 9405a9082df9a211fac6458a73021be760f84c168a039503cd1498d6c8f8fb8a files/5.5.20/tomcat.conf 2689
+AUX 5.5.20/tomcat.env 36 RMD160 2d6488d26696ec0624b7774d3a31cb02afeaeea0 SHA1 1c9ad9ffa7dcaa5f071631d8a1bc65519b2eec15 SHA256 c2aa217a92fb637fb81a77c98cd769932923bbe65e72c25295993f7cf4982fef
+MD5 f41b77c0652379c5cfbe0f04bf99b4c2 files/5.5.20/tomcat.env 36
+RMD160 2d6488d26696ec0624b7774d3a31cb02afeaeea0 files/5.5.20/tomcat.env 36
+SHA256 c2aa217a92fb637fb81a77c98cd769932923bbe65e72c25295993f7cf4982fef files/5.5.20/tomcat.env 36
+AUX 5.5.20/tomcat.init 3163 RMD160 d74368768c9908e5f6054fa4af4ad78a6a70a6f7 SHA1 07d3aca48f9cfd762e8a907f31129f4bc32a19f5 SHA256 072f143e2764747872ac6b8c94ff3d82e459ba21c6275529594202700d20e50e
+MD5 0f92a29b8d1e84a354ee8f2248658142 files/5.5.20/tomcat.init 3163
+RMD160 d74368768c9908e5f6054fa4af4ad78a6a70a6f7 files/5.5.20/tomcat.init 3163
+SHA256 072f143e2764747872ac6b8c94ff3d82e459ba21c6275529594202700d20e50e files/5.5.20/tomcat.init 3163
+AUX 5.5.20/tomcatbuild-xml-docs.patch 4745 RMD160 ad084d8290dd628a4b1e1a13bfdc3dca7446fa04 SHA1 7c2d036d8931409dab360ed83346a6fc69203cf4 SHA256 ac0248500302ff5bac595296e30008dccc5e901c13a998aff859a36c6c8945ff
+MD5 ca2c6c89f893448ccaeebff6255b285f files/5.5.20/tomcatbuild-xml-docs.patch 4745
+RMD160 ad084d8290dd628a4b1e1a13bfdc3dca7446fa04 files/5.5.20/tomcatbuild-xml-docs.patch 4745
+SHA256 ac0248500302ff5bac595296e30008dccc5e901c13a998aff859a36c6c8945ff files/5.5.20/tomcatbuild-xml-docs.patch 4745
+AUX 5.5.20/tomcatbuild-xml-examples.patch 2766 RMD160 2693d0e3c1a61eec4a001332648e21be92741c60 SHA1 0269427e4cc658fbccda30a5f6061a485bdbcd9c SHA256 5f4f8541fd68b71ae659d970e0671c35f3f4edcd54e54e2f9db44876dbeb0824
+MD5 263ec369e78ddd9d4bfc7e60de2b1a9d files/5.5.20/tomcatbuild-xml-examples.patch 2766
+RMD160 2693d0e3c1a61eec4a001332648e21be92741c60 files/5.5.20/tomcatbuild-xml-examples.patch 2766
+SHA256 5f4f8541fd68b71ae659d970e0671c35f3f4edcd54e54e2f9db44876dbeb0824 files/5.5.20/tomcatbuild-xml-examples.patch 2766
+AUX 5.5.20/tomcatbuild-xml.patch 5235 RMD160 b82aae53ac882e5914aea8dfc8f80283bee7f9b1 SHA1 7a97a4e3ab76228c3d6964355dd3b5a9b3bce33a SHA256 d5f621c8d3972a88a057db3c028baedf4affab4333c3f1c6117461d3dd0b6cec
+MD5 276495751102b4c1e19aa944043055e6 files/5.5.20/tomcatbuild-xml.patch 5235
+RMD160 b82aae53ac882e5914aea8dfc8f80283bee7f9b1 files/5.5.20/tomcatbuild-xml.patch 5235
+SHA256 d5f621c8d3972a88a057db3c028baedf4affab4333c3f1c6117461d3dd0b6cec files/5.5.20/tomcatbuild-xml.patch 5235
 DIST apache-tomcat-5.5.17-src.tar.gz 4282022 RMD160 004d87bc64b32eee42f9979d2fdbb36836b69015 SHA1 d59994d06608fe13eb42a65484ccb1fdcca325e2 SHA256 295c9fa64d9aa81d5c836b694804d8d57fcfdbc76b9889a044852aa73f2c3ad8
+DIST apache-tomcat-5.5.20-src.tar.gz 4796377 RMD160 587590d2e272d1ede73501b62933f544cd969822 SHA1 cc416242d8c9e1978702a207e305ca97afe53d4d SHA256 19f24717fb3e2db902c33e21650dfa88bbf98428c15b1ed68ecaf7a9150e4a77
 DIST jakarta-tomcat-5.0.27.tar.gz 10298374 RMD160 a333fcb531bb98af20db6e0a10d3e8b2c72ee1fa SHA1 5f3981ecdd67e2b9774e643b336ad98ebc1bd4e3 SHA256 873fc94b4316235091e69bca926bd66a0fb9fab542016e582a03323ed6777d78
 DIST jakarta-tomcat-5.0.28-src.tar.gz 3565766 RMD160 22c5e60b2c5009dc33a62edcefa6760d82da859b SHA1 a4ac2ad52f8b8db8ae8c38979f5f50713e242e36 SHA256 bbf584b3c376d23d92b1a0d306eb8f3729cea244c7a850f81d2527a7df6d20fc
 EBUILD tomcat-5.0.27-r6.ebuild 3896 RMD160 e8e8ec3431a39a4125b3ed0ed7b2e30321542a64 SHA1 950e793680afb81a8cb28d45fb51bd66abcf6768 SHA256 784397258d9e1b4715cd08ab3f97e270d720d22105c99798794d346a255641ec
@@ -125,6 +170,10 @@ EBUILD tomcat-5.5.17-r7.ebuild 10026 RMD160 c9ed391b49b799a3101326e9d3b5e0d71658
 MD5 8371674bc81a3d62d335fb0c26037a1f tomcat-5.5.17-r7.ebuild 10026
 RMD160 c9ed391b49b799a3101326e9d3b5e0d71658d034 tomcat-5.5.17-r7.ebuild 10026
 SHA256 1c0e5a968089d97216f51b985ee25e615845cd26a538734e0b4f616fa75c0ea6 tomcat-5.5.17-r7.ebuild 10026
+EBUILD tomcat-5.5.20.ebuild 10162 RMD160 1b9979b66ee52833fd35e1677a1e8285dfbe9f4d SHA1 34ad802dadee507ee0c2d248f3f4dd51fddeb19d SHA256 8ab139d658b4e150a7fbb6d8e342ed3b462edee522603c48576b4a10ab3f6bf6
+MD5 1095b76bd2d2f4a2df916e7108550eca tomcat-5.5.20.ebuild 10162
+RMD160 1b9979b66ee52833fd35e1677a1e8285dfbe9f4d tomcat-5.5.20.ebuild 10162
+SHA256 8ab139d658b4e150a7fbb6d8e342ed3b462edee522603c48576b4a10ab3f6bf6 tomcat-5.5.20.ebuild 10162
 MISC ChangeLog 24359 RMD160 94c713c6c805246bcc5341c497602b85e5cea212 SHA1 aebc65f291909c02cdd0a475e17bf4dffa0518cb SHA256 07d16600b39f566353874cb6e3287c688cd319ee1d6ba594d8a48884522cea3b
 MD5 aa5c9ea83499541c538f01bdc865f3e0 ChangeLog 24359
 RMD160 94c713c6c805246bcc5341c497602b85e5cea212 ChangeLog 24359
@@ -145,3 +194,6 @@ SHA256 99d72ea7a66a7df313d7f01eeb4bd0d7e6e0325601affc35142b9df1371398e7 files/di
 MD5 b8576467d4d99bc9c4862c31d5839d56 files/digest-tomcat-5.5.17-r7 277
 RMD160 6a37c8c24770ea3fdb63334615303b56350f1cf9 files/digest-tomcat-5.5.17-r7 277
 SHA256 99d72ea7a66a7df313d7f01eeb4bd0d7e6e0325601affc35142b9df1371398e7 files/digest-tomcat-5.5.17-r7 277
+MD5 8adc14a8534e1c6f8d5f96b371e1895f files/digest-tomcat-5.5.20 277
+RMD160 b9c5deac84bf5acd7a65ad80bdfaca9f7e343f3f files/digest-tomcat-5.5.20 277
+SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/digest-tomcat-5.5.20 277
diff --git a/www-servers/tomcat/files/5.5.20/catalinabuild-xml.patch b/www-servers/tomcat/files/5.5.20/catalinabuild-xml.patch
new file mode 100644
index 000000000000..da6b96901aab
--- /dev/null
+++ b/www-servers/tomcat/files/5.5.20/catalinabuild-xml.patch
@@ -0,0 +1,30 @@
+--- apache-tomcat-5.5.15-src/container/catalina/build.xml	2006-01-03 10:15:07.000000000 -0500
++++ container/catalina/build.xml	2006-01-28 11:57:25.000000000 -0500
+@@ -60,6 +60,7 @@
+     <pathelement location="${jaas.jar}"/>
+     <pathelement location="${javagroups.jar}"/>
+     <pathelement location="${jcert.jar}"/>
++    <pathelement location="${jdt.jar}"/>
+     <pathelement location="${jmx.jar}"/>
+     <pathelement location="${jmx-remote.jar}"/>
+     <pathelement location="${jndi.jar}"/>
+@@ -91,6 +92,7 @@
+     <pathelement location="${commons-modeler.jar}"/>
+     <pathelement location="${jaas.jar}"/>
+     <pathelement location="${jcert.jar}"/>
++    <pathelement location="${jdt.jar}"/>
+     <pathelement location="${jmx.jar}"/>
+     <pathelement location="${jndi.jar}"/>
+     <pathelement location="${jnet.jar}"/>
+@@ -548,9 +550,10 @@
+ <!--
+     <copy todir="${catalina.build}/common/lib" file="${servlet-api.jar}"/>
+ -->
++    <!--
+     <copy todir="${catalina.build}/common/lib"
+            file="${tomcat-dbcp.jar}" />
+-
++    -->
+     <!-- Configuration Files -->
+     <copy todir="${catalina.build}/conf">
+       <fileset dir="src/conf">
diff --git a/www-servers/tomcat/files/5.5.20/jasperbuild-xml.patch b/www-servers/tomcat/files/5.5.20/jasperbuild-xml.patch
new file mode 100644
index 000000000000..1f0de5f8a04f
--- /dev/null
+++ b/www-servers/tomcat/files/5.5.20/jasperbuild-xml.patch
@@ -0,0 +1,10 @@
+--- jasper/build.xml	2005-02-13 19:28:36.000000000 +0100
++++ jasper/build.xml	2005-02-13 20:46:15.554972064 +0100
+@@ -30,6 +30,7 @@
+     <pathelement location="${jsp-api.jar}"/>
+     <pathelement location="${tools.jar}"/>
+     <pathelement location="${jasper-compiler-jdt.jar}"/>
++    <pathelement location="${jdt.jar}"/>
+     <pathelement location="${xerces.jar}"/>
+     <pathelement location="${xercesImpl.jar}"/>
+     <pathelement location="${xml-apis.jar}"/>
diff --git a/www-servers/tomcat/files/5.5.20/jsr152build-xml-examples.patch b/www-servers/tomcat/files/5.5.20/jsr152build-xml-examples.patch
new file mode 100644
index 000000000000..933e2aa48242
--- /dev/null
+++ b/www-servers/tomcat/files/5.5.20/jsr152build-xml-examples.patch
@@ -0,0 +1,28 @@
+--- 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/jsr154build-xml-examples.patch b/www-servers/tomcat/files/5.5.20/jsr154build-xml-examples.patch
new file mode 100644
index 000000000000..4dac35390f1d
--- /dev/null
+++ b/www-servers/tomcat/files/5.5.20/jsr154build-xml-examples.patch
@@ -0,0 +1,28 @@
+--- 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
new file mode 100644
index 000000000000..7ef15860cb5c
--- /dev/null
+++ b/www-servers/tomcat/files/5.5.20/mainbuild-xml.patch
@@ -0,0 +1,19 @@
+--- apache-tomcat-5.5.15-src/build.xml 
++++ build.xml
+@@ -64,13 +64,14 @@
+   <target name="checkout"
+           description="Update or checkout required sources from SVN">
+ 
++    <!--
+     <echo level="info"
+         message="If the checkout fails, - todo - " />
+ 
+     <exec dir="${basedir}" executable="svn">
+          <arg line="checkout ${svnroot}/${current.loc} ${basedir}" />
+     </exec>
+-
++    -->
+   </target>
+ 
+   <!-- *************** UTILITY TARGETS *************** -->
+
diff --git a/www-servers/tomcat/files/5.5.20/tomcat.conf b/www-servers/tomcat/files/5.5.20/tomcat.conf
new file mode 100644
index 000000000000..1424e4b59660
--- /dev/null
+++ b/www-servers/tomcat/files/5.5.20/tomcat.conf
@@ -0,0 +1,75 @@
+# $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.env b/www-servers/tomcat/files/5.5.20/tomcat.env
new file mode 100644
index 000000000000..8afb01ff1d8e
--- /dev/null
+++ b/www-servers/tomcat/files/5.5.20/tomcat.env
@@ -0,0 +1 @@
+CATALINA_HOME=/usr/share/tomcat-5.5
diff --git a/www-servers/tomcat/files/5.5.20/tomcat.init b/www-servers/tomcat/files/5.5.20/tomcat.init
new file mode 100755
index 000000000000..4818d8e01978
--- /dev/null
+++ b/www-servers/tomcat/files/5.5.20/tomcat.init
@@ -0,0 +1,86 @@
+#!/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.1 2006/09/28 16:36:00 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 "
+}
+
+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}
+	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} stop
+	eend $?
+}
diff --git a/www-servers/tomcat/files/5.5.20/tomcatbuild-xml-docs.patch b/www-servers/tomcat/files/5.5.20/tomcatbuild-xml-docs.patch
new file mode 100644
index 000000000000..513eeefe5d34
--- /dev/null
+++ b/www-servers/tomcat/files/5.5.20/tomcatbuild-xml-docs.patch
@@ -0,0 +1,120 @@
+--- apache-tomcat-5.5.17-src/build/build.xml	2006-04-14 14:11:26.000000000 -0400
++++ build.xml	2006-07-29 14:58:08.000000000 -0400
+@@ -788,6 +788,7 @@
+         <property name="flags.hide" value="true" />
+     </ant>
+ 
++    <!--
+     <ant dir="${catalina.home}/webapps/docs" target="build-main">
+         <property name="webapps.build" value="${tomcat.build}/webapps" />
+         <property name="classes.dir" value="${tomcat.build}/classes" />
+@@ -795,6 +796,7 @@
+         <property name="catalina.deploy" value="${tomcat.build}" />
+         <property name="flags.hide" value="true" />
+     </ant>
++    -->
+ 
+     <antcall target="build-admin" />
+ 
+@@ -843,11 +845,13 @@
+         filtering="true" />
+ 
+     <!-- Add documents to the tomcat-docs webapp -->
++    <!--
+     <copy file="${basedir}/resources/build.xml"
+         todir="${tomcat.build}/webapps/tomcat-docs" />
+     <copy file="./RELEASE-NOTES"
+         tofile="${tomcat.build}/webapps/tomcat-docs/RELEASE-NOTES.txt"
+         filtering="true" />
++     -->
+ 
+     <!-- Build JARs for webapps classes -->
+     <mkdir dir="${tomcat.build}/server/webapps/admin/WEB-INF/lib" />
+@@ -1027,6 +1031,7 @@
+     </copy>
+ 
+     <!-- Copy deployer documentation -->
++    <!--
+     <copy todir="${tomcat.deployer}">
+       <fileset dir="${tomcat.build}/webapps/tomcat-docs">
+         <include name="images/jakarta-logo.gif" />
+@@ -1035,7 +1040,8 @@
+     </copy>
+     <copy tofile="${tomcat.deployer}/docs/manual.html"
+       file="${tomcat.build}/webapps/tomcat-docs/printer/deployer-howto.html" />
+-
++    -->
++    
+   </target>
+ 
+   <!-- ====================== Compat target =================== -->
+@@ -1344,8 +1350,8 @@
+ 
+ 
+   <!-- ====================== DIST: Create Javadoc ======================== -->
+-  <target name="dist-javadoc">
+     <!--
++  <target name="dist-javadoc">
+     <ant dir="${catalina.home}" target="dist-javadoc"/>
+     <mkdir  dir="${tomcat.dist}/webapps/tomcat-docs/catalina/docs/api"/>
+     <copy todir="${tomcat.dist}/webapps/tomcat-docs/catalina/docs/api">
+@@ -1356,7 +1362,6 @@
+     <copy todir="${tomcat.dist}/webapps/tomcat-docs/jasper/docs/api">
+       <fileset dir="${jasper.build}/javadoc" />
+     </copy>
+-    -->
+     <mkdir  dir="${tomcat.dist}/webapps/tomcat-docs/servletapi"/>
+     <copy todir="${tomcat.dist}/webapps/tomcat-docs/servletapi">
+       <fileset dir="${api.home}/jsr154/dist/docs/api" />
+@@ -1366,6 +1371,7 @@
+       <fileset dir="${api.home}/jsr152/dist/docs/api" />
+     </copy>
+   </target>
++    -->
+ 
+ 
+   <!-- ====================== DIST: Create Sources ======================== -->
+@@ -1441,7 +1447,7 @@
+ 
+ 
+   <!-- ====================== DIST: Create Archives ======================= -->
+-  <target name="dist" depends="deploy,dist-static,dist-javadoc,embed"
++  <target name="dist" depends="deploy,dist-static,embed"
+    description="Create binary distribution">
+   </target>
+ 
+@@ -1479,7 +1485,7 @@
+ 
+ 
+   <!-- ==================== RELEASE: Create Release ======================= -->
+-  <target name="release" depends="clean,dist,dist-source,prepare-release,installer,package-zip,package-tgz,package-embed-zip,package-embed-tgz,package-deployer-zip,package-deployer-tgz,package-compat-zip,package-compat-tgz,package-admin-zip,package-admin-tgz,package-src-zip,package-src-tgz,package-docs-tgz,clean-tester,run-tester"
++  <target name="release" depends="clean,dist,dist-source,prepare-release,installer,package-zip,package-tgz,package-embed-zip,package-embed-tgz,package-deployer-zip,package-deployer-tgz,package-compat-zip,package-compat-tgz,package-admin-zip,package-admin-tgz,package-src-zip,package-src-tgz,clean-tester,run-tester"
+    description="Create a Tomcat 5 packaged distribution">
+ 
+     <filter token="VERSION" value="${version}"/>
+@@ -1772,8 +1778,8 @@
+   </target>
+ 
+   <!-- Packages the documentation distro in tar.gz format -->
++  <!--
+   <target name="package-docs-tgz" depends="prepare-release">
+-    <!-- Generate docs -->
+     <ant dir="${catalina.home}" target="dist-javadoc"/>
+     <mkdir  dir="${tomcat.dist}/webapps/tomcat-docs/catalina/docs/api"/>
+     <copy todir="${tomcat.dist}/webapps/tomcat-docs/catalina/docs/api">
+@@ -1785,7 +1791,6 @@
+       <fileset dir="${jasper.build}/javadoc" />
+     </copy>
+ 
+-    <!-- Package gocs -->
+     <fixcrlf srcdir="${tomcat.dist}" includes="*.txt,LICENSE,NOTICE" eol="lf"/>
+ 
+     <tar longfile="gnu" compression="gzip"
+@@ -1805,6 +1810,7 @@
+     <echo     file="${tomcat.release}/v${version}/bin/${final.name}-fulldocs.tar.gz.MD5"
+                       message="${md5sum.binary-prefix}${final.name}-fulldocs.tar.gz${line.separator}" append="true" />
+   </target>
++  -->
+ 
+   <!-- Packages the source code distribution in zip format -->
+   <target name="package-src-zip">
diff --git a/www-servers/tomcat/files/5.5.20/tomcatbuild-xml-examples.patch b/www-servers/tomcat/files/5.5.20/tomcatbuild-xml-examples.patch
new file mode 100644
index 000000000000..c2cae9e208b8
--- /dev/null
+++ b/www-servers/tomcat/files/5.5.20/tomcatbuild-xml-examples.patch
@@ -0,0 +1,84 @@
+--- apache-tomcat-5.5.17-src/build/build.xml	2006-04-14 14:11:26.000000000 -0400
++++ build/build.xml	2006-07-29 13:02:50.000000000 -0400
+@@ -398,12 +398,16 @@
+     <!-- 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,6 +441,7 @@
+              addWebXmlMappings="true"
+              outputDir="${ROOT.base}/WEB-INF/src" />
+ 
++    <!--
+     <jasper2
+              compile="false"
+              validateXml="false"
+@@ -444,6 +449,7 @@
+          webXmlFragment="${jsp-examples.base}/WEB-INF/generated_web.xml"
+              addWebXmlMappings="true"
+              outputDir="${jsp-examples.base}/WEB-INF/src" />
++    -->
+ 
+     <jasper2
+              package="admin"
+@@ -475,6 +481,7 @@
+       <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">
+@@ -507,6 +514,7 @@
+       <include name="**" />
+       <exclude name="tags/**" />
+     </javac>
++    -->
+ 
+     <javac destdir="${admin.base}/WEB-INF/classes"
+            optimize="off"
+@@ -767,7 +775,7 @@
+     </ant>
+     <ant dir="${api.home}/jsr152" target="dist">
+     </ant>
+-
++    <!--
+     <mkdir dir="${tomcat.build}/webapps/servlets-examples"/>
+     <copy todir="${tomcat.build}/webapps/servlets-examples">
+       <fileset dir="${api.home}/jsr154/build/examples" includes="**"/>
+@@ -779,7 +787,7 @@
+         <exclude name="WEB-INF/tagPlugins.xml" />
+       </fileset>
+     </copy>
+-
++    -->
+     <ant dir="${catalina.home}/webapps/ROOT" target="build-main">
+         <property name="webapps.build" value="${tomcat.build}/webapps" />
+         <property name="classes.dir" value="${tomcat.build}/classes" />
+@@ -1082,12 +1090,14 @@
+     <antcall target="fix-webapps"/>
+ 
+     <!-- Copy the examples webapps -->
++    <!--
+     <copy todir="${tomcat.build}/webapps/jsp-examples">
+       <fileset dir="${api.home}/jsr152/build/examples"/>
+     </copy>
+     <copy todir="${tomcat.build}/webapps/servlets-examples">
+       <fileset dir="${api.home}/jsr154/build/examples"/>
+     </copy>
++    -->
+ 
+     <!-- Copy Unix JSVC from commons-daemon -->
+     <copy file="${commons-daemon.jsvc.tar.gz}"
diff --git a/www-servers/tomcat/files/5.5.20/tomcatbuild-xml.patch b/www-servers/tomcat/files/5.5.20/tomcatbuild-xml.patch
new file mode 100644
index 000000000000..73f56dad7742
--- /dev/null
+++ b/www-servers/tomcat/files/5.5.20/tomcatbuild-xml.patch
@@ -0,0 +1,148 @@
+--- apache-tomcat-5.5.15-src/build/build.xml	2006-01-03 10:15:03.000000000 -0500
++++ build/build.xml	2006-01-28 13:12:39.000000000 -0500
+@@ -140,6 +140,7 @@
+ 
+   <!-- ====================== DEPLOY: Copy Static Files =================== -->
+   <target name="deploy-static" depends="init">
++  <!--
+     <copy file="${jsp-api.jar}"  todir="${tomcat.build}/common/lib"/>
+     <copy file="${servlet-api.jar}" todir="${tomcat.build}/common/lib"/>
+ 
+@@ -158,9 +159,9 @@
+     <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
+             file="${tomcat-native.tar.gz}" />
+ 
+-    <!-- <copy todir="${tomcat.build}/common/lib" file="${ant.jar}"/>
+-    <copy todir="${tomcat.build}/common/lib" file="${ant-launcher.jar}"/> -->
++    <copy todir="${tomcat.build}/common/lib" file="${ant-launcher.jar}"/>
+     <copy todir="${tomcat.build}/common/lib" file="${jasper-compiler-jdt.jar}"/>
++    -->
+   </target>
+ 
+   <!-- ====================== Build all components =================== -->
+@@ -650,28 +651,8 @@
+ 
+     <!-- <antcall target="build-commons-modeler" /> -->
+     <!-- <antcall target="build-commons-daemon"  /> -->
+-
+-    <antcall target="downloadgz">
+-      <param name="sourcefile" value="${commons-collections-src.loc}"/>
+-      <param name="destfile" value="${tomcat-dbcp.jar}" />
+-    </antcall>
+-    <antcall target="downloadgz">
+-      <param name="sourcefile" value="${commons-pool-src.loc}"/>
+-      <param name="destfile" value="${tomcat-dbcp.jar}" />
+-    </antcall>
+-    <antcall target="downloadgz">
+-      <param name="sourcefile" value="${commons-dbcp-src.loc}"/>
+-      <param name="destfile" value="${tomcat-dbcp.jar}" />
+-    </antcall>
+-
+-    <antcall target="build-tomcat-dbcp" />
+-
+-    <antcall target="downloadzip">
+-      <param name="sourcefile" value="${jdt.loc}"/>
+-      <param name="destfile" value="${jdt.jar}"/>
+-      <param name="destdir" value="${base.path}"/>
+-    </antcall>
+-    <antcall target="build-jasper-compiler-jdt" />
++    <!-- <antcall target="build-tomcat-dbcp" /> -->
++    <!-- <antcall target="build-jasper-compiler-jdt" /> -->
+   </target>
+ 
+   <target name="build-tomcat-dbcp">
+@@ -824,9 +805,10 @@
+     </ant>
+ 
+     <!-- Precompiling and fixing webapps -->
++    <!--
+     <antcall target="build-webapps-precompile" />
+     <antcall target="fix-webapps" />
+-
++    -->
+   </target>
+ 
+   <target name="fix-webapps" depends="init" >
+@@ -1038,11 +1020,11 @@
+   <!-- ====================== Compat target =================== -->
+ 
+   <target name="compat" description="Create compatibility binaries for JREs before 1.5" >
+-
++    <!--
+     <copy todir="${tomcat.compat}/common/endorsed" file="${xercesImpl.jar}"/>
+     <copy todir="${tomcat.compat}/common/endorsed" file="${xml-apis.jar}"/>
+     <copy tofile="${tomcat.compat}/bin/jmx.jar" file="${jmx.jar}"/>
+-
++    -->
+   </target>
+ 
+   <!-- ====================== DEPLOY: Deploy Components =================== -->
+@@ -1089,8 +1071,9 @@
+     <!-- Copy Unix JSVC from commons-daemon -->
+     <copy file="${commons-daemon.jsvc.tar.gz}"
+         tofile="${tomcat.dist}/bin/jsvc.tar.gz" />
++    <!--
+     <copy todir="${tomcat.build}/bin" file="${commons-daemon.jar}" />
+-
++    -->
+     <echo>Target: Webapps precompilation ...</echo>
+ 
+     <antcall target="build-admin"/>
+@@ -1185,10 +1168,11 @@
+    description="Catalina Tests" depends="dist-tester">
+ 
+     <!-- For Java 1.4 -->
++    <!--
+     <copy file="${jmx.jar}" tofile="${tomcat.build}/bin/jmx.jar" />
+     <copy todir="${tomcat.build}/common/endorsed" file="${xercesImpl.jar}"/>
+     <copy todir="${tomcat.build}/common/endorsed" file="${xml-apis.jar}"/>
+-
++    -->
+     <parallel>
+ 
+         <java classname="LauncherBootstrap" fork="yes">
+@@ -1827,10 +1811,10 @@
+ 
+     <!-- commons-digester needs ../LICENSE -->
+     <!-- That is ugly XXX needs a review -->
++    <!--
+     <copy file="LICENSE" tofile="../LICENSE"/>
+     <copy file="LICENSE" tofile="${base.path}/LICENSE"/>
+ 
+-    <!-- Downdown any sub package or tools needed. -->
+     <antcall target="downloadgz">
+       <param name="sourcefile" value="${commons-beanutils.loc}"/>
+       <param name="destfile" value="${commons-beanutils.jar}"/>
+@@ -1872,7 +1856,6 @@
+     </antcall>
+ 
+     <antcall target="downloadgz">
+-      <!-- xerces2 brings 2 files, test for one of them -->
+       <param name="sourcefile" value="${xerces.loc}"/>
+       <param name="destfile" value="${xml-apis.jar}"/>
+     </antcall>
+@@ -1893,7 +1876,6 @@
+       <param name="destfile" value="${commons-launcher.jar}"/>
+     </antcall>
+ 
+-    <!--
+     <antcall target="downloadgz">
+       <param name="sourcefile" value="${commons-pool.loc}"/>
+       <param name="destfile" value="${commons-pool.jar}"/>
+@@ -1904,7 +1886,6 @@
+       <param name="destfile" value="${commons-dbcp.jar}"/>
+       <param name="destdir" value="${base.path}"/>
+     </antcall>
+-    -->
+ 
+     <antcall target="downloadgz">
+       <param name="sourcefile" value="${commons-httpclient.loc}"/>
+@@ -1932,7 +1913,7 @@
+       <param name="destfile" value="${tomcat-native.tar.gz}"/>
+       <param name="destdir" value="${tomcat-native.home}"/>
+     </antcall>
+-
++    -->
+     <!-- Build the dependencies that are not yet released -->
+     <antcall target="build-depends"/>
+ 
diff --git a/www-servers/tomcat/files/digest-tomcat-5.5.20 b/www-servers/tomcat/files/digest-tomcat-5.5.20
new file mode 100644
index 000000000000..25cb711a112c
--- /dev/null
+++ b/www-servers/tomcat/files/digest-tomcat-5.5.20
@@ -0,0 +1,3 @@
+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.ebuild b/www-servers/tomcat/tomcat-5.5.20.ebuild
new file mode 100644
index 000000000000..85028ea6f6e4
--- /dev/null
+++ b/www-servers/tomcat/tomcat-5.5.20.ebuild
@@ -0,0 +1,331 @@
+# Copyright 1999-2006 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.ebuild,v 1.1 2006/09/28 16:36:00 wltjr Exp $
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Apache Servlet-2.4/JSP-2.0 Container"
+
+MY_P="apache-${P}-src"
+SLOT="5.5"
+SRC_URI="mirror://apache/${PN}/${PN}-5/v${PV}/src/${MY_P}.tar.gz"
+HOMEPAGE="http://jakarta.apache.org/tomcat"
+KEYWORDS="~amd64 ~x86"
+LICENSE="Apache-2.0"
+
+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.0
+	>=dev-java/commons-el-1.0
+	>=dev-java/commons-launcher-0.9
+	>=dev-java/commons-logging-1.0.4
+	>=dev-java/commons-modeler-1.1
+	>=dev-java/commons-pool-1.2
+	>=dev-java/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/jaxen-1.0
+		>=dev-java/junit-3.8.1
+		=dev-java/mx4j-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}
+	sys-apps/sed
+	dev-java/ant"
+
+if ! use java5; then
+	JAVA_PKG_NV_DEPEND="=virtual/jdk-1.4*"
+else
+	JAVA_PKG_NV_DEPEND="=virtual/jdk-1.5*"
+fi
+
+S=${WORKDIR}/${MY_P}
+
+TOMCAT_HOME="/usr/share/${PN}-${SLOT}"
+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
+
+	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 doc; then
+		epatch "${FILESDIR}/${PV}/tomcatbuild-xml-docs.patch"
+	fi
+	if ! use examples; then
+		epatch "${FILESDIR}/${PV}/tomcatbuild-xml-examples.patch"
+		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-3.0 mx4j.jar jmx.jar
+		java-pkg_jar-from mx4j-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-fileupload
+	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"
+	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} -Djaxen.jar=$(java-pkg_getjar jaxen jaxen-full.jar)"
+		antflags="${antflags} -Djmx.jar=$(java-pkg_getjar mx4j-3.0 mx4j.jar)"
+		antflags="${antflags} -Djmx-remote.jar=$(java-pkg_getjar mx4j-3.0 mx4j-rjmx.jar)"
+		antflags="${antflags} -Dsaxpath.jar=$(java-pkg_getjar saxpath saxpath.jar)"
+		antflags="${antflags} -DxercesImpl.jar=$(java-pkg_getjar xerces-2 xercesImpl.jar)"
+		antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xml-commons-external-1.3 xml-apis.jar)"
+	fi
+
+	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}/${CATALIA_HOME}/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
+
+	# 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}
+
+	# 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}
+
+	einfo
+	ewarn " This ebuild implements a new filesystem layout for tomcat"
+	ewarn " please read http://www.gentoo.org/proj/en/java/tomcat-guide.xml"
+	ewarn " for more information!."
+	einfo
+	einfo " Please file any bugs at http://bugs.gentoo.org/ or else it"
+	einfo " may not get seen.  Thank you."
+	einfo
+
+#	einfo "Run emerge --config =${PF}"
+#	einfo "to configure Tomcat if you need to for example"
+#	einfo "change the home directory of the Tomcat user."
+}
+
+#helpers
+set_webapps_perms() {
+	chown  tomcat:tomcat ${1} || die "Failed to change owner off ${1}."
+	chmod  750           ${1} || die "Failed to change permissions off ${1}."
+}
+
+pkg_config() {
+	# Better suggestions are welcome
+	local currentdir="$(getent passwd tomcat | gawk -F':' '{ print $6 }')"
+
+	einfo "The default home directory for Tomcat is /dev/null."
+	einfo "You need to change it if your applications needs it to"
+	einfo "be an actual directory. Current home directory:"
+	einfo "${currentdir}"
+	einfo ""
+	einfo "Do you want to change it [yes/no]?"
+
+	local answer
+	read answer
+
+	if [[ "${answer}" == "yes" ]]; then
+		einfo ""
+		einfo "Suggestions:"
+		einfo "${WEBAPPS_DIR}"
+		einfo ""
+		einfo "If you want to suggest a directory, file a bug to"
+		einfo "http://bugs.gentoo.org"
+		einfo ""
+		einfo "Enter home directory:"
+
+		local homedir
+		read homedir
+
+		einfo ""
+		einfo "Setting home directory to: ${homedir}"
+
+		/usr/sbin/usermod -d"${homedir}" tomcat
+
+		einfo "You can run emerge --config =${PF}"
+		einfo "again to change to homedir"
+		einfo "at any time."
+	fi
+}