commit: dbfb5c45e92dd153733fffe84334dd3120c82142 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Sun Oct 30 08:01:26 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Oct 30 09:27:36 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbfb5c45
www-servers/tomcat: remove unused file Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/28038 Signed-off-by: Sam James <sam <AT> gentoo.org> .../tomcat/files/tomcat-10.0.20-build.xml.patch | 347 --------------------- 1 file changed, 347 deletions(-) diff --git a/www-servers/tomcat/files/tomcat-10.0.20-build.xml.patch b/www-servers/tomcat/files/tomcat-10.0.20-build.xml.patch deleted file mode 100644 index 7332c570160a..000000000000 --- a/www-servers/tomcat/files/tomcat-10.0.20-build.xml.patch +++ /dev/null @@ -1,347 +0,0 @@ -diff --git a/build.xml b/build.xml -index 72e49ad..8ff8ecc 100644 ---- a/build.xml -+++ b/build.xml -@@ -1030,6 +1030,7 @@ - addOSGi="true" /> - - <!-- Servlet Implementation JAR File --> -+<!-- - <jarIt jarfile="${servlet-api.jar}" - filesDir="${tomcat.classes}" - filesId="files.servlet-api" -@@ -1037,21 +1038,23 @@ - notice="${tomcat.manifests}/servlet-api.jar.notice" - license="${tomcat.manifests}/servlet-api.jar.license" - addOSGi="true" /> -- -+--> - <!-- EL Implementation JAR File --> -+<!-- - <jarIt jarfile="${el-api.jar}" - filesDir="${tomcat.classes}" - filesId="files.el-api" - manifest="${tomcat.manifests}/el-api.jar.manifest" - addOSGi="true" /> -- -+--> - <!-- JSP Implementation JAR File --> -+<!-- - <jarIt jarfile="${jsp-api.jar}" - filesDir="${tomcat.classes}" - filesId="files.jsp-api" - manifest="${tomcat.manifests}/jsp-api.jar.manifest" - addOSGi="true" /> -- -+--> - <!-- WebSocket API JAR File --> - <jarIt jarfile="${websocket-api.jar}" - filesDir="${tomcat.classes}" -@@ -1164,10 +1167,10 @@ - addOSGi="true" /> - - <!-- Re-packaged Apache Commons DBCP 2--> -- <jarIt jarfile="${tomcat-dbcp.jar}" -+<!-- <jarIt jarfile="${tomcat-dbcp.jar}" - filesDir="${tomcat.classes}" - filesId="files.tomcat-dbcp" -- addOSGi="true" /> -+ addOSGi="true" /> --> - - <!-- i18n JARs --> - <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar" -@@ -1404,9 +1407,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"> -@@ -1466,7 +1469,7 @@ - <exclude name="${jdt.jar.filename}"/> - </fileset> - </delete> -- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> --> - - <!-- Delete all other versions of Tomcat Migration Tool for Jakarta EE and copy the current one --> - <local name="migration.jar.filename" /> -@@ -1477,7 +1480,7 @@ - <exclude name="${migration-lib.jar.filename}"/> - </fileset> - </delete> -- <copy file="${migration-lib.jar}" todir="${tomcat.build}/lib"/> -+<!-- <copy file="${migration-lib.jar}" todir="${tomcat.build}/lib"/> --> - - <!-- Add sources for examples --> - <antcall target="examples-sources" /> -@@ -1506,7 +1509,7 @@ - - </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}" -@@ -1522,7 +1525,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}" -@@ -1625,9 +1628,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 -@@ -2131,11 +2136,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. -@@ -2159,13 +2165,13 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - additionalparam="-breakiterator -notimestamp -html5" - source="${compile.release}" - maxmemory="512m" -- failonerror="true" -- failonwarning="true"> -+ failonerror="true"> - <classpath> - <path refid="compile.classpath"/> - <path location="${ant.core.lib}"/> - </classpath> - </javadoc> -+<!-- - <javadoc packagenames="jakarta.servlet.*" - excludepackagenames="jakarta.servlet.jsp.*" - sourcepath="${tomcat.dist}/src/java" -@@ -2181,8 +2187,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - additionalparam="-breakiterator -notimestamp -html5" - source="${compile.release}" - maxmemory="512m" -- failonerror="true" -- failonwarning="true"> -+ failonerror="true"> - <classpath> - <path refid="compile.classpath"/> - <path location="${ant.core.lib}"/> -@@ -2202,8 +2207,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - additionalparam="-breakiterator -notimestamp -html5" - source="${compile.release}" - maxmemory="512m" -- failonerror="true" -- failonwarning="true"> -+ failonerror="true"> - <classpath> - <path refid="compile.classpath"/> - <path location="${ant.core.lib}"/> -@@ -2223,13 +2227,13 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - additionalparam="-breakiterator -notimestamp -html5" - source="${compile.release}" - maxmemory="512m" -- failonerror="true" -- failonwarning="true"> -+ failonerror="true"> - <classpath> - <path refid="compile.classpath"/> - <path location="${ant.core.lib}"/> - </classpath> - </javadoc> -+--> - <javadoc packagenames="jakarta.websocket.*" - sourcepath="${tomcat.dist}/src/java" - destdir="${tomcat.dist}/webapps/docs/websocketapi" -@@ -2244,8 +2248,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - additionalparam="-breakiterator -notimestamp -html5" - source="${compile.release}" - maxmemory="512m" -- failonerror="true" -- failonwarning="true"> -+ failonerror="true"> - <classpath> - <path refid="compile.classpath"/> - <path location="${ant.core.lib}"/> -@@ -2264,8 +2267,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - charset="UTF-8" - additionalparam="-breakiterator -notimestamp -html5" - maxmemory="512m" -- failonerror="true" -- failonwarning="true"> -+ failonerror="true"> - <classpath> - <path refid="compile.classpath"/> - <path location="${ant.core.lib}"/> -@@ -2284,20 +2286,23 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - additionalparam="-breakiterator -notimestamp -html5" - source="${compile.release}" - maxmemory="512m" -- failonerror="true" - failonwarning="true"> - <classpath> - <path refid="compile.classpath"/> - <path location="${ant.core.lib}"/> - </classpath> - <link href="../annotationapi"/> -+<!-- - <link href="../servletapi"/> - <link href="../jspapi"/> - <link href="../elapi"/> -+--> - <link href="../websocketapi"/> - <link href="../jaspicapi"/> -+<!-- - <link href="https://docs.oracle.com/javase/8/docs/api/"/> - <link href="https://javaee.github.io/javaee-spec/javadocs/"/> -+--> - <packageset dir="${tomcat.dist}/src/java/"> - <include name="org/**"/> - <exclude name="org/apache/el/parser/**"/> -@@ -3134,7 +3139,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"> - - <antcall target="downloadfile"> - <param name="sourcefile" value="${junit.loc}"/> -@@ -3262,7 +3267,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"> - - <antcall target="downloadfile-2"> - <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> -@@ -3317,13 +3322,13 @@ 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> -@@ -3445,7 +3450,7 @@ skip.installer property in build.properties" /> - </sequential> - </macrodef> - -- <target name="downloadgz" unless="exist" if="${execute.download}" depends="testexist,setproxy"> -+ <target name="downloadgz" unless="noget" if="${execute.download}" depends="testexist,setproxy"> - <!-- Download and extract the package --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -3462,7 +3467,7 @@ skip.installer property in build.properties" /> - <delete file="${temp.file}.tar.gz"/> - </target> - -- <target name="downloadgz-2" unless="exist" if="${execute.download}" depends="testexist"> -+ <target name="downloadgz-2" unless="noget" if="${execute.download}" depends="testexist"> - <!-- Download and extract the package from the two alternative locations --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -3487,7 +3492,7 @@ skip.installer property in build.properties" /> - <delete file="${temp.file}.tar.gz"/> - </target> - -- <target name="downloadzip" unless="exist" if="${execute.download}" depends="testexist,setproxy"> -+ <target name="downloadzip" unless="noget" if="${execute.download}" depends="testexist,setproxy"> - <!-- Download and extract the package --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -3503,7 +3508,7 @@ skip.installer property in build.properties" /> - <delete file="${temp.file}"/> - </target> - -- <target name="downloadzip-2" unless="exist" if="${execute.download}" depends="testexist"> -+ <target name="downloadzip-2" unless="noget" if="${execute.download}" depends="testexist"> - <!-- Download and extract the package from the two alternative locations --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -3527,7 +3532,7 @@ skip.installer property in build.properties" /> - <delete file="${temp.file}"/> - </target> - -- <target name="downloadfile" unless="exist" if="${execute.download}" depends="testexist,setproxy"> -+ <target name="downloadfile" unless="noget" if="${execute.download}" depends="testexist,setproxy"> - <!-- Download the file --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -3542,7 +3547,7 @@ skip.installer property in build.properties" /> - <move file="${temp.file}" tofile="${destfile}"/> - </target> - -- <target name="downloadfile-2" unless="exist" if="${execute.download}" depends="testexist"> -+ <target name="downloadfile-2" unless="noget" if="${execute.download}" depends="testexist"> - <!-- Download the file from the two alternative locations --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -3570,7 +3575,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> -@@ -3581,7 +3586,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> -@@ -3592,7 +3597,7 @@ skip.installer property in build.properties" /> - - <target name="ide-eclipse" - depends="download-compile, 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"/> -@@ -3610,7 +3615,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho - - <target name="ide-intellij" - depends="download-compile, download-test-compile" -- description="Creates project directory .idea for IntelliJ IDEA"> -+ description="Creates project directory .idea for IntelliJ IDEA" unless="noget"> - - <copy todir="${tomcat.home}/.idea"> - <fileset dir="${tomcat.home}/res/ide-support/idea"/>
