www-servers/tomcat: version bump for slot 9

Package-Manager: Portage-2.3.11, Repoman-2.3.3

3 files changed, 30 insertions, 31 deletions

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 0f5333ff3d25..18dbcb4bc281 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -3,4 +3,4 @@ DIST apache-tomcat-7.0.81-src.tar.gz 4689428 SHA256 fca79afb210cfbc8f9ebcdebdd04
 DIST apache-tomcat-8.0.45-src.tar.gz 4978313 SHA256 450fd2890b12e56692cb203f95651f9a873dce056b7b4362e142bc817032b291 SHA512 80e4281f5b6e4d6bf607179840bc6cb923ea9f57ec8231a451c3b5a1f8938f72ec1097290059afba0ef7b56edeb56d63636849517b69b91c7093cb15ff0eaa04 WHIRLPOOL c893cd5c26637f8881c19353e269145e33fa11e02eb10ef93a41590ad2e1e6c6ffa1b3f6c3c7c318630765f666be07447fd3a21c70c2c381e75c458b60383ea0
 DIST apache-tomcat-8.0.46-src.tar.gz 4985079 SHA256 b5b9e560b3f75dd68b3103915c754ac47cf526f26f18cd6e9baba9580be25161 SHA512 9adbea9faf61f782ede1c657e833dea55ad1b4a874a1eb9801eab82ac9999de847e7f08ff7a49b3389b9d0683d185c6d4981f9f8d2f607f68c077a682af508d5 WHIRLPOOL eafb2768555261836b04f12f95ba2755d2a7ef98754a5a009099e377220dff1251c6ad1cbe672764787c485b3f922bf1fda8db663890db36e356e7a5139b83e9
 DIST apache-tomcat-8.5.20-src.tar.gz 5063310 SHA256 6bc40ae61b77906325bf8bdb2b0767aeb96f4c5a7a9b618aa496db59387d6610 SHA512 dea3095792de76a3a56bd6fd6c9ed5702ca539856d0e07a5de2600f456e7255929d14748a2dc9b3c626b3a67aaac8795ef3f5a6a1351991a0e89443e0c9d0807 WHIRLPOOL 1924f12c5068574424587d5b8b7261efb7496dbc53915d8cb2558b4a643aedecc98823ac7dec238fe7cb1a1874734e05de2dc6b7b28e48ffdae9e8c5c586e895
-DIST apache-tomcat-9.0.0.M26-src.tar.gz 5011957 SHA256 02ba2c9a3a2d78994fc14f2b304c3b3f46615538a48a9193e475b08565cb9b7e SHA512 8c25932aa244edb46eee26aa837636e78c8104ca6617cb5ba924e0e45c2f9dbcd7d196ddf69ee2f1c1b6053dda818a3b92f8f46c156f3048c46cee919fc22c13 WHIRLPOOL 11e00a6e6a5822bd4e357e375b026dd732bf33319e30dde25f11bc1b99994617be3ce6d4976870f725e56646e5ffee92acb6fc23f46b53a46ebbf6c53707ea07
+DIST apache-tomcat-9.0.1-src.tar.gz 5029499 SHA256 f4da8ef7a03dd7280a9a4b6c66cc9bd34dddc6429c33d9db1a8acfc1596c4e90 SHA512 6116b05f448c24e691c4b56372a41cfd8900adc5e759f2f5026c808de48d65705763236fca46f69321d351f37f5dbc7aa49db8c097b8a3155e367fe21aa0d384 WHIRLPOOL 2e0f05001b9f0d57a241db8ddf0212d3adce2c1b829a03318b5cc1b5a250ae32a50d801e23d9b6a2943c208a478dd00d1f5ae07d1c3c736fbf059554a40caf66
diff --git a/www-servers/tomcat/files/tomcat-9.0.0_alpha26-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.1_beta-build.xml.patch
index 3c4e5c2a9d45..3f55c285e230 100644
--- a/www-servers/tomcat/files/tomcat-9.0.0_alpha26-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-9.0.1_beta-build.xml.patch
@@ -1,8 +1,8 @@
-diff --git a/apache-tomcat-9.0.0.M8-src/build.xml b/apache-tomcat-9.0.0.M8-src/build.xml
-index dfec1f7..4dfc5d8 100644
---- a/apache-tomcat-9.0.0.M8-src/build.xml
-+++ b/apache-tomcat-9.0.0.M8-src/build.xml
-@@ -695,24 +695,30 @@
+diff --git a/apache-tomcat-9.0.1-src/build.xml b/apache-tomcat-9.0.1-src/build.xml
+index aa29b28..a9ac6bd 100644
+--- a/apache-tomcat-9.0.1-src/build.xml
++++ b/apache-tomcat-9.0.1-src/build.xml
+@@ -715,24 +715,30 @@
        manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
  
      <!-- Servlet 4.0 Implementation JAR File -->
@@ -33,7 +33,7 @@ index dfec1f7..4dfc5d8 100644
  
      <!-- WebSocket 1.1 API JAR File -->
      <jarIt jarfile="${websocket-api.jar}"
-@@ -986,14 +992,14 @@
+@@ -1006,14 +1012,14 @@
  
    <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
            description="Default. Builds a working Tomcat instance">
@@ -50,7 +50,7 @@ index dfec1f7..4dfc5d8 100644
      <!-- Copy scripts -->
      <copy todir="${tomcat.build}/bin">
        <fileset dir="bin">
-@@ -1053,7 +1059,7 @@
+@@ -1073,7 +1079,7 @@
          <exclude name="${jdt.jar.filename}"/>
        </fileset>
      </delete>
@@ -59,7 +59,7 @@ index dfec1f7..4dfc5d8 100644
  
      <!-- Add sources for examples -->
      <antcall target="examples-sources" />
-@@ -1087,7 +1093,7 @@
+@@ -1107,7 +1113,7 @@
      </javac>
    </target>
  
@@ -68,7 +68,7 @@ index dfec1f7..4dfc5d8 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}"
-@@ -1102,7 +1108,7 @@
+@@ -1122,7 +1128,7 @@
      <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
    </target>
  
@@ -77,7 +77,7 @@ index dfec1f7..4dfc5d8 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}"
-@@ -1206,10 +1212,11 @@
+@@ -1226,9 +1232,11 @@
  
      <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
      <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
@@ -85,12 +85,11 @@ index dfec1f7..4dfc5d8 100644
      <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
-          that needs to add entries. If there is more than one a more complex
-          solution will be required. -->
-@@ -1583,7 +1590,7 @@
+@@ -1609,7 +1617,7 @@
  
    <target name="extras-webservices-prepare"
            depends="extras-prepare"
@@ -99,7 +98,7 @@ index dfec1f7..4dfc5d8 100644
  
      <antcall target="downloadfile">
        <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1731,6 +1738,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -1757,6 +1765,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" >
@@ -107,7 +106,7 @@ index dfec1f7..4dfc5d8 100644
      <javadoc packagenames="javax.servlet.*"
        excludepackagenames="javax.servlet.jsp.*"
        sourcepath="${tomcat.dist}/src/java"
-@@ -1795,6 +1803,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -1821,6 +1830,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
          <path location="${ant.core.lib}"/>
        </classpath>
      </javadoc>
@@ -115,7 +114,7 @@ index dfec1f7..4dfc5d8 100644
      <javadoc packagenames="javax.websocket.*"
        sourcepath="${tomcat.dist}/src/java"
        destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -1835,9 +1844,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -1861,9 +1871,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
          <path refid="tomcat.webservices.classpath"/>
          <path location="${ant.core.lib}"/>
        </classpath>
@@ -127,7 +126,7 @@ index dfec1f7..4dfc5d8 100644
        <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/"/>
-@@ -2578,7 +2589,7 @@ skip.installer property in build.properties" />
+@@ -2608,7 +2620,7 @@ skip.installer property in build.properties" />
    </target>
  
    <target name="download-compile"
@@ -136,7 +135,7 @@ index dfec1f7..4dfc5d8 100644
  
      <antcall target="downloadfile-2">
        <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2612,7 +2623,7 @@ skip.installer property in build.properties" />
+@@ -2642,7 +2654,7 @@ skip.installer property in build.properties" />
    </target>
  
    <target name="download-test-compile"
@@ -145,7 +144,7 @@ index dfec1f7..4dfc5d8 100644
  
      <antcall target="downloadfile">
        <param name="sourcefile" value="${junit.loc}"/>
-@@ -2669,7 +2680,7 @@ skip.installer property in build.properties" />
+@@ -2699,7 +2711,7 @@ skip.installer property in build.properties" />
    </target>
  
    <target name="download-dist"
@@ -154,7 +153,7 @@ index dfec1f7..4dfc5d8 100644
  
      <antcall target="downloadzip-2">
        <param name="sourcefile.1" value="${tomcat-native.win.1}"/>
-@@ -2695,18 +2706,18 @@ skip.installer property in build.properties" />
+@@ -2725,18 +2737,18 @@ skip.installer property in build.properties" />
  
    <!-- =============== Utility Targets to support downloads ================ -->
  
@@ -176,7 +175,7 @@ index dfec1f7..4dfc5d8 100644
      <!-- Download and extract the package -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -2718,7 +2729,7 @@ skip.installer property in build.properties" />
+@@ -2748,7 +2760,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}.tar.gz"/>
    </target>
  
@@ -185,7 +184,7 @@ index dfec1f7..4dfc5d8 100644
      <!-- Download and extract the package from the two alternative locations -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -2737,7 +2748,7 @@ skip.installer property in build.properties" />
+@@ -2767,7 +2779,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}.tar.gz"/>
    </target>
  
@@ -194,7 +193,7 @@ index dfec1f7..4dfc5d8 100644
      <!-- Download and extract the package -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -2748,7 +2759,7 @@ skip.installer property in build.properties" />
+@@ -2778,7 +2790,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}"/>
    </target>
  
@@ -203,7 +202,7 @@ index dfec1f7..4dfc5d8 100644
      <!-- Download and extract the package from the two alternative locations -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -2766,7 +2777,7 @@ skip.installer property in build.properties" />
+@@ -2796,7 +2808,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}"/>
    </target>
  
@@ -212,7 +211,7 @@ index dfec1f7..4dfc5d8 100644
      <!-- Download the file -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -2776,7 +2787,7 @@ skip.installer property in build.properties" />
+@@ -2806,7 +2818,7 @@ skip.installer property in build.properties" />
      <move file="${temp.file}" tofile="${destfile}"/>
    </target>
  
@@ -221,7 +220,7 @@ index dfec1f7..4dfc5d8 100644
      <!-- Download the file from the two alternative locations -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -2799,7 +2810,7 @@ skip.installer property in build.properties" />
+@@ -2829,7 +2841,7 @@ skip.installer property in build.properties" />
      <move file="${temp.file}" tofile="${destfile}"/>
    </target>
  
@@ -230,7 +229,7 @@ index dfec1f7..4dfc5d8 100644
      <condition property="trydownload.run">
        <and>
          <not>
-@@ -2810,7 +2821,7 @@ skip.installer property in build.properties" />
+@@ -2840,7 +2852,7 @@ skip.installer property in build.properties" />
      </condition>
    </target>
  
@@ -239,7 +238,7 @@ index dfec1f7..4dfc5d8 100644
      <!-- Downloads a file if not yet downloaded and the source URL is available -->
      <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
    </target>
-@@ -2821,7 +2832,7 @@ skip.installer property in build.properties" />
+@@ -2851,7 +2863,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/tomcat-9.0.0_alpha26.ebuild b/www-servers/tomcat/tomcat-9.0.1_beta.ebuild
index 8090b4f5c011..4fc6821dab5a 100644
--- a/www-servers/tomcat/tomcat-9.0.0_alpha26.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.1_beta.ebuild
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc source test"
 
 inherit eutils java-pkg-2 java-ant-2 prefix user
 
-MY_PV="${PV/_alpha/.M}"
+MY_PV="${PV/_beta/}"
 MY_P="apache-${PN}-${MY_PV}-src"
 
 DESCRIPTION="Tomcat Servlet-4.0/JSP-2.4?/EL-3.1?/WebSocket-1.2?/JASPIC-1.1 Container"