www-servers/tomcat: version bump in slot 9

Package-Manager: Portage-2.3.20, Repoman-2.3.6

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index e826fdb793a36370a7b405fdd3e702e81ef03311..98013508714a1774be993b0dcb1a6c738db261a3 100644 (file)
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -3,4 +3,4 @@ DIST apache-tomcat-8.0.47-src.tar.gz 4996505 BLAKE2B 8024ec5248fed57bf1841a320fc
 DIST apache-tomcat-8.0.48-src.tar.gz 5009969 BLAKE2B 4b1db654d74b02f5fd589590197561496ecfb9b219e445fd18f2e967c78fb95f7fc71a21a6ed9ab5f8c6cee448b74a1729eb3627bcf1a59e2d2748c9c80cc76c SHA512 c56aaa7335c4ef221b2e5de7a7d4946ae1221127f977da5f46a97b062d909abc918b0e6ceb887d98ea5f5b38a26bbe9a3de481972492be593636f6f7e6ef7841
 DIST apache-tomcat-8.5.23-src.tar.gz 5086043 BLAKE2B 9bcad0d465aff6da1ba4a846042491bc8d5963283ed1d2530a26ab48289d14e8b85834d24ca476c95a75c1a5f51ee3ecd71c190b9609983cce56b56bc046b6d3 SHA512 2848331553f2c1bc51a4113960c6fe7e2beddf9146341dbfde1a27e2232802cfc364c8e8b988ae862371ca1a3be34665a56a28be9eadf80f8b317e0e2525cbef
 DIST apache-tomcat-8.5.24-src.tar.gz 5101516 BLAKE2B c19c46cca562f0c4c4733608ec007dd423f9a8ed0595bfb835554a7d08be06b791933e4beacbb0fe472589feae82f7d1a46934c0fb68930343cb2f4589bf6530 SHA512 f4ef9a66f2cafb3207c5a38c0f88efc1189e72f02fa88ef2a1b3626a03a57d0ba505b099f6185d747d5ab858aa3f8f3446ae60789312a900ec443eac45233efc
-DIST apache-tomcat-9.0.2-src.tar.gz 5047832 BLAKE2B 7be9cb7569fc771fab849cfe0b3e8154482fd97c2b74f46ebf457084e7f40d8bc70dd9d96793b6b6b43bcb64537dfab4360ea2fe6d3c437788263871944c19cc SHA512 463c0e8daa656dcd8193b3cdbec89bffa762c90b15933755fa51bc2268c28e142544fe71da1d459befb42b70d14834313de30a7f49a082e5121cf3f553c35cbe
+DIST apache-tomcat-9.0.4-src.tar.gz 5073991 BLAKE2B 7efffbba395d78d5ab051dd2bdb7a1491cb04159421bec17deebcb901bbca5cfec67a651f8e1fcd9a394ba3e0650fc61e7da039f0f979ae60a87f477bc4bc3b8 SHA512 bb8777f6fff861a53381b15a4196053abd9cc01e080f0511032f69eb6f57f5c6ed0eafd8a94155f19a4654bce4fad39e0fcaa2e5473cb269bceeb46a2ea43557

diff --git a/www-servers/tomcat/files/tomcat-9.0.2_beta-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.4-build.xml.patch
similarity index 83%
rename from www-servers/tomcat/files/tomcat-9.0.2_beta-build.xml.patch
rename to www-servers/tomcat/files/tomcat-9.0.4-build.xml.patch
index 3f55c285e2304b9810267f356dbabc0ce57a25b9..87f869dd4c0cf2ec18d20af4f6c106cc25b6528e 100644 (file)
--- a/www-servers/tomcat/files/tomcat-9.0.2_beta-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-9.0.4-build.xml.patch
@@ -1,8 +1,8 @@
-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 @@
+diff --git a/build.xml b/build.xml
+index c1331c9..b664cc3 100644
+--- a/build.xml
++++ b/build.xml
+@@ -719,24 +719,30 @@
        manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
  
      <!-- Servlet 4.0 Implementation JAR File -->
@@ -33,24 +33,19 @@ index aa29b28..a9ac6bd 100644
  
      <!-- WebSocket 1.1 API JAR File -->
      <jarIt jarfile="${websocket-api.jar}"
-@@ -1006,14 +1012,14 @@
+@@ -1012,9 +1018,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/tomcat-native.tar.gz"
-             file="${tomcat-native.tar.gz}" />
-     <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
-             file="${commons-daemon.native.src.tgz}" />
- 
      <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
 -
 +-->
      <!-- Copy scripts -->
      <copy todir="${tomcat.build}/bin">
        <fileset dir="bin">
-@@ -1073,7 +1079,7 @@
+@@ -1074,7 +1080,7 @@
          <exclude name="${jdt.jar.filename}"/>
        </fileset>
      </delete>
@@ -59,7 +54,7 @@ index aa29b28..a9ac6bd 100644
  
      <!-- Add sources for examples -->
      <antcall target="examples-sources" />
-@@ -1107,7 +1113,7 @@
+@@ -1108,7 +1114,7 @@
      </javac>
    </target>
  
@@ -68,7 +63,7 @@ index aa29b28..a9ac6bd 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}"
-@@ -1122,7 +1128,7 @@
+@@ -1123,7 +1129,7 @@
      <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
    </target>
  
@@ -77,7 +72,7 @@ index aa29b28..a9ac6bd 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}"
-@@ -1226,9 +1232,11 @@
+@@ -1227,9 +1233,11 @@
  
      <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
      <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
@@ -89,7 +84,7 @@ index aa29b28..a9ac6bd 100644
      <copy file="${annotations-api.jar}" todir="${tomcat.embed}" />
  
      <!-- Note the meta-inf below will work as long as there is only one JAR
-@@ -1609,7 +1617,7 @@
+@@ -1612,7 +1620,7 @@
  
    <target name="extras-webservices-prepare"
            depends="extras-prepare"
@@ -98,7 +93,21 @@ index aa29b28..a9ac6bd 100644
  
      <antcall target="downloadfile">
        <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1757,6 +1765,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -1752,11 +1760,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.
+@@ -1766,6 +1775,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" >
@@ -106,7 +115,7 @@ index aa29b28..a9ac6bd 100644
      <javadoc packagenames="javax.servlet.*"
        excludepackagenames="javax.servlet.jsp.*"
        sourcepath="${tomcat.dist}/src/java"
-@@ -1821,6 +1830,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -1830,6 +1840,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
          <path location="${ant.core.lib}"/>
        </classpath>
      </javadoc>
@@ -114,7 +123,7 @@ index aa29b28..a9ac6bd 100644
      <javadoc packagenames="javax.websocket.*"
        sourcepath="${tomcat.dist}/src/java"
        destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -1861,9 +1871,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -1870,9 +1881,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
          <path refid="tomcat.webservices.classpath"/>
          <path location="${ant.core.lib}"/>
        </classpath>
@@ -124,18 +133,18 @@ index aa29b28..a9ac6bd 100644
        <link href="../elapi"/>
 +-->
        <link href="../websocketapi"/>
-       <link href="http://docs.oracle.com/javase/7/docs/api/"/>
+       <link href="http://docs.oracle.com/javase/8/docs/api/"/>
        <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
-@@ -2608,7 +2620,7 @@ skip.installer property in build.properties" />
+@@ -2617,7 +2630,7 @@ skip.installer property in build.properties" />
    </target>
  
    <target name="download-compile"
 -          description="Download (and build) components necessary to compile" >
 +          description="Download (and build) components necessary to compile" unless="noget">
  
-     <antcall target="downloadfile-2">
-       <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2642,7 +2654,7 @@ skip.installer property in build.properties" />
+     <!-- Download Commons Daemon -->
+     <antcall target="downloadgz-2">
+@@ -2637,7 +2650,7 @@ skip.installer property in build.properties" />
    </target>
  
    <target name="download-test-compile"
@@ -144,16 +153,16 @@ index aa29b28..a9ac6bd 100644
  
      <antcall target="downloadfile">
        <param name="sourcefile" value="${junit.loc}"/>
-@@ -2699,7 +2711,7 @@ skip.installer property in build.properties" />
+@@ -2694,7 +2707,7 @@ skip.installer property in build.properties" />
    </target>
  
    <target name="download-dist"
 -          description="Download additional components for a distribution" >
 +          description="Download additional components for a distribution" unless="noget">
  
-     <antcall target="downloadzip-2">
-       <param name="sourcefile.1" value="${tomcat-native.win.1}"/>
-@@ -2725,18 +2737,18 @@ skip.installer property in build.properties" />
+     <antcall target="downloadfile-2">
+       <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
+@@ -2734,18 +2747,18 @@ skip.installer property in build.properties" />
  
    <!-- =============== Utility Targets to support downloads ================ -->
  
@@ -175,7 +184,7 @@ index aa29b28..a9ac6bd 100644
      <!-- Download and extract the package -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -2748,7 +2760,7 @@ skip.installer property in build.properties" />
+@@ -2757,7 +2770,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}.tar.gz"/>
    </target>
  
@@ -184,7 +193,7 @@ index aa29b28..a9ac6bd 100644
      <!-- Download and extract the package from the two alternative locations -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -2767,7 +2779,7 @@ skip.installer property in build.properties" />
+@@ -2776,7 +2789,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}.tar.gz"/>
    </target>
  
@@ -193,7 +202,7 @@ index aa29b28..a9ac6bd 100644
      <!-- Download and extract the package -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -2778,7 +2790,7 @@ skip.installer property in build.properties" />
+@@ -2787,7 +2800,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}"/>
    </target>
  
@@ -202,7 +211,7 @@ index aa29b28..a9ac6bd 100644
      <!-- Download and extract the package from the two alternative locations -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -2796,7 +2808,7 @@ skip.installer property in build.properties" />
+@@ -2805,7 +2818,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}"/>
    </target>
  
@@ -211,7 +220,7 @@ index aa29b28..a9ac6bd 100644
      <!-- Download the file -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -2806,7 +2818,7 @@ skip.installer property in build.properties" />
+@@ -2815,7 +2828,7 @@ skip.installer property in build.properties" />
      <move file="${temp.file}" tofile="${destfile}"/>
    </target>
  
@@ -220,7 +229,7 @@ index aa29b28..a9ac6bd 100644
      <!-- Download the file from the two alternative locations -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -2829,7 +2841,7 @@ skip.installer property in build.properties" />
+@@ -2838,7 +2851,7 @@ skip.installer property in build.properties" />
      <move file="${temp.file}" tofile="${destfile}"/>
    </target>
  
@@ -229,7 +238,7 @@ index aa29b28..a9ac6bd 100644
      <condition property="trydownload.run">
        <and>
          <not>
-@@ -2840,7 +2852,7 @@ skip.installer property in build.properties" />
+@@ -2849,7 +2862,7 @@ skip.installer property in build.properties" />
      </condition>
    </target>
  
@@ -238,7 +247,7 @@ index aa29b28..a9ac6bd 100644
      <!-- Downloads a file if not yet downloaded and the source URL is available -->
      <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
    </target>
-@@ -2851,7 +2863,7 @@ skip.installer property in build.properties" />
+@@ -2860,7 +2873,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.2_beta.ebuild b/www-servers/tomcat/tomcat-9.0.4.ebuild
similarity index 96%
rename from www-servers/tomcat/tomcat-9.0.2_beta.ebuild
rename to www-servers/tomcat/tomcat-9.0.4.ebuild
index 6151c2e699bb00095146fca620ae6ad85bb51e1a..bb86ba9675bc361ec1389537d5fe87f11e5f46b2 100644 (file)
--- a/www-servers/tomcat/tomcat-9.0.2_beta.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,12 +7,11 @@ JAVA_PKG_IUSE="doc source test"
 
 inherit eutils java-pkg-2 java-ant-2 prefix user
 
-MY_PV="${PV/_beta/}"
-MY_P="apache-${PN}-${MY_PV}-src"
+MY_P="apache-${PN}-${PV}-src"
 
 DESCRIPTION="Tomcat Servlet-4.0/JSP-2.4?/EL-3.1?/WebSocket-1.2?/JASPIC-1.1 Container"
 HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-9/v${MY_PV}/src/${MY_P}.tar.gz"
+SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="9"