Created new patch re-writing some existing and adding a few new, ant targets for admin/example webapps. Should resolve bug #150715

(Portage version: 2.1.2_pre3-r2)
 (Unsigned Manifest commit)

4 files changed, 15 insertions, 225 deletions

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 9f3f5b467238..39e98181e8f7 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -130,26 +130,14 @@ AUX 5.5.20/tomcat.conf 2689 RMD160 476e33ffd9e99215fea1d44cd2bd978ea31d2c69 SHA1
 MD5 8b018a037f70ee95ea823e42356aaeb5 files/5.5.20/tomcat.conf 2689
 RMD160 476e33ffd9e99215fea1d44cd2bd978ea31d2c69 files/5.5.20/tomcat.conf 2689
 SHA256 286400591a4a0b80be72267c016c0b14a2878ba502a6ce2c384b49f4d51bd677 files/5.5.20/tomcat.conf 2689
-AUX 5.5.20/tomcat.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 47945971232d8037e3b8355a5bf527daae69cacb SHA1 b9cd6cd0ac6c619abb32cc138f88cea53ed42710 SHA256 9e0e39397d6beb4b1e7a5e76dfa1f56985951fa2ee0c8efbbc4bcba0d0557eab
 MD5 a34f6d05b67c28654cfe09cae579364b files/5.5.20/tomcat.init 3163
 RMD160 47945971232d8037e3b8355a5bf527daae69cacb files/5.5.20/tomcat.init 3163
 SHA256 9e0e39397d6beb4b1e7a5e76dfa1f56985951fa2ee0c8efbbc4bcba0d0557eab 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 4976 RMD160 6acb607da6859c90515a63026f75ab2b45f0d5c1 SHA1 3f6fda75dbb7342e9bbcff1bbc45df119a039803 SHA256 61b5d509e8e9956072769346cc65d8e41ac16f8e36a83495249be505d3b610ba
-MD5 4d23fa5f0c0183d7c719ee8167a6895e files/5.5.20/tomcatbuild-xml.patch 4976
-RMD160 6acb607da6859c90515a63026f75ab2b45f0d5c1 files/5.5.20/tomcatbuild-xml.patch 4976
-SHA256 61b5d509e8e9956072769346cc65d8e41ac16f8e36a83495249be505d3b610ba files/5.5.20/tomcatbuild-xml.patch 4976
+AUX 5.5.20/tomcatbuild-xml.patch 12470 RMD160 e936baf49d5f1a34b5b3c5787d62fb5a06ea52a2 SHA1 4857962223dc50dbb43e9e362e53f114723ff4d6 SHA256 d76b0dcc3a6d8d60c0305d74ef980e5461bbcaef1059a306e38e5d358c2a01a4
+MD5 83d2b72b5c1c52e80492ee5199eb3625 files/5.5.20/tomcatbuild-xml.patch 12470
+RMD160 e936baf49d5f1a34b5b3c5787d62fb5a06ea52a2 files/5.5.20/tomcatbuild-xml.patch 12470
+SHA256 d76b0dcc3a6d8d60c0305d74ef980e5461bbcaef1059a306e38e5d358c2a01a4 files/5.5.20/tomcatbuild-xml.patch 12470
 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
@@ -170,14 +158,18 @@ EBUILD tomcat-5.5.20-r1.ebuild 10160 RMD160 6bb48ece42420fcb236e1996b6756365bdb2
 MD5 b274087a9eeb3bb8b2cce756acfca69e tomcat-5.5.20-r1.ebuild 10160
 RMD160 6bb48ece42420fcb236e1996b6756365bdb21b5c tomcat-5.5.20-r1.ebuild 10160
 SHA256 9fdafe2f1873958ede8e308256649ab8cbef92159920a2a401e74f321afc75f1 tomcat-5.5.20-r1.ebuild 10160
+EBUILD tomcat-5.5.20-r2.ebuild 10264 RMD160 6a7b4a9b495dc71e7d216fb54af6fa7204574703 SHA1 4443cff06390da192908737e3b953238fee8e05f SHA256 1bbeb2ea99353f0a6bd7818941357aaeebabbb0babcc9c50039c99415fd172d7
+MD5 195baad02512fb034063e9bc54cea23c tomcat-5.5.20-r2.ebuild 10264
+RMD160 6a7b4a9b495dc71e7d216fb54af6fa7204574703 tomcat-5.5.20-r2.ebuild 10264
+SHA256 1bbeb2ea99353f0a6bd7818941357aaeebabbb0babcc9c50039c99415fd172d7 tomcat-5.5.20-r2.ebuild 10264
 EBUILD tomcat-5.5.20.ebuild 10159 RMD160 ccb63bc3de9f6885378d0b460f54e900f36ba65e SHA1 5e42b03c4d37167c6baa0131908c220fc3ef5f2f SHA256 226a19b4d1357ef1e94afaac92cee0b551459357ff4513169b18940ea93ff760
 MD5 ece22bdbe2b716ccc17046c2babd6e66 tomcat-5.5.20.ebuild 10159
 RMD160 ccb63bc3de9f6885378d0b460f54e900f36ba65e tomcat-5.5.20.ebuild 10159
 SHA256 226a19b4d1357ef1e94afaac92cee0b551459357ff4513169b18940ea93ff760 tomcat-5.5.20.ebuild 10159
-MISC ChangeLog 25370 RMD160 2f4b520713658f9d70aceabed4ef72f684b002ff SHA1 c89c23f7e806b516247b4054a54b0783a1d0bfeb SHA256 e3c5f686947ade604041dfdfd345e0d85f80c8fc97c4b1a593e33ea03811d71b
-MD5 065e9e1f3a0ad317d28d0c8e27cd4a2a ChangeLog 25370
-RMD160 2f4b520713658f9d70aceabed4ef72f684b002ff ChangeLog 25370
-SHA256 e3c5f686947ade604041dfdfd345e0d85f80c8fc97c4b1a593e33ea03811d71b ChangeLog 25370
+MISC ChangeLog 25777 RMD160 404e022be71c734cbd15ab67d5f2a4258ef025a6 SHA1 9a8931bb3adb0df1a27d9fb177a89d2f7aa8ea96 SHA256 64aaab03d24787f25dddf2fd5f3b42ecedab7f04c9bfacb8bb40d0312cc4ac66
+MD5 68ba8a1b12cd29fdfa8f2c68cf2bd2bd ChangeLog 25777
+RMD160 404e022be71c734cbd15ab67d5f2a4258ef025a6 ChangeLog 25777
+SHA256 64aaab03d24787f25dddf2fd5f3b42ecedab7f04c9bfacb8bb40d0312cc4ac66 ChangeLog 25777
 MISC metadata.xml 558 RMD160 f81f3d20ca526007bbd8f0f88deffb7a097334ea SHA1 6ab9eadb2a8f19b0d4ea1f02ba88315d49e61fb1 SHA256 d5b4cdcd581677edce5b62c586d618f4c95660127fcb2fb7157f83e6d0e35fce
 MD5 e26537a19167254676bb36654dc01f91 metadata.xml 558
 RMD160 f81f3d20ca526007bbd8f0f88deffb7a097334ea metadata.xml 558
@@ -197,3 +189,6 @@ SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/di
 MD5 8adc14a8534e1c6f8d5f96b371e1895f files/digest-tomcat-5.5.20-r1 277
 RMD160 b9c5deac84bf5acd7a65ad80bdfaca9f7e343f3f files/digest-tomcat-5.5.20-r1 277
 SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/digest-tomcat-5.5.20-r1 277
+MD5 8adc14a8534e1c6f8d5f96b371e1895f files/digest-tomcat-5.5.20-r2 277
+RMD160 b9c5deac84bf5acd7a65ad80bdfaca9f7e343f3f files/digest-tomcat-5.5.20-r2 277
+SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/digest-tomcat-5.5.20-r2 277
diff --git a/www-servers/tomcat/files/5.5.20/tomcat.env b/www-servers/tomcat/files/5.5.20/tomcat.env
deleted file mode 100644
index 8afb01ff1d8e..000000000000
--- a/www-servers/tomcat/files/5.5.20/tomcat.env
+++ /dev/null
@@ -1 +0,0 @@
-CATALINA_HOME=/usr/share/tomcat-5.5
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
deleted file mode 100644
index 513eeefe5d34..000000000000
--- a/www-servers/tomcat/files/5.5.20/tomcatbuild-xml-docs.patch
+++ /dev/null
@@ -1,120 +0,0 @@
---- 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
deleted file mode 100644
index c2cae9e208b8..000000000000
--- a/www-servers/tomcat/files/5.5.20/tomcatbuild-xml-examples.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- 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}"