[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/

[Miroslav Šulc]

commit:     daf2c8f780a651ffa6a346393bf49cc82de32315
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 13 17:10:16 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Oct 13 17:10:35 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=daf2c8f7

www-servers/tomcat: version bump in slot 8, 8.5 and 9

Package-Manager: portage-2.3.2

 www-servers/tomcat/Manifest                        |  4 +-
 ...ild.xml.patch => tomcat-8.0.38-build.xml.patch} | 65 ++++++++++++----------
 ...uild.xml.patch => tomcat-8.5.6-build.xml.patch} | 56 +++++++++----------
 ....patch => tomcat-9.0.0_alpha11-build.xml.patch} |  0
 ...t-9.0.0_alpha10.ebuild => tomcat-8.0.38.ebuild} | 17 +++---
 ...at-9.0.0_alpha10.ebuild => tomcat-8.5.6.ebuild} | 17 +++---
 ..._alpha10.ebuild => tomcat-9.0.0_alpha11.ebuild} |  0
 7 files changed, 84 insertions(+), 75 deletions(-)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 05e8497..539b526 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -7,7 +7,9 @@ DIST apache-tomcat-8.0.33-src.tar.gz 4969308 SHA256 1a141b90111347640df57fe506d9
 DIST apache-tomcat-8.0.35-src.tar.gz 4980657 SHA256 420036fde5e1bfe0a3d27299e355ee153b7c547d17c7b52fe4b15a1315d9c4e9 SHA512 c56ba4339fc114cda9a784c7f37be99c82238bbe043f69a3bed2ec86a0bf60325af9105d74cfcffa144636fecc7f4730cee08eca3a22ed035dd5e3e483fa1742 WHIRLPOOL 38d2382eabe19be8b008eb8975ddf95e086b482eb58cb56f566cf4ec7c7628663260a550b611f4db57803e503ab6746aedaac279bff24868c5997eaee3514966
 DIST apache-tomcat-8.0.36-src.tar.gz 4988679 SHA256 36db67592adda575fc08dd5f0cd3532934d2edb117028e29bdd9f702bf31ab10 SHA512 192a31eb42afdc345fa5ea5f05b03766e70a67841fca9bd9c76bcd47ae1d505fd3cd1fde6bc64e145add2b6a9e88ecc50ab1a0954942704c139ec3c7a6bf7286 WHIRLPOOL da1bb6570d62caedfe83948f2e850ec7e8bdba36925d1f000067864c98b1bd780aabf2f1cbcb66cb544db292156a98819e9cc6dfa42a345064f09dcc4471a7c3
 DIST apache-tomcat-8.0.37-src.tar.gz 5003508 SHA256 72bfdfeed09f535990d234429ed7b3f1856ee3d0b89168472a40256cc8efcf1d SHA512 cb4da5cf8a056a2a5549914fb405ec66867021da90877415f399b2f4aeb62b776d6d4b1ed176ab53070f7de2525bcde549919f7cbddb2e89945092ae95f914f6 WHIRLPOOL 90218e0b7ab01973ed321ea6bd25f28bfde0534cbe9537d3e931a8ed9ad5eba9592245ff018ddfe241c7ddcc7bd9370b111c3082048f800a5653bb1270fc4ec7
+DIST apache-tomcat-8.0.38-src.tar.gz 5011165 SHA256 9577c174a686364b5206dc4ae622dddb09c23ceb3d4c252ecf5db7fb38626eea SHA512 53a4eaaadf3054b0801137a99679947e017f75a8a66924c0476b60e5a6866097dcecde329bdc14f53bbcddaeea48d683b8d4c72982c44354212bdd0278651f2b WHIRLPOOL 400a056d45989aefb7a81e5cd719508a40ea5981834aec03dddcf12bf5e3eb932db841b8c6c7ae4630ad2e8976532aaa8fbc6a854d0023281d5528ebc4b87c5f
 DIST apache-tomcat-8.5.3-src.tar.gz 5001008 SHA256 d0d1ecfd88d733cf3666cc39483ea092627840cd2cfab8fae09f93b7bf05d21d SHA512 7c4da46725c6e34669f538f406e699c235b99b4ec47a289f4fcbf93b49a35082cea3e041bee8a2772a29c240521d8720b2b50b5cda7afe0ec0f2b4f5cb29bda5 WHIRLPOOL 2ad999e8ee068d66164e2a256ee58f47799251fab60cf9af3a67128b131a07116a2faf2da6eef132e13f5df6ed78f1c44ac69bf5615178b63452fbffc62a4852
 DIST apache-tomcat-8.5.4-src.tar.gz 5000058 SHA256 bb35d2b37e2ff237e09e389dbfb0a99fa8a71f11c947c20f5bbea375f6f3449d SHA512 65d4d72eb46d75d6985f07c6d630d0b27cafb08f3cf125710b78d29d5737798341d484b1f12ae5cfc7347f9984563213b00a5aaab64f920f65f13a3d6009083d WHIRLPOOL bef3192957e91e4964d84f969961c32a61e4a4b5c8acdfcf56c6f6a87c6f3f4dd4350d099fd9904e07e9e1ba8369fa4e86c54a8e25c26a7c0b6a3518aacd9582
 DIST apache-tomcat-8.5.5-src.tar.gz 5017061 SHA256 28c50366e0b8f16086ab792fbe4c3dba5a716185d0c8c143661b7fed870147c0 SHA512 37b390fe12a356e9621b047d7838027bc33d3c32cb1489957589399f5557e9cf0c788a8a623821e69969983321f233518604629233337355ef7c918ae364f586 WHIRLPOOL b6f79e2acf88aa0980e3726131805b8f5098d887a978ba7d8fb028e261f8ba0fea4da6fafc2f1f4129ff5313011519f7a6cfa827da7bd6778e4ed666ba21a716
-DIST apache-tomcat-9.0.0.M10-src.tar.gz 5046851 SHA256 d1cd106ed13facdc34b7b9416d381df9cd59b49a574585d1afd44ed779a3fe4e SHA512 925ea178448c2d26ec22a70b08ac3e9c55f02a6989759a77eace46abcb4c41ed006253d85253f744ac3b9ac4763babc6ed3f06d53a34e27dd901fef3f5445843 WHIRLPOOL 2f19c21d27767cdcfcfbd2705356d3f6a40918ebe8016bfe6ed268ee36816cbe016f8643d3c55f0d22531754e92a8e1fd17112e2d378f1c17b31b8175442cf2d
+DIST apache-tomcat-8.5.6-src.tar.gz 5028904 SHA256 7690e985544f30bd9cfdec2d0b1088f9cd2f2fbd1575116cb92c79cfed863fc6 SHA512 3b9d3b6edf4f3832891207d38d9f4a5aed9aa53fad895fccce2f6311d197aa1e0877052ad5fc8239b53cc671e373c8ae3c6d284a8b17bb15bf427bda7111a508 WHIRLPOOL a74bfc20efa0a44433205c514124496d17289f109e7b2cd2ad90f7556c8e4dc235531137f7dfc22085f46f9ed7d026d4e5d8ebd42101c4815acb631008849eb6
+DIST apache-tomcat-9.0.0.M11-src.tar.gz 5053865 SHA256 5f82b3cddf5736c6f1854732d508b8ea675a4ce837bfcf5f62dafcfdde3b59b1 SHA512 af9a5b361f129d9cd65aebb26d4eecb46770e50e46698c168e1c8c2b48fafcd45ce6a4ee49d81704be5b02eb076216342ebd843645e79acf9d15444bd81c193d WHIRLPOOL 289190b55bad7bdbe3277ab8cb8a92175c8195ad0a49bbc981bd23dfb3c98a2b4de857294d5d90afe1e40b65a826144b7437f68b9b188f168b7d8ec74994b31a

diff --git a/www-servers/tomcat/files/tomcat-9.0.0_alpha10-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.38-build.xml.patch
similarity index 83%
copy from www-servers/tomcat/files/tomcat-9.0.0_alpha10-build.xml.patch
copy to www-servers/tomcat/files/tomcat-8.0.38-build.xml.patch
index 3c4e5c2..cefd59f 100644
--- a/www-servers/tomcat/files/tomcat-9.0.0_alpha10-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-8.0.38-build.xml.patch
@@ -1,11 +1,11 @@
-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-8.0.36-src/build.xml b/apache-tomcat-8.0.36-src/build.xml
+index 1ba0dae..81a0a2c 100644
+--- a/apache-tomcat-8.0.36-src/build.xml
++++ b/apache-tomcat-8.0.36-src/build.xml
+@@ -701,24 +701,29 @@
        manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
  
-     <!-- Servlet 4.0 Implementation JAR File -->
+     <!-- Servlet 3.1 Implementation JAR File -->
 +<!--
      <jarIt jarfile="${servlet-api.jar}"
        filesDir="${tomcat.classes}"
@@ -13,8 +13,8 @@ index dfec1f7..4dfc5d8 100644
        manifest="${tomcat.manifests}/servlet-api.jar.manifest"
        notice="${tomcat.manifests}/servlet-api.jar.notice"
        license="${tomcat.manifests}/servlet-api.jar.license" />
+-
 +-->
- 
      <!-- JSP 2.3 Implementation JAR File -->
 +<!--
      <jarIt jarfile="${jsp-api.jar}"
@@ -33,7 +33,7 @@ index dfec1f7..4dfc5d8 100644
  
      <!-- WebSocket 1.1 API JAR File -->
      <jarIt jarfile="${websocket-api.jar}"
-@@ -986,14 +992,14 @@
+@@ -986,14 +991,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 @@
+@@ -1053,7 +1058,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 @@
+@@ -1087,7 +1092,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 @@
+@@ -1102,7 +1107,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 @@
+@@ -1206,10 +1211,11 @@
  
      <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
      <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
@@ -90,7 +90,16 @@ index dfec1f7..4dfc5d8 100644
      <!-- 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 @@
+@@ -1594,7 +1600,7 @@
+ 
+   <target name="extras-commons-logging-prepare"
+           depends="extras-prepare"
+-          description="Prepare to build web services extras package">
++          description="Prepare to build web services extras package" unless="noget">
+ 
+     <antcall target="downloadfile-2">
+       <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/>
+@@ -1733,7 +1739,7 @@
  
    <target name="extras-webservices-prepare"
            depends="extras-prepare"
@@ -99,7 +108,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.
+@@ -1928,6 +1934,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 +116,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.
+@@ -1989,6 +1996,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
          <path location="${ant.core.lib}"/>
        </classpath>
      </javadoc>
@@ -115,7 +124,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.
+@@ -2027,9 +2035,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
          <path refid="tomcat.webservices.classpath"/>
          <path location="${ant.core.lib}"/>
        </classpath>
@@ -127,7 +136,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" />
+@@ -2757,7 +2767,7 @@ skip.installer property in build.properties" />
    </target>
  
    <target name="download-compile"
@@ -136,7 +145,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" />
+@@ -2791,7 +2801,7 @@ skip.installer property in build.properties" />
    </target>
  
    <target name="download-test-compile"
@@ -145,7 +154,7 @@ index dfec1f7..4dfc5d8 100644
  
      <antcall target="downloadfile">
        <param name="sourcefile" value="${junit.loc}"/>
-@@ -2669,7 +2680,7 @@ skip.installer property in build.properties" />
+@@ -2848,7 +2858,7 @@ skip.installer property in build.properties" />
    </target>
  
    <target name="download-dist"
@@ -154,7 +163,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" />
+@@ -2874,18 +2884,18 @@ skip.installer property in build.properties" />
  
    <!-- =============== Utility Targets to support downloads ================ -->
  
@@ -176,7 +185,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" />
+@@ -2897,7 +2907,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}.tar.gz"/>
    </target>
  
@@ -185,7 +194,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" />
+@@ -2916,7 +2926,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}.tar.gz"/>
    </target>
  
@@ -194,7 +203,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" />
+@@ -2927,7 +2937,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}"/>
    </target>
  
@@ -203,7 +212,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" />
+@@ -2945,7 +2955,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}"/>
    </target>
  
@@ -212,7 +221,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" />
+@@ -2955,7 +2965,7 @@ skip.installer property in build.properties" />
      <move file="${temp.file}" tofile="${destfile}"/>
    </target>
  
@@ -221,7 +230,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" />
+@@ -2978,7 +2988,7 @@ skip.installer property in build.properties" />
      <move file="${temp.file}" tofile="${destfile}"/>
    </target>
  
@@ -230,7 +239,7 @@ index dfec1f7..4dfc5d8 100644
      <condition property="trydownload.run">
        <and>
          <not>
-@@ -2810,7 +2821,7 @@ skip.installer property in build.properties" />
+@@ -2989,7 +2999,7 @@ skip.installer property in build.properties" />
      </condition>
    </target>
  
@@ -239,7 +248,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" />
+@@ -3000,7 +3010,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.0_alpha10-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.6-build.xml.patch
similarity index 86%
copy from www-servers/tomcat/files/tomcat-9.0.0_alpha10-build.xml.patch
copy to www-servers/tomcat/files/tomcat-8.5.6-build.xml.patch
index 3c4e5c2..611c99d 100644
--- a/www-servers/tomcat/files/tomcat-9.0.0_alpha10-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-8.5.6-build.xml.patch
@@ -1,11 +1,11 @@
-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-8.5.4-src/build.xml b/apache-tomcat-8.5.4-src/build.xml
+index 655e379..b973b7f 100644
+--- a/apache-tomcat-8.5.4-src/build.xml
++++ b/apache-tomcat-8.5.4-src/build.xml
+@@ -691,24 +691,29 @@
        manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
  
-     <!-- Servlet 4.0 Implementation JAR File -->
+     <!-- Servlet 3.1 Implementation JAR File -->
 +<!--
      <jarIt jarfile="${servlet-api.jar}"
        filesDir="${tomcat.classes}"
@@ -13,8 +13,8 @@ index dfec1f7..4dfc5d8 100644
        manifest="${tomcat.manifests}/servlet-api.jar.manifest"
        notice="${tomcat.manifests}/servlet-api.jar.notice"
        license="${tomcat.manifests}/servlet-api.jar.license" />
+-
 +-->
- 
      <!-- JSP 2.3 Implementation JAR File -->
 +<!--
      <jarIt jarfile="${jsp-api.jar}"
@@ -33,7 +33,7 @@ index dfec1f7..4dfc5d8 100644
  
      <!-- WebSocket 1.1 API JAR File -->
      <jarIt jarfile="${websocket-api.jar}"
-@@ -986,14 +992,14 @@
+@@ -982,14 +987,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 @@
+@@ -1049,7 +1054,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 @@
+@@ -1083,7 +1088,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 @@
+@@ -1098,7 +1103,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 @@
+@@ -1202,10 +1207,11 @@
  
      <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
      <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
@@ -90,7 +90,7 @@ index dfec1f7..4dfc5d8 100644
      <!-- 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 @@
+@@ -1579,7 +1585,7 @@
  
    <target name="extras-webservices-prepare"
            depends="extras-prepare"
@@ -99,7 +99,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.
+@@ -1727,6 +1733,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 +107,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.
+@@ -1791,6 +1798,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
          <path location="${ant.core.lib}"/>
        </classpath>
      </javadoc>
@@ -115,7 +115,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.
+@@ -1831,9 +1839,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
          <path refid="tomcat.webservices.classpath"/>
          <path location="${ant.core.lib}"/>
        </classpath>
@@ -127,7 +127,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" />
+@@ -2574,7 +2584,7 @@ skip.installer property in build.properties" />
    </target>
  
    <target name="download-compile"
@@ -136,7 +136,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" />
+@@ -2608,7 +2618,7 @@ skip.installer property in build.properties" />
    </target>
  
    <target name="download-test-compile"
@@ -145,7 +145,7 @@ index dfec1f7..4dfc5d8 100644
  
      <antcall target="downloadfile">
        <param name="sourcefile" value="${junit.loc}"/>
-@@ -2669,7 +2680,7 @@ skip.installer property in build.properties" />
+@@ -2665,7 +2675,7 @@ skip.installer property in build.properties" />
    </target>
  
    <target name="download-dist"
@@ -154,7 +154,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" />
+@@ -2691,18 +2701,18 @@ skip.installer property in build.properties" />
  
    <!-- =============== Utility Targets to support downloads ================ -->
  
@@ -176,7 +176,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" />
+@@ -2714,7 +2724,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}.tar.gz"/>
    </target>
  
@@ -185,7 +185,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" />
+@@ -2733,7 +2743,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}.tar.gz"/>
    </target>
  
@@ -194,7 +194,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" />
+@@ -2744,7 +2754,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}"/>
    </target>
  
@@ -203,7 +203,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" />
+@@ -2762,7 +2772,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}"/>
    </target>
  
@@ -212,7 +212,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" />
+@@ -2772,7 +2782,7 @@ skip.installer property in build.properties" />
      <move file="${temp.file}" tofile="${destfile}"/>
    </target>
  
@@ -221,7 +221,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" />
+@@ -2795,7 +2805,7 @@ skip.installer property in build.properties" />
      <move file="${temp.file}" tofile="${destfile}"/>
    </target>
  
@@ -230,7 +230,7 @@ index dfec1f7..4dfc5d8 100644
      <condition property="trydownload.run">
        <and>
          <not>
-@@ -2810,7 +2821,7 @@ skip.installer property in build.properties" />
+@@ -2806,7 +2816,7 @@ skip.installer property in build.properties" />
      </condition>
    </target>
  
@@ -239,7 +239,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" />
+@@ -2817,7 +2827,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.0_alpha10-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.0_alpha11-build.xml.patch
similarity index 100%
rename from www-servers/tomcat/files/tomcat-9.0.0_alpha10-build.xml.patch
rename to www-servers/tomcat/files/tomcat-9.0.0_alpha11-build.xml.patch

diff --git a/www-servers/tomcat/tomcat-9.0.0_alpha10.ebuild b/www-servers/tomcat/tomcat-8.0.38.ebuild
similarity index 92%
copy from www-servers/tomcat/tomcat-9.0.0_alpha10.ebuild
copy to www-servers/tomcat/tomcat-8.0.38.ebuild
index 76dbdc9..d990243 100644
--- a/www-servers/tomcat/tomcat-9.0.0_alpha10.ebuild
+++ b/www-servers/tomcat/tomcat-8.0.38.ebuild
@@ -8,31 +8,30 @@ JAVA_PKG_IUSE="doc source test"
 
 inherit eutils java-pkg-2 java-ant-2 prefix user
 
-MY_PV="${PV/_alpha/.M}"
-MY_P="apache-${PN}-${MY_PV}-src"
+MY_P="apache-${P}-src"
 
-DESCRIPTION="Tomcat Servlet-4.0/JSP-2.4?/EL-3.1?/WebSocket-1.2?/JASPIC-1.1 Container"
+DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1 Container"
 HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-9/v${MY_PV}/src/${MY_P}.tar.gz"
+SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
-SLOT="9"
+SLOT="8"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
 
 ECJ_SLOT="4.5"
-SAPI_SLOT="4.0"
+SAPI_SLOT="3.1"
 
 COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	=dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
+	dev-java/tomcat-servlet-api:${SAPI_SLOT}"
 RDEPEND="${COMMON_DEP}
 	!<dev-java/tomcat-native-1.1.24
-	>=virtual/jre-1.8"
+	>=virtual/jre-1.7"
 DEPEND="${COMMON_DEP}
 	app-admin/pwgen
-	>=virtual/jdk-1.8
+	>=virtual/jdk-1.7
 	test? (
 		>=dev-java/ant-junit-1.9:0
 		dev-java/easymock:3.2

diff --git a/www-servers/tomcat/tomcat-9.0.0_alpha10.ebuild b/www-servers/tomcat/tomcat-8.5.6.ebuild
similarity index 92%
copy from www-servers/tomcat/tomcat-9.0.0_alpha10.ebuild
copy to www-servers/tomcat/tomcat-8.5.6.ebuild
index 76dbdc9..b0508e4 100644
--- a/www-servers/tomcat/tomcat-9.0.0_alpha10.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.6.ebuild
@@ -8,31 +8,30 @@ JAVA_PKG_IUSE="doc source test"
 
 inherit eutils java-pkg-2 java-ant-2 prefix user
 
-MY_PV="${PV/_alpha/.M}"
-MY_P="apache-${PN}-${MY_PV}-src"
+MY_P="apache-${P}-src"
 
-DESCRIPTION="Tomcat Servlet-4.0/JSP-2.4?/EL-3.1?/WebSocket-1.2?/JASPIC-1.1 Container"
+DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
 HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-9/v${MY_PV}/src/${MY_P}.tar.gz"
+SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
-SLOT="9"
+SLOT="8.5"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
 
 ECJ_SLOT="4.5"
-SAPI_SLOT="4.0"
+SAPI_SLOT="3.1"
 
 COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	=dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
+	>=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}"
 RDEPEND="${COMMON_DEP}
 	!<dev-java/tomcat-native-1.1.24
-	>=virtual/jre-1.8"
+	>=virtual/jre-1.7"
 DEPEND="${COMMON_DEP}
 	app-admin/pwgen
-	>=virtual/jdk-1.8
+	>=virtual/jdk-1.7
 	test? (
 		>=dev-java/ant-junit-1.9:0
 		dev-java/easymock:3.2

diff --git a/www-servers/tomcat/tomcat-9.0.0_alpha10.ebuild b/www-servers/tomcat/tomcat-9.0.0_alpha11.ebuild
similarity index 100%
rename from www-servers/tomcat/tomcat-9.0.0_alpha10.ebuild
rename to www-servers/tomcat/tomcat-9.0.0_alpha11.ebuild