gentoo auto-resync : 28:06:2024 - 07:59:59

2 files changed, 0 insertions, 121 deletions

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 7934989b1823..90248417e89a 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,6 +1,5 @@
 AUX tomcat-10.1.20-do-not-copy.patch 1164 BLAKE2B 4df0dc611ab7694d784adfaf132502c8e11b60f91a8dbb5e1385ed44e965f175660e9d5ed29d0e32d1b77a614d1bb41499bcc987e109d41bc1acd5876ace3c0c SHA512 e7a1f058566a44b6b88f3c968cddb7effe9301aadc199d127bf8269c847ecc6a2c4ad8d09b3d489dba49eff79e69e033e3acb729fd7337ec8bb378aa65c0bdfa
 AUX tomcat-10.1.20-offline.patch 562 BLAKE2B 338f3fe3604004ab2920d67c39facb41d506a3a56c5fe7d1c11f4fa11b8391aac7b0088b46be3b4ef5ffef7590b525f09a53985abc8d753999a548ea9a2f31c5 SHA512 0f814adf5a837985b14aca22fd1e41f36eff74c6065577a5fb46df19c67cfd85aac86edbdd12f009014c9a96342baa8db74130d0020c0390e74bdfa5cd7a56e6
-AUX tomcat-10.1.6-build.xml.patch 4856 BLAKE2B ed44d53877c96f06cab6354b034f88ba3382c34eaf504f10c9fcaaaf2b0c812901f3bfca8114f2aab4faa2604800f81f18932ac12065d09846f879edc1eaad96 SHA512 005d0b3fe6e14dca303bc3d5c4ab1fbf35a309be9a8ffcebd24e739301f33f202616e17973dd954bd1bd1ae89978c3147593d42ee2508c56026579d37722470b
 AUX tomcat-9.0.87-build.xml.patch 1240 BLAKE2B 26fbfd5ba353fd3f5a02a1feb984eee7b6e5b9ed1f711e969e135e87761f0b6be5503abf93a53ecdfa7de35e00765f1c3a7e057702fe14d62bfb58cc93356b84 SHA512 b62fc4d3a0d2d1134587fe284956a4961b353c730a4084e50f4cbf1ec096a2261c8c77a58940c808e47e5c0a8cdbffdbbb74de45de0251bddff9e461a5fe450c
 AUX tomcat-9.0.87-gentoo-bnd.patch 1432 BLAKE2B 07964d271be70afe13116c9ce27c956a6812f5da0237b19a1bc915ac3a0abd1e3e1ad89d59049152c1f3f24b84a45a076375f7dc6784c87ebac440b15ec5557d SHA512 210754982a5ac789aecedd9916d45190c8ca92661b9f492d40b6c4f0758c69a2d5b961150cc83573c9b7890a73fc4e8bd130a2837d6de9164fc8a18bee0e7676
 AUX tomcat-instance-manager-r2.bash 6999 BLAKE2B f1c771678bd8b894ecf242d5a8fb22f5b2f0f33445a1ff158c242b5154edc4483a5707ce33a5dcee53a3106e631ad8218243d8b72a32a10cd99e9646fa54085d SHA512 c30c156cbf2b53cf8498288bacaedd48872dce52f461ff32071310b438bdb5015c1cd1d512a2905c4db01e2b22342590e1b8aeadbd44f29062606fabbb2f2fed
diff --git a/www-servers/tomcat/files/tomcat-10.1.6-build.xml.patch b/www-servers/tomcat/files/tomcat-10.1.6-build.xml.patch
deleted file mode 100644
index 41cf58bc908c..000000000000
--- a/www-servers/tomcat/files/tomcat-10.1.6-build.xml.patch
+++ /dev/null
@@ -1,120 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -1457,9 +1457,9 @@
- 
-   <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
-           description="Default. Builds a working Tomcat instance">
--
-+<!-- not needed for us
-     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
-     <!-- Copy scripts -->
-     <copy todir="${tomcat.build}/bin">
-       <fileset dir="bin">
-@@ -1519,8 +1519,9 @@
-         <exclude name="${jdt.jar.filename}"/>
-       </fileset>
-     </delete>
-+<!-- we provide jdt jar externally
-     <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" />
-     <basename property="migration.jar.filename" file="${migration-lib.jar}"/>
-@@ -1530,8 +1531,9 @@
-         <exclude name="${migration-lib.jar.filename}"/>
-       </fileset>
-     </delete>
-+<!-- we provide migration tool externally
-     <copy file="${migration-lib.jar}" todir="${tomcat.build}/lib"/>
--
-+-->
-     <!-- Delete all other versions of OpenSSL support for Tomcat and copy the current one -->
-     <!-- After module release
-     <local name="openssl-lib.jar.filename" />
-@@ -2213,11 +2215,12 @@
-     </copy>
- 
-     <!-- Source bundles for native components -->
-+<!-- we provide tomcat native as another package and we don't need commons-daemon
-     <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.
-@@ -2378,8 +2381,10 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-       <link href="../elapi"/>
-       <link href="../websocketapi"/>
-       <link href="../jaspicapi"/>
-+<!-- net is not accessed from emerge
-       <link href="https://docs.oracle.com/en/java/javase/11/docs/api/"/>
-       <link href="https://jakarta.ee/specifications/platform/10/apidocs/"/>
-+-->
-       <packageset dir="${tomcat.dist}/src/java/">
-         <include name="org/**"/>
-         <exclude name="org/apache/el/parser/**"/>
-@@ -3300,6 +3305,7 @@ asf.ldap.username=${release.asfusername}
-           depends="setup-bnd">
- 
-     <!-- Download Commons Daemon -->
-+<!-- not needed
-     <antcall target="downloadgz-2">
-       <param name="sourcefile.1" value="${commons-daemon.bin.loc.1}"/>
-       <param name="sourcefile.2" value="${commons-daemon.bin.loc.2}"/>
-@@ -3308,8 +3314,9 @@ asf.ldap.username=${release.asfusername}
-       <param name="checksum.algorithm" value="${commons-daemon.bin.checksum.algorithm}"/>
-       <param name="checksum.value" value="${commons-daemon.bin.checksum.value}"/>
-     </antcall>
--
-+-->
-     <!-- Download JDT (Eclipse compiler) -->
-+<!-- we provide JDT
-     <antcall target="downloadfile-2">
-       <param name="sourcefile.1" value="${jdt.loc.1}"/>
-       <param name="sourcefile.2" value="${jdt.loc.2}"/>
-@@ -3319,8 +3326,9 @@ asf.ldap.username=${release.asfusername}
-       <param name="checksum.algorithm" value="${jdt.checksum.algorithm}"/>
-       <param name="checksum.value" value="${jdt.checksum.value}"/>
-     </antcall>
--
-+-->
-     <!-- Download WS API -->
-+<!-- we provide jaxrpc
-     <antcall target="downloadfile">
-       <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-       <param name="destfile" value="${jaxrpc-lib.jar}"/>
-@@ -3329,6 +3337,8 @@ asf.ldap.username=${release.asfusername}
-       <param name="checksum.algorithm" value="${jaxrpc-lib.checksum.algorithm}"/>
-       <param name="checksum.value" value="${jaxrpc-lib.checksum.value}"/>
-     </antcall>
-+-->
-+<!-- we provide wsdl4j
-     <antcall target="downloadfile">
-       <param name="sourcefile" value="${wsdl4j-lib.loc}"/>
-       <param name="destfile" value="${wsdl4j-lib.jar}"/>
-@@ -3337,8 +3347,9 @@ asf.ldap.username=${release.asfusername}
-       <param name="checksum.algorithm" value="${wsdl4j-lib.checksum.algorithm}"/>
-       <param name="checksum.value" value="${wsdl4j-lib.checksum.value}"/>
-     </antcall>
--
-+-->
-     <!-- Tomcat Migration Tool for Jakarta EE -->
-+<!-- we provide migration tool
-     <antcall target="downloadfile">
-       <param name="sourcefile" value="${migration-lib.loc}"/>
-       <param name="destfile" value="${migration-lib.jar}"/>
-@@ -3347,7 +3358,7 @@ asf.ldap.username=${release.asfusername}
-       <param name="checksum.algorithm" value="${migration-lib.checksum.algorithm}"/>
-       <param name="checksum.value" value="${migration-lib.checksum.value}"/>
-     </antcall>
--
-+-->
-   </target>
- 
-   <target name="download-test-compile"