gentoo auto-resync : 04:01:2023 - 12:06:28

2 files changed, 0 insertions, 378 deletions

diff --git a/www-servers/tomcat/files/tomcat-10.0.16-build.xml-strip-html5.patch b/www-servers/tomcat/files/tomcat-10.0.16-build.xml-strip-html5.patch
deleted file mode 100644
index 44f629ec29b0..000000000000
--- a/www-servers/tomcat/files/tomcat-10.0.16-build.xml-strip-html5.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 6b2b5d5..16d55c2 100644
---- a/build.xml
-+++ b/build.xml
-@@ -2148,7 +2148,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-       encoding="UTF-8"
-       docencoding="UTF-8"
-       charset="UTF-8"
--      additionalparam="-breakiterator -notimestamp -html5"
-+      additionalparam="-breakiterator -notimestamp"
-       source="${compile.release}"
-       maxmemory="512m"
-       failonerror="true">
-@@ -2231,7 +2231,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-       encoding="UTF-8"
-       docencoding="UTF-8"
-       charset="UTF-8"
--      additionalparam="-breakiterator -notimestamp -html5"
-+      additionalparam="-breakiterator -notimestamp"
-       source="${compile.release}"
-       maxmemory="512m"
-       failonerror="true">
-@@ -2269,7 +2269,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-       encoding="UTF-8"
-       docencoding="UTF-8"
-       charset="UTF-8"
--      additionalparam="-breakiterator -notimestamp -html5"
-+      additionalparam="-breakiterator -notimestamp"
-       source="${compile.release}"
-       maxmemory="512m"
-       failonerror="true">
diff --git a/www-servers/tomcat/files/tomcat-10.0.26-build.xml.patch b/www-servers/tomcat/files/tomcat-10.0.26-build.xml.patch
deleted file mode 100644
index aff5333f0833..000000000000
--- a/www-servers/tomcat/files/tomcat-10.0.26-build.xml.patch
+++ /dev/null
@@ -1,347 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 774e25e..2684b10 100644
---- a/build.xml
-+++ b/build.xml
-@@ -1041,6 +1041,7 @@
-       addOSGi="true" />
- 
-     <!-- Servlet Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${servlet-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.servlet-api"
-@@ -1048,21 +1049,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}"
-@@ -1175,10 +1178,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"
-@@ -1415,9 +1418,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">
-@@ -1477,7 +1480,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" />
-@@ -1488,7 +1491,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" />
-@@ -1517,7 +1520,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}"
-@@ -1534,7 +1537,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}"
-@@ -1637,9 +1640,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
-@@ -2144,11 +2149,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.
-@@ -2172,13 +2178,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"
-@@ -2194,8 +2200,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}"/>
-@@ -2215,8 +2220,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}"/>
-@@ -2236,13 +2240,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"
-@@ -2257,8 +2261,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}"/>
-@@ -2277,8 +2280,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}"/>
-@@ -2297,20 +2299,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://jakarta.ee/specifications/platform/9/apidocs/"/>
-+-->
-       <packageset dir="${tomcat.dist}/src/java/">
-         <include name="org/**"/>
-         <exclude name="org/apache/el/parser/**"/>
-@@ -3275,7 +3280,7 @@ asf.ldap.username=${release.asfusername}
-   </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}"/>
-@@ -3403,7 +3408,7 @@ asf.ldap.username=${release.asfusername}
-   </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}"/>
-@@ -3458,13 +3463,13 @@ asf.ldap.username=${release.asfusername}
- 
-   <!-- =============== 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>
-@@ -3586,7 +3591,7 @@ asf.ldap.username=${release.asfusername}
-     </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}"/>
-@@ -3603,7 +3608,7 @@ asf.ldap.username=${release.asfusername}
-     <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}"/>
-@@ -3628,7 +3633,7 @@ asf.ldap.username=${release.asfusername}
-     <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}"/>
-@@ -3644,7 +3649,7 @@ asf.ldap.username=${release.asfusername}
-     <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}"/>
-@@ -3668,7 +3673,7 @@ asf.ldap.username=${release.asfusername}
-     <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}"/>
-@@ -3683,7 +3688,7 @@ asf.ldap.username=${release.asfusername}
-     <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}"/>
-@@ -3711,7 +3716,7 @@ asf.ldap.username=${release.asfusername}
-     <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>
-@@ -3722,7 +3727,7 @@ asf.ldap.username=${release.asfusername}
-     </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>
-@@ -3733,7 +3738,7 @@ asf.ldap.username=${release.asfusername}
- 
-   <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"/>
-@@ -3751,7 +3756,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"/>