commit:     89207d1358e4fd2c23c25adbe4dc1d16d2bcffaf
Author:     Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
AuthorDate: Sun Apr  8 19:12:30 2018 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Apr  8 20:15:00 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89207d13

www-servers/tomcat: clean duplicate patches

Also cleaned up the patches to be -p1 applicable where doable for the
eventual epatch->eapply change.

Package-Manager: Portage-2.3.28, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/7888

 .../tomcat/files/tomcat-7.0.82-build.xml.patch     |   5 +-
 .../tomcat/files/tomcat-7.0.84-build.xml.patch     |   2 -
 .../tomcat/files/tomcat-7.0.85-build.xml.patch     | 161 -------------
 .../tomcat/files/tomcat-8.0.48-build.xml.patch     |   6 +-
 .../tomcat/files/tomcat-8.0.49-build.xml.patch     |   2 -
 .../tomcat/files/tomcat-8.0.50-build.xml.patch     | 267 ---------------------
 .../tomcat/files/tomcat-8.5.24-build.xml.patch     |   6 +-
 .../tomcat/files/tomcat-8.5.27-build.xml.patch     |   2 -
 .../tomcat/files/tomcat-8.5.28-build.xml.patch     | 258 --------------------
 .../tomcat/files/tomcat-9.0.4-build.xml.patch      |   2 -
 .../tomcat/files/tomcat-9.0.5-build.xml.patch      | 258 --------------------
 www-servers/tomcat/tomcat-7.0.84.ebuild            |   2 +-
 www-servers/tomcat/tomcat-7.0.85.ebuild            |   2 +-
 www-servers/tomcat/tomcat-8.0.49.ebuild            |   2 +-
 www-servers/tomcat/tomcat-8.0.50.ebuild            |   2 +-
 www-servers/tomcat/tomcat-8.5.27.ebuild            |   2 +-
 www-servers/tomcat/tomcat-8.5.28.ebuild            |   2 +-
 www-servers/tomcat/tomcat-9.0.4.ebuild             |   2 +-
 www-servers/tomcat/tomcat-9.0.5.ebuild             |   2 +-
 19 files changed, 14 insertions(+), 971 deletions(-)

diff --git a/www-servers/tomcat/files/tomcat-7.0.82-build.xml.patch 
b/www-servers/tomcat/files/tomcat-7.0.82-build.xml.patch
index 481591fb6ff..fa05cb73305 100644
--- a/www-servers/tomcat/files/tomcat-7.0.82-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-7.0.82-build.xml.patch
@@ -1,6 +1,5 @@
-diff -Naur apache-tomcat-7.0.63-src.orig/build.xml 
apache-tomcat-7.0.63-src/build.xml
---- apache-tomcat-7.0.63-src.orig/build.xml    2015-06-30 09:15:44.000000000 
+0100
-+++ apache-tomcat-7.0.63-src/build.xml 2015-08-22 21:13:12.453038827 +0100
+--- a/build.xml
++++ b/build.xml
 @@ -660,12 +660,14 @@
        </fileset>
      </copy>

diff --git a/www-servers/tomcat/files/tomcat-7.0.84-build.xml.patch 
b/www-servers/tomcat/files/tomcat-7.0.84-build.xml.patch
index aa40bd1564a..743320010c9 100644
--- a/www-servers/tomcat/files/tomcat-7.0.84-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-7.0.84-build.xml.patch
@@ -1,5 +1,3 @@
-diff --git a/build.xml b/build.xml
-index 3f1229c..13894ed 100644
 --- a/build.xml
 +++ b/build.xml
 @@ -671,12 +671,14 @@

diff --git a/www-servers/tomcat/files/tomcat-7.0.85-build.xml.patch 
b/www-servers/tomcat/files/tomcat-7.0.85-build.xml.patch
deleted file mode 100644
index aa40bd1564a..00000000000
--- a/www-servers/tomcat/files/tomcat-7.0.85-build.xml.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 3f1229c..13894ed 100644
---- a/build.xml
-+++ b/build.xml
-@@ -671,12 +671,14 @@
-       </fileset>
-     </copy>
-     <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
-+<!--
-     <copy todir="${tomcat.classes}/javax/servlet/resources" 
encoding="ISO-8859-1">
-       <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
-         <include name="*" />
-         <exclude name="jspxml*" />
-       </fileset>
-     </copy>
-+-->
- 
-   </target>
- 
-@@ -733,26 +735,32 @@
-       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
- 
-     <!-- Servlet 3.0 Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${servlet-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.servlet-api"
-       manifest="${tomcat.manifests}/servlet-api.jar.manifest"
-       notice="${tomcat.manifests}/servlet-api.jar.notice"
-       license="${tomcat.manifests}/servlet-api.jar.license" />
-+-->
- 
-     <!-- JSP 2.2 Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${jsp-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.jsp-api"
-       manifest="${tomcat.manifests}/jsp-api.jar.manifest"
-       notice="${tomcat.manifests}/jsp-api.jar.notice"
-       license="${tomcat.manifests}/jsp-api.jar.license" />
-+-->
- 
-     <!-- JSP 2.2 EL Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${el-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.el-api"
-       manifest="${tomcat.manifests}/el-api.jar.manifest" />
-+-->
- 
-     <!-- Bootstrap JAR File -->
-     <jarIt jarfile="${bootstrap.jar}"
-@@ -999,9 +1007,9 @@
- 
-   <target name="deploy" depends="package,build-docs,compile-webapp-examples"
-           description="Default. Builds a working Tomcat instance">
--
-+<!--
-     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" 
file="${commons-daemon.jar}" />
--
-+-->
-     <!-- Copy scripts -->
-     <copy todir="${tomcat.build}/bin">
-       <fileset dir="bin">
-@@ -1060,14 +1068,15 @@
-         <exclude name="${jdt.jar.filename}"/>
-       </fileset>
-     </delete>
-+<!--
-     <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
--
-+-->
-     <!-- Add sources for examples -->
-     <antcall target="examples-sources" />
--
-+<!--
-     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
-       failonerror="false"/>
--
-+-->
-     <!-- build the jdbc-pool jar and source jar-->
-     <echo message="Building Tomcat JDBC pool libraries"/>
-     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1697,7 +1706,7 @@
- 
-   <target name="extras-webservices-prepare"
-           depends="extras-prepare"
--          description="Prepare to build web services extras package">
-+          description="Prepare to build web services extras package" 
unless="noget">
- 
-     <antcall target="downloadfile">
-       <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1886,11 +1895,12 @@
-     </copy>
- 
-     <!-- Source bundles for native components -->
-+<!--
-     <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
-             file="${tomcat-native.tar.gz}" />
-     <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
-             file="${commons-daemon.native.src.tgz}" />
--
-+-->
-     <!-- platform README files -->
-     <echo append="false" file="${tomcat.dist}/bin/x64/README">
- Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-@@ -1902,6 +1912,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
-     description="Create the Tomcat javadoc" >
-     <fail unless="java.7.home"
-           message="The java.7.home property must be set for javadoc build"/>
-+<!--
-     <javadoc packagenames="javax.servlet.*"
-       excludepackagenames="javax.servlet.jsp.*"
-       sourcepath="${tomcat.dist}/src/java"
-@@ -1966,6 +1977,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
-         <path location="${ant.core.lib}"/>
-       </classpath>
-     </javadoc>
-+-->
-     <javadoc packagenames="javax.websocket.*"
-       sourcepath="${tomcat.dist}/src/java"
-       destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -2006,9 +2018,11 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
-         <path refid="tomcat.webservices.classpath"/>
-         <path location="${ant.core.lib}"/>
-       </classpath>
-+<!--
-       <link href="../servletapi"/>
-       <link href="../jspapi"/>
-       <link href="../elapi"/>
-+-->
-       <link href="../websocketapi"/>
-       <link href="http://docs.oracle.com/javase/7/docs/api/"/>
-       <link 
href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
-@@ -2632,7 +2646,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
-   </target>
- 
-   <target name="download-compile"
--          description="Download (and build) components necessary to compile" >
-+          description="Download (and build) components necessary to compile" 
unless="noget">
- 
-     <!-- Download Commons Daemon -->
-     <antcall target="downloadgz-2">
-@@ -2675,7 +2689,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
-   </target>
- 
-   <target name="download-test-compile"
--          description="Download additional components for the tests" >
-+          description="Download additional components for the tests" 
unless="noget">
- 
-     <antcall target="downloadfile">
-       <param name="sourcefile" value="${junit.loc}"/>
-@@ -2721,7 +2735,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
-   </target>
- 
-   <target name="download-dist"
--          description="Download additional components for a distribution" >
-+          description="Download additional components for a distribution" 
unless="noget">
- 
-     <antcall target="downloadfile-2">
-       <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>

diff --git a/www-servers/tomcat/files/tomcat-8.0.48-build.xml.patch 
b/www-servers/tomcat/files/tomcat-8.0.48-build.xml.patch
index b0862aef305..7cb4e1ed527 100644
--- a/www-servers/tomcat/files/tomcat-8.0.48-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-8.0.48-build.xml.patch
@@ -1,7 +1,5 @@
-diff --git a/apache-tomcat-8.0.47-src/build.xml 
b/apache-tomcat-8.0.47-src/build.xml
-index 6b4465a..ab4008d 100644
---- a/apache-tomcat-8.0.47-src/build.xml
-+++ b/apache-tomcat-8.0.47-src/build.xml
+--- a/build.xml
++++ b/build.xml
 @@ -715,24 +715,29 @@
        manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
  

diff --git a/www-servers/tomcat/files/tomcat-8.0.49-build.xml.patch 
b/www-servers/tomcat/files/tomcat-8.0.49-build.xml.patch
index b7e0a283fe2..ab6590d5c12 100644
--- a/www-servers/tomcat/files/tomcat-8.0.49-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-8.0.49-build.xml.patch
@@ -1,5 +1,3 @@
-diff --git a/build.xml b/build.xml
-index 3152712..9e09384 100644
 --- a/build.xml
 +++ b/build.xml
 @@ -718,24 +718,29 @@

diff --git a/www-servers/tomcat/files/tomcat-8.0.50-build.xml.patch 
b/www-servers/tomcat/files/tomcat-8.0.50-build.xml.patch
deleted file mode 100644
index b7e0a283fe2..00000000000
--- a/www-servers/tomcat/files/tomcat-8.0.50-build.xml.patch
+++ /dev/null
@@ -1,267 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 3152712..9e09384 100644
---- a/build.xml
-+++ b/build.xml
-@@ -718,24 +718,29 @@
-       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
- 
-     <!-- Servlet 3.1 Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${servlet-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.servlet-api"
-       manifest="${tomcat.manifests}/servlet-api.jar.manifest"
-       notice="${tomcat.manifests}/servlet-api.jar.notice"
-       license="${tomcat.manifests}/servlet-api.jar.license" />
--
-+-->
-     <!-- JSP 2.3 Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${jsp-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.jsp-api"
-       manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
- 
-     <!-- EL 3.0 Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${el-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.el-api"
-       manifest="${tomcat.manifests}/el-api.jar.manifest" />
-+-->
- 
-     <!-- WebSocket 1.1 API JAR File -->
-     <jarIt jarfile="${websocket-api.jar}"
-@@ -1005,9 +1010,9 @@
- 
-   <target name="deploy" 
depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
-           description="Default. Builds a working Tomcat instance">
--
-+<!--
-     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" 
file="${commons-daemon.jar}" />
--
-+-->
-     <!-- Copy scripts -->
-     <copy todir="${tomcat.build}/bin">
-       <fileset dir="bin">
-@@ -1067,7 +1072,7 @@
-         <exclude name="${jdt.jar.filename}"/>
-       </fileset>
-     </delete>
--    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!--    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
- 
-     <!-- Add sources for examples -->
-     <antcall target="examples-sources" />
-@@ -1101,7 +1106,7 @@
-     </javac>
-   </target>
- 
--  <target name="build-tomcat-jdbc" depends="package">
-+  <target name="build-tomcat-jdbc" depends="package" unless="noget">
-     <!-- build the jdbc-pool jar and source jar-->
-     <echo message="Building Tomcat JDBC pool libraries"/>
-     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1116,7 +1121,7 @@
-     <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
-   </target>
- 
--  <target name="build-tomcat-jdbc-src">
-+  <target name="build-tomcat-jdbc-src" unless="noget">
-     <!-- build the jdbc-pool source jar-->
-     <echo message="Building Tomcat JDBC pool src JAR"/>
-     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1220,9 +1225,11 @@
- 
-     <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
-     <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
-     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
-       failonerror="false"/>
-     <copy file="${jdt.jar}" todir="${tomcat.embed}" />
-+-->
-     <copy file="${annotations-api.jar}" todir="${tomcat.embed}" />
- 
-     <!-- Note the meta-inf below will work as long as there is only one JAR
-@@ -1615,7 +1622,7 @@
- 
-   <target name="extras-commons-logging-prepare"
-           depends="extras-prepare"
--          description="Prepare to build web services extras package">
-+          description="Prepare to build web services extras package" 
unless="noget">
- 
-     <antcall target="downloadfile-2">
-       <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/>
-@@ -1754,7 +1761,7 @@
- 
-   <target name="extras-webservices-prepare"
-           depends="extras-prepare"
--          description="Prepare to build web services extras package">
-+          description="Prepare to build web services extras package" 
unless="noget">
- 
-     <antcall target="downloadfile">
-       <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1941,11 +1948,12 @@
-     </copy>
- 
-     <!-- Source bundles for native components -->
-+<!--
-     <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
-             file="${tomcat-native.tar.gz}" />
-     <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
-             file="${commons-daemon.native.src.tgz}" />
--
-+-->
-     <!-- platform README files -->
-     <echo append="false" file="${tomcat.dist}/bin/x64/README">
- Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-@@ -1955,6 +1963,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
- 
-   <target name="javadoc" depends="dist-source,extras-webservices-prepare"
-     description="Create the Tomcat javadoc" >
-+<!--
-     <javadoc packagenames="javax.servlet.*"
-       excludepackagenames="javax.servlet.jsp.*"
-       sourcepath="${tomcat.dist}/src/java"
-@@ -2016,6 +2025,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
-         <path location="${ant.core.lib}"/>
-       </classpath>
-     </javadoc>
-+-->
-     <javadoc packagenames="javax.websocket.*"
-       sourcepath="${tomcat.dist}/src/java"
-       destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -2054,9 +2064,11 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
-         <path refid="tomcat.webservices.classpath"/>
-         <path location="${ant.core.lib}"/>
-       </classpath>
-+<!--
-       <link href="../servletapi"/>
-       <link href="../jspapi"/>
-       <link href="../elapi"/>
-+-->
-       <link href="../websocketapi"/>
-       <link href="http://docs.oracle.com/javase/7/docs/api/"/>
-       <link 
href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
-@@ -2791,7 +2803,7 @@ skip.installer property in build.properties" />
-   </target>
- 
-   <target name="download-compile"
--          description="Download (and build) components necessary to compile" >
-+          description="Download (and build) components necessary to compile" 
unless="noget">
- 
-     <!-- Download Commons Daemon -->
-     <antcall target="downloadgz-2">
-@@ -2811,7 +2823,7 @@ skip.installer property in build.properties" />
-   </target>
- 
-   <target name="download-test-compile"
--          description="Download additional components for the tests" >
-+          description="Download additional components for the tests" 
unless="noget">
- 
-     <antcall target="downloadfile">
-       <param name="sourcefile" value="${junit.loc}"/>
-@@ -2868,7 +2880,7 @@ skip.installer property in build.properties" />
-   </target>
- 
-   <target name="download-dist"
--          description="Download additional components for a distribution" >
-+          description="Download additional components for a distribution" 
unless="noget">
- 
-     <antcall target="downloadfile-2">
-       <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2908,18 +2920,18 @@ skip.installer property in build.properties" />
- 
-   <!-- =============== Utility Targets to support downloads ================ 
-->
- 
--  <target name="setproxy" if="${proxy.use}">
-+  <target name="setproxy" if="${proxy.use}" unless="noget">
-     <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
-               proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
-     <echo message="Using ${proxy.host}:${proxy.port} to download 
${sourcefile}"/>
-   </target>
- 
--  <target name="testexist">
-+  <target name="testexist" unless="noget">
-     <echo message="Testing  for ${destfile}"/>
-     <available file="${destfile}" property="exist"/>
-   </target>
- 
--  <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+  <target name="downloadgz" unless="noget" depends="testexist,setproxy">
-     <!-- Download and extract the package -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2931,7 +2943,7 @@ skip.installer property in build.properties" />
-     <delete file="${temp.file}.tar.gz"/>
-   </target>
- 
--  <target name="downloadgz-2" unless="exist" depends="testexist">
-+  <target name="downloadgz-2" unless="noget" depends="testexist">
-     <!-- Download and extract the package from the two alternative locations 
-->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2950,7 +2962,7 @@ skip.installer property in build.properties" />
-     <delete file="${temp.file}.tar.gz"/>
-   </target>
- 
--  <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+  <target name="downloadzip" unless="noget" depends="testexist,setproxy">
-     <!-- Download and extract the package -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2961,7 +2973,7 @@ skip.installer property in build.properties" />
-     <delete file="${temp.file}"/>
-   </target>
- 
--  <target name="downloadzip-2" unless="exist" depends="testexist">
-+  <target name="downloadzip-2" unless="noget" depends="testexist">
-     <!-- Download and extract the package from the two alternative locations 
-->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2979,7 +2991,7 @@ skip.installer property in build.properties" />
-     <delete file="${temp.file}"/>
-   </target>
- 
--  <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+  <target name="downloadfile" unless="noget" depends="testexist,setproxy">
-     <!-- Download the file -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2989,7 +3001,7 @@ skip.installer property in build.properties" />
-     <move file="${temp.file}" tofile="${destfile}"/>
-   </target>
- 
--  <target name="downloadfile-2" unless="exist" depends="testexist">
-+  <target name="downloadfile-2" unless="noget" depends="testexist">
-     <!-- Download the file from the two alternative locations -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -3012,7 +3024,7 @@ skip.installer property in build.properties" />
-     <move file="${temp.file}" tofile="${destfile}"/>
-   </target>
- 
--  <target name="trydownload.check" depends="setproxy">
-+  <target name="trydownload.check" depends="setproxy" unless="noget">
-     <condition property="trydownload.run">
-       <and>
-         <not>
-@@ -3023,7 +3035,7 @@ skip.installer property in build.properties" />
-     </condition>
-   </target>
- 
--  <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+  <target name="trydownload" if="trydownload.run" depends="trydownload.check" 
unless="noget">
-     <!-- Downloads a file if not yet downloaded and the source URL is 
available -->
-     <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" 
dest="${destfile}" />
-   </target>
-@@ -3034,7 +3046,7 @@ skip.installer property in build.properties" />
- 
-   <target name="ide-eclipse"
-           depends="download-compile, extras-webservices-prepare, 
download-test-compile"
--          description="Prepares the source tree to be built in Eclipse">
-+          description="Prepares the source tree to be built in Eclipse" 
unless="noget">
- 
-     <!-- Copy the sample project files into the root directory -->
-     <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" 
tofile="${tomcat.home}/.project"/>

diff --git a/www-servers/tomcat/files/tomcat-8.5.24-build.xml.patch 
b/www-servers/tomcat/files/tomcat-8.5.24-build.xml.patch
index d83440c0c4d..9db6d404674 100644
--- a/www-servers/tomcat/files/tomcat-8.5.24-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-8.5.24-build.xml.patch
@@ -1,7 +1,5 @@
-diff --git a/apache-tomcat-8.5.23-src/build.xml 
b/apache-tomcat-8.5.23-src/build.xml
-index b1b2666..263800c 100644
---- a/apache-tomcat-8.5.23-src/build.xml
-+++ b/apache-tomcat-8.5.23-src/build.xml
+--- a/build.xml
++++ b/build.xml
 @@ -714,24 +714,29 @@
        manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
  

diff --git a/www-servers/tomcat/files/tomcat-8.5.27-build.xml.patch 
b/www-servers/tomcat/files/tomcat-8.5.27-build.xml.patch
index e08dd17c6cc..c8022bcd5e4 100644
--- a/www-servers/tomcat/files/tomcat-8.5.27-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-8.5.27-build.xml.patch
@@ -1,5 +1,3 @@
-diff --git a/build.xml b/build.xml
-index 2b3c7cf..b8e57e0 100644
 --- a/build.xml
 +++ b/build.xml
 @@ -717,24 +717,29 @@

diff --git a/www-servers/tomcat/files/tomcat-8.5.28-build.xml.patch 
b/www-servers/tomcat/files/tomcat-8.5.28-build.xml.patch
deleted file mode 100644
index e08dd17c6cc..00000000000
--- a/www-servers/tomcat/files/tomcat-8.5.28-build.xml.patch
+++ /dev/null
@@ -1,258 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 2b3c7cf..b8e57e0 100644
---- a/build.xml
-+++ b/build.xml
-@@ -717,24 +717,29 @@
-       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
- 
-     <!-- Servlet 3.1 Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${servlet-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.servlet-api"
-       manifest="${tomcat.manifests}/servlet-api.jar.manifest"
-       notice="${tomcat.manifests}/servlet-api.jar.notice"
-       license="${tomcat.manifests}/servlet-api.jar.license" />
--
-+-->
-     <!-- JSP 2.3 Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${jsp-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.jsp-api"
-       manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
- 
-     <!-- EL 3.0 Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${el-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.el-api"
-       manifest="${tomcat.manifests}/el-api.jar.manifest" />
-+-->
- 
-     <!-- WebSocket 1.1 API JAR File -->
-     <jarIt jarfile="${websocket-api.jar}"
-@@ -1010,9 +1015,9 @@
- 
-   <target name="deploy" 
depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
-           description="Default. Builds a working Tomcat instance">
--
-+<!--
-     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" 
file="${commons-daemon.jar}" />
--
-+-->
-     <!-- Copy scripts -->
-     <copy todir="${tomcat.build}/bin">
-       <fileset dir="bin">
-@@ -1072,7 +1077,7 @@
-         <exclude name="${jdt.jar.filename}"/>
-       </fileset>
-     </delete>
--    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!--    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
- 
-     <!-- Add sources for examples -->
-     <antcall target="examples-sources" />
-@@ -1106,7 +1111,7 @@
-     </javac>
-   </target>
- 
--  <target name="build-tomcat-jdbc" depends="package">
-+  <target name="build-tomcat-jdbc" depends="package" unless="noget">
-     <!-- build the jdbc-pool jar and source jar-->
-     <echo message="Building Tomcat JDBC pool libraries"/>
-     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1121,7 +1126,7 @@
-     <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
-   </target>
- 
--  <target name="build-tomcat-jdbc-src">
-+  <target name="build-tomcat-jdbc-src" unless="noget">
-     <!-- build the jdbc-pool source jar-->
-     <echo message="Building Tomcat JDBC pool src JAR"/>
-     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1225,9 +1230,11 @@
- 
-     <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
-     <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
-     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
-       failonerror="false"/>
-     <copy file="${jdt.jar}" todir="${tomcat.embed}" />
-+-->
-     <copy file="${annotations-api.jar}" todir="${tomcat.embed}" />
- 
-     <!-- Note the meta-inf below will work as long as there is only one JAR
-@@ -1610,7 +1617,7 @@
- 
-   <target name="extras-webservices-prepare"
-           depends="extras-prepare"
--          description="Prepare to build web services extras package">
-+          description="Prepare to build web services extras package" 
unless="noget">
- 
-     <antcall target="downloadfile">
-       <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1750,11 +1757,12 @@
-     </copy>
- 
-     <!-- Source bundles for native components -->
-+<!--
-     <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
-             file="${tomcat-native.tar.gz}" />
-     <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
-             file="${commons-daemon.native.src.tgz}" />
--
-+-->
-     <!-- platform README files -->
-     <echo append="false" file="${tomcat.dist}/bin/x64/README">
- Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-@@ -1764,6 +1772,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
- 
-   <target name="javadoc" depends="dist-source,extras-webservices-prepare"
-     description="Create the Tomcat javadoc" >
-+<!--
-     <javadoc packagenames="javax.servlet.*"
-       excludepackagenames="javax.servlet.jsp.*"
-       sourcepath="${tomcat.dist}/src/java"
-@@ -1828,6 +1837,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
-         <path location="${ant.core.lib}"/>
-       </classpath>
-     </javadoc>
-+-->
-     <javadoc packagenames="javax.websocket.*"
-       sourcepath="${tomcat.dist}/src/java"
-       destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -1868,9 +1878,11 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
-         <path refid="tomcat.webservices.classpath"/>
-         <path location="${ant.core.lib}"/>
-       </classpath>
-+<!--
-       <link href="../servletapi"/>
-       <link href="../jspapi"/>
-       <link href="../elapi"/>
-+-->
-       <link href="../websocketapi"/>
-       <link href="http://docs.oracle.com/javase/7/docs/api/"/>
-       <link 
href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
-@@ -2617,7 +2629,7 @@ skip.installer property in build.properties" />
-   </target>
- 
-   <target name="download-compile"
--          description="Download (and build) components necessary to compile" >
-+          description="Download (and build) components necessary to compile" 
unless="noget">
- 
-     <!-- Download Commons Daemon -->
-     <antcall target="downloadgz-2">
-@@ -2637,7 +2649,7 @@ skip.installer property in build.properties" />
-   </target>
- 
-   <target name="download-test-compile"
--          description="Download additional components for the tests" >
-+          description="Download additional components for the tests" 
unless="noget">
- 
-     <antcall target="downloadfile">
-       <param name="sourcefile" value="${junit.loc}"/>
-@@ -2694,7 +2706,7 @@ skip.installer property in build.properties" />
-   </target>
- 
-   <target name="download-dist"
--          description="Download additional components for a distribution" >
-+          description="Download additional components for a distribution" 
unless="noget">
- 
-     <antcall target="downloadfile-2">
-       <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2734,18 +2746,18 @@ skip.installer property in build.properties" />
- 
-   <!-- =============== Utility Targets to support downloads ================ 
-->
- 
--  <target name="setproxy" if="${proxy.use}">
-+  <target name="setproxy" if="${proxy.use}" unless="noget">
-     <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
-               proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
-     <echo message="Using ${proxy.host}:${proxy.port} to download 
${sourcefile}"/>
-   </target>
- 
--  <target name="testexist">
-+  <target name="testexist" unless="noget">
-     <echo message="Testing  for ${destfile}"/>
-     <available file="${destfile}" property="exist"/>
-   </target>
- 
--  <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+  <target name="downloadgz" unless="noget" depends="testexist,setproxy">
-     <!-- Download and extract the package -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2757,7 +2769,7 @@ skip.installer property in build.properties" />
-     <delete file="${temp.file}.tar.gz"/>
-   </target>
- 
--  <target name="downloadgz-2" unless="exist" depends="testexist">
-+  <target name="downloadgz-2" unless="noget" depends="testexist">
-     <!-- Download and extract the package from the two alternative locations 
-->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2776,7 +2788,7 @@ skip.installer property in build.properties" />
-     <delete file="${temp.file}.tar.gz"/>
-   </target>
- 
--  <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+  <target name="downloadzip" unless="noget" depends="testexist,setproxy">
-     <!-- Download and extract the package -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2787,7 +2799,7 @@ skip.installer property in build.properties" />
-     <delete file="${temp.file}"/>
-   </target>
- 
--  <target name="downloadzip-2" unless="exist" depends="testexist">
-+  <target name="downloadzip-2" unless="noget" depends="testexist">
-     <!-- Download and extract the package from the two alternative locations 
-->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2805,7 +2817,7 @@ skip.installer property in build.properties" />
-     <delete file="${temp.file}"/>
-   </target>
- 
--  <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+  <target name="downloadfile" unless="noget" depends="testexist,setproxy">
-     <!-- Download the file -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2815,7 +2827,7 @@ skip.installer property in build.properties" />
-     <move file="${temp.file}" tofile="${destfile}"/>
-   </target>
- 
--  <target name="downloadfile-2" unless="exist" depends="testexist">
-+  <target name="downloadfile-2" unless="noget" depends="testexist">
-     <!-- Download the file from the two alternative locations -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2838,7 +2850,7 @@ skip.installer property in build.properties" />
-     <move file="${temp.file}" tofile="${destfile}"/>
-   </target>
- 
--  <target name="trydownload.check" depends="setproxy">
-+  <target name="trydownload.check" depends="setproxy" unless="noget">
-     <condition property="trydownload.run">
-       <and>
-         <not>
-@@ -2849,7 +2861,7 @@ skip.installer property in build.properties" />
-     </condition>
-   </target>
- 
--  <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+  <target name="trydownload" if="trydownload.run" depends="trydownload.check" 
unless="noget">
-     <!-- Downloads a file if not yet downloaded and the source URL is 
available -->
-     <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" 
dest="${destfile}" />
-   </target>
-@@ -2860,7 +2872,7 @@ skip.installer property in build.properties" />
- 
-   <target name="ide-eclipse"
-           depends="download-compile, extras-webservices-prepare, 
download-test-compile"
--          description="Prepares the source tree to be built in Eclipse">
-+          description="Prepares the source tree to be built in Eclipse" 
unless="noget">
- 
-     <!-- Copy the sample project files into the root directory -->
-     <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" 
tofile="${tomcat.home}/.project"/>

diff --git a/www-servers/tomcat/files/tomcat-9.0.4-build.xml.patch 
b/www-servers/tomcat/files/tomcat-9.0.4-build.xml.patch
index 87f869dd4c0..feb5f126a37 100644
--- a/www-servers/tomcat/files/tomcat-9.0.4-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-9.0.4-build.xml.patch
@@ -1,5 +1,3 @@
-diff --git a/build.xml b/build.xml
-index c1331c9..b664cc3 100644
 --- a/build.xml
 +++ b/build.xml
 @@ -719,24 +719,30 @@

diff --git a/www-servers/tomcat/files/tomcat-9.0.5-build.xml.patch 
b/www-servers/tomcat/files/tomcat-9.0.5-build.xml.patch
deleted file mode 100644
index 87f869dd4c0..00000000000
--- a/www-servers/tomcat/files/tomcat-9.0.5-build.xml.patch
+++ /dev/null
@@ -1,258 +0,0 @@
-diff --git a/build.xml b/build.xml
-index c1331c9..b664cc3 100644
---- a/build.xml
-+++ b/build.xml
-@@ -719,24 +719,30 @@
-       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
- 
-     <!-- Servlet 4.0 Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${servlet-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.servlet-api"
-       manifest="${tomcat.manifests}/servlet-api.jar.manifest"
-       notice="${tomcat.manifests}/servlet-api.jar.notice"
-       license="${tomcat.manifests}/servlet-api.jar.license" />
-+-->
- 
-     <!-- JSP 2.3 Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${jsp-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.jsp-api"
-       manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
- 
-     <!-- EL 3.0 Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${el-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.el-api"
-       manifest="${tomcat.manifests}/el-api.jar.manifest" />
-+-->
- 
-     <!-- WebSocket 1.1 API JAR File -->
-     <jarIt jarfile="${websocket-api.jar}"
-@@ -1012,9 +1018,9 @@
- 
-   <target name="deploy" 
depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
-           description="Default. Builds a working Tomcat instance">
--
-+<!--
-     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" 
file="${commons-daemon.jar}" />
--
-+-->
-     <!-- Copy scripts -->
-     <copy todir="${tomcat.build}/bin">
-       <fileset dir="bin">
-@@ -1074,7 +1080,7 @@
-         <exclude name="${jdt.jar.filename}"/>
-       </fileset>
-     </delete>
--    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!--    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
- 
-     <!-- Add sources for examples -->
-     <antcall target="examples-sources" />
-@@ -1108,7 +1114,7 @@
-     </javac>
-   </target>
- 
--  <target name="build-tomcat-jdbc" depends="package">
-+  <target name="build-tomcat-jdbc" depends="package" unless="noget">
-     <!-- build the jdbc-pool jar and source jar-->
-     <echo message="Building Tomcat JDBC pool libraries"/>
-     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1123,7 +1129,7 @@
-     <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
-   </target>
- 
--  <target name="build-tomcat-jdbc-src">
-+  <target name="build-tomcat-jdbc-src" unless="noget">
-     <!-- build the jdbc-pool source jar-->
-     <echo message="Building Tomcat JDBC pool src JAR"/>
-     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1227,9 +1233,11 @@
- 
-     <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
-     <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
-     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
-       failonerror="false"/>
-     <copy file="${jdt.jar}" todir="${tomcat.embed}" />
-+-->
-     <copy file="${annotations-api.jar}" todir="${tomcat.embed}" />
- 
-     <!-- Note the meta-inf below will work as long as there is only one JAR
-@@ -1612,7 +1620,7 @@
- 
-   <target name="extras-webservices-prepare"
-           depends="extras-prepare"
--          description="Prepare to build web services extras package">
-+          description="Prepare to build web services extras package" 
unless="noget">
- 
-     <antcall target="downloadfile">
-       <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1752,11 +1760,12 @@
-     </copy>
- 
-     <!-- Source bundles for native components -->
-+<!--
-     <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
-             file="${tomcat-native.tar.gz}" />
-     <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
-             file="${commons-daemon.native.src.tgz}" />
--
-+-->
-     <!-- platform README files -->
-     <echo append="false" file="${tomcat.dist}/bin/x64/README">
- Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-@@ -1766,6 +1775,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
- 
-   <target name="javadoc" depends="dist-source,extras-webservices-prepare"
-     description="Create the Tomcat javadoc" >
-+<!--
-     <javadoc packagenames="javax.servlet.*"
-       excludepackagenames="javax.servlet.jsp.*"
-       sourcepath="${tomcat.dist}/src/java"
-@@ -1830,6 +1840,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
-         <path location="${ant.core.lib}"/>
-       </classpath>
-     </javadoc>
-+-->
-     <javadoc packagenames="javax.websocket.*"
-       sourcepath="${tomcat.dist}/src/java"
-       destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -1870,9 +1881,11 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
-         <path refid="tomcat.webservices.classpath"/>
-         <path location="${ant.core.lib}"/>
-       </classpath>
-+<!--
-       <link href="../servletapi"/>
-       <link href="../jspapi"/>
-       <link href="../elapi"/>
-+-->
-       <link href="../websocketapi"/>
-       <link href="http://docs.oracle.com/javase/8/docs/api/"/>
-       <link 
href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
-@@ -2617,7 +2630,7 @@ skip.installer property in build.properties" />
-   </target>
- 
-   <target name="download-compile"
--          description="Download (and build) components necessary to compile" >
-+          description="Download (and build) components necessary to compile" 
unless="noget">
- 
-     <!-- Download Commons Daemon -->
-     <antcall target="downloadgz-2">
-@@ -2637,7 +2650,7 @@ skip.installer property in build.properties" />
-   </target>
- 
-   <target name="download-test-compile"
--          description="Download additional components for the tests" >
-+          description="Download additional components for the tests" 
unless="noget">
- 
-     <antcall target="downloadfile">
-       <param name="sourcefile" value="${junit.loc}"/>
-@@ -2694,7 +2707,7 @@ skip.installer property in build.properties" />
-   </target>
- 
-   <target name="download-dist"
--          description="Download additional components for a distribution" >
-+          description="Download additional components for a distribution" 
unless="noget">
- 
-     <antcall target="downloadfile-2">
-       <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2734,18 +2747,18 @@ skip.installer property in build.properties" />
- 
-   <!-- =============== Utility Targets to support downloads ================ 
-->
- 
--  <target name="setproxy" if="${proxy.use}">
-+  <target name="setproxy" if="${proxy.use}" unless="noget">
-     <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
-               proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
-     <echo message="Using ${proxy.host}:${proxy.port} to download 
${sourcefile}"/>
-   </target>
- 
--  <target name="testexist">
-+  <target name="testexist" unless="noget">
-     <echo message="Testing  for ${destfile}"/>
-     <available file="${destfile}" property="exist"/>
-   </target>
- 
--  <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+  <target name="downloadgz" unless="noget" depends="testexist,setproxy">
-     <!-- Download and extract the package -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2757,7 +2770,7 @@ skip.installer property in build.properties" />
-     <delete file="${temp.file}.tar.gz"/>
-   </target>
- 
--  <target name="downloadgz-2" unless="exist" depends="testexist">
-+  <target name="downloadgz-2" unless="noget" depends="testexist">
-     <!-- Download and extract the package from the two alternative locations 
-->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2776,7 +2789,7 @@ skip.installer property in build.properties" />
-     <delete file="${temp.file}.tar.gz"/>
-   </target>
- 
--  <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+  <target name="downloadzip" unless="noget" depends="testexist,setproxy">
-     <!-- Download and extract the package -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2787,7 +2800,7 @@ skip.installer property in build.properties" />
-     <delete file="${temp.file}"/>
-   </target>
- 
--  <target name="downloadzip-2" unless="exist" depends="testexist">
-+  <target name="downloadzip-2" unless="noget" depends="testexist">
-     <!-- Download and extract the package from the two alternative locations 
-->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2805,7 +2818,7 @@ skip.installer property in build.properties" />
-     <delete file="${temp.file}"/>
-   </target>
- 
--  <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+  <target name="downloadfile" unless="noget" depends="testexist,setproxy">
-     <!-- Download the file -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2815,7 +2828,7 @@ skip.installer property in build.properties" />
-     <move file="${temp.file}" tofile="${destfile}"/>
-   </target>
- 
--  <target name="downloadfile-2" unless="exist" depends="testexist">
-+  <target name="downloadfile-2" unless="noget" depends="testexist">
-     <!-- Download the file from the two alternative locations -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2838,7 +2851,7 @@ skip.installer property in build.properties" />
-     <move file="${temp.file}" tofile="${destfile}"/>
-   </target>
- 
--  <target name="trydownload.check" depends="setproxy">
-+  <target name="trydownload.check" depends="setproxy" unless="noget">
-     <condition property="trydownload.run">
-       <and>
-         <not>
-@@ -2849,7 +2862,7 @@ skip.installer property in build.properties" />
-     </condition>
-   </target>
- 
--  <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+  <target name="trydownload" if="trydownload.run" depends="trydownload.check" 
unless="noget">
-     <!-- Downloads a file if not yet downloaded and the source URL is 
available -->
-     <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" 
dest="${destfile}" />
-   </target>
-@@ -2860,7 +2873,7 @@ skip.installer property in build.properties" />
- 
-   <target name="ide-eclipse"
-           depends="download-compile, extras-webservices-prepare, 
download-test-compile"
--          description="Prepares the source tree to be built in Eclipse">
-+          description="Prepares the source tree to be built in Eclipse" 
unless="noget">
- 
-     <!-- Copy the sample project files into the root directory -->
-     <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" 
tofile="${tomcat.home}/.project"/>

diff --git a/www-servers/tomcat/tomcat-7.0.84.ebuild 
b/www-servers/tomcat/tomcat-7.0.84.ebuild
index bebf2f0f814..7917995deab 100644
--- a/www-servers/tomcat/tomcat-7.0.84.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.84.ebuild
@@ -48,7 +48,7 @@ src_prepare() {
 
        java-pkg_clean
 
-       epatch "${FILESDIR}/${P}-build.xml.patch"
+       epatch "${FILESDIR}/${PN}-7.0.84-build.xml.patch"
 
        # For use of catalina.sh in netbeans
        sed -i -e "/^# ----- Execute The Requested Command/ a\

diff --git a/www-servers/tomcat/tomcat-7.0.85.ebuild 
b/www-servers/tomcat/tomcat-7.0.85.ebuild
index bebf2f0f814..7917995deab 100644
--- a/www-servers/tomcat/tomcat-7.0.85.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.85.ebuild
@@ -48,7 +48,7 @@ src_prepare() {
 
        java-pkg_clean
 
-       epatch "${FILESDIR}/${P}-build.xml.patch"
+       epatch "${FILESDIR}/${PN}-7.0.84-build.xml.patch"
 
        # For use of catalina.sh in netbeans
        sed -i -e "/^# ----- Execute The Requested Command/ a\

diff --git a/www-servers/tomcat/tomcat-8.0.49.ebuild 
b/www-servers/tomcat/tomcat-8.0.49.ebuild
index 5f9b5faf780..d75c0ef779c 100644
--- a/www-servers/tomcat/tomcat-8.0.49.ebuild
+++ b/www-servers/tomcat/tomcat-8.0.49.ebuild
@@ -52,7 +52,7 @@ src_prepare() {
        # Remove bundled servlet-api
        rm -rv java/javax/{el,servlet} || die
 
-       epatch "${FILESDIR}/${P}-build.xml.patch"
+       epatch "${FILESDIR}/${PN}-8.0.49-build.xml.patch"
 
        # For use of catalina.sh in netbeans
        sed -i -e "/^# ----- Execute The Requested Command/ a\

diff --git a/www-servers/tomcat/tomcat-8.0.50.ebuild 
b/www-servers/tomcat/tomcat-8.0.50.ebuild
index 5f9b5faf780..d75c0ef779c 100644
--- a/www-servers/tomcat/tomcat-8.0.50.ebuild
+++ b/www-servers/tomcat/tomcat-8.0.50.ebuild
@@ -52,7 +52,7 @@ src_prepare() {
        # Remove bundled servlet-api
        rm -rv java/javax/{el,servlet} || die
 
-       epatch "${FILESDIR}/${P}-build.xml.patch"
+       epatch "${FILESDIR}/${PN}-8.0.49-build.xml.patch"
 
        # For use of catalina.sh in netbeans
        sed -i -e "/^# ----- Execute The Requested Command/ a\

diff --git a/www-servers/tomcat/tomcat-8.5.27.ebuild 
b/www-servers/tomcat/tomcat-8.5.27.ebuild
index 889da8d4f23..0fb74bf75f0 100644
--- a/www-servers/tomcat/tomcat-8.5.27.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.27.ebuild
@@ -52,7 +52,7 @@ src_prepare() {
        # Remove bundled servlet-api
        rm -rv java/javax/{el,servlet} || die
 
-       epatch "${FILESDIR}/${P}-build.xml.patch"
+       epatch "${FILESDIR}/${PN}-8.5.27-build.xml.patch"
 
        # For use of catalina.sh in netbeans
        sed -i -e "/^# ----- Execute The Requested Command/ a\

diff --git a/www-servers/tomcat/tomcat-8.5.28.ebuild 
b/www-servers/tomcat/tomcat-8.5.28.ebuild
index 889da8d4f23..0fb74bf75f0 100644
--- a/www-servers/tomcat/tomcat-8.5.28.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.28.ebuild
@@ -52,7 +52,7 @@ src_prepare() {
        # Remove bundled servlet-api
        rm -rv java/javax/{el,servlet} || die
 
-       epatch "${FILESDIR}/${P}-build.xml.patch"
+       epatch "${FILESDIR}/${PN}-8.5.27-build.xml.patch"
 
        # For use of catalina.sh in netbeans
        sed -i -e "/^# ----- Execute The Requested Command/ a\

diff --git a/www-servers/tomcat/tomcat-9.0.4.ebuild 
b/www-servers/tomcat/tomcat-9.0.4.ebuild
index 9b79ebaf947..36b0d091699 100644
--- a/www-servers/tomcat/tomcat-9.0.4.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.4.ebuild
@@ -52,7 +52,7 @@ src_prepare() {
        # Remove bundled servlet-api
        rm -rv java/javax/{el,servlet} || die
 
-       epatch "${FILESDIR}/${P}-build.xml.patch"
+       epatch "${FILESDIR}/${PN}-9.0.4-build.xml.patch"
 
        # For use of catalina.sh in netbeans
        sed -i -e "/^# ----- Execute The Requested Command/ a\

diff --git a/www-servers/tomcat/tomcat-9.0.5.ebuild 
b/www-servers/tomcat/tomcat-9.0.5.ebuild
index 9b79ebaf947..36b0d091699 100644
--- a/www-servers/tomcat/tomcat-9.0.5.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.5.ebuild
@@ -52,7 +52,7 @@ src_prepare() {
        # Remove bundled servlet-api
        rm -rv java/javax/{el,servlet} || die
 
-       epatch "${FILESDIR}/${P}-build.xml.patch"
+       epatch "${FILESDIR}/${PN}-9.0.4-build.xml.patch"
 
        # For use of catalina.sh in netbeans
        sed -i -e "/^# ----- Execute The Requested Command/ a\

Reply via email to