gentoo resync : 25.08.2020

7 files changed, 137 insertions, 99 deletions

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 47e4079c3f7f..d9e4d68af6d8 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,16 +1,17 @@
 AUX tomcat-7.0.99-build.xml.patch 5913 BLAKE2B 21316c4ce76bd3e87c2749354cbd455c1322431649b276b59a93f10b97f59d03690f3531c2fd3a8ce67b81969544d498bf04e829407005dbed867067f8970347 SHA512 f8d0cb4ba0effdeea3db4049381efc84513551a1e28551b59a254340a8add306824d1dba344f6eaddc93e8b61fc0b71e1a8d0bcfc860500134cc19072deef30e
-AUX tomcat-8.5.47-build.xml.patch 10363 BLAKE2B 8f851b5eaa4ffb3073ee526122ef278f8e975e263b439140748ba774152a72712b6bc78d6568d097befac4ba56bc6a1721f14dd0a85d288e88621f49819e1a97 SHA512 236df8ce63e7e48293584868c140d4ba5160172cc19bd90eeacd6f14e08663b7c750f95fb24ab1eddf7c7a2a80e2f05e5470261159f3c95d3b22bd790b2f6b89
-AUX tomcat-9.0.27-build.xml.patch 10936 BLAKE2B a75c4635744b1815d5f4df29ac6bbb2afebf752c7b43cda2cd69c2cbe66100b10e04fe8a4306e2c166a6b2159091a7c7a4b88d299ea7d408e6af04c8b552ea8f SHA512 e1a68955dc6a89e1751cb429d44a19501644425b1a7553c0021255016bf69c58b64059267dab91457e78573e9dce01c3f3abe0f776d69bbf35d1c36c0535e1ce
+AUX tomcat-8.5.57-build.xml.patch 10554 BLAKE2B 40df509d8f5e3022a9d384d8d939800062ec383ea000f1224dfd5816a76af12dbde7d36826659707ae7e2a2bf0c19c1e8bc96bec5854bcd2422910530a0530fd SHA512 c1e3b73e2aece5e849219c663a01a31bd2f6355d37b51e18b68d42a05be2a49d173520450ac1aeef7b394fe860135afda225d450b4e98d912fe90231c9d70601
+AUX tomcat-9.0.37-build.xml.patch 11111 BLAKE2B dea5b3226ec9ade17e8e84c1ea00c97bb6154e212f5e43ee93876c60d4ac365e24613d80457b02ab27141a51933d8a758acd8ed2ee7f0224d13c0fb9d18101ae SHA512 3f185c3108a1f6ddccc068fe4b9f45638faba1060ab26237da17521110450d19722f374a86c4122eb59ee7ea53dbec78c9e77d8ba1c36c9e8e8cbbb414e9041c
+AUX tomcat-9.0.37-fix-build-rewrite.patch 513 BLAKE2B e806ca32771bcad0fbc2f1b3f223af2b17d2caffe6ed034783294650d4ec22c8d9d9d215ade85569f6627508c61b7d469412d582093708b6bb728d6123d65155 SHA512 7aab16d1b52fa88352df849ca051dcaf27f645b1b3edd3df3a7d87385b5068d300105f89c18ba3a0f65818739b85ec847ddd5b28b8b655efbb7b39036099cae2
 AUX tomcat-instance-manager-r1.bash 6451 BLAKE2B 3bcd9dd4d3360a91f4a548c050eab6f7174453cfbe7b4a1a7167e122efa3ec2ea6c17c88de1f9223e21e773cf717ed04d79fe0b1e7fc816400033094a07a35c6 SHA512 3c8f994519d1ca5ff24229798786ad3d75dd20dbf8b3b81f6c0ccd121b978d2cb12633270f463a39ed5c4097e5869b1a4bfbf867994a64c5e41916e378038570
 AUX tomcat-instance-manager-r2.bash 6999 BLAKE2B f1c771678bd8b894ecf242d5a8fb22f5b2f0f33445a1ff158c242b5154edc4483a5707ce33a5dcee53a3106e631ad8218243d8b72a32a10cd99e9646fa54085d SHA512 c30c156cbf2b53cf8498288bacaedd48872dce52f461ff32071310b438bdb5015c1cd1d512a2905c4db01e2b22342590e1b8aeadbd44f29062606fabbb2f2fed
 AUX tomcat-r1.init 3200 BLAKE2B eb913d32bb8c1883e58551a25ff9516337d947c6fd2c7b449601a89a4518286d61dbca76417265289782a7a08540d8e78a3ea1cd1427d43d87e24813261c0fee SHA512 3d32e2ad998adfbaea5fe0ffcbbe6659dcb530a110faed5f2712ae2fd767353b1fc3f1ac83a24d43138c1bfc55949e645833a428ab982be14415887fc46d9fab
 AUX tomcat.conf 1811 BLAKE2B a92606e113172c6f0f73e18ab8ad8796f38bd8c741bb2fd1f6c43d7682728729d0198d4150e42282c7e732750231b7cdbfb51de9b24f2ba780a22700965113c5 SHA512 0747dd2fdad6c68123425adce39f625d34924ae3e7c9d5a00361565a593047d7a4d01dee64c1ef831e5ad79b51750babaf642b0588d4b5948bbed441d53d654d
-DIST apache-tomcat-7.0.104-src.tar.gz 5309794 BLAKE2B 0d4d5d668e1131bb533af1d56fe37ee1f5c252c2c4dd987e24aae67484f27805f88750b27248c6acfd0585eacd0d3f2155c723e9a25c8613652101944add2a15 SHA512 788eab3ac343815362decf4c0d5db91f3697cc669e7e051f93bf82905cc52f9b040d00b7e07f7b85bcf470e802418896a678f991e523e08a3ae5a2f212a53257
-DIST apache-tomcat-8.5.56-src.tar.gz 5724546 BLAKE2B 623dc2d1f6808f012f19fdd0d914c4bb200e8328ab6b6855666c1db1704e198d069ff74d227bf51e8376c20daf0640002e5d6907edadfde294d8c62a64d55f83 SHA512 75529e567a7be48f2c1034f3eeada571478d0babb63fb2d368061573d7e64d5fc0a937304e2e2ffa956b5d8a403936c1543a93ee78b258b532939fb9ce80ef3d
-DIST apache-tomcat-9.0.36-src.tar.gz 5890912 BLAKE2B 18962c7d4dcd75a04476acd306002977bf039d832aa1ed5551ffcaa0612e612e6b11db6d80cea149b9fb5df9d0f76284d55a1745760df8f4fa7449999e095c61 SHA512 f8263594bc679f75cecf5bcf4ad8e8ccfea42ad8e90eaeb7004c63875c6b700b0f863d68f1cdd932ebc7b303bdfb86d70afe88686e576c8ea7ccd9574c74e25b
-DIST biz.aQute.bnd-4.1.0.jar 9263260 BLAKE2B e251a9d8b653f3e815e6c2f7774d64f1d594f3ce4b2f77956c806698df4d873310067cece68663324b11fcef8d90796b087abb289dbe2a13164a9038da4a6260 SHA512 f5d230358840f4909e35de40343fb7ee50a2d4d4691691f5ea896cfe212a086ad4859e0ee6ed4c315211223663b2fb2c07af7ea88786cedbcd4f891e5a4589ef
-DIST biz.aQute.bndlib-4.1.0.jar 2897463 BLAKE2B c29a55e07cc103919dca1e938722bf94b107e2989a4a8ae887998152a93b641a659a5209129b992432bcb2673dd4b56ec9a929627530a631db10666f2177c0e4 SHA512 2acccbb323f3d740506e89a74c5affab85e628f9062ee0d799ccd09efe0b55436d8887a46d7d94ad636a2c793632635974f1bbb045e4789391937222c8d00d30
-EBUILD tomcat-7.0.104.ebuild 4204 BLAKE2B 933c63117433e3c57c394bfedbaf75c808f79d5b811a0d3580281658298d62c81a81b35c20be389d8135391a14cb68942749927f8b3c02063fdd89411a53f70b SHA512 8a5e1571002872eb6bd972c50ebfb721ad05a78a9176c7215f0ad9d4422109a2206d24d68ff7b82f62745c67d2416b5771af14f24e809a8c097aaaa44e7fd8e5
-EBUILD tomcat-8.5.56.ebuild 4556 BLAKE2B 6a67a362e8fd98f7b233857abbcc2e85e3ce6911c795db4ba899932e62848c060f607b9bff66426dd0fbec9df91dcae959258ad813d4629ddede5c4986204ffb SHA512 de5dfd04a260674bab8c6d6dfbedc9684ad26a98994796472e694a1fa6105f55f721f97eb5ff3331a5c71182aa6874aa9be4bb0ee1fba427a6d7a0e2bdb25154
-EBUILD tomcat-9.0.36.ebuild 5479 BLAKE2B f9ca5f12da777e5a7c4022324f5dbd5e7c62607e1afd2888b9903307ae3af7a6b17fdc8ee7e82011291b4ca39fa59334754189e9abee646453bacbd497a92a03 SHA512 ce012dea0e52c29533191fc08436779309c6ce053d620c018c82d31fe26a8e5da9f39ebc64902ccd642577351c4093e23055306b3790ef107a512c01b0cdc639
+DIST apache-tomcat-7.0.105-src.tar.gz 5312024 BLAKE2B 0eaad66c6dcc3e2f6a2d8e142a7832cbd413724cab8b10f00e87d5535f4f20d5ba4712794e09444a8b3e0cf23f036da7c6923f038a6a11714682b129ed4ac5dd SHA512 249e039775e833d75b631cec26132b42e4aed25491a29f2349fa41b81737688b0a2e453072d8e3c5fc28763a9d1922f59da7529378ce8fd472eca7bbc73a6bd2
+DIST apache-tomcat-8.5.57-src.tar.gz 5730658 BLAKE2B f9bd2e159abc6af62c8681c38ea4eae8155f95df11f7c244e45018929189ef6b6a37a11e84119c3ddcb134a8ab58773add19cbab7506bb87c43b0039899fde60 SHA512 8bf4334b190c36900b708ee7097097e513f2d4572f119173bee732c76b5b660350fe516e58ac867250c2ef7a1371b55c116d3a1abd18323ceb92337f1dcb0f60
+DIST apache-tomcat-9.0.37-src.tar.gz 5894559 BLAKE2B 63148418ef96e90f212ce8a00dc6a274a8da2a1aa8a53ad0f6d3960efc8e876dd2812f425c0f21c73ee291752c5fd3bc8025eed46d18d31ae72e8bbe6dc1ba10 SHA512 6e819fe255c467b0081e91c17a53fa383fe84d922492c62d7dd93cabf00e22ab30872ecaa298a9b12977b8c7518f36c8429091b24c9fb5200db64e80e853ce98
+DIST biz.aQute.bnd-5.1.1.jar 16088761 BLAKE2B 59906cc39ea27ef20cbf82de1ba78096f34dc417da6dc5c28e21f6e92c0625efecf14cec6c5faf0ab17551c31a6c87a24614c2ac75ac902cfea30199ecc0d39f SHA512 8092b083e7b86e75bf27233964763b88bee74d8ae141c85e387c1cc8bd0cbf3a54be27afea29931fb3ae950700a515fd4a28cfe8e7f26cbaaec506aa06357a37
+DIST biz.aQute.bndlib-5.1.1.jar 3652944 BLAKE2B dad9f9835fb407a36e0eae4b65fa2fda147e06ab3f3211a2ed2f1631aeccd6d14d198c325793cb1ce9a57b719a836db230d0452715744ba5a4a6c2983c17916b SHA512 d7da056ba541ae0862159bf5e38e1a5351b2ab5388c88733b46601c2d7dab8970f16af00df186a6cb67fbe81ef53f2c8402db9d28a8c6819dadf60a1df40879b
+EBUILD tomcat-7.0.105-r1.ebuild 4224 BLAKE2B 9ff5e9fa663926e0609ffc15804c5426e95d4eb6dacd1e4e9f27ca06dd167f22bccf44e8b2cfc323532490846f7ae04672494f000e5efcddbf21c1126ae17a67 SHA512 9160d59093bbe4fe7260ac0bb26f124f70574cc4564f52f02d2987f7d6ca46825fe973cdbc69f1493d6a5a9c62ba5059ccabf5bb618ccdfd162c631b1a347b3e
+EBUILD tomcat-8.5.57-r1.ebuild 4805 BLAKE2B 3a5d5f2af2c2d9e430f986b1226754f039956e4af8a23c05ffe4f77f9e662703c95d235b78796bd8e34f3b22f873324aa1d797600ad36ef5cbc612e9429fd953 SHA512 501fc5e0db0329232cb68b370e3d496a4a9c9a992c50e4d6b9a7151f4478ea7e6778ffa054bdbe8eeb0be42e5f6fec6597ce2240f1a0550f8e100bfdb0369117
+EBUILD tomcat-9.0.37-r1.ebuild 5590 BLAKE2B 550cb8e050d04bbc872b788c35fbea2aff91d9d12c153cf06a41e980bc9f9f61adbc025271e50764ecde87585999a2ab243040962ef71a96aa4e18c13197c1c2 SHA512 576e3a41e80f10c0372e81de2bacf7f900c6bc6220986be56fa102a0133521bc7c11af69b5c5083a9224f605d3d09a22b86965a8d8e32b81ec781a66d3fd5c2d
 MISC metadata.xml 712 BLAKE2B 3e0a9b1bd07334015006678c0e1d933dc3d7b65291425754f7bcaec673f2316ba85b2e7df2c79a90f0d53dfbc443329cbea8ddfde7d4c93a1635b6140a3b18b6 SHA512 bc7c894d5f945a732078cc4d9a7fa9d0374ebb6aec449487f8968b22aed07bc5e20094448fda9be7516206121d0dfec8c6d6e48ee818786999703ea778a82109
diff --git a/www-servers/tomcat/files/tomcat-8.5.47-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.57-build.xml.patch
index ffbd07016110..c01699945e0c 100644
--- a/www-servers/tomcat/files/tomcat-8.5.47-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-8.5.57-build.xml.patch
@@ -1,8 +1,8 @@
 diff --git a/build.xml b/build.xml
-index c274aab..ed1c3e5 100644
+index 348487c..d0b8b81 100644
 --- a/build.xml
 +++ b/build.xml
-@@ -739,24 +739,29 @@
+@@ -762,25 +762,28 @@
        manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
  
      <!-- Servlet 3.1 Implementation JAR File -->
@@ -15,26 +15,27 @@ index c274aab..ed1c3e5 100644
        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 -->
+     <!-- EL 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 -->
+     <!-- JSP Implementation JAR File -->
++<!--
+     <jarIt jarfile="${jsp-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.jsp-api"
+       manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
+-
++-->
+     <!-- WebSocket API JAR File -->
      <jarIt jarfile="${websocket-api.jar}"
-@@ -848,9 +853,9 @@
-       filesId="files.jasper-el" />
+       filesDir="${tomcat.classes}"
+@@ -872,9 +875,9 @@
+       meta-inf="${tomcat.manifests}/jasper.jar" />
  
      <!-- Re-packaged Apache Commons DBCP 2-->
 -    <jarIt jarfile="${tomcat-dbcp.jar}"
@@ -45,7 +46,7 @@ index c274aab..ed1c3e5 100644
  
      <!-- i18n JARs -->
      <jar jarfile="${tomcat.build}/lib/tomcat-i18n-de.jar"
-@@ -1072,9 +1077,9 @@
+@@ -1096,9 +1099,9 @@
  
    <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
            description="Default. Builds a working Tomcat instance">
@@ -57,7 +58,7 @@ index c274aab..ed1c3e5 100644
      <!-- Copy scripts -->
      <copy todir="${tomcat.build}/bin">
        <fileset dir="bin">
-@@ -1134,7 +1139,7 @@
+@@ -1158,7 +1161,7 @@
          <exclude name="${jdt.jar.filename}"/>
        </fileset>
      </delete>
@@ -66,7 +67,7 @@ index c274aab..ed1c3e5 100644
  
      <!-- Add sources for examples -->
      <antcall target="examples-sources" />
-@@ -1177,7 +1182,7 @@
+@@ -1201,7 +1204,7 @@
  
    </target>
  
@@ -75,7 +76,7 @@ index c274aab..ed1c3e5 100644
      <!-- 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}"
-@@ -1192,7 +1197,7 @@
+@@ -1216,7 +1219,7 @@
      <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
    </target>
  
@@ -84,7 +85,7 @@ index c274aab..ed1c3e5 100644
      <!-- 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}"
-@@ -1295,9 +1300,11 @@
+@@ -1319,9 +1322,11 @@
  
      <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
      <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
@@ -96,7 +97,7 @@ index c274aab..ed1c3e5 100644
      <copy file="${annotations-api.jar}" todir="${tomcat.embed}" />
  
      <!-- Note the meta-inf below will work as long as there is only one JAR
-@@ -1681,7 +1688,7 @@
+@@ -1710,7 +1715,7 @@
  
    <target name="extras-webservices-prepare"
            depends="extras-prepare"
@@ -105,15 +106,15 @@ index c274aab..ed1c3e5 100644
  
      <antcall target="downloadfile">
        <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1845,6 +1852,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" >
+@@ -1895,6 +1900,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+         <path location="${ant.core.lib}"/>
+       </classpath>
+     </javadoc>
 +<!--
-     <javadoc packagenames="javax.annotation.*"
+     <javadoc packagenames="javax.servlet.*"
+       excludepackagenames="javax.servlet.jsp.*"
        sourcepath="${tomcat.dist}/src/java"
-       destdir="${tomcat.dist}/webapps/docs/annotationapi"
-@@ -1933,6 +1941,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -1962,6 +1968,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
          <path location="${ant.core.lib}"/>
        </classpath>
      </javadoc>
@@ -121,7 +122,7 @@ index c274aab..ed1c3e5 100644
      <javadoc packagenames="javax.websocket.*"
        sourcepath="${tomcat.dist}/src/java"
        destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -1996,9 +2005,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -2025,13 +2032,17 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
          <path location="${ant.core.lib}"/>
        </classpath>
        <link href="../annotationapi"/>
@@ -132,8 +133,14 @@ index c274aab..ed1c3e5 100644
 +-->
        <link href="../websocketapi"/>
        <link href="../jaspicapi"/>
++<!--
        <link href="https://docs.oracle.com/javase/7/docs/api/"/>
-@@ -2728,7 +2739,7 @@ skip.installer property in build.properties" />
+       <link href="https://docs.oracle.com/javaee/7/api/"/>
++-->
+       <packageset dir="${tomcat.dist}/src/java/">
+         <include name="org/**"/>
+         <exclude name="org/apache/el/parser/**"/>
+@@ -2759,7 +2770,7 @@ skip.installer property in build.properties" />
    </target>
  
    <target name="download-compile"
@@ -142,7 +149,7 @@ index c274aab..ed1c3e5 100644
  
      <!-- Download Commons Daemon -->
      <antcall target="downloadgz-2">
-@@ -2764,7 +2775,7 @@ skip.installer property in build.properties" />
+@@ -2795,7 +2806,7 @@ skip.installer property in build.properties" />
    </target>
  
    <target name="download-test-compile"
@@ -151,7 +158,7 @@ index c274aab..ed1c3e5 100644
  
      <antcall target="downloadfile">
        <param name="sourcefile" value="${junit.loc}"/>
-@@ -2842,7 +2853,7 @@ skip.installer property in build.properties" />
+@@ -2873,7 +2884,7 @@ skip.installer property in build.properties" />
    </target>
  
    <target name="download-dist"
@@ -160,7 +167,7 @@ index c274aab..ed1c3e5 100644
  
      <antcall target="downloadfile-2">
        <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2897,13 +2908,13 @@ skip.installer property in build.properties" />
+@@ -2928,13 +2939,13 @@ skip.installer property in build.properties" />
  
    <!-- =============== Utility Targets to support downloads ================ -->
  
@@ -176,7 +183,7 @@ index c274aab..ed1c3e5 100644
      <echo message="Testing  for ${destfile}"/>
      <available file="${destfile}" property="exist"/>
    </target>
-@@ -3025,7 +3036,7 @@ skip.installer property in build.properties" />
+@@ -3056,7 +3067,7 @@ skip.installer property in build.properties" />
      </sequential>
    </macrodef>
  
@@ -185,7 +192,7 @@ index c274aab..ed1c3e5 100644
      <!-- Download and extract the package -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -3042,7 +3053,7 @@ skip.installer property in build.properties" />
+@@ -3073,7 +3084,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}.tar.gz"/>
    </target>
  
@@ -194,7 +201,7 @@ index c274aab..ed1c3e5 100644
      <!-- Download and extract the package from the two alternative locations -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -3067,7 +3078,7 @@ skip.installer property in build.properties" />
+@@ -3098,7 +3109,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}.tar.gz"/>
    </target>
  
@@ -203,7 +210,7 @@ index c274aab..ed1c3e5 100644
      <!-- Download and extract the package -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -3083,7 +3094,7 @@ skip.installer property in build.properties" />
+@@ -3114,7 +3125,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}"/>
    </target>
  
@@ -212,7 +219,7 @@ index c274aab..ed1c3e5 100644
      <!-- Download and extract the package from the two alternative locations -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -3107,7 +3118,7 @@ skip.installer property in build.properties" />
+@@ -3138,7 +3149,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}"/>
    </target>
  
@@ -221,7 +228,7 @@ index c274aab..ed1c3e5 100644
      <!-- Download the file -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -3122,7 +3133,7 @@ skip.installer property in build.properties" />
+@@ -3153,7 +3164,7 @@ skip.installer property in build.properties" />
      <move file="${temp.file}" tofile="${destfile}"/>
    </target>
  
@@ -230,7 +237,7 @@ index c274aab..ed1c3e5 100644
      <!-- Download the file from the two alternative locations -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -3150,7 +3161,7 @@ skip.installer property in build.properties" />
+@@ -3181,7 +3192,7 @@ skip.installer property in build.properties" />
      <move file="${temp.file}" tofile="${destfile}"/>
    </target>
  
@@ -239,7 +246,7 @@ index c274aab..ed1c3e5 100644
      <condition property="trydownload.run">
        <and>
          <not>
-@@ -3161,7 +3172,7 @@ skip.installer property in build.properties" />
+@@ -3192,7 +3203,7 @@ skip.installer property in build.properties" />
      </condition>
    </target>
  
@@ -248,7 +255,7 @@ index c274aab..ed1c3e5 100644
      <!-- Downloads a file if not yet downloaded and the source URL is available -->
      <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
    </target>
-@@ -3172,7 +3183,7 @@ skip.installer property in build.properties" />
+@@ -3203,7 +3214,7 @@ skip.installer property in build.properties" />
  
    <target name="ide-eclipse"
            depends="download-compile, extras-webservices-prepare, download-test-compile"
diff --git a/www-servers/tomcat/files/tomcat-9.0.27-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.37-build.xml.patch
index 05c8ffa1f990..ea902b4b922f 100644
--- a/www-servers/tomcat/files/tomcat-9.0.27-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-9.0.37-build.xml.patch
@@ -1,8 +1,8 @@
 diff --git a/build.xml b/build.xml
-index 020531c..a71f6ee 100644
+index 8e02cb5..9007e8b 100644
 --- a/build.xml
 +++ b/build.xml
-@@ -754,6 +754,7 @@
+@@ -760,6 +760,7 @@
        addOSGi="true" />
  
      <!-- Servlet 4.0 Implementation JAR File -->
@@ -10,34 +10,34 @@ index 020531c..a71f6ee 100644
      <jarIt jarfile="${servlet-api.jar}"
        filesDir="${tomcat.classes}"
        filesId="files.servlet-api"
-@@ -761,21 +762,23 @@
+@@ -767,21 +768,23 @@
        notice="${tomcat.manifests}/servlet-api.jar.notice"
        license="${tomcat.manifests}/servlet-api.jar.license"
        addOSGi="true" />
 -
 +-->
-     <!-- JSP 2.3 Implementation JAR File -->
+     <!-- EL Implementation JAR File -->
 +<!--
-     <jarIt jarfile="${jsp-api.jar}"
+     <jarIt jarfile="${el-api.jar}"
        filesDir="${tomcat.classes}"
-       filesId="files.jsp-api"
-       manifest="${tomcat.manifests}/jsp-api.jar.manifest"
+       filesId="files.el-api"
+       manifest="${tomcat.manifests}/el-api.jar.manifest"
        addOSGi="true" />
 -
 +-->
-     <!-- EL 3.0 Implementation JAR File -->
+     <!-- JSP Implementation JAR File -->
 +<!--
-     <jarIt jarfile="${el-api.jar}"
+     <jarIt jarfile="${jsp-api.jar}"
        filesDir="${tomcat.classes}"
-       filesId="files.el-api"
-       manifest="${tomcat.manifests}/el-api.jar.manifest"
+       filesId="files.jsp-api"
+       manifest="${tomcat.manifests}/jsp-api.jar.manifest"
        addOSGi="true" />
 -
 +-->
-     <!-- WebSocket 1.1 API JAR File -->
+     <!-- WebSocket API JAR File -->
      <jarIt jarfile="${websocket-api.jar}"
        filesDir="${tomcat.classes}"
-@@ -881,10 +884,10 @@
+@@ -894,10 +897,10 @@
        addOSGi="true" />
  
      <!-- Re-packaged Apache Commons DBCP 2-->
@@ -50,7 +50,7 @@ index 020531c..a71f6ee 100644
  
      <!-- i18n JARs -->
      <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
-@@ -1126,9 +1129,9 @@
+@@ -1139,9 +1142,9 @@
  
    <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
            description="Default. Builds a working Tomcat instance">
@@ -62,7 +62,7 @@ index 020531c..a71f6ee 100644
      <!-- Copy scripts -->
      <copy todir="${tomcat.build}/bin">
        <fileset dir="bin">
-@@ -1188,7 +1191,7 @@
+@@ -1201,7 +1204,7 @@
          <exclude name="${jdt.jar.filename}"/>
        </fileset>
      </delete>
@@ -71,7 +71,7 @@ index 020531c..a71f6ee 100644
  
      <!-- Add sources for examples -->
      <antcall target="examples-sources" />
-@@ -1231,7 +1234,7 @@
+@@ -1244,7 +1247,7 @@
  
    </target>
  
@@ -80,7 +80,7 @@ index 020531c..a71f6ee 100644
      <!-- 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}"
-@@ -1246,7 +1249,7 @@
+@@ -1259,7 +1262,7 @@
      <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
    </target>
  
@@ -89,7 +89,7 @@ index 020531c..a71f6ee 100644
      <!-- 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}"
-@@ -1349,9 +1352,11 @@
+@@ -1362,9 +1365,11 @@
  
      <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
      <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
@@ -101,7 +101,7 @@ index 020531c..a71f6ee 100644
      <copy file="${annotations-api.jar}" todir="${tomcat.embed}" />
  
      <!-- Note the meta-inf below will work as long as there is only one JAR
-@@ -1830,11 +1835,12 @@
+@@ -1863,11 +1868,12 @@
      </copy>
  
      <!-- Source bundles for native components -->
@@ -115,15 +115,15 @@ index 020531c..a71f6ee 100644
      <!-- platform README files -->
      <echo append="false" file="${tomcat.dist}/bin/x64/README">
  Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-@@ -1844,6 +1850,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- 
-   <target name="javadoc" depends="dist-source"
-     description="Create the Tomcat javadoc" >
+@@ -1898,6 +1904,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+         <path location="${ant.core.lib}"/>
+       </classpath>
+     </javadoc>
 +<!--
-     <javadoc packagenames="javax.annotation.*"
+     <javadoc packagenames="javax.servlet.*"
+       excludepackagenames="javax.servlet.jsp.*"
        sourcepath="${tomcat.dist}/src/java"
-       destdir="${tomcat.dist}/webapps/docs/annotationapi"
-@@ -1929,6 +1936,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -1962,6 +1969,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
          <path location="${ant.core.lib}"/>
        </classpath>
      </javadoc>
@@ -131,7 +131,7 @@ index 020531c..a71f6ee 100644
      <javadoc packagenames="javax.websocket.*"
        sourcepath="${tomcat.dist}/src/java"
        destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -1990,9 +1998,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -2023,13 +2031,17 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
          <path location="${ant.core.lib}"/>
        </classpath>
        <link href="../annotationapi"/>
@@ -142,8 +142,14 @@ index 020531c..a71f6ee 100644
 +-->
        <link href="../websocketapi"/>
        <link href="../jaspicapi"/>
++<!--
        <link href="https://docs.oracle.com/javase/8/docs/api/"/>
-@@ -2714,7 +2724,7 @@ skip.installer property in build.properties" />
+       <link href="https://javaee.github.io/javaee-spec/javadocs/"/>
++-->
+       <packageset dir="${tomcat.dist}/src/java/">
+         <include name="org/**"/>
+         <exclude name="org/apache/el/parser/**"/>
+@@ -2756,7 +2768,7 @@ skip.installer property in build.properties" />
    </target>
  
    <target name="download-compile"
@@ -152,7 +158,7 @@ index 020531c..a71f6ee 100644
  
      <!-- Download Commons Daemon -->
      <antcall target="downloadgz-2">
-@@ -2769,7 +2779,7 @@ skip.installer property in build.properties" />
+@@ -2811,7 +2823,7 @@ skip.installer property in build.properties" />
    </target>
  
    <target name="download-test-compile"
@@ -161,7 +167,7 @@ index 020531c..a71f6ee 100644
  
      <antcall target="downloadfile">
        <param name="sourcefile" value="${junit.loc}"/>
-@@ -2847,7 +2857,7 @@ skip.installer property in build.properties" />
+@@ -2889,7 +2901,7 @@ skip.installer property in build.properties" />
    </target>
  
    <target name="download-dist"
@@ -170,7 +176,7 @@ index 020531c..a71f6ee 100644
  
      <antcall target="downloadfile-2">
        <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2902,13 +2912,13 @@ skip.installer property in build.properties" />
+@@ -2944,13 +2956,13 @@ skip.installer property in build.properties" />
  
    <!-- =============== Utility Targets to support downloads ================ -->
  
@@ -186,7 +192,7 @@ index 020531c..a71f6ee 100644
      <echo message="Testing  for ${destfile}"/>
      <available file="${destfile}" property="exist"/>
    </target>
-@@ -3030,7 +3040,7 @@ skip.installer property in build.properties" />
+@@ -3072,7 +3084,7 @@ skip.installer property in build.properties" />
      </sequential>
    </macrodef>
  
@@ -195,7 +201,7 @@ index 020531c..a71f6ee 100644
      <!-- Download and extract the package -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -3047,7 +3057,7 @@ skip.installer property in build.properties" />
+@@ -3089,7 +3101,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}.tar.gz"/>
    </target>
  
@@ -204,7 +210,7 @@ index 020531c..a71f6ee 100644
      <!-- Download and extract the package from the two alternative locations -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -3072,7 +3082,7 @@ skip.installer property in build.properties" />
+@@ -3114,7 +3126,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}.tar.gz"/>
    </target>
  
@@ -213,7 +219,7 @@ index 020531c..a71f6ee 100644
      <!-- Download and extract the package -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -3088,7 +3098,7 @@ skip.installer property in build.properties" />
+@@ -3130,7 +3142,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}"/>
    </target>
  
@@ -222,7 +228,7 @@ index 020531c..a71f6ee 100644
      <!-- Download and extract the package from the two alternative locations -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -3112,7 +3122,7 @@ skip.installer property in build.properties" />
+@@ -3154,7 +3166,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}"/>
    </target>
  
@@ -231,7 +237,7 @@ index 020531c..a71f6ee 100644
      <!-- Download the file -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -3127,7 +3137,7 @@ skip.installer property in build.properties" />
+@@ -3169,7 +3181,7 @@ skip.installer property in build.properties" />
      <move file="${temp.file}" tofile="${destfile}"/>
    </target>
  
@@ -240,7 +246,7 @@ index 020531c..a71f6ee 100644
      <!-- Download the file from the two alternative locations -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -3155,7 +3165,7 @@ skip.installer property in build.properties" />
+@@ -3197,7 +3209,7 @@ skip.installer property in build.properties" />
      <move file="${temp.file}" tofile="${destfile}"/>
    </target>
  
@@ -249,7 +255,7 @@ index 020531c..a71f6ee 100644
      <condition property="trydownload.run">
        <and>
          <not>
-@@ -3166,7 +3176,7 @@ skip.installer property in build.properties" />
+@@ -3208,7 +3220,7 @@ skip.installer property in build.properties" />
      </condition>
    </target>
  
@@ -258,7 +264,7 @@ index 020531c..a71f6ee 100644
      <!-- Downloads a file if not yet downloaded and the source URL is available -->
      <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
    </target>
-@@ -3177,7 +3187,7 @@ skip.installer property in build.properties" />
+@@ -3219,7 +3231,7 @@ skip.installer property in build.properties" />
  
    <target name="ide-eclipse"
            depends="download-compile, download-test-compile"
@@ -267,7 +273,7 @@ index 020531c..a71f6ee 100644
  
      <!-- Copy the sample project files into the root directory -->
      <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
-@@ -3195,7 +3205,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho
+@@ -3237,7 +3249,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"
diff --git a/www-servers/tomcat/files/tomcat-9.0.37-fix-build-rewrite.patch b/www-servers/tomcat/files/tomcat-9.0.37-fix-build-rewrite.patch
new file mode 100644
index 000000000000..7aa1e883f133
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-9.0.37-fix-build-rewrite.patch
@@ -0,0 +1,13 @@
+diff --git a/build.xml b/build.xml
+index 9ba357b..352e141 100644
+--- a/build.xml
++++ b/build.xml
+@@ -2716,7 +2716,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho
+       <bndfiles >
+         <pathelement location="${tomcat.bnd}/${filename}.tmp.bnd" ></pathelement>
+       </bndfiles>
+-    <classpath path="${gentoo.classpath}" ></classpath></bnd>
++    </bnd>
+     <delete file="${jarfile}" ></delete>
+     <move file="${jarfile}.tmp" tofile="${jarfile}" ></move>
+   </target>
diff --git a/www-servers/tomcat/tomcat-7.0.104.ebuild b/www-servers/tomcat/tomcat-7.0.105-r1.ebuild
index 8fa804171b41..a905c145be4a 100644
--- a/www-servers/tomcat/tomcat-7.0.104.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.105-r1.ebuild
@@ -51,7 +51,7 @@ src_prepare() {
 
 	# For use of catalina.sh in netbeans
 	sed -i -e "/^# ----- Execute The Requested Command/ a\
-		CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
+		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
 		bin/catalina.sh || die
 
 	java-pkg-2_src_prepare
diff --git a/www-servers/tomcat/tomcat-8.5.56.ebuild b/www-servers/tomcat/tomcat-8.5.57-r1.ebuild
index 688cb7615768..3ab7947a19c5 100644
--- a/www-servers/tomcat/tomcat-8.5.56.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.57-r1.ebuild
@@ -31,6 +31,10 @@ DEPEND="${COMMON_DEP}
 	app-admin/pwgen
 	>=dev-java/ant-core-1.9.13
 	virtual/jdk:1.8
+	doc? (
+		dev-java/glassfish-xmlrpc-api:0
+		dev-java/wsdl4j:0
+	)
 	test? (
 		>=dev-java/ant-junit-1.9:0
 		dev-java/easymock:3.2
@@ -52,11 +56,11 @@ src_prepare() {
 	# Remove bundled servlet-api
 	rm -rv java/javax/{el,servlet} || die
 
-	eapply "${FILESDIR}/${PN}-8.5.47-build.xml.patch"
+	eapply "${FILESDIR}/${P}-build.xml.patch"
 
 	# For use of catalina.sh in netbeans
 	sed -i -e "/^# ----- Execute The Requested Command/ a\
-		CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
+		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
 		bin/catalina.sh || die
 
 	java-pkg-2_src_prepare
@@ -77,6 +81,7 @@ INIT_REV="-r1"
 
 src_compile() {
 	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+	use doc && EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only glassfish-xmlrpc-api glassfish-xmlrpc-api.jar):$(java-pkg_getjar --build-only wsdl4j wsdl4j.jar)"
 	java-pkg-2_src_compile
 }
 
diff --git a/www-servers/tomcat/tomcat-9.0.36.ebuild b/www-servers/tomcat/tomcat-9.0.37-r1.ebuild
index b0c29cb19e68..8ac1a2107bd5 100644
--- a/www-servers/tomcat/tomcat-9.0.36.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.37-r1.ebuild
@@ -11,7 +11,7 @@ MY_P="apache-${PN}-${PV}-src"
 
 # Currently we bundle binary versions of bnd.jar and bndlib.jar
 # See bugs #203080 and #676116
-BND_VERSION="4.1.0"
+BND_VERSION="5.1.1"
 BND="biz.aQute.bnd-${BND_VERSION}.jar"
 BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
 
@@ -75,11 +75,11 @@ src_prepare() {
 	# Remove bundled servlet-api
 	rm -rv java/javax/{el,servlet} || die
 
-	eapply "${FILESDIR}/${PN}-9.0.27-build.xml.patch"
+	eapply "${FILESDIR}/${P}-build.xml.patch"
 
 	# For use of catalina.sh in netbeans
 	sed -i -e "/^# ----- Execute The Requested Command/ a\
-		CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
+		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
 		bin/catalina.sh || die
 
 	java-pkg-2_src_prepare
@@ -98,6 +98,12 @@ EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=f
 IM_REV="-r2"
 INIT_REV="-r1"
 
+src_configure() {
+	java-ant-2_src_configure
+
+	eapply "${FILESDIR}/${P}-fix-build-rewrite.patch"
+}
+
 src_compile() {
 	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
 	java-pkg-2_src_compile