Removed previous versions in same slot as stable. Added remaining EAPI=1 and switched to new slot deps.

Package-Manager: portage-2.1.5_rc6

11 files changed, 30 insertions, 1526 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 4a71cfdc7811..b22b8ce5c7e6 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.183 2008/03/17 22:35:33 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.184 2008/05/13 02:06:49 wltjr Exp $
+
+  13 May 2008; William L. Thomson Jr. <wltjr@gentoo.org>
+  -files/5.5/main_tomcat_catalina_jasper_build_xml.patch,
+  -files/5.5/webdav.patch, -files/6/webdav.patch, -tomcat-5.5.25.ebuild,
+  -tomcat-5.5.25-r1.ebuild, tomcat-5.5.26.ebuild, -tomcat-6.0.14.ebuild,
+  -tomcat-6.0.14-r1.ebuild, tomcat-6.0.16.ebuild:
+  Removed previous versions in same slot as stable. Added remaining EAPI=1
+  and switched to new slot deps.
 
   17 Mar 2008; Markus Meier <maekke@gentoo.org> tomcat-5.5.26.ebuild,
   tomcat-6.0.16.ebuild:
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index cef5774bbafe..8115c179f688 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,34 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 5.5/26-main_tomcat_catalina_jasper_build_xml.patch 16573 RMD160 53f1deaa88a39459a584cf14c761cb411d68f2e6 SHA1 69b3ca39f9dbabe12c56865d47866c06dcb7c2e3 SHA256 99a2c1bb164d97407525305512a85e6139531d81a47aa2c25f5c2cfe50aee1f6
 AUX 5.5/catalina.policy 10897 RMD160 d6accc56803b132d0e82e163cc583464c38248ef SHA1 585f80e24cad7e5927f8c2c6ad03f668eb904cc1 SHA256 8188db94772eb00d44b28cb9b40e9ccf30803acf576c0af1be5844ebd35d763c
 AUX 5.5/jsr152_jsr154_examples_build_xml.patch 2478 RMD160 39a279b0f64bcf112fdaa26c51e3aaa2c7f7a089 SHA1 15857d3b5eaadd6c11bf271f7e7d4705aface448 SHA256 cdc63acd96a3d13d32c37fcbd975f85d38309a0df87a36bf8f49347dc34a181c
-AUX 5.5/main_tomcat_catalina_jasper_build_xml.patch 16214 RMD160 4e9d678bef6f03698a46704c8044ae7523ec2b65 SHA1 b437e06ddf4713fdc68121c8a60f2cf2492f3bd3 SHA256 fa80692985150f7cf0385415bed8d60905ea4c5a703362ce816609cb3a91da70
 AUX 5.5/tomcat.conf.2 2775 RMD160 9ab105f0e57276c105fb406d5632cc2a47401c26 SHA1 cb00a622c7858a81838292200d36d7901ee9cb2e SHA256 7539da9262abd8f8b04e9589e8a733a64670f641035a1ca8a40a236e486038f2
 AUX 5.5/tomcat.init.2 3679 RMD160 48068f010cb0f0fd4bf54384485faa8791b0d00d SHA1 a37bd7ba46d4fd25ee719b1e0d6042778be5f999 SHA256 e0f64f1e1b104c9cd9807308809e6e09a99b2fff235e4c1c7923fa64d9326e80
-AUX 5.5/webdav.patch 918 RMD160 1d3d299f5a3152a5bf4328deae3c67798c692750 SHA1 bd8b541232751dcb023ed12a2832e596ca19da99 SHA256 77e66fa3443405a35a384100e133c09922993895175969f65019fbb2eaa4bfad
 AUX 6/build-xml.patch 2786 RMD160 7d05d8c4ddcadf882f918e54c8c51c9c54782944 SHA1 944111d0faacf74c7daabcd3aa07cd68daf4a317 SHA256 ef0d6b59aa09e44c789157200dc472331d46ca30434dfec020edeabf40ca9f30
 AUX 6/catalina.policy 6956 RMD160 957ad3b5dc4aeaa5acd289cdaada0a2e48974d52 SHA1 13b65455c8f52fff9d1b09ea67e93ec7a88f1a47 SHA256 9399efda3f6cfc238fb783fb338060e67aff15d0044b31c3d0265e1f9e5769e5
 AUX 6/tomcat.conf 2756 RMD160 4679e6b1e15c3ef70b832f57f1e7f85b21d60b38 SHA1 a48eaaffb5537cf8a2756cc3d23a8306e3fa7291 SHA256 159edf302064703b7636f381d2a0e2f8a4d533bdad4f438795d1b98728785a82
 AUX 6/tomcat.init 3355 RMD160 169a9af752e814f7cafbfa849fb1dbc433bbbbf3 SHA1 96a474418bfe6844468ac43fd7b4ecc53e7ce942 SHA256 d53e31a221a3e78f6cc8686d7e123da10216a46851e64a2f5819f1f8147b86b8
-AUX 6/webdav.patch 822 RMD160 391bafed1ff60c20f403c0983845b7da601447f1 SHA1 50d2ddac7bbeebe688b4722d90d2f4dbbf55cb12 SHA256 9ddac7c8eeac8b6892f9fd69c8c1d927bde47880e3470859da185599682cdc9c
-DIST apache-tomcat-5.5.25-src.tar.gz 5106363 RMD160 83bb506b3f0fbde75e346e02832645bd6526fa7d SHA1 81ef41e25f805831aa63353f52e5b498c74a3414 SHA256 b7618f0a1e04623bfc9e14bdb51ae54203fa1e80f6c7ee61e2387cb11de8736f
 DIST apache-tomcat-5.5.26-src.tar.gz 5062991 RMD160 c82e7640b36c27cfc6ea51f01dc3ff492441a930 SHA1 1eb1c479023d3a7e459ce03860d9d984b673ab27 SHA256 ddc677d7391c438e6102d0b3e9653eaca661344ef74b0260c1f488340d660395
-DIST apache-tomcat-6.0.14-src.tar.gz 3458776 RMD160 24f586d946654edcc70c5ec1ee457022c4a5d070 SHA1 3156b0b853f8f340ef825c58d0281cdda3f5816e SHA256 ef57398cc8e0294fb74d0d76debdaebf51ec47f18c9c927ddc98530dfa93cf88
 DIST apache-tomcat-6.0.16-src.tar.gz 3527896 RMD160 8e6c0900889439f4cb89db35afb0c27e77103c00 SHA1 74127ba3da450a97869f2a2a2f0e134d23474018 SHA256 9e0a776f9d9c5fe935a39b066f74c07e7d26b4f30b66b22622a20dec235b0a7f
-EBUILD tomcat-5.5.25-r1.ebuild 10867 RMD160 d581fa53dbdcc48e746c13a95aa5a607ed6e830a SHA1 7567d5696255718aa49be515b26b006b2fe0ad46 SHA256 f61338b1a3281ab4f988dd9f561de0b3feee0df122f0d38b834f8212d27248f9
-EBUILD tomcat-5.5.25.ebuild 10821 RMD160 794cc24a400931038e8231671bb51a1ae3b485a4 SHA1 1eda05953d562c7d78186d0f592fa6178b18b252 SHA256 e9cbfc3613e97573849b27220a6c2080f8c068deec27d1f092d1106f2aef3566
-EBUILD tomcat-5.5.26.ebuild 10922 RMD160 d2879a44aef943157f15927867e0c3456177584f SHA1 3fdc812d6a59836c5c34f994f6133cf031e35378 SHA256 9f0c551dc55020228076fbcba43440e462f79cce448b2e57bc3ae6c9074b947c
-EBUILD tomcat-6.0.14-r1.ebuild 6286 RMD160 024b3fa2b315b61ac26e7edc0209a6d49296cb93 SHA1 58d0180b5cf01c5f1487c9bf1da5e18ee950c0d9 SHA256 5a096f5ab7504f8f004fc3cb71be282e64a4b680447812fab9bbdb986c6c697d
-EBUILD tomcat-6.0.14.ebuild 6240 RMD160 72934cf6951ae21b034506705ff5b5bb8148725b SHA1 aae418d32043873e694fa19d0a3c915771608b1a SHA256 621fb73876cdfdec865251467c26b15320e646e38d67ce9d5b31d5063c4be7b7
-EBUILD tomcat-6.0.16.ebuild 6240 RMD160 d074789b0e57e59a724872f9c34c19f277cd800c SHA1 7717450833b2c56516040162f121bf9c2e15a0b9 SHA256 21df89cea45f4c8568209a32177e0bad84fdcda50930d4bca18b55146418cf72
-MISC ChangeLog 52188 RMD160 bad8f5573e9bd6f17405c102060e774dc727a56f SHA1 b4695cf0b6d242410612b6c8aa3f0dc3f3c282ba SHA256 7c1cb44d016dc541af7ac9c8a530b5f2e32428f45b33909f1a0ac7acf1a21d46
+EBUILD tomcat-5.5.26.ebuild 10956 RMD160 def823fb1872b6a29fce27f2fbb3d821e02f0047 SHA1 c55fc5fe2815405cce9df2700e0194f2e5b23610 SHA256 fe7e7e9dc8bad29644611cc532ff6d6709056b5953929d8bf91e6ec3093ba4b7
+EBUILD tomcat-6.0.16.ebuild 6290 RMD160 8ddb427fbd5f776da58a1efbeafab9861f8ddcba SHA1 eedebefa220053bb55a5e500aba1f25129ae231d SHA256 6ea2a0011e98dd70235e7431b55a620e81b513fad110b10eda5b6c406bf634ef
+MISC ChangeLog 52607 RMD160 1d37ff3b5655cb2d2ab4d45e88e0971508af9cfa SHA1 ba7da64cc327a0894b9c4f3f997206cebe778037 SHA256 1d81a1b7d45a91a41d5dacf21da8c96a57bcc82473315e911d42cee608cc57df
 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFH3vJ5kKaRLQcq0GIRAjmWAJsH39Df+obYXfFy+LbrfhAcojz2ygCgjUK2
-nVOgS4heCc2rcPvCuGRnrNA=
-=R+gl
------END PGP SIGNATURE-----
diff --git a/www-servers/tomcat/files/5.5/main_tomcat_catalina_jasper_build_xml.patch b/www-servers/tomcat/files/5.5/main_tomcat_catalina_jasper_build_xml.patch
deleted file mode 100644
index 11c4d3afa106..000000000000
--- a/www-servers/tomcat/files/5.5/main_tomcat_catalina_jasper_build_xml.patch
+++ /dev/null
@@ -1,415 +0,0 @@
-diff -Naur apache-tomcat-5.5.25-src_orig/build/build.xml apache-tomcat-5.5.25-src/build/build.xml
---- apache-tomcat-5.5.25-src_orig/build/build.xml	2007-09-08 12:24:17.000000000 -0400
-+++ apache-tomcat-5.5.25-src/build/build.xml	2007-09-08 12:57:43.000000000 -0400
-@@ -161,6 +161,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"/>
- 
-@@ -179,9 +180,10 @@
-     <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.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 =================== -->
-@@ -413,15 +415,14 @@
-   <target name="build-webapps-precompile"
-           depends="init" description="Precompile webapps" >
- 
-+    <antcall target="build-webapp-precompile-admin" />
-+    <antcall target="build-webapp-precompile-examples" />
-+
-     <!-- JSPC -->
--    <property name="admin.base" location="${tomcat.build}/server/webapps/admin" />
-     <property name="ROOT.base" location="${tomcat.build}/webapps/ROOT" />
--    <property name="jsp-examples.base" location="${tomcat.build}/webapps/jsp-examples" />
- 
--    <mkdir dir="${admin.base}/WEB-INF/src/admin" />
-     <mkdir dir="${ROOT.base}/WEB-INF/src" />
-     <mkdir dir="${ROOT.base}/WEB-INF/classes" />
--    <mkdir dir="${jsp-examples.base}/WEB-INF/src" />
- 
-     <path id="jspc.classpath">
-       <pathelement location="${java.home}/../lib/tools.jar"/>
-@@ -455,23 +456,6 @@
-              addWebXmlMappings="true"
-              outputDir="${ROOT.base}/WEB-INF/src" />
- 
--    <jasper2
--             compile="false"
--             validateXml="false"
--             uriroot="${jsp-examples.base}"
--         webXmlFragment="${jsp-examples.base}/WEB-INF/generated_web.xml"
--             addWebXmlMappings="true"
--             outputDir="${jsp-examples.base}/WEB-INF/src" />
--
--    <jasper2
--             package="admin"
--             compile="false"
--             validateXml="false"
--             uriroot="${admin.base}"
--             webXmlFragment="${admin.base}/WEB-INF/generated_web.xml"
--             addWebXmlMappings="true"
--             outputDir="${admin.base}/WEB-INF/src/admin" />
--
-     <javac destdir="${ROOT.base}/WEB-INF/classes"
-            optimize="off"
-            debug="${compile.debug}"
-@@ -492,62 +476,90 @@
-       </classpath>
-       <include name="**" />
-     </javac>
-+  </target>
- 
--    <mkdir dir="${jsp-examples.base}/WEB-INF/src/tags"/>
--    <copy todir="${jsp-examples.base}/WEB-INF/classes">
--      <fileset dir="${jsp-examples.base}/WEB-INF/src">
--        <include name="**/*.class" />
--      </fileset>
--    </copy>
--
--    <javac destdir="${jsp-examples.base}/WEB-INF/classes"
-+  <target name="build-webapp-precompile-admin" unless="admin.precompile.notrequired">
-+    <property name="admin.base" location="${tomcat.build}/server/webapps/admin" />
-+    <mkdir dir="${admin.base}/WEB-INF/src/admin" />
-+    <taskdef classname="org.apache.jasper.JspC" name="jasper2" >
-+      <classpath refid="jspc.classpath"/>
-+    </taskdef>
-+    <jasper2
-+             package="admin"
-+             compile="false"
-+             validateXml="false"
-+             uriroot="${admin.base}"
-+             webXmlFragment="${admin.base}/WEB-INF/generated_web.xml"
-+             addWebXmlMappings="true"
-+             outputDir="${admin.base}/WEB-INF/src/admin" />
-+    <javac destdir="${admin.base}/WEB-INF/classes"
-            optimize="off"
-            debug="${compile.debug}"
-            deprecation="${compile.deprecation}"
-            source="${compile.source}"
-            failonerror="false"
--           srcdir="${jsp-examples.base}/WEB-INF/src"
-+           srcdir="${admin.base}/WEB-INF/src"
-        excludes="**/*.smap">
-       <classpath>
-         <pathelement location="${java.home}/../lib/tools.jar"/>
-         <fileset dir="${tomcat.build}/server/lib">
-           <include name="*.jar"/>
-         </fileset>
--        <fileset dir="${jsp-examples.base}/WEB-INF/lib">
-+        <fileset dir="${admin.base}/WEB-INF/lib">
-           <include name="*.jar"/>
-         </fileset>
-         <fileset dir="${tomcat.build}/common/lib">
-           <include name="*.jar"/>
-         </fileset>
-         <pathelement location="${tomcat.build}/classes"/>
--        <pathelement location="${jsp-examples.base}/WEB-INF/classes"/>
-       </classpath>
--      <include name="**" />
--      <exclude name="tags/**" />
-+      <include name="admin/**" />
-     </javac>
-+  </target>
- 
--    <javac destdir="${admin.base}/WEB-INF/classes"
-+  <target name="build-webapp-precompile-examples" unless="examples.precompile.notrequired">
-+    <property name="jsp-examples.base" location="${tomcat.build}/webapps/jsp-examples" />
-+    <mkdir dir="${jsp-examples.base}/WEB-INF/src" />
-+    <taskdef classname="org.apache.jasper.JspC" name="jasper2" >
-+      <classpath refid="jspc.classpath"/>
-+    </taskdef>
-+    <jasper2
-+             compile="false"
-+             validateXml="false"
-+             uriroot="${jsp-examples.base}"
-+         webXmlFragment="${jsp-examples.base}/WEB-INF/generated_web.xml"
-+             addWebXmlMappings="true"
-+             outputDir="${jsp-examples.base}/WEB-INF/src" />
-+    <mkdir dir="${jsp-examples.base}/WEB-INF/src/tags"/>
-+    <copy todir="${jsp-examples.base}/WEB-INF/classes">
-+      <fileset dir="${jsp-examples.base}/WEB-INF/src">
-+        <include name="**/*.class" />
-+      </fileset>
-+    </copy>
-+    <javac destdir="${jsp-examples.base}/WEB-INF/classes"
-            optimize="off"
-            debug="${compile.debug}"
-            deprecation="${compile.deprecation}"
-            source="${compile.source}"
-            failonerror="false"
--           srcdir="${admin.base}/WEB-INF/src"
-+           srcdir="${jsp-examples.base}/WEB-INF/src"
-        excludes="**/*.smap">
-       <classpath>
-         <pathelement location="${java.home}/../lib/tools.jar"/>
-         <fileset dir="${tomcat.build}/server/lib">
-           <include name="*.jar"/>
-         </fileset>
--        <fileset dir="${admin.base}/WEB-INF/lib">
-+        <fileset dir="${jsp-examples.base}/WEB-INF/lib">
-           <include name="*.jar"/>
-         </fileset>
-         <fileset dir="${tomcat.build}/common/lib">
-           <include name="*.jar"/>
-         </fileset>
-         <pathelement location="${tomcat.build}/classes"/>
-+        <pathelement location="${jsp-examples.base}/WEB-INF/classes"/>
-       </classpath>
--      <include name="admin/**" />
-+      <include name="**" />
-+      <exclude name="tags/**" />
-     </javac>
-   </target>
- 
-@@ -676,7 +688,6 @@
-       <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}" />
-@@ -694,6 +705,7 @@
-       <param name="destdir" value="${base.path}"/>
-     </antcall>
-     <antcall target="build-jasper-compiler-jdt" />
-+    -->
-   </target>
- 
-   <target name="build-tomcat-dbcp">
-@@ -773,14 +785,7 @@
-         </jar>
-   </target>
- 
--  <target name="build-webapps" depends="init"
--          description="build  webapps">
--
--    <echo>========== Building: webapps </echo>
--
--    <mkdir dir="${tomcat.build}/webapps" />
--    <mkdir dir="${tomcat.build}/server/webapps" />
--
-+  <target name="build-examples" unless="examples.build.notrequired">
-     <!-- The build files are far too difficult to hack - just build it and copy -->
-     <ant dir="${api.home}/jsr154" target="dist">
-     </ant>
-@@ -798,6 +803,17 @@
-         <exclude name="WEB-INF/tagPlugins.xml" />
-       </fileset>
-     </copy>
-+  </target>
-+
-+  <target name="build-webapps" depends="init"
-+          description="build  webapps">
-+
-+    <echo>========== Building: webapps </echo>
-+
-+    <mkdir dir="${tomcat.build}/webapps" />
-+    <mkdir dir="${tomcat.build}/server/webapps" />
-+
-+    <antcall target="build-examples" />
- 
-     <ant dir="${catalina.home}/webapps/ROOT" target="build-main">
-         <property name="webapps.build" value="${tomcat.build}/webapps" />
-@@ -869,14 +885,7 @@
-         filtering="true" />
- 
-     <!-- Build JARs for webapps classes -->
--    <mkdir dir="${tomcat.build}/server/webapps/admin/WEB-INF/lib" />
--    <jar jarfile="${tomcat.build}/server/webapps/admin/WEB-INF/lib/catalina-admin.jar"
--         index="true">
--       <fileset dir="${tomcat.build}/server/webapps/admin/WEB-INF/classes">
--          <include name="**/*.class" />
--          <include name="**/*.properties" />
--       </fileset>
--    </jar>
-+    <antcall target="fix-admin-webapp" />
-     <mkdir dir="${tomcat.build}/server/webapps/manager/WEB-INF/lib" />
-     <jar jarfile="${tomcat.build}/server/webapps/manager/WEB-INF/lib/catalina-manager.jar"
-          index="true">
-@@ -915,9 +924,19 @@
-          todir="${tomcat.build}/conf/Catalina/localhost" />
-     <copy file="${tomcat.build}/server/webapps/host-manager/host-manager.xml"
-          todir="${tomcat.build}/conf/Catalina/localhost" />
-+  </target>
-+
-+  <target name="fix-admin-webapp" unless="admin.build.notrequired">
-+    <mkdir dir="${tomcat.build}/server/webapps/admin/WEB-INF/lib" />
-+    <jar jarfile="${tomcat.build}/server/webapps/admin/WEB-INF/lib/catalina-admin.jar"
-+         index="true">
-+       <fileset dir="${tomcat.build}/server/webapps/admin/WEB-INF/classes">
-+          <include name="**/*.class" />
-+          <include name="**/*.properties" />
-+       </fileset>
-+    </jar>
-     <copy file="${tomcat.build}/server/webapps/admin/admin.xml"
-          todir="${tomcat.build}/conf/Catalina/localhost" />
--
-   </target>
- 
-   <!-- ====================== Embed target =================== -->
-@@ -1060,11 +1079,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 =================== -->
-@@ -1111,8 +1130,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"/>
-@@ -1213,11 +1233,11 @@
-   <target name="run-tester"
-    description="Catalina Tests" depends="dist-tester">
- 
--    <!-- For Java 1.4 -->
-+    <!-- 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">
-@@ -1899,11 +1919,10 @@
-     <mkdir dir="${base.path}" />
- 
-     <!-- commons-digester needs ../LICENSE -->
--    <!-- That is ugly XXX needs a review -->
-+    <!-- 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}"/>
-@@ -1940,7 +1959,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>
-@@ -1961,7 +1979,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}"/>
-@@ -1972,7 +1989,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}"/>
-@@ -2000,7 +2016,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 -Naur apache-tomcat-5.5.25-src_orig/build.xml apache-tomcat-5.5.25-src/build.xml
---- apache-tomcat-5.5.25-src_orig/build.xml	2007-09-08 12:24:17.000000000 -0400
-+++ apache-tomcat-5.5.25-src/build.xml	2007-09-08 12:45:21.000000000 -0400
-@@ -81,13 +81,10 @@
- 
-   <target name="checkout"
-           description="Update or checkout required sources from SVN">
--
-+<!--
-     <echo level="info"
-           message="If the checkout fails, see http://tomcat.apache.org/svn.html and http://subversion.tigris.org/faq.html#proxy" />
- 
--    <!-- Bugzilla 37977: http://issues.apache.org/bugzilla/show_bug.cgi?id=37977 -->
--    <!--  hackish: inputstring="t${line.separator}" is t+<enter> for svn         -->
--    <!--  to temporarily accept the certificate of svn.apache.org.               -->
-     <exec dir="${basedir}"
-           executable="svn"
-           inputstring="t${line.separator}"
-@@ -96,7 +93,7 @@
-       <arg value="${svnroot}/${current.loc}" />
-       <arg value="${basedir}" />
-     </exec>
--
-+-->
-   </target>
- 
-   <!-- *************** UTILITY TARGETS *************** -->
-diff -Naur apache-tomcat-5.5.25-src_orig/container/catalina/build.xml apache-tomcat-5.5.25-src/container/catalina/build.xml
---- apache-tomcat-5.5.25-src_orig/container/catalina/build.xml	2007-09-08 12:24:17.000000000 -0400
-+++ apache-tomcat-5.5.25-src/container/catalina/build.xml	2007-09-08 13:03:28.000000000 -0400
-@@ -61,6 +61,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}"/>
-@@ -92,6 +93,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}"/>
-@@ -549,9 +551,9 @@
-            file="${commons-logging-api.jar}"/>
- <!--
-     <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">
-diff -Naur apache-tomcat-5.5.25-src_orig/jasper/build.xml apache-tomcat-5.5.25-src/jasper/build.xml
---- apache-tomcat-5.5.25-src_orig/jasper/build.xml	2007-09-08 12:24:17.000000000 -0400
-+++ apache-tomcat-5.5.25-src/jasper/build.xml	2007-09-08 13:02:30.000000000 -0400
-@@ -47,6 +47,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/webdav.patch b/www-servers/tomcat/files/5.5/webdav.patch
deleted file mode 100644
index 80d6cae60ec9..000000000000
--- a/www-servers/tomcat/files/5.5/webdav.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur apache-tomcat-5.5.25-src_orig/container/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java apache-tomcat-5.5.25-src/container/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java
---- apache-tomcat-5.5.25-src_orig/container/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java	2007-10-16 16:54:54.000000000 -0400
-+++ apache-tomcat-5.5.25-src/container/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java	2007-10-16 16:56:57.000000000 -0400
-@@ -252,6 +252,7 @@
-         try {
-             documentBuilderFactory = DocumentBuilderFactory.newInstance();
-             documentBuilderFactory.setNamespaceAware(true);
-+            documentBuilderFactory.setExpandEntityReferences(false);
-             documentBuilder = documentBuilderFactory.newDocumentBuilder();
-         } catch(ParserConfigurationException e) {
-             throw new ServletException
diff --git a/www-servers/tomcat/files/6/webdav.patch b/www-servers/tomcat/files/6/webdav.patch
deleted file mode 100644
index e82614ab6044..000000000000
--- a/www-servers/tomcat/files/6/webdav.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur apache-tomcat-6.0.14-src_orig/java/org/apache/catalina/servlets/WebdavServlet.java apache-tomcat-6.0.14-src/java/org/apache/catalina/servlets/WebdavServlet.java
---- apache-tomcat-6.0.14-src_orig/java/org/apache/catalina/servlets/WebdavServlet.java	2007-10-16 16:59:48.000000000 -0400
-+++ apache-tomcat-6.0.14-src/java/org/apache/catalina/servlets/WebdavServlet.java	2007-10-16 17:01:20.000000000 -0400
-@@ -242,6 +242,7 @@
-         try {
-             documentBuilderFactory = DocumentBuilderFactory.newInstance();
-             documentBuilderFactory.setNamespaceAware(true);
-+            documentBuilderFactory.setExpandEntityReferences(false);
-             documentBuilder = documentBuilderFactory.newDocumentBuilder();
-         } catch(ParserConfigurationException e) {
-             throw new ServletException
diff --git a/www-servers/tomcat/tomcat-5.5.25-r1.ebuild b/www-servers/tomcat/tomcat-5.5.25-r1.ebuild
deleted file mode 100644
index 8177d8e8d482..000000000000
--- a/www-servers/tomcat/tomcat-5.5.25-r1.ebuild
+++ /dev/null
@@ -1,331 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.25-r1.ebuild,v 1.4 2008/01/21 13:28:57 caster 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.3*
-	=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-2.0
-	>=dev-java/commons-pool-1.2
-	=dev-java/junit-3*
-	>=dev-java/log4j-1.2.9
-	>=dev-java/saxpath-1.0
-	~dev-java/tomcat-servlet-api-${PV}
-	dev-java/ant-core
-	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() {
-	java-pkg-2_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}"
-
-	epatch "${FILESDIR}/${SLOT}/webdav.patch"
-	epatch "${FILESDIR}/${SLOT}/main_tomcat_catalina_jasper_build_xml.patch"
-
-	use examples && epatch "${FILESDIR}/${SLOT}/jsr152_jsr154_examples_build_xml.patch"
-
-	# 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.3 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
-
-	eant ${antflags}
-}
-
-src_install() {
-	cd "${S}"/build/build
-
-	# init.d, conf.d
-	newinitd "${FILESDIR}"/${SLOT}/tomcat.init.2 ${TOMCAT_NAME}
-	newconfd "${FILESDIR}"/${SLOT}/tomcat.conf.2 ${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"
-
-	# replace catalina.policy with gentoo specific one bug #176701
-	cp "${FILESDIR}"/${SLOT}/catalina.policy "${D}"/etc/${TOMCAT_NAME} || die "failed to replace catalina.policy"
-
-	keepdir               ${WEBAPPS_DIR}
-	set_webapps_perms     "${D}"/${WEBAPPS_DIR}
-
-	# Copy over webapps, some controlled by use flags
-	cp -p ../RELEASE-NOTES webapps/ROOT/RELEASE-NOTES.txt
-	cp -pr webapps/ROOT "${D}"${CATALINA_BASE}/webapps
-	if use doc; then
-		cp -pr webapps/tomcat-docs "${D}"${CATALINA_BASE}/webapps
-	fi
-	if use examples; then
-		cp -pr webapps/{jsp-examples,servlets-examples,webdav} \
-			"${D}"${CATALINA_BASE}/webapps
-	fi
-
-	# symlink the directories to make CATALINA_BASE possible
-	dosym /etc/${TOMCAT_NAME} ${CATALINA_BASE}/conf
-	dosym /var/log/${TOMCAT_NAME} ${CATALINA_BASE}/logs
-	dosym /var/tmp/${TOMCAT_NAME} ${CATALINA_BASE}/temp
-	dosym /var/run/${TOMCAT_NAME} ${CATALINA_BASE}/work
-
-	dodoc  "${S}"/build/{RELEASE-NOTES,RUNNING.txt}
-	fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
-}
-
-pkg_postinst() {
-	#due to previous ebuild bloopers, make sure everything is correct
-	chown root:root /etc/init.d/${TOMCAT_NAME}
-	chown root:root /etc/conf.d/${TOMCAT_NAME}
-
-	elog
-	elog " This ebuild implements a new filesystem layout for tomcat"
-	elog " please read http://www.gentoo.org/proj/en/java/tomcat-guide.xml"
-	elog " for more information!."
-	elog
-	ewarn "naming-factory-dbcp.jar is not built at this time. Please fetch"
-	ewarn "jar from upstream binary if you need it. Gentoo Bug # 144276"
-	elog
-	ewarn "The manager webapps have known exploits, please refer to"
-	ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2450"
-	if use examples ; then
-		elog
-		ewarn "The examples webapp has a known exploit, please refer to"
-		ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2449"
-	fi
-	elog
-	elog " Please file any bugs at http://bugs.gentoo.org/ or else it"
-	elog " may not get seen.  Thank you."
-	elog
-}
-
-#helpers
-set_webapps_perms() {
-	chown  tomcat:tomcat ${1} || die "Failed to change owner off ${1}."
-	chmod  750           ${1} || die "Failed to change permissions off ${1}."
-}
-
-pkg_config() {
-	# Better suggestions are welcome
-	local currentdir="$(getent passwd tomcat | gawk -F':' '{ print $6 }')"
-
-	elog "The default home directory for Tomcat is /dev/null."
-	elog "You need to change it if your applications needs it to"
-	elog "be an actual directory. Current home directory:"
-	elog "${currentdir}"
-	elog ""
-	elog "Do you want to change it [yes/no]?"
-
-	local answer
-	read answer
-
-	if [[ "${answer}" == "yes" ]]; then
-		elog ""
-		elog "Suggestions:"
-		elog "${WEBAPPS_DIR}"
-		elog ""
-		elog "If you want to suggest a directory, file a bug to"
-		elog "http://bugs.gentoo.org"
-		elog ""
-		elog "Enter home directory:"
-
-		local homedir
-		read homedir
-
-		elog ""
-		elog "Setting home directory to: ${homedir}"
-
-		/usr/sbin/usermod -d"${homedir}" tomcat
-
-		elog "You can run emerge --config =${PF}"
-		elog "again to change to homedir"
-		elog "at any time."
-	fi
-}
diff --git a/www-servers/tomcat/tomcat-5.5.25.ebuild b/www-servers/tomcat/tomcat-5.5.25.ebuild
deleted file mode 100644
index e4f9a47005c8..000000000000
--- a/www-servers/tomcat/tomcat-5.5.25.ebuild
+++ /dev/null
@@ -1,330 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.25.ebuild,v 1.7 2008/01/21 13:28:57 caster 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.3*
-	=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-2.0
-	>=dev-java/commons-pool-1.2
-	=dev-java/junit-3*
-	>=dev-java/log4j-1.2.9
-	>=dev-java/saxpath-1.0
-	~dev-java/tomcat-servlet-api-${PV}
-	dev-java/ant-core
-	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() {
-	java-pkg-2_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}"
-
-	epatch "${FILESDIR}/${SLOT}/main_tomcat_catalina_jasper_build_xml.patch"
-
-	use examples && epatch "${FILESDIR}/${SLOT}/jsr152_jsr154_examples_build_xml.patch"
-
-	# 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.3 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
-
-	eant ${antflags}
-}
-
-src_install() {
-	cd "${S}"/build/build
-
-	# init.d, conf.d
-	newinitd "${FILESDIR}"/${SLOT}/tomcat.init.2 ${TOMCAT_NAME}
-	newconfd "${FILESDIR}"/${SLOT}/tomcat.conf.2 ${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"
-
-	# replace catalina.policy with gentoo specific one bug #176701
-	cp "${FILESDIR}"/${SLOT}/catalina.policy "${D}"/etc/${TOMCAT_NAME} || die "failed to replace catalina.policy"
-
-	keepdir               ${WEBAPPS_DIR}
-	set_webapps_perms     "${D}"/${WEBAPPS_DIR}
-
-	# Copy over webapps, some controlled by use flags
-	cp -p ../RELEASE-NOTES webapps/ROOT/RELEASE-NOTES.txt
-	cp -pr webapps/ROOT "${D}"${CATALINA_BASE}/webapps
-	if use doc; then
-		cp -pr webapps/tomcat-docs "${D}"${CATALINA_BASE}/webapps
-	fi
-	if use examples; then
-		cp -pr webapps/{jsp-examples,servlets-examples,webdav} \
-			"${D}"${CATALINA_BASE}/webapps
-	fi
-
-	# symlink the directories to make CATALINA_BASE possible
-	dosym /etc/${TOMCAT_NAME} ${CATALINA_BASE}/conf
-	dosym /var/log/${TOMCAT_NAME} ${CATALINA_BASE}/logs
-	dosym /var/tmp/${TOMCAT_NAME} ${CATALINA_BASE}/temp
-	dosym /var/run/${TOMCAT_NAME} ${CATALINA_BASE}/work
-
-	dodoc  "${S}"/build/{RELEASE-NOTES,RUNNING.txt}
-	fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
-}
-
-pkg_postinst() {
-	#due to previous ebuild bloopers, make sure everything is correct
-	chown root:root /etc/init.d/${TOMCAT_NAME}
-	chown root:root /etc/conf.d/${TOMCAT_NAME}
-
-	elog
-	elog " This ebuild implements a new filesystem layout for tomcat"
-	elog " please read http://www.gentoo.org/proj/en/java/tomcat-guide.xml"
-	elog " for more information!."
-	elog
-	ewarn "naming-factory-dbcp.jar is not built at this time. Please fetch"
-	ewarn "jar from upstream binary if you need it. Gentoo Bug # 144276"
-	elog
-	ewarn "The manager webapps have known exploits, please refer to"
-	ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2450"
-	if use examples ; then
-		elog
-		ewarn "The examples webapp has a known exploit, please refer to"
-		ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2449"
-	fi
-	elog
-	elog " Please file any bugs at http://bugs.gentoo.org/ or else it"
-	elog " may not get seen.  Thank you."
-	elog
-}
-
-#helpers
-set_webapps_perms() {
-	chown  tomcat:tomcat ${1} || die "Failed to change owner off ${1}."
-	chmod  750           ${1} || die "Failed to change permissions off ${1}."
-}
-
-pkg_config() {
-	# Better suggestions are welcome
-	local currentdir="$(getent passwd tomcat | gawk -F':' '{ print $6 }')"
-
-	elog "The default home directory for Tomcat is /dev/null."
-	elog "You need to change it if your applications needs it to"
-	elog "be an actual directory. Current home directory:"
-	elog "${currentdir}"
-	elog ""
-	elog "Do you want to change it [yes/no]?"
-
-	local answer
-	read answer
-
-	if [[ "${answer}" == "yes" ]]; then
-		elog ""
-		elog "Suggestions:"
-		elog "${WEBAPPS_DIR}"
-		elog ""
-		elog "If you want to suggest a directory, file a bug to"
-		elog "http://bugs.gentoo.org"
-		elog ""
-		elog "Enter home directory:"
-
-		local homedir
-		read homedir
-
-		elog ""
-		elog "Setting home directory to: ${homedir}"
-
-		/usr/sbin/usermod -d"${homedir}" tomcat
-
-		elog "You can run emerge --config =${PF}"
-		elog "again to change to homedir"
-		elog "at any time."
-	fi
-}
diff --git a/www-servers/tomcat/tomcat-5.5.26.ebuild b/www-servers/tomcat/tomcat-5.5.26.ebuild
index 04181083912a..1959cb50781a 100644
--- a/www-servers/tomcat/tomcat-5.5.26.ebuild
+++ b/www-servers/tomcat/tomcat-5.5.26.ebuild
@@ -1,7 +1,9 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.26.ebuild,v 1.3 2008/03/17 22:35:33 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.26.ebuild,v 1.4 2008/05/13 02:06:49 wltjr Exp $
 
+EAPI=1
+JAVA_PKG_IUSE="doc source"
 WANT_ANT_TASKS="ant-trax"
 
 inherit eutils java-pkg-2 java-ant-2
@@ -15,16 +17,17 @@ HOMEPAGE="http://tomcat.apache.org/"
 KEYWORDS="amd64 -ppc -ppc64 x86 ~x86-fbsd"
 LICENSE="Apache-2.0"
 
-IUSE="admin java5 doc examples source test"
+IUSE="admin java5 examples test"
 
-RDEPEND="=dev-java/eclipse-ecj-3.3*
-	=dev-java/commons-beanutils-1.7*
+RDEPEND="dev-java/eclipse-ecj:3.3
+	dev-java/ant-eclipse-ecj:3.3
+	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-httpclient:0
 	>=dev-java/commons-io-1.1
 	>=dev-java/commons-el-1.0
 	>=dev-java/commons-launcher-0.9
@@ -36,15 +39,15 @@ RDEPEND="=dev-java/eclipse-ecj-3.3*
 	>=dev-java/saxpath-1.0
 	~dev-java/tomcat-servlet-api-${PV}
 	dev-java/ant-core
-	admin? ( =dev-java/struts-1.2* )
+	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*
+		dev-java/mx4j-core:3.0
+		dev-java/xerces:2
+	   	dev-java/xml-commons-external:1.3
 	   )"
 DEPEND="java5? ( >=virtual/jdk-1.5 )
 	!java5? ( =virtual/jdk-1.4* )
diff --git a/www-servers/tomcat/tomcat-6.0.14-r1.ebuild b/www-servers/tomcat/tomcat-6.0.14-r1.ebuild
deleted file mode 100644
index 8bb8c46f2476..000000000000
--- a/www-servers/tomcat/tomcat-6.0.14-r1.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.14-r1.ebuild,v 1.6 2008/01/10 23:08:12 caster Exp $
-
-WANT_ANT_TASKS="ant-trax"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Tomcat Servlet-2.5/JSP-2.1 Container"
-
-MY_P="apache-${P}-src"
-SLOT="6"
-SRC_URI="mirror://apache/${PN}/${PN}-6/v${PV/_/-}/src/${MY_P}.tar.gz"
-HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-LICENSE="Apache-2.0"
-
-IUSE="doc examples source test"
-
-COMMON_DEPEND="=dev-java/eclipse-ecj-3.2*
-	>=dev-java/commons-daemon-1.0.1
-	>=dev-java/commons-dbcp-1.2.1
-	>=dev-java/commons-logging-1.1
-	>=dev-java/commons-pool-1.2
-	~dev-java/tomcat-servlet-api-${PV}
-	examples? ( dev-java/jakarta-jstl )"
-
-RDEPEND=">=virtual/jre-1.5
-	dev-java/ant-core
-	${COMMON_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.5
-	${COMMON_DEPEND}
-	test? ( =dev-java/junit-3.8* )"
-
-S=${WORKDIR}/${MY_P}
-
-TOMCAT_NAME="${PN}-${SLOT}"
-TOMCAT_HOME="/usr/share/${TOMCAT_NAME}"
-WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	enewgroup tomcat 265
-	enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${SLOT}/webdav.patch"
-	epatch "${FILESDIR}/${SLOT}/build-xml.patch"
-
-	cd webapps/examples/WEB-INF/lib/
-	rm -v *.jar
-}
-
-src_compile(){
-	# Fix for bug # 178980
-	if use amd64 && [[ "${GENTOO_VM}" = "sun-jdk-1.5" ]] ; then
-	        java-pkg_force-compiler ecj-3.2
-	fi
-
-	local antflags="build-jasper-jdt deploy -Dbase.path=${T}"
-	antflags="${antflags} -Dcompile.debug=false"
-	if ! use doc; then
-		antflags="${antflags} -Dnobuild.docs=true"
-	fi
-	antflags="${antflags} -Dant.jar=$(java-pkg_getjar ant-core ant.jar)"
-	antflags="${antflags} -Dcommons-daemon.jar=$(java-pkg_getjar commons-daemon commons-daemon.jar)"
-	antflags="${antflags} -Djdt.jar=$(java-pkg_getjar eclipse-ecj-3.2 ecj.jar)"
-	antflags="${antflags} -Djsp-api.jar=$(java-pkg_getjar tomcat-servlet-api-2.5 jsp-api.jar)"
-	antflags="${antflags} -Dservlet-api.jar=$(java-pkg_getjar tomcat-servlet-api-2.5 servlet-api.jar)"
-	eant ${antflags}
-}
-
-src_install() {
-	cd "${S}/output/build/bin"
-	rm -f *.bat commons-daemon.jar
-	java-pkg_jar-from commons-daemon
-	chmod 755 *.sh
-
-	# register jars per bug #171496
-	cd "${S}/output/build/lib/"
-	for jar in *.jar; do
-		java-pkg_dojar ${jar}
-	done
-
-	local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/
-
-	# init.d, conf.d
-	newinitd "${FILESDIR}"/${SLOT}/tomcat.init ${TOMCAT_NAME}
-	newconfd "${FILESDIR}"/${SLOT}/tomcat.conf ${TOMCAT_NAME}
-
-	# create dir structure
-	dodir /usr/share/${TOMCAT_NAME}
-
-	diropts -m750 -o tomcat -g tomcat
-	dodir   /etc/${TOMCAT_NAME}
-	keepdir ${WEBAPPS_DIR}
-
-	diropts -m755 -o tomcat -g tomcat
-	dodir   ${CATALINA_BASE}
-
-	diropts -m775 -o tomcat -g tomcat
-	dodir   /etc/${TOMCAT_NAME}/Catalina/localhost
-	keepdir /var/log/${TOMCAT_NAME}/
-	keepdir /var/run/${TOMCAT_NAME}/
-	keepdir /var/tmp/${TOMCAT_NAME}/
-
-	cd "${S}"
-	# fix context's so webapps will be deployed
-	sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/host-manager"  a:' "${S}"/webapps/host-manager/META-INF/context.xml
-	sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/manager"  a:' "${S}"/webapps/manager/META-INF/context.xml
-
-	# 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.xml
-
-	# copy over the directories
-	chown -R tomcat:tomcat webapps/* conf/*
-	cp -pR conf/* "${D}"/etc/${TOMCAT_NAME} || die "failed to copy conf"
-	cp -pPR output/build/bin "${D}"/usr/share/${TOMCAT_NAME} \
-		|| die "failed to copy"
-
-	# replace catalina.policy with gentoo specific one bug #176701
-#	cp ${FILESDIR}/${SLOT}/catalina.policy "${D}"/etc/${TOMCAT_NAME} \
-#		|| die "failed to replace catalina.policy"
-
-	cp "${T}"/tomcat6-deps/jdt/jasper-jdt.jar "${D}"/usr/share/${TOMCAT_NAME}/lib \
-		|| die "failed to copy"
-
-	cd "${D}/usr/share/${TOMCAT_NAME}/lib"
-	java-pkg_jar-from tomcat-servlet-api-2.5
-
-	cd "${S}"
-
-	# 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
-
-	diropts -m755 -o tomcat -g tomcat
-	dodir ${TOMCAT_HOME}/webapps
-	cp -pr webapps/host-manager "${D}"${TOMCAT_HOME}/webapps
-	cp -pr webapps/manager "${D}"${TOMCAT_HOME}/webapps
-
-	if use doc; then
-		cp -pr output/build/webapps/docs "${D}"${CATALINA_BASE}/webapps
-	fi
-	if use examples; then
-		cd output/build/webapps/examples/WEB-INF/lib
-		java-pkg_jar-from jakarta-jstl jstl.jar
-		java-pkg_jar-from jakarta-jstl standard.jar
-		cd "${S}"
-		cp -pPr output/build/webapps/examples "${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
-
-	# link the manager's context to the right position
-	dosym ${TOMCAT_HOME}/webapps/host-manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/host-manager.xml
-	dosym ${TOMCAT_HOME}/webapps/manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/manager.xml
-
-	dodoc  "${S}"/{RELEASE-NOTES,RUNNING.txt}
-	fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
-}
-
-pkg_postinst() {
-	ewarn "Changing ownership recursively on /etc/${TOMCAT_NAME}"
-	# temp fix for bug #176097
-	chown -fR tomcat:tomcat /etc/${TOMCAT_NAME}
-	ewarn "Owner ship changed to tomcat:tomcat. Temp hack/fix."
-
-	elog
-	elog " This ebuild implements a FHS compliant layout for tomcat"
-	elog " Please read http://www.gentoo.org/proj/en/java/tomcat6-guide.xml"
-	elog " for more information."
-	elog
-	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
-	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-	elog
-	ewarn "The manager webapps have known exploits, please refer to"
-	ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2450"
-	if use examples ; then
-		elog
-		ewarn "The examples webapp has a known exploit, please refer to"
-		ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2449"
-	fi
-	elog
-	elog " Please report any bugs to http://bugs.gentoo.org/"
-	elog
-}
diff --git a/www-servers/tomcat/tomcat-6.0.14.ebuild b/www-servers/tomcat/tomcat-6.0.14.ebuild
deleted file mode 100644
index cb252459fd25..000000000000
--- a/www-servers/tomcat/tomcat-6.0.14.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.14.ebuild,v 1.7 2008/01/10 23:08:12 caster Exp $
-
-WANT_ANT_TASKS="ant-trax"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Tomcat Servlet-2.5/JSP-2.1 Container"
-
-MY_P="apache-${P}-src"
-SLOT="6"
-SRC_URI="mirror://apache/${PN}/${PN}-6/v${PV/_/-}/src/${MY_P}.tar.gz"
-HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-LICENSE="Apache-2.0"
-
-IUSE="doc examples source test"
-
-COMMON_DEPEND="=dev-java/eclipse-ecj-3.2*
-	>=dev-java/commons-daemon-1.0.1
-	>=dev-java/commons-dbcp-1.2.1
-	>=dev-java/commons-logging-1.1
-	>=dev-java/commons-pool-1.2
-	~dev-java/tomcat-servlet-api-${PV}
-	examples? ( dev-java/jakarta-jstl )"
-
-RDEPEND=">=virtual/jre-1.5
-	dev-java/ant-core
-	${COMMON_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.5
-	${COMMON_DEPEND}
-	test? ( =dev-java/junit-3.8* )"
-
-S=${WORKDIR}/${MY_P}
-
-TOMCAT_NAME="${PN}-${SLOT}"
-TOMCAT_HOME="/usr/share/${TOMCAT_NAME}"
-WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	enewgroup tomcat 265
-	enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${SLOT}/build-xml.patch"
-
-	cd webapps/examples/WEB-INF/lib/
-	rm -v *.jar
-}
-
-src_compile(){
-	# Fix for bug # 178980
-	if use amd64 && [[ "${GENTOO_VM}" = "sun-jdk-1.5" ]] ; then
-	        java-pkg_force-compiler ecj-3.2
-	fi
-
-	local antflags="build-jasper-jdt deploy -Dbase.path=${T}"
-	antflags="${antflags} -Dcompile.debug=false"
-	if ! use doc; then
-		antflags="${antflags} -Dnobuild.docs=true"
-	fi
-	antflags="${antflags} -Dant.jar=$(java-pkg_getjar ant-core ant.jar)"
-	antflags="${antflags} -Dcommons-daemon.jar=$(java-pkg_getjar commons-daemon commons-daemon.jar)"
-	antflags="${antflags} -Djdt.jar=$(java-pkg_getjar eclipse-ecj-3.2 ecj.jar)"
-	antflags="${antflags} -Djsp-api.jar=$(java-pkg_getjar tomcat-servlet-api-2.5 jsp-api.jar)"
-	antflags="${antflags} -Dservlet-api.jar=$(java-pkg_getjar tomcat-servlet-api-2.5 servlet-api.jar)"
-	eant ${antflags}
-}
-
-src_install() {
-	cd "${S}/output/build/bin"
-	rm -f *.bat commons-daemon.jar
-	java-pkg_jar-from commons-daemon
-	chmod 755 *.sh
-
-	# register jars per bug #171496
-	cd "${S}/output/build/lib/"
-	for jar in *.jar; do
-		java-pkg_dojar ${jar}
-	done
-
-	local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/
-
-	# init.d, conf.d
-	newinitd "${FILESDIR}"/${SLOT}/tomcat.init ${TOMCAT_NAME}
-	newconfd "${FILESDIR}"/${SLOT}/tomcat.conf ${TOMCAT_NAME}
-
-	# create dir structure
-	dodir /usr/share/${TOMCAT_NAME}
-
-	diropts -m750 -o tomcat -g tomcat
-	dodir   /etc/${TOMCAT_NAME}
-	keepdir ${WEBAPPS_DIR}
-
-	diropts -m755 -o tomcat -g tomcat
-	dodir   ${CATALINA_BASE}
-
-	diropts -m775 -o tomcat -g tomcat
-	dodir   /etc/${TOMCAT_NAME}/Catalina/localhost
-	keepdir /var/log/${TOMCAT_NAME}/
-	keepdir /var/run/${TOMCAT_NAME}/
-	keepdir /var/tmp/${TOMCAT_NAME}/
-
-	cd "${S}"
-	# fix context's so webapps will be deployed
-	sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/host-manager"  a:' "${S}"/webapps/host-manager/META-INF/context.xml
-	sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/manager"  a:' "${S}"/webapps/manager/META-INF/context.xml
-
-	# 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.xml
-
-	# copy over the directories
-	chown -R tomcat:tomcat webapps/* conf/*
-	cp -pR conf/* "${D}"/etc/${TOMCAT_NAME} || die "failed to copy conf"
-	cp -pPR output/build/bin "${D}"/usr/share/${TOMCAT_NAME} \
-		|| die "failed to copy"
-
-	# replace catalina.policy with gentoo specific one bug #176701
-#	cp ${FILESDIR}/${SLOT}/catalina.policy "${D}"/etc/${TOMCAT_NAME} \
-#		|| die "failed to replace catalina.policy"
-
-	cp "${T}"/tomcat6-deps/jdt/jasper-jdt.jar "${D}"/usr/share/${TOMCAT_NAME}/lib \
-		|| die "failed to copy"
-
-	cd "${D}/usr/share/${TOMCAT_NAME}/lib"
-	java-pkg_jar-from tomcat-servlet-api-2.5
-
-	cd "${S}"
-
-	# 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
-
-	diropts -m755 -o tomcat -g tomcat
-	dodir ${TOMCAT_HOME}/webapps
-	cp -pr webapps/host-manager "${D}"${TOMCAT_HOME}/webapps
-	cp -pr webapps/manager "${D}"${TOMCAT_HOME}/webapps
-
-	if use doc; then
-		cp -pr output/build/webapps/docs "${D}"${CATALINA_BASE}/webapps
-	fi
-	if use examples; then
-		cd output/build/webapps/examples/WEB-INF/lib
-		java-pkg_jar-from jakarta-jstl jstl.jar
-		java-pkg_jar-from jakarta-jstl standard.jar
-		cd "${S}"
-		cp -pPr output/build/webapps/examples "${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
-
-	# link the manager's context to the right position
-	dosym ${TOMCAT_HOME}/webapps/host-manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/host-manager.xml
-	dosym ${TOMCAT_HOME}/webapps/manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/manager.xml
-
-	dodoc  "${S}"/{RELEASE-NOTES,RUNNING.txt}
-	fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
-}
-
-pkg_postinst() {
-	ewarn "Changing ownership recursively on /etc/${TOMCAT_NAME}"
-	# temp fix for bug #176097
-	chown -fR tomcat:tomcat /etc/${TOMCAT_NAME}
-	ewarn "Owner ship changed to tomcat:tomcat. Temp hack/fix."
-
-	elog
-	elog " This ebuild implements a FHS compliant layout for tomcat"
-	elog " Please read http://www.gentoo.org/proj/en/java/tomcat6-guide.xml"
-	elog " for more information."
-	elog
-	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
-	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-	elog
-	ewarn "The manager webapps have known exploits, please refer to"
-	ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2450"
-	if use examples ; then
-		elog
-		ewarn "The examples webapp has a known exploit, please refer to"
-		ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2449"
-	fi
-	elog
-	elog " Please report any bugs to http://bugs.gentoo.org/"
-	elog
-}
diff --git a/www-servers/tomcat/tomcat-6.0.16.ebuild b/www-servers/tomcat/tomcat-6.0.16.ebuild
index 5801c4c2e82f..6569c481d343 100644
--- a/www-servers/tomcat/tomcat-6.0.16.ebuild
+++ b/www-servers/tomcat/tomcat-6.0.16.ebuild
@@ -1,7 +1,9 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.16.ebuild,v 1.5 2008/03/17 22:35:33 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.16.ebuild,v 1.6 2008/05/13 02:06:49 wltjr Exp $
 
+EAPI=1
+JAVA_PKG_IUSE="doc source"
 WANT_ANT_TASKS="ant-trax"
 
 inherit eutils java-pkg-2 java-ant-2
@@ -15,9 +17,10 @@ HOMEPAGE="http://tomcat.apache.org/"
 KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
 LICENSE="Apache-2.0"
 
-IUSE="doc examples source test"
+IUSE="examples test"
 
-COMMON_DEPEND="=dev-java/eclipse-ecj-3.3*
+COMMON_DEPEND="dev-java/eclipse-ecj:3.3
+	dev-java/ant-eclipse-ecj:3.3
 	>=dev-java/commons-daemon-1.0.1
 	>=dev-java/commons-dbcp-1.2.1
 	>=dev-java/commons-logging-1.1