* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2015-08-16 14:22 James Le Cuirot
0 siblings, 0 replies; 73+ messages in thread
From: James Le Cuirot @ 2015-08-16 14:22 UTC (permalink / raw
To: gentoo-commits
commit: 480ab71a5cb19f40a74ffaa947b954b0ea4b2783
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 16 13:39:50 2015 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 14:22:06 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=480ab71a
www-servers/tomcat: Version bumps, fix bug #453212, general cleanup
* Version bumps for 7.0.63 and 8.0.24.
* Start with a minimal classpath by prepending remaining jars to
common.loader instead. Fixes bug #453212.
* Unbundle javamail at runtime and servlet-api at build time.
* Clean up test handling and add missing easymock dependency.
* Fix handling of websockets flag under 7.
Package-Manager: portage-2.2.20.1
www-servers/tomcat/Manifest | 2 +
.../tomcat/files/tomcat-6.0.44-build.xml.patch | 45 +++-
.../tomcat/files/tomcat-7.0.63-build.xml.patch | 121 +++++++++++
.../tomcat/files/tomcat-8.0.24-build.xml.patch | 230 ++++++++++++++++++++
.../tomcat/files/tomcat-instance-manager.bash | 240 ---------------------
www-servers/tomcat/files/tomcat-r1.init | 111 ++++++++++
www-servers/tomcat/files/tomcat.conf | 8 +
www-servers/tomcat/tomcat-6.0.44-r1.ebuild | 141 ++++++++++++
www-servers/tomcat/tomcat-7.0.63.ebuild | 146 +++++++++++++
www-servers/tomcat/tomcat-8.0.24.ebuild | 147 +++++++++++++
10 files changed, 945 insertions(+), 246 deletions(-)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index dafdb4c..1b82f42 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,3 +1,5 @@
DIST apache-tomcat-6.0.44-src.tar.gz 3447711 SHA256 c6f01526d58f2ba7b9da496e959d9e68cc49183006077704ab91c36ebebf5a4a SHA512 0d6a1539b28fa8ca3442557889d7d21cc523b18136f6998820ba13f41420536aba65ce78bac526002ee1dd86df3cbc80d9f043a3f765d7cf0b79e58e516030be WHIRLPOOL c65e704466191a0f98ec777e95dda889599ff6a545e7c013fd04bc0b72e0d0edf4491415f243d6a4de60cf76abe5c13ffbcc6d98f78b51490f7b7b43b24ecb97
DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 3a1dedda4019db87464fca3aeb4e800a538f0baee96d8b14c9d64967b0d2ea44 SHA512 acc322eee1446dd1bff72910ae9f40a62f88332ee69d6057b3c684e2abf8f28e6df6ab9505900f0b0cf7a5e2e0e80e64b0a790b3b78594ce595ce897706b4bcb WHIRLPOOL 4948964c1746e6ee912ac72c901ba271793610f402bf082455d104e2e8d6dbfa0bf5371d42d48d8ad7c826271fa60d989119a01e700497099022d0cf3564fdff
+DIST apache-tomcat-7.0.63-src.tar.gz 4577737 SHA256 443aa92f2668906fb24cc43ba952068240f445df637a6e5da8d4661527536657 SHA512 677b28aa0131d309aed83afc73a778c16fd27a187e971ea6929b9b6b65268caa2a67cc468b15565a7d5944a60e8528cc26c82437b476ebc41ff9556367349d8a WHIRLPOOL a208ac63ed6f7ce7ac23674d8bb20d523b3fb5d10dfb46d292004f9b296986c4cab690f0252ad53bb4c625c3f58e04b9ddcda5a580fdafea20118b93f544760c
DIST apache-tomcat-8.0.23-src.tar.gz 4868650 SHA256 6293713e78da9bb803060c8ddff982f8f7aef5a2e4b325340088493ce9957ba4 SHA512 cc83194b2847fc2db5448d548c7e65a1198cda02726b070f913a762d324152315886fba09532b879e26d15ec57e04057cc30b3a686b2a2307d6447d17f84e16c WHIRLPOOL b0559a4ef1b4c1f0683e4cce976d31db175d3c4f4d2b809b127e1074d49a6bf764366cc3e91f9a0818afd6de35e662a7aab89866dfd2e61673327c50535bff88
+DIST apache-tomcat-8.0.24-src.tar.gz 4888751 SHA256 184b0d8bda512204a2e565f9175a13f9772a9d13185e1aa228394b45c641474c SHA512 af5619a63db3d1f6d39eb0290c83a38272c31803ee39a40aebfba5f7a0cf67d830ffcbebe518aff8de4a1f8eb44021975d7e43d45b4bd9804e8ca9cfbfc4904a WHIRLPOOL 4d37f4d1fe3ee138252813bd4a65025d0ccceea8aec57aa0c9474ad4902f85938627277f6e4ece30793326c31d7790b0ca0b8d99d7b21857519d7c22c28794e8
diff --git a/www-servers/tomcat/files/tomcat-6.0.44-build.xml.patch b/www-servers/tomcat/files/tomcat-6.0.44-build.xml.patch
index 6517dee..eaa1963 100644
--- a/www-servers/tomcat/files/tomcat-6.0.44-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-6.0.44-build.xml.patch
@@ -1,6 +1,41 @@
---- build.xml.orig 2012-07-06 20:26:21.361299240 +0200
-+++ build.xml 2012-07-06 20:26:56.085899911 +0200
-@@ -487,12 +487,14 @@
+diff -Naur apache-tomcat-6.0.44-src.orig/build.xml apache-tomcat-6.0.44-src/build.xml
+--- apache-tomcat-6.0.44-src.orig/build.xml 2015-05-08 13:22:05.000000000 +0100
++++ apache-tomcat-6.0.44-src/build.xml 2015-08-16 14:10:03.609366396 +0100
+@@ -159,12 +159,14 @@
+ </fileset>
+ </copy>
+ <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
++<!--
+ <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1">
+ <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
+ <include name="*" />
+ <exclude name="jspxml*" />
+ </fileset>
+ </copy>
++ -->
+
+ </target>
+
+@@ -307,14 +309,18 @@
+ manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+
+ <!-- Servlet 2.5 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}" filesId="files.servlet-api"
+ manifest="${tomcat.manifests}/servlet-api.jar.manifest"
+ license="${tomcat.manifests}/servlet-api.jar.license"
+ notice="${tomcat.manifests}/servlet-api.jar.notice" />
++-->
+
+ <!-- JSP 2.1 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${jsp-api.jar}" filesId="files.jsp-api"
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
++-->
+
+
+ <!-- JSP 2.1 EL Implementation JAR File -->
+@@ -492,12 +498,14 @@
<target name="deploy" depends="build-only,build-docs,warn.dbcp">
@@ -15,9 +50,7 @@
<!-- Copy scripts -->
<copy todir="${tomcat.build}/bin">
---- build.xml.orig 2012-07-06 20:31:31.387806167 +0200
-+++ build.xml 2012-07-06 20:32:33.185315885 +0200
-@@ -646,9 +646,11 @@
+@@ -649,9 +657,11 @@
</fileset>
</txt2html>
diff --git a/www-servers/tomcat/files/tomcat-7.0.63-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.63-build.xml.patch
new file mode 100644
index 0000000..23181e7
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-7.0.63-build.xml.patch
@@ -0,0 +1,121 @@
+diff -Naur apache-tomcat-7.0.63-src.orig/build.xml apache-tomcat-7.0.63-src/build.xml
+--- apache-tomcat-7.0.63-src.orig/build.xml 2015-06-30 09:15:44.000000000 +0100
++++ apache-tomcat-7.0.63-src/build.xml 2015-08-16 14:17:34.594426081 +0100
+@@ -660,12 +660,14 @@
+ </fileset>
+ </copy>
+ <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
++<!--
+ <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1">
+ <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
+ <include name="*" />
+ <exclude name="jspxml*" />
+ </fileset>
+ </copy>
++-->
+
+ </target>
+
+@@ -721,26 +723,32 @@
+ manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+
+ <!-- Servlet 3.0 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+ manifest="${tomcat.manifests}/servlet-api.jar.manifest"
+ notice="${tomcat.manifests}/servlet-api.jar.notice"
+ license="${tomcat.manifests}/servlet-api.jar.license" />
++-->
+
+ <!-- JSP 2.2 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${jsp-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.jsp-api"
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest"
+ notice="${tomcat.manifests}/jsp-api.jar.notice"
+ license="${tomcat.manifests}/jsp-api.jar.license" />
++-->
+
+ <!-- JSP 2.2 EL Implementation JAR File -->
++<!--
+ <jarIt jarfile="${el-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.el-api"
+ manifest="${tomcat.manifests}/el-api.jar.manifest" />
++-->
+
+ <!-- Bootstrap JAR File -->
+ <jarIt jarfile="${bootstrap.jar}"
+@@ -986,12 +994,14 @@
+ <target name="deploy" depends="package,build-docs,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">
+@@ -1051,14 +1061,15 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
++<!--
+ <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
+-
++-->
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+-
++<!--
+ <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
+ failonerror="false"/>
+-
++-->
+ <!-- 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}"
+@@ -1681,7 +1692,7 @@
+
+ <target name="extras-webservices-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">
+ <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -2642,7 +2653,7 @@
+ </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}"/>
+@@ -2699,7 +2710,7 @@
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -2727,7 +2738,7 @@
+ </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}"/>
diff --git a/www-servers/tomcat/files/tomcat-8.0.24-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.24-build.xml.patch
new file mode 100644
index 0000000..9854c9d
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.0.24-build.xml.patch
@@ -0,0 +1,230 @@
+diff -Naur apache-tomcat-8.0.24-src.orig/build.xml apache-tomcat-8.0.24-src/build.xml
+--- apache-tomcat-8.0.24-src.orig/build.xml 2015-07-01 21:25:21.000000000 +0100
++++ apache-tomcat-8.0.24-src/build.xml 2015-08-14 13:45:50.315788075 +0100
+@@ -697,24 +697,29 @@
+ manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+
+ <!-- Servlet 3.1 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+ 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}"
+ filesDir="${tomcat.classes}"
+ filesId="files.jsp-api"
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
++-->
+
+ <!-- EL 3.0 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 -->
+ <jarIt jarfile="${websocket-api.jar}"
+@@ -982,14 +987,14 @@
+
+ <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">
+@@ -1049,7 +1054,7 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
+- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+@@ -1083,7 +1088,7 @@
+ </javac>
+ </target>
+
+- <target name="build-tomcat-jdbc" depends="package">
++ <target name="build-tomcat-jdbc" depends="package" unless="noget">
+ <!-- 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}"
+@@ -1098,7 +1103,7 @@
+ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+ </target>
+
+- <target name="build-tomcat-jdbc-src">
++ <target name="build-tomcat-jdbc-src" unless="noget">
+ <!-- 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}"
+@@ -1202,10 +1207,11 @@
+
+ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+ <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+ <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
+ failonerror="false"/>
+ <copy file="${jdt.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. -->
+@@ -1542,7 +1548,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}"/>
+@@ -1681,7 +1687,7 @@
+
+ <target name="extras-webservices-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">
+ <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -2739,7 +2745,7 @@
+ </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}"/>
+@@ -2773,7 +2779,7 @@
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -2819,7 +2825,7 @@
+ </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}"/>
+@@ -2845,18 +2851,18 @@
+
+ <!-- =============== Utility Targets to support downloads ================ -->
+
+- <target name="setproxy" if="${proxy.use}">
++ <target name="setproxy" if="${proxy.use}" unless="noget">
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+ proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+ </target>
+
+- <target name="testexist">
++ <target name="testexist" unless="noget">
+ <echo message="Testing for ${destfile}"/>
+ <available file="${destfile}" property="exist"/>
+ </target>
+
+- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
++ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2868,7 +2874,7 @@
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadgz-2" unless="exist" depends="testexist">
++ <target name="downloadgz-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2887,7 +2893,7 @@
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
++ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2898,7 +2904,7 @@
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadzip-2" unless="exist" depends="testexist">
++ <target name="downloadzip-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2916,7 +2922,7 @@
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
++ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
+ <!-- Download the file -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2926,7 +2932,7 @@
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="downloadfile-2" unless="exist" depends="testexist">
++ <target name="downloadfile-2" unless="noget" depends="testexist">
+ <!-- Download the file from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2949,7 +2955,7 @@
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="trydownload.check" depends="setproxy">
++ <target name="trydownload.check" depends="setproxy" unless="noget">
+ <condition property="trydownload.run">
+ <and>
+ <not>
+@@ -2960,7 +2966,7 @@
+ </condition>
+ </target>
+
+- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+ <!-- Downloads a file if not yet downloaded and the source URL is available -->
+ <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+ </target>
+@@ -2971,7 +2977,7 @@
+
+ <target name="ide-eclipse"
+ depends="download-compile, extras-webservices-prepare, download-test-compile"
+- description="Prepares the source tree to be built in Eclipse">
++ description="Prepares the source tree to be built in Eclipse" unless="noget">
+
+ <!-- Copy the sample project files into the root directory -->
+ <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/files/tomcat-instance-manager.bash b/www-servers/tomcat/files/tomcat-instance-manager.bash
deleted file mode 100644
index fcdfebf..0000000
--- a/www-servers/tomcat/files/tomcat-instance-manager.bash
+++ /dev/null
@@ -1,240 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Author: Ralph Sennhauser <sera@gentoo.org>
-
-die() {
- echo "${@}"
- exit 1
-}
-
-usage() {
- cat <<EOL
-Usage: ${BASH_SOURCE} <--create|--remove|--help> [--suffix s][--user u][--group g]
-
- Options:
- --help:
- show this text.
- --create:
- create a new instance
- --remove:
- remove an existing instance.
- --suffix SUFFIX:
- a suffix for this instance. the suffix may not collide with an already
- existing instance, defaults to empty.
- --user USER:
- the user for which to configure this instance for. The user needs to
- exist already. defaults to tomcat.
- --group GROUP:
- the group for which to configure this instance for. The group needs to
- exist already. defaults to tomcat.
-
- Examples:
- ${BASH_SOURCE} --create --suffix testing --user tacmot --group tacmot
- ${BASH_SOURCE} --remove --suffix testing
-EOL
-}
-
-parse_argv() {
- action="not specified"
- instance_name="tomcat-@SLOT@"
- instance_user="tomcat"
- instance_group="tomcat"
-
- while [[ -n $1 ]]; do
- case $1 in
- --help)
- usage
- exit 0;;
- --suffix)
- instance_name+="-$2"
- shift; shift;;
- --user)
- instance_user="$2"
- shift; shift;;
- --group)
- instance_group="$2"
- shift; shift;;
- --create)
- action=create
- shift;;
- --remove)
- action=remove
- shift;;
- --backup)
- action=backup
- shift;;
- --restore)
- action=restore
- shift;;
- --update)
- action=update
- shift;;
- *)
- echo "Invalid option '$1'"
- usage
- exit 2;;
- esac
- done
-
- tomcat_home="/@GENTOO_PORTAGE_EPREFIX@usr/share/tomcat-@SLOT@"
- instance_base="/@GENTOO_PORTAGE_EPREFIX@var/lib/${instance_name}"
- instance_conf="/@GENTOO_PORTAGE_EPREFIX@etc/${instance_name}"
- instance_logs="/@GENTOO_PORTAGE_EPREFIX@var/log/${instance_name}"
- instance_temp="/@GENTOO_PORTAGE_EPREFIX@var/tmp/${instance_name}"
-
- all_targets=(
- "${instance_base}"
- "${instance_logs}"
- "${instance_temp}"
- "/@GENTOO_PORTAGE_EPREFIX@etc/${instance_name}"
- "/@GENTOO_PORTAGE_EPREFIX@etc/init.d/${instance_name}"
- "/@GENTOO_PORTAGE_EPREFIX@etc/conf.d/${instance_name}"
- )
-}
-
-test_can_deploy() {
- local no_deploy target
- for target in "${all_targets[@]}"; do
- if [[ -e "${target}" ]]; then
- echo "Error: '${target}' already exists."
- no_deploy=yes
- fi
- done
- if [[ -n "${no_deploy}" ]]; then
- cat <<-EOL
-
- To protect an existing installation no new instance was deployed. You can use
- '${BASH_SOURCE} --remove'
- to remove an existing instance first or run
- '${BASH_SOURCE} --create --sufix <instance_suffix>'
- to deploy an instance under a different name
-
- EOL
- usage
- exit 1
- fi
-
- if ! id --user "${instance_user}" >/dev/null 2>&1; then
- echo "Error: user '${instance_user}' doesn't exist."
- exit 1
- fi
-
- if ! id --group "${instance_group}" >/dev/null 2>&1; then
- echo "Error: group '${instance_group}' doesn't exist."
- exit 1
- fi
-}
-
-deploy_instance() {
- test_can_deploy
-
- mkdir -p "${instance_base}"/{work,webapps} || die
- mkdir -p "${instance_logs}" || die
- mkdir -p "${instance_temp}" || die
-
- cp -r "${tomcat_home}"/webapps/ROOT "${instance_base}"/webapps || die
-
- chown -R "${instance_user}":"${instance_group}" \
- "${instance_base}" "${instance_logs}" "${instance_temp}" || die
-
- find "${instance_base}"/webapps -type d -exec chmod 750 {} + || die
- find "${instance_base}"/webapps -type f -exec chmod 640 {} + || die
-
- # initial config #
-
- cp -r "${tomcat_home}"/conf "${instance_conf}" || die
-
- sed -i -e "s|\${catalina.base}/logs|${instance_logs}|" \
- "${instance_conf}"/logging.properties || die
- sed -i -e "s|directory=\"logs\"|directory=\"${instance_logs}\"|" \
- "${instance_conf}"/server.xml || die
-
- mkdir -p "${instance_conf}"/Catalina/localhost || die
- cat > "${instance_conf}"/Catalina/localhost/host-manager.xml <<-'EOF'
- <?xml version="1.0" encoding="UTF-8"?>
- <Context docBase="${catalina.home}/webapps/host-manager"
- antiResourceLocking="false" privileged="true" />
- EOF
-
- cat > "${instance_conf}"/Catalina/localhost/manager.xml <<-'EOF'
- <?xml version="1.0" encoding="UTF-8"?>
- <Context docBase="${catalina.home}/webapps/manager"
- antiResourceLocking="false" privileged="true" />
- EOF
-
- if [[ -d "${tomcat_home}"/webapps/docs ]]; then
- cat > "${instance_conf}"/Catalina/localhost/docs.xml <<-'EOF'
- <?xml version="1.0" encoding="UTF-8"?>
- <Context docBase="${catalina.home}/webapps/docs" />
- EOF
- fi
-
- if [[ -d "${tomcat_home}"/webapps/examples ]]; then
- cat > "${instance_conf}"/Catalina/localhost/examples.xml <<-'EOF'
- <?xml version="1.0" encoding="UTF-8"?>
- <Context docBase="${catalina.home}/webapps/examples" />
- EOF
- fi
-
- chown -R "${instance_user}":"${instance_group}" "${instance_conf}" || die
- find "${instance_conf}" -type d -exec chmod 750 {} + || die
- find "${instance_conf}" -type f -exec chmod 640 {} + || die
-
- # rc script #
-
- cp "${tomcat_home}"/gentoo/tomcat.init \
- "/@GENTOO_PORTAGE_EPREFIX@etc/init.d/${instance_name}" || die
-
- sed -e "s|@INSTANCE_NAME@|${instance_name}|g" \
- -e "s|@INSTANCE_USER@|${instance_user}|g" \
- -e "s|@INSTANCE_GROUP@|${instance_group}|g" \
- "${tomcat_home}"/gentoo/tomcat.conf \
- > "/@GENTOO_PORTAGE_EPREFIX@etc/conf.d/${instance_name}" || die
-
- # some symlinks for tomcat and netbeans #
-
- ln -s "${instance_conf}" "${instance_base}"/conf || die
- ln -s "${instance_temp}" "${instance_base}"/temp || die
-
- # a note to update the default configuration #
-
- cat <<-EOL
- Successfully created instance '${instance_name}'
- It's strongly recommended for production systems to go carefully through the
- configuration files at '${instance_conf}'.
- The generated initial configuration is close to upstreams default which
- favours the demo aspect over hardening.
- EOL
-}
-
-remove_instance() {
- echo "The following files will be removed permanently:"
- local target; for target in "${all_targets[@]}"; do
- find ${target}
- done
-
- echo "Type 'yes' to continue"
- read
- if [[ ${REPLY} == yes ]]; then
- rm -rv "${all_targets[@]}"
- else
- echo "Aborting as requested ..."
- fi
-}
-
-parse_argv "$@"
-
-if [[ ${action} == create ]]; then
- deploy_instance
-elif [[ ${action} == remove ]]; then
- remove_instance
-elif [[ ${action} == "not specified" ]]; then
- echo "No action specified!"
- usage
- exit 1
-else
- echo "${action} not yet implemented!"
- usage
- exit 1
-fi
diff --git a/www-servers/tomcat/files/tomcat-r1.init b/www-servers/tomcat/files/tomcat-r1.init
new file mode 100644
index 0000000..3a69a9d
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-r1.init
@@ -0,0 +1,111 @@
+#!/@GENTOO_PORTAGE_EPREFIX@sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="forcestop"
+
+PIDFILE=/@GENTOO_PORTAGE_EPREFIX@var/run/${RC_SVCNAME}.pid
+
+: ${CATALINA_HOME:=/@GENTOO_PORTAGE_EPREFIX@usr/share/tomcat-@SLOT@}
+: ${CATALINA_BASE:=/@GENTOO_PORTAGE_EPREFIX@var/lib/${RC_SVCNAME}}
+: ${CATALINA_TMPDIR:=/@GENTOO_PORTAGE_EPREFIX@var/tmp/${RC_SVCNAME}}
+: ${CATALINA_USER:=tomcat}
+: ${CATALINA_GROUP:=tomcat}
+
+: ${TOMCAT_START:=start}
+
+: ${JPDA_TRANSPORT:="dt_socket"}
+: ${JPDA_ADDRESS:="8000"}
+: ${JPDA_OPTS="-Xdebug -Xrunjdwp:transport=${JPDA_TRANSPORT},address=${JPDA_ADDRESS},server=y,suspend=n"}
+
+export JAVA_HOME=`java-config ${TOMCAT_JVM:+--select-vm ${TOMCAT_JVM}} --jre-home`
+export CLASSPATH="${CATALINA_HOME}/bin/bootstrap.jar:${CATALINA_HOME}/bin/tomcat-juli.jar"
+[[ @SLOT@ = 6 ]] && CLASSPATH+=":/@GENTOO_PORTAGE_EPREFIX@usr/share/tomcat-servlet-api-2.5/lib/jsp-api.jar:/@GENTOO_PORTAGE_EPREFIX@usr/share/tomcat-servlet-api-2.5/lib/servlet-api.jar"
+
+depend() {
+ use dns logger net
+}
+
+start() {
+ ebegin "Starting ${RC_SVCNAME}"
+
+ if [ ! -e "${CATALINA_TMPDIR}" ]; then
+ eerror "CATALINA_TMPDIR does not exist. Unable to start tomcat."
+ eerror "Please see /@GENTOO_PORTAGE_EPREFIX@etc/conf.d/${RC_SVCNAME} for more information."
+ eend 1
+ fi
+
+ local DEPEND=$(java-config --query DEPEND --package tomcat-@SLOT@):${TOMCAT_EXTRA_JARS}
+ DEPEND=${DEPEND%:}
+
+ local GCLASSPATH=$(java-config --with-dependencies --classpath "${DEPEND//:/,}"):${TOMCAT_EXTRA_CLASSPATH}
+ GCLASSPATH=${GCLASSPATH%:}
+
+ local cmd=java args=
+ if [ "${TOMCAT_START}" = "debug" ] || [ "${TOMCAT_START}" = "-security debug" ] ; then
+ cmd=jdb
+ args="${args} -sourcepath ${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share"
+ fi
+ if [ "${TOMCAT_START}" = "-security debug" ] || [ "${TOMCAT_START}" = "-security start" ]; then
+ args="${args} -Djava.security.manager"
+ args="${args} -Djava.security.policy=${CATALINA_BASE}/conf/catalina.policy"
+ fi
+ if [ "${TOMCAT_START}" = "jpda start" ] ; then
+ args="${args} ${JPDA_OPTS}"
+ fi
+ if [ -r "${CATALINA_HOME}"/bin/tomcat-juli.jar ]; then
+ args="${args} -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager \
+ -Djava.util.logging.config.file=${CATALINA_BASE}/conf/logging.properties"
+ fi
+
+ start-stop-daemon --start \
+ --quiet --background \
+ --chdir "${CATALINA_TMPDIR}" \
+ --user ${CATALINA_USER}:${CATALINA_GROUP} \
+ --make-pidfile --pidfile ${PIDFILE} \
+ --exec ${JAVA_HOME}/bin/${cmd} \
+ -- \
+ ${JAVA_OPTS} \
+ ${args} \
+ -Dcatalina.base="${CATALINA_BASE}" \
+ -Dcatalina.home="${CATALINA_HOME}" \
+ -Djava.io.tmpdir="${CATALINA_TMPDIR}" \
+ -Dgentoo.classpath="${GCLASSPATH//:/,}" \
+ -classpath "${CLASSPATH}" \
+ org.apache.catalina.startup.Bootstrap \
+ ${CATALINA_OPTS} \
+ ${TOMCAT_START}
+
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping '${RC_SVCNAME}'"
+
+ start-stop-daemon --stop \
+ --quiet --retry=60 \
+ --pidfile ${PIDFILE} \
+ --exec ${JAVA_HOME}/bin/java \
+ -- \
+ ${JAVA_OPTS} \
+ -classpath "${CLASSPATH}" \
+ ${CATALINA_OPTS} \
+ stop ${STD_OUT}
+
+ eend $?
+}
+
+forcestop() {
+ ebegin "Forcing '${RC_SVCNAME}' to stop"
+
+ start-stop-daemon --stop \
+ --quiet --retry=60 \
+ --pidfile ${PIDFILE} \
+ --signal=9
+
+ if service_started "${RC_SVCNAME}"; then
+ mark_service_stopped "${RC_SVCNAME}"
+ fi
+
+ eend $?
+}
diff --git a/www-servers/tomcat/files/tomcat.conf b/www-servers/tomcat/files/tomcat.conf
index a27f933..376af44 100644
--- a/www-servers/tomcat/files/tomcat.conf
+++ b/www-servers/tomcat/files/tomcat.conf
@@ -17,6 +17,14 @@
#
#TOMCAT_EXTRA_JARS=""
+# Additional paths to put on the default classpath.
+# These should be separated by the : character.
+# Note: The extra jars listed here will be visible to webapps.
+# Example:
+# TOMCAT_EXTRA_CLASSPATH="/path/to/foo.jar:/path/to/bar.jar"
+#
+#TOMCAT_EXTRA_CLASSPATH=""
+
# User/Group of this instance.
CATALINA_USER=@INSTANCE_USER@
CATALINA_GROUP=@INSTANCE_GROUP@
diff --git a/www-servers/tomcat/tomcat-6.0.44-r1.ebuild b/www-servers/tomcat/tomcat-6.0.44-r1.ebuild
new file mode 100644
index 0000000..a315545
--- /dev/null
+++ b/www-servers/tomcat/tomcat-6.0.44-r1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-2.5/JSP-2.1 Container"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-6/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="6"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="extra-webapps"
+
+ECJ_SLOT="3.7"
+SAPI_SLOT="2.5"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ dev-java/oracle-javamail:0
+ dev-java/tomcat-servlet-api:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+ >=virtual/jre-1.6
+ !<dev-java/tomcat-native-1.1.20"
+DEPEND="${COMMON_DEP}
+ >=virtual/jdk-1.6
+ test? ( dev-java/ant-junit:0 )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup tomcat 265
+ enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+java_prepare() {
+ find -name '*.jar' -type f -delete -print || die
+
+ # Remove bundled javamail, servlet-api
+ rm -rv java/javax/{mail,servlet} || die
+
+ epatch "${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}\`" \
+ bin/catalina.sh || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_TEST_TARGET="all"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},oracle-javamail,tomcat-servlet-api-${SAPI_SLOT}"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r1"
+INIT_REV="-r1"
+
+src_compile() {
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+ java-pkg-2_src_compile
+}
+
+src_test() {
+ EANT_BUILD_XML="test/build.xml" java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<6.0.36), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+# einfo "Please read http://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}
diff --git a/www-servers/tomcat/tomcat-7.0.63.ebuild b/www-servers/tomcat/tomcat-7.0.63.ebuild
new file mode 100644
index 0000000..e4f542a
--- /dev/null
+++ b/www-servers/tomcat/tomcat-7.0.63.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="7"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps websockets"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.4"
+SAPI_SLOT="3.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ dev-java/oracle-javamail:0
+ dev-java/tomcat-servlet-api:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+ websockets? ( >=virtual/jre-1.7 )
+ !websockets? ( >=virtual/jre-1.6 )
+ !<dev-java/tomcat-native-1.1.24"
+DEPEND="${COMMON_DEP}
+ websockets? ( >=virtual/jdk-1.7 )
+ !websockets? ( >=virtual/jdk-1.6 )
+ test? ( dev-java/ant-junit:0 )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup tomcat 265
+ enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+java_prepare() {
+ find -name '*.jar' -type f -delete -print || die
+
+ # Remove bundled javamail, servlet-api
+ rm -rv java/javax/{el,mail,servlet} || die
+
+ epatch "${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}\`" \
+ bin/catalina.sh || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},oracle-javamail,tomcat-servlet-api-${SAPI_SLOT}"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r1"
+INIT_REV="-r1"
+
+src_compile() {
+ use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+ java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+# einfo "Please read http://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}
diff --git a/www-servers/tomcat/tomcat-8.0.24.ebuild b/www-servers/tomcat/tomcat-8.0.24.ebuild
new file mode 100644
index 0000000..4d74ee6
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.0.24.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3 Container"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+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.4"
+SAPI_SLOT="3.1"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ dev-java/oracle-javamail:0
+ dev-java/tomcat-servlet-api:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+ !<dev-java/tomcat-native-1.1.24
+ >=virtual/jre-1.7"
+DEPEND="${COMMON_DEP}
+ >=virtual/jdk-1.7
+ test? (
+ >=dev-java/ant-junit-1.9:0
+ dev-java/easymock:3.2
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup tomcat 265
+ enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+java_prepare() {
+ find -name '*.jar' -type f -delete -print || die
+
+ # Remove bundled javamail, servlet-api
+ rm -rv java/javax/{el,mail,servlet} || die
+
+ epatch "${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}\`" \
+ bin/catalina.sh || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},oracle-javamail,tomcat-servlet-api-${SAPI_SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r1"
+INIT_REV="-r1"
+
+src_compile() {
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+ java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+# einfo "Please read http://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2015-08-25 23:22 James Le Cuirot
0 siblings, 0 replies; 73+ messages in thread
From: James Le Cuirot @ 2015-08-25 23:22 UTC (permalink / raw
To: gentoo-commits
commit: 586d3c9272612840f57fba6196d2ac11a8a5a9dd
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 25 23:20:50 2015 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 23:22:12 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=586d3c92
www-servers/tomcat: Second stab at bug #453212 for version 6
The previous attempt didn't work because 6 doesn't resolve system
properties in the catalina.properties file. I have backported the
change from 7 to make it work.
I have also unbundled el-api.jar in line with the later versions as
per bug #558728.
Package-Manager: portage-2.2.20.1
www-servers/tomcat/files/tomcat-6-sysprop.patch | 109 +++++++++++++++++++++
.../tomcat/files/tomcat-6.0.44-build.xml.patch | 15 ++-
www-servers/tomcat/files/tomcat-r1.init | 1 -
...at-6.0.44-r1.ebuild => tomcat-6.0.44-r2.ebuild} | 8 +-
4 files changed, 125 insertions(+), 8 deletions(-)
diff --git a/www-servers/tomcat/files/tomcat-6-sysprop.patch b/www-servers/tomcat/files/tomcat-6-sysprop.patch
new file mode 100644
index 0000000..033bbc8
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-6-sysprop.patch
@@ -0,0 +1,109 @@
+diff -Naur apache-tomcat-6.0.44-src.orig/java/org/apache/catalina/startup/Bootstrap.java apache-tomcat-6.0.44-src/java/org/apache/catalina/startup/Bootstrap.java
+--- apache-tomcat-6.0.44-src.orig/java/org/apache/catalina/startup/Bootstrap.java 2015-05-08 13:22:05.000000000 +0100
++++ apache-tomcat-6.0.44-src/java/org/apache/catalina/startup/Bootstrap.java 2015-08-25 21:34:29.774917427 +0100
+@@ -109,40 +109,18 @@
+ String value = CatalinaProperties.getProperty(name + ".loader");
+ if ((value == null) || (value.equals("")))
+ return parent;
++
++ value = replace(value);
+
+ ArrayList repositoryLocations = new ArrayList();
+ ArrayList repositoryTypes = new ArrayList();
+- int i;
+
+ StringTokenizer tokenizer = new StringTokenizer(value, ",");
+ while (tokenizer.hasMoreElements()) {
+- String repository = tokenizer.nextToken();
+-
+- // Local repository
+- boolean replace = false;
+- String before = repository;
+- while ((i=repository.indexOf(CATALINA_HOME_TOKEN))>=0) {
+- replace=true;
+- if (i>0) {
+- repository = repository.substring(0,i) + getCatalinaHome()
+- + repository.substring(i+CATALINA_HOME_TOKEN.length());
+- } else {
+- repository = getCatalinaHome()
+- + repository.substring(CATALINA_HOME_TOKEN.length());
+- }
+- }
+- while ((i=repository.indexOf(CATALINA_BASE_TOKEN))>=0) {
+- replace=true;
+- if (i>0) {
+- repository = repository.substring(0,i) + getCatalinaBase()
+- + repository.substring(i+CATALINA_BASE_TOKEN.length());
+- } else {
+- repository = getCatalinaBase()
+- + repository.substring(CATALINA_BASE_TOKEN.length());
+- }
++ String repository = tokenizer.nextToken().trim();
++ if (repository.length() == 0) {
++ continue;
+ }
+- if (replace && log.isDebugEnabled())
+- log.debug("Expanded " + before + " to " + repository);
+
+ // Check for a JAR URL repository
+ try {
+@@ -154,6 +132,7 @@
+ // Ignore
+ }
+
++ // Local repository
+ if (repository.endsWith("*.jar")) {
+ repository = repository.substring
+ (0, repository.length() - "*.jar".length());
+@@ -192,6 +171,51 @@
+
+ }
+
++ /**
++ * System property replacement in the given string.
++ *
++ * @param str The original string
++ * @return the modified string
++ */
++ protected String replace(String str) {
++ // Implementation is copied from ClassLoaderLogManager.replace(),
++ // but added special processing for catalina.home and catalina.base.
++ String result = str;
++ int pos_start = str.indexOf("${");
++ if (pos_start >= 0) {
++ StringBuilder builder = new StringBuilder();
++ int pos_end = -1;
++ while (pos_start >= 0) {
++ builder.append(str, pos_end + 1, pos_start);
++ pos_end = str.indexOf('}', pos_start + 2);
++ if (pos_end < 0) {
++ pos_end = pos_start - 1;
++ break;
++ }
++ String propName = str.substring(pos_start + 2, pos_end);
++ String replacement;
++ if (propName.length() == 0) {
++ replacement = null;
++ } else if (CATALINA_HOME_TOKEN.equals(propName)) {
++ replacement = getCatalinaHome();
++ } else if (CATALINA_BASE_TOKEN.equals(propName)) {
++ replacement = getCatalinaBase();
++ } else {
++ replacement = System.getProperty(propName);
++ }
++ if (replacement != null) {
++ builder.append(replacement);
++ } else {
++ builder.append(str, pos_start, pos_end + 1);
++ }
++ pos_start = str.indexOf("${", pos_end + 1);
++ }
++ builder.append(str, pos_end + 1, str.length());
++ result = builder.toString();
++ }
++ return result;
++ }
++
+
+ /**
+ * Initialize daemon.
diff --git a/www-servers/tomcat/files/tomcat-6.0.44-build.xml.patch b/www-servers/tomcat/files/tomcat-6.0.44-build.xml.patch
index eaa1963..7430651 100644
--- a/www-servers/tomcat/files/tomcat-6.0.44-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-6.0.44-build.xml.patch
@@ -1,6 +1,6 @@
diff -Naur apache-tomcat-6.0.44-src.orig/build.xml apache-tomcat-6.0.44-src/build.xml
--- apache-tomcat-6.0.44-src.orig/build.xml 2015-05-08 13:22:05.000000000 +0100
-+++ apache-tomcat-6.0.44-src/build.xml 2015-08-16 14:10:03.609366396 +0100
++++ apache-tomcat-6.0.44-src/build.xml 2015-08-25 23:38:46.147332131 +0100
@@ -159,12 +159,14 @@
</fileset>
</copy>
@@ -16,7 +16,7 @@ diff -Naur apache-tomcat-6.0.44-src.orig/build.xml apache-tomcat-6.0.44-src/buil
</target>
-@@ -307,14 +309,18 @@
+@@ -307,19 +309,25 @@
manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
<!-- Servlet 2.5 Implementation JAR File -->
@@ -35,7 +35,14 @@ diff -Naur apache-tomcat-6.0.44-src.orig/build.xml apache-tomcat-6.0.44-src/buil
<!-- JSP 2.1 EL Implementation JAR File -->
-@@ -492,12 +498,14 @@
++<!--
+ <jarIt jarfile="${el-api.jar}" filesId="files.el-api"
+ manifest="${tomcat.manifests}/el-api.jar.manifest" />
++-->
+
+ <!-- Bootstrap JAR File -->
+ <jarIt jarfile="${bootstrap.jar}" filesId="files.bootstrap"
+@@ -492,12 +500,14 @@
<target name="deploy" depends="build-only,build-docs,warn.dbcp">
@@ -50,7 +57,7 @@ diff -Naur apache-tomcat-6.0.44-src.orig/build.xml apache-tomcat-6.0.44-src/buil
<!-- Copy scripts -->
<copy todir="${tomcat.build}/bin">
-@@ -649,9 +657,11 @@
+@@ -649,9 +659,11 @@
</fileset>
</txt2html>
diff --git a/www-servers/tomcat/files/tomcat-r1.init b/www-servers/tomcat/files/tomcat-r1.init
index 3a69a9d..531baa1 100644
--- a/www-servers/tomcat/files/tomcat-r1.init
+++ b/www-servers/tomcat/files/tomcat-r1.init
@@ -20,7 +20,6 @@ PIDFILE=/@GENTOO_PORTAGE_EPREFIX@var/run/${RC_SVCNAME}.pid
export JAVA_HOME=`java-config ${TOMCAT_JVM:+--select-vm ${TOMCAT_JVM}} --jre-home`
export CLASSPATH="${CATALINA_HOME}/bin/bootstrap.jar:${CATALINA_HOME}/bin/tomcat-juli.jar"
-[[ @SLOT@ = 6 ]] && CLASSPATH+=":/@GENTOO_PORTAGE_EPREFIX@usr/share/tomcat-servlet-api-2.5/lib/jsp-api.jar:/@GENTOO_PORTAGE_EPREFIX@usr/share/tomcat-servlet-api-2.5/lib/servlet-api.jar"
depend() {
use dns logger net
diff --git a/www-servers/tomcat/tomcat-6.0.44-r1.ebuild b/www-servers/tomcat/tomcat-6.0.44-r2.ebuild
similarity index 95%
rename from www-servers/tomcat/tomcat-6.0.44-r1.ebuild
rename to www-servers/tomcat/tomcat-6.0.44-r2.ebuild
index e2d1b32..d3f72ba 100644
--- a/www-servers/tomcat/tomcat-6.0.44-r1.ebuild
+++ b/www-servers/tomcat/tomcat-6.0.44-r2.ebuild
@@ -24,7 +24,7 @@ SAPI_SLOT="2.5"
COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
dev-java/oracle-javamail:0
- dev-java/tomcat-servlet-api:${SAPI_SLOT}"
+ >=dev-java/tomcat-servlet-api-6.0.44-r1:${SAPI_SLOT}"
RDEPEND="${COMMON_DEP}
>=virtual/jre-1.6
!<dev-java/tomcat-native-1.1.20"
@@ -44,9 +44,11 @@ java_prepare() {
find -name '*.jar' -type f -delete -print || die
# Remove bundled javamail, servlet-api
- rm -rv java/javax/{mail,servlet} || die
+ rm -rv java/javax/{el,mail,servlet} || die
- epatch "${FILESDIR}/${P}-build.xml.patch"
+ epatch \
+ "${FILESDIR}/${P}-build.xml.patch" \
+ "${FILESDIR}/tomcat-6-sysprop.patch"
# For use of catalina.sh in netbeans
sed -i -e "/^# ----- Execute The Requested Command/ a\
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2015-09-03 16:50 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2015-09-03 16:50 UTC (permalink / raw
To: gentoo-commits
commit: c65a30c63935be2101dd2b2e33f861ecbe92fe63
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 3 16:50:32 2015 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Sep 3 16:50:32 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c65a30c6
www-servers/tomcat: version bump
Package-Manager: portage-2.2.20.1
www-servers/tomcat/Manifest | 1 +
.../tomcat/files/tomcat-7.0.64-build.xml.patch | 149 +++++++++++++++++++++
www-servers/tomcat/tomcat-7.0.64.ebuild | 146 ++++++++++++++++++++
3 files changed, 296 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 1b82f42..c486b11 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,5 +1,6 @@
DIST apache-tomcat-6.0.44-src.tar.gz 3447711 SHA256 c6f01526d58f2ba7b9da496e959d9e68cc49183006077704ab91c36ebebf5a4a SHA512 0d6a1539b28fa8ca3442557889d7d21cc523b18136f6998820ba13f41420536aba65ce78bac526002ee1dd86df3cbc80d9f043a3f765d7cf0b79e58e516030be WHIRLPOOL c65e704466191a0f98ec777e95dda889599ff6a545e7c013fd04bc0b72e0d0edf4491415f243d6a4de60cf76abe5c13ffbcc6d98f78b51490f7b7b43b24ecb97
DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 3a1dedda4019db87464fca3aeb4e800a538f0baee96d8b14c9d64967b0d2ea44 SHA512 acc322eee1446dd1bff72910ae9f40a62f88332ee69d6057b3c684e2abf8f28e6df6ab9505900f0b0cf7a5e2e0e80e64b0a790b3b78594ce595ce897706b4bcb WHIRLPOOL 4948964c1746e6ee912ac72c901ba271793610f402bf082455d104e2e8d6dbfa0bf5371d42d48d8ad7c826271fa60d989119a01e700497099022d0cf3564fdff
DIST apache-tomcat-7.0.63-src.tar.gz 4577737 SHA256 443aa92f2668906fb24cc43ba952068240f445df637a6e5da8d4661527536657 SHA512 677b28aa0131d309aed83afc73a778c16fd27a187e971ea6929b9b6b65268caa2a67cc468b15565a7d5944a60e8528cc26c82437b476ebc41ff9556367349d8a WHIRLPOOL a208ac63ed6f7ce7ac23674d8bb20d523b3fb5d10dfb46d292004f9b296986c4cab690f0252ad53bb4c625c3f58e04b9ddcda5a580fdafea20118b93f544760c
+DIST apache-tomcat-7.0.64-src.tar.gz 4592198 SHA256 d805dec3b387a244c4285ce1f9fc5028bb836716db52f1b1b5036a97dd9ec4dc SHA512 180479b0f5b5604597f850676235fab1f3e63051b503cfa3b4da1e6820505dece73f502249b6e032cfaaad18c9e2d4c057c9854ae5cbf088b214b51e0687ed8c WHIRLPOOL a461d7deae890227052bd83ac97c698821b1f6d6ff97c179b124de9b1b7ccdf1498651a391a03008b840fac730c080682f207db4d44e76d15dba63b266ddee51
DIST apache-tomcat-8.0.23-src.tar.gz 4868650 SHA256 6293713e78da9bb803060c8ddff982f8f7aef5a2e4b325340088493ce9957ba4 SHA512 cc83194b2847fc2db5448d548c7e65a1198cda02726b070f913a762d324152315886fba09532b879e26d15ec57e04057cc30b3a686b2a2307d6447d17f84e16c WHIRLPOOL b0559a4ef1b4c1f0683e4cce976d31db175d3c4f4d2b809b127e1074d49a6bf764366cc3e91f9a0818afd6de35e662a7aab89866dfd2e61673327c50535bff88
DIST apache-tomcat-8.0.24-src.tar.gz 4888751 SHA256 184b0d8bda512204a2e565f9175a13f9772a9d13185e1aa228394b45c641474c SHA512 af5619a63db3d1f6d39eb0290c83a38272c31803ee39a40aebfba5f7a0cf67d830ffcbebe518aff8de4a1f8eb44021975d7e43d45b4bd9804e8ca9cfbfc4904a WHIRLPOOL 4d37f4d1fe3ee138252813bd4a65025d0ccceea8aec57aa0c9474ad4902f85938627277f6e4ece30793326c31d7790b0ca0b8d99d7b21857519d7c22c28794e8
diff --git a/www-servers/tomcat/files/tomcat-7.0.64-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.64-build.xml.patch
new file mode 100644
index 0000000..481591f
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-7.0.64-build.xml.patch
@@ -0,0 +1,149 @@
+diff -Naur apache-tomcat-7.0.63-src.orig/build.xml apache-tomcat-7.0.63-src/build.xml
+--- apache-tomcat-7.0.63-src.orig/build.xml 2015-06-30 09:15:44.000000000 +0100
++++ apache-tomcat-7.0.63-src/build.xml 2015-08-22 21:13:12.453038827 +0100
+@@ -660,12 +660,14 @@
+ </fileset>
+ </copy>
+ <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
++<!--
+ <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1">
+ <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
+ <include name="*" />
+ <exclude name="jspxml*" />
+ </fileset>
+ </copy>
++-->
+
+ </target>
+
+@@ -721,26 +723,32 @@
+ manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+
+ <!-- Servlet 3.0 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+ manifest="${tomcat.manifests}/servlet-api.jar.manifest"
+ notice="${tomcat.manifests}/servlet-api.jar.notice"
+ license="${tomcat.manifests}/servlet-api.jar.license" />
++-->
+
+ <!-- JSP 2.2 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${jsp-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.jsp-api"
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest"
+ notice="${tomcat.manifests}/jsp-api.jar.notice"
+ license="${tomcat.manifests}/jsp-api.jar.license" />
++-->
+
+ <!-- JSP 2.2 EL Implementation JAR File -->
++<!--
+ <jarIt jarfile="${el-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.el-api"
+ manifest="${tomcat.manifests}/el-api.jar.manifest" />
++-->
+
+ <!-- Bootstrap JAR File -->
+ <jarIt jarfile="${bootstrap.jar}"
+@@ -986,12 +994,14 @@
+ <target name="deploy" depends="package,build-docs,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">
+@@ -1051,14 +1061,15 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
++<!--
+ <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
+-
++-->
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+-
++<!--
+ <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
+ failonerror="false"/>
+-
++-->
+ <!-- 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}"
+@@ -1681,7 +1692,7 @@
+
+ <target name="extras-webservices-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">
+ <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -1886,6 +1897,7 @@
+ description="Create the Tomcat javadoc" >
+ <fail unless="java.7.home"
+ message="The java.7.home property must be set for javadoc build"/>
++<!--
+ <javadoc packagenames="javax.servlet.*"
+ excludepackagenames="javax.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -1947,6 +1959,7 @@
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="javax.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -1985,9 +1998,11 @@
+ <path refid="tomcat.webservices.classpath"/>
+ <path location="${ant.core.lib}"/>
+ </classpath>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <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/"/>
+@@ -2642,7 +2657,7 @@
+ </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}"/>
+@@ -2699,7 +2714,7 @@
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -2727,7 +2742,7 @@
+ </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}"/>
diff --git a/www-servers/tomcat/tomcat-7.0.64.ebuild b/www-servers/tomcat/tomcat-7.0.64.ebuild
new file mode 100644
index 0000000..ec08f2d
--- /dev/null
+++ b/www-servers/tomcat/tomcat-7.0.64.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="7"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps websockets"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.4"
+SAPI_SLOT="3.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ dev-java/oracle-javamail:0
+ dev-java/tomcat-servlet-api:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+ websockets? ( >=virtual/jre-1.7 )
+ !websockets? ( >=virtual/jre-1.6 )
+ !<dev-java/tomcat-native-1.1.24"
+DEPEND="${COMMON_DEP}
+ websockets? ( >=virtual/jdk-1.7 )
+ !websockets? ( >=virtual/jdk-1.6 )
+ test? ( dev-java/ant-junit:0 )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup tomcat 265
+ enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+java_prepare() {
+ find -name '*.jar' -type f -delete -print || die
+
+ # Remove bundled javamail, servlet-api
+ rm -rv java/javax/{el,mail,servlet} || die
+
+ epatch "${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}\`" \
+ bin/catalina.sh || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},oracle-javamail,tomcat-servlet-api-${SAPI_SLOT}"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r1"
+INIT_REV="-r1"
+
+src_compile() {
+ use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+ java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2015-10-02 9:08 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2015-10-02 9:08 UTC (permalink / raw
To: gentoo-commits
commit: 44e3d762ef900e3724eaec49e06a881104773b1d
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 2 09:07:40 2015 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Oct 2 09:07:40 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44e3d762
www-servers/tomcat: version bump
Package-Manager: portage-2.2.22
www-servers/tomcat/Manifest | 1 +
.../tomcat/files/tomcat-8.0.27-build.xml.patch | 265 +++++++++++++++++++++
www-servers/tomcat/tomcat-8.0.27.ebuild | 147 ++++++++++++
3 files changed, 413 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 7f85a74..93e7f82 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -3,3 +3,4 @@ DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 3a1dedda4019db87464fca3aeb4e
DIST apache-tomcat-7.0.64-src.tar.gz 4592198 SHA256 d805dec3b387a244c4285ce1f9fc5028bb836716db52f1b1b5036a97dd9ec4dc SHA512 180479b0f5b5604597f850676235fab1f3e63051b503cfa3b4da1e6820505dece73f502249b6e032cfaaad18c9e2d4c057c9854ae5cbf088b214b51e0687ed8c WHIRLPOOL a461d7deae890227052bd83ac97c698821b1f6d6ff97c179b124de9b1b7ccdf1498651a391a03008b840fac730c080682f207db4d44e76d15dba63b266ddee51
DIST apache-tomcat-8.0.23-src.tar.gz 4868650 SHA256 6293713e78da9bb803060c8ddff982f8f7aef5a2e4b325340088493ce9957ba4 SHA512 cc83194b2847fc2db5448d548c7e65a1198cda02726b070f913a762d324152315886fba09532b879e26d15ec57e04057cc30b3a686b2a2307d6447d17f84e16c WHIRLPOOL b0559a4ef1b4c1f0683e4cce976d31db175d3c4f4d2b809b127e1074d49a6bf764366cc3e91f9a0818afd6de35e662a7aab89866dfd2e61673327c50535bff88
DIST apache-tomcat-8.0.26-src.tar.gz 4904717 SHA256 3725621a73501a6e09438f177acfab7ce11fabeb2b0380a909273410f3b50b3b SHA512 70ef253889916bcca309a8f80675c4c588fef1cc5dc0360c45347107fb56fd546a334ca01e1109775410f7642acf6c75d9887f9403ad4c1d0e30f041f9ce34fb WHIRLPOOL 3c29a5418dfefc12157d8656dfa15a2937668f52d18c21f6dd4a278d2bc4c84d5b6d542daf6244040eabeab57cb759a510b7b1d0e41440a2d9ad62586723dafc
+DIST apache-tomcat-8.0.27-src.tar.gz 4911212 SHA256 149b203c55c08d3ef1e823e8f0f771362bee75ea95db693757e53ddc9fba8fae SHA512 dfb504b37bf991c03b58b50af833d2d84d3f36a1eb5c4290a0eb8abee92811e78798ea69ba21ed72e82abbf8e27f9c2e74fe5989a31e49ee8cecb8530ce3c93a WHIRLPOOL 5dbb965aacbe5c178a4d2dcdf9719821498b3694fd909fe276d8dad7fb96b8c402fcf8d21b6e9b125b55d1c39408cbcb2ce85789c0eb3204d1d9aae5ea1cde3d
diff --git a/www-servers/tomcat/files/tomcat-8.0.27-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.27-build.xml.patch
new file mode 100644
index 0000000..1923d23
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.0.27-build.xml.patch
@@ -0,0 +1,265 @@
+diff -Naur apache-tomcat-8.0.24-src.orig/build.xml apache-tomcat-8.0.24-src/build.xml
+--- apache-tomcat-8.0.24-src.orig/build.xml 2015-07-01 21:25:21.000000000 +0100
++++ apache-tomcat-8.0.24-src/build.xml 2015-08-22 21:17:05.825564599 +0100
+@@ -697,24 +697,29 @@
+ manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+
+ <!-- Servlet 3.1 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+ 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}"
+ filesDir="${tomcat.classes}"
+ filesId="files.jsp-api"
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
++-->
+
+ <!-- EL 3.0 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 -->
+ <jarIt jarfile="${websocket-api.jar}"
+@@ -982,14 +987,14 @@
+
+ <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">
+@@ -1049,7 +1054,7 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
+- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+@@ -1083,7 +1088,7 @@
+ </javac>
+ </target>
+
+- <target name="build-tomcat-jdbc" depends="package">
++ <target name="build-tomcat-jdbc" depends="package" unless="noget">
+ <!-- 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}"
+@@ -1098,7 +1103,7 @@
+ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+ </target>
+
+- <target name="build-tomcat-jdbc-src">
++ <target name="build-tomcat-jdbc-src" unless="noget">
+ <!-- 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}"
+@@ -1202,10 +1207,11 @@
+
+ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+ <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+ <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
+ failonerror="false"/>
+ <copy file="${jdt.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. -->
+@@ -1542,7 +1548,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}"/>
+@@ -1681,7 +1687,7 @@
+
+ <target name="extras-webservices-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">
+ <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -1882,6 +1888,7 @@
+
+ <target name="javadoc" depends="dist-source,extras-webservices-prepare"
+ description="Create the Tomcat javadoc" >
++<!--
+ <javadoc packagenames="javax.servlet.*"
+ excludepackagenames="javax.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -1940,6 +1947,7 @@
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="javax.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -1970,15 +1978,17 @@
+ docencoding="UTF-8"
+ charset="UTF-8"
+ additionalparam="-breakiterator -notimestamp"
+- maxmemory="256m" >
++ maxmemory="512m" >
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path refid="tomcat.webservices.classpath"/>
+ <path location="${ant.core.lib}"/>
+ </classpath>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <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/"/>
+@@ -2739,7 +2749,7 @@
+ </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}"/>
+@@ -2773,7 +2783,7 @@
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -2819,7 +2829,7 @@
+ </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}"/>
+@@ -2845,18 +2855,18 @@
+
+ <!-- =============== Utility Targets to support downloads ================ -->
+
+- <target name="setproxy" if="${proxy.use}">
++ <target name="setproxy" if="${proxy.use}" unless="noget">
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+ proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+ </target>
+
+- <target name="testexist">
++ <target name="testexist" unless="noget">
+ <echo message="Testing for ${destfile}"/>
+ <available file="${destfile}" property="exist"/>
+ </target>
+
+- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
++ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2868,7 +2878,7 @@
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadgz-2" unless="exist" depends="testexist">
++ <target name="downloadgz-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2887,7 +2897,7 @@
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
++ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2898,7 +2908,7 @@
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadzip-2" unless="exist" depends="testexist">
++ <target name="downloadzip-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2916,7 +2926,7 @@
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
++ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
+ <!-- Download the file -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2926,7 +2936,7 @@
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="downloadfile-2" unless="exist" depends="testexist">
++ <target name="downloadfile-2" unless="noget" depends="testexist">
+ <!-- Download the file from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2949,7 +2959,7 @@
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="trydownload.check" depends="setproxy">
++ <target name="trydownload.check" depends="setproxy" unless="noget">
+ <condition property="trydownload.run">
+ <and>
+ <not>
+@@ -2960,7 +2970,7 @@
+ </condition>
+ </target>
+
+- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+ <!-- Downloads a file if not yet downloaded and the source URL is available -->
+ <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+ </target>
+@@ -2971,7 +2981,7 @@
+
+ <target name="ide-eclipse"
+ depends="download-compile, extras-webservices-prepare, download-test-compile"
+- description="Prepares the source tree to be built in Eclipse">
++ description="Prepares the source tree to be built in Eclipse" unless="noget">
+
+ <!-- Copy the sample project files into the root directory -->
+ <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-8.0.27.ebuild b/www-servers/tomcat/tomcat-8.0.27.ebuild
new file mode 100644
index 0000000..3074dfa
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.0.27.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3 Container"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+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.4"
+SAPI_SLOT="3.1"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ dev-java/oracle-javamail:0
+ dev-java/tomcat-servlet-api:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+ !<dev-java/tomcat-native-1.1.24
+ >=virtual/jre-1.7"
+DEPEND="${COMMON_DEP}
+ >=virtual/jdk-1.7
+ test? (
+ >=dev-java/ant-junit-1.9:0
+ dev-java/easymock:3.2
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup tomcat 265
+ enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+java_prepare() {
+ find -name '*.jar' -type f -delete -print || die
+
+ # Remove bundled javamail, servlet-api
+ rm -rv java/javax/{el,mail,servlet} || die
+
+ epatch "${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}\`" \
+ bin/catalina.sh || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},oracle-javamail,tomcat-servlet-api-${SAPI_SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r1"
+INIT_REV="-r1"
+
+src_compile() {
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+ java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2015-10-15 11:07 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2015-10-15 11:07 UTC (permalink / raw
To: gentoo-commits
commit: e217598b4505b7f28b05b2db0a44fbd4022b70b0
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 15 11:07:02 2015 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Oct 15 11:07:02 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e217598b
www-servers/tomcat: version bump
Package-Manager: portage-2.2.23
www-servers/tomcat/Manifest | 1 +
.../tomcat/files/tomcat-8.0.28-build.xml.patch | 265 +++++++++++++++++++++
www-servers/tomcat/tomcat-8.0.28.ebuild | 147 ++++++++++++
3 files changed, 413 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 93e7f82..fbb8dff 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -4,3 +4,4 @@ DIST apache-tomcat-7.0.64-src.tar.gz 4592198 SHA256 d805dec3b387a244c4285ce1f9fc
DIST apache-tomcat-8.0.23-src.tar.gz 4868650 SHA256 6293713e78da9bb803060c8ddff982f8f7aef5a2e4b325340088493ce9957ba4 SHA512 cc83194b2847fc2db5448d548c7e65a1198cda02726b070f913a762d324152315886fba09532b879e26d15ec57e04057cc30b3a686b2a2307d6447d17f84e16c WHIRLPOOL b0559a4ef1b4c1f0683e4cce976d31db175d3c4f4d2b809b127e1074d49a6bf764366cc3e91f9a0818afd6de35e662a7aab89866dfd2e61673327c50535bff88
DIST apache-tomcat-8.0.26-src.tar.gz 4904717 SHA256 3725621a73501a6e09438f177acfab7ce11fabeb2b0380a909273410f3b50b3b SHA512 70ef253889916bcca309a8f80675c4c588fef1cc5dc0360c45347107fb56fd546a334ca01e1109775410f7642acf6c75d9887f9403ad4c1d0e30f041f9ce34fb WHIRLPOOL 3c29a5418dfefc12157d8656dfa15a2937668f52d18c21f6dd4a278d2bc4c84d5b6d542daf6244040eabeab57cb759a510b7b1d0e41440a2d9ad62586723dafc
DIST apache-tomcat-8.0.27-src.tar.gz 4911212 SHA256 149b203c55c08d3ef1e823e8f0f771362bee75ea95db693757e53ddc9fba8fae SHA512 dfb504b37bf991c03b58b50af833d2d84d3f36a1eb5c4290a0eb8abee92811e78798ea69ba21ed72e82abbf8e27f9c2e74fe5989a31e49ee8cecb8530ce3c93a WHIRLPOOL 5dbb965aacbe5c178a4d2dcdf9719821498b3694fd909fe276d8dad7fb96b8c402fcf8d21b6e9b125b55d1c39408cbcb2ce85789c0eb3204d1d9aae5ea1cde3d
+DIST apache-tomcat-8.0.28-src.tar.gz 4913153 SHA256 441a0a0459b6c2dacab3bcf68a9e512b4bb62f7251a27bd15b909ee31b659367 SHA512 60f9a9f643595cdc87598169b8b66cc1e445445a530cad88d2957e90ca99e7c77be9d3576c7fa3a0e7051166f2a960a1c3bf4103f902d1da122825d41e1154c7 WHIRLPOOL 5867ec0c128fe5247c7b874baf05fba9fc9a5663e1c16ecd60bc6ae1e3c411a43f4d8784db5c915fe6c54bc2ec728a01773708738aede30e5abaf1f77072cdcb
diff --git a/www-servers/tomcat/files/tomcat-8.0.28-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.28-build.xml.patch
new file mode 100644
index 0000000..1923d23
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.0.28-build.xml.patch
@@ -0,0 +1,265 @@
+diff -Naur apache-tomcat-8.0.24-src.orig/build.xml apache-tomcat-8.0.24-src/build.xml
+--- apache-tomcat-8.0.24-src.orig/build.xml 2015-07-01 21:25:21.000000000 +0100
++++ apache-tomcat-8.0.24-src/build.xml 2015-08-22 21:17:05.825564599 +0100
+@@ -697,24 +697,29 @@
+ manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+
+ <!-- Servlet 3.1 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+ 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}"
+ filesDir="${tomcat.classes}"
+ filesId="files.jsp-api"
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
++-->
+
+ <!-- EL 3.0 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 -->
+ <jarIt jarfile="${websocket-api.jar}"
+@@ -982,14 +987,14 @@
+
+ <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">
+@@ -1049,7 +1054,7 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
+- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+@@ -1083,7 +1088,7 @@
+ </javac>
+ </target>
+
+- <target name="build-tomcat-jdbc" depends="package">
++ <target name="build-tomcat-jdbc" depends="package" unless="noget">
+ <!-- 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}"
+@@ -1098,7 +1103,7 @@
+ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+ </target>
+
+- <target name="build-tomcat-jdbc-src">
++ <target name="build-tomcat-jdbc-src" unless="noget">
+ <!-- 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}"
+@@ -1202,10 +1207,11 @@
+
+ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+ <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+ <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
+ failonerror="false"/>
+ <copy file="${jdt.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. -->
+@@ -1542,7 +1548,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}"/>
+@@ -1681,7 +1687,7 @@
+
+ <target name="extras-webservices-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">
+ <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -1882,6 +1888,7 @@
+
+ <target name="javadoc" depends="dist-source,extras-webservices-prepare"
+ description="Create the Tomcat javadoc" >
++<!--
+ <javadoc packagenames="javax.servlet.*"
+ excludepackagenames="javax.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -1940,6 +1947,7 @@
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="javax.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -1970,15 +1978,17 @@
+ docencoding="UTF-8"
+ charset="UTF-8"
+ additionalparam="-breakiterator -notimestamp"
+- maxmemory="256m" >
++ maxmemory="512m" >
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path refid="tomcat.webservices.classpath"/>
+ <path location="${ant.core.lib}"/>
+ </classpath>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <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/"/>
+@@ -2739,7 +2749,7 @@
+ </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}"/>
+@@ -2773,7 +2783,7 @@
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -2819,7 +2829,7 @@
+ </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}"/>
+@@ -2845,18 +2855,18 @@
+
+ <!-- =============== Utility Targets to support downloads ================ -->
+
+- <target name="setproxy" if="${proxy.use}">
++ <target name="setproxy" if="${proxy.use}" unless="noget">
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+ proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+ </target>
+
+- <target name="testexist">
++ <target name="testexist" unless="noget">
+ <echo message="Testing for ${destfile}"/>
+ <available file="${destfile}" property="exist"/>
+ </target>
+
+- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
++ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2868,7 +2878,7 @@
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadgz-2" unless="exist" depends="testexist">
++ <target name="downloadgz-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2887,7 +2897,7 @@
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
++ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2898,7 +2908,7 @@
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadzip-2" unless="exist" depends="testexist">
++ <target name="downloadzip-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2916,7 +2926,7 @@
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
++ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
+ <!-- Download the file -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2926,7 +2936,7 @@
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="downloadfile-2" unless="exist" depends="testexist">
++ <target name="downloadfile-2" unless="noget" depends="testexist">
+ <!-- Download the file from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2949,7 +2959,7 @@
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="trydownload.check" depends="setproxy">
++ <target name="trydownload.check" depends="setproxy" unless="noget">
+ <condition property="trydownload.run">
+ <and>
+ <not>
+@@ -2960,7 +2970,7 @@
+ </condition>
+ </target>
+
+- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+ <!-- Downloads a file if not yet downloaded and the source URL is available -->
+ <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+ </target>
+@@ -2971,7 +2981,7 @@
+
+ <target name="ide-eclipse"
+ depends="download-compile, extras-webservices-prepare, download-test-compile"
+- description="Prepares the source tree to be built in Eclipse">
++ description="Prepares the source tree to be built in Eclipse" unless="noget">
+
+ <!-- Copy the sample project files into the root directory -->
+ <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-8.0.28.ebuild b/www-servers/tomcat/tomcat-8.0.28.ebuild
new file mode 100644
index 0000000..3074dfa
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.0.28.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3 Container"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+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.4"
+SAPI_SLOT="3.1"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ dev-java/oracle-javamail:0
+ dev-java/tomcat-servlet-api:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+ !<dev-java/tomcat-native-1.1.24
+ >=virtual/jre-1.7"
+DEPEND="${COMMON_DEP}
+ >=virtual/jdk-1.7
+ test? (
+ >=dev-java/ant-junit-1.9:0
+ dev-java/easymock:3.2
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup tomcat 265
+ enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+java_prepare() {
+ find -name '*.jar' -type f -delete -print || die
+
+ # Remove bundled javamail, servlet-api
+ rm -rv java/javax/{el,mail,servlet} || die
+
+ epatch "${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}\`" \
+ bin/catalina.sh || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},oracle-javamail,tomcat-servlet-api-${SAPI_SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r1"
+INIT_REV="-r1"
+
+src_compile() {
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+ java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2015-11-25 19:49 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2015-11-25 19:49 UTC (permalink / raw
To: gentoo-commits
commit: 2d9f56cb73c053a1c95c2da0fb1ce2266e040fce
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 25 19:48:00 2015 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 19:48:56 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d9f56cb
www-servers/tomcat: version bump
Package-Manager: portage-2.2.26
www-servers/tomcat/Manifest | 1 +
.../tomcat/files/tomcat-8.0.29-build.xml.patch | 265 +++++++++++++++++++++
www-servers/tomcat/tomcat-8.0.29.ebuild | 155 ++++++++++++
3 files changed, 421 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 6e88e73..0ea45d7 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -4,3 +4,4 @@ DIST apache-tomcat-7.0.64-src.tar.gz 4592198 SHA256 d805dec3b387a244c4285ce1f9fc
DIST apache-tomcat-7.0.65-src.tar.gz 4600718 SHA256 38c266a21ff27560ba4c213dd64628a1ed35b22289d37b5d7f250010e963cc39 SHA512 6eb420a3067783a6ffee781c834dc363d6638d6e79182886594249a0ef810b2ab721f2a44f84b4ea90372a7e2e5171caf49697945d359e9c877a2db640fc3da2 WHIRLPOOL db678b899455ef977d893eec01ba50687c7563646321dbe511be6c55f03859a08778e4f6da14021a9ed051c1f3573edf9d0de527383aaf4ee6114f3a027b281d
DIST apache-tomcat-8.0.26-src.tar.gz 4904717 SHA256 3725621a73501a6e09438f177acfab7ce11fabeb2b0380a909273410f3b50b3b SHA512 70ef253889916bcca309a8f80675c4c588fef1cc5dc0360c45347107fb56fd546a334ca01e1109775410f7642acf6c75d9887f9403ad4c1d0e30f041f9ce34fb WHIRLPOOL 3c29a5418dfefc12157d8656dfa15a2937668f52d18c21f6dd4a278d2bc4c84d5b6d542daf6244040eabeab57cb759a510b7b1d0e41440a2d9ad62586723dafc
DIST apache-tomcat-8.0.28-src.tar.gz 4913153 SHA256 441a0a0459b6c2dacab3bcf68a9e512b4bb62f7251a27bd15b909ee31b659367 SHA512 60f9a9f643595cdc87598169b8b66cc1e445445a530cad88d2957e90ca99e7c77be9d3576c7fa3a0e7051166f2a960a1c3bf4103f902d1da122825d41e1154c7 WHIRLPOOL 5867ec0c128fe5247c7b874baf05fba9fc9a5663e1c16ecd60bc6ae1e3c411a43f4d8784db5c915fe6c54bc2ec728a01773708738aede30e5abaf1f77072cdcb
+DIST apache-tomcat-8.0.29-src.tar.gz 4933339 SHA256 5cb87ae9afd145d68906e93b825a6a41303d7975bafe3d57530e9a8ec01c7c80 SHA512 279c971529f0e7513885a0a201753bc94b1ed7a4f035cb33943bf6ae769102630b94144c65236e8b42c666ded7cc843db54c155e8b5cd1ae175b6385d9c2789b WHIRLPOOL 8cfb5402b877be4bd4306cf5d14cf76302b1904e3530de108f262f9bb3de6f1377882fb5a1406e4b2ffc5c239c541f64df55fc98945157edafbd14586deb26bd
diff --git a/www-servers/tomcat/files/tomcat-8.0.29-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.29-build.xml.patch
new file mode 100644
index 0000000..1923d23
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.0.29-build.xml.patch
@@ -0,0 +1,265 @@
+diff -Naur apache-tomcat-8.0.24-src.orig/build.xml apache-tomcat-8.0.24-src/build.xml
+--- apache-tomcat-8.0.24-src.orig/build.xml 2015-07-01 21:25:21.000000000 +0100
++++ apache-tomcat-8.0.24-src/build.xml 2015-08-22 21:17:05.825564599 +0100
+@@ -697,24 +697,29 @@
+ manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+
+ <!-- Servlet 3.1 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+ 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}"
+ filesDir="${tomcat.classes}"
+ filesId="files.jsp-api"
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
++-->
+
+ <!-- EL 3.0 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 -->
+ <jarIt jarfile="${websocket-api.jar}"
+@@ -982,14 +987,14 @@
+
+ <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">
+@@ -1049,7 +1054,7 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
+- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+@@ -1083,7 +1088,7 @@
+ </javac>
+ </target>
+
+- <target name="build-tomcat-jdbc" depends="package">
++ <target name="build-tomcat-jdbc" depends="package" unless="noget">
+ <!-- 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}"
+@@ -1098,7 +1103,7 @@
+ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+ </target>
+
+- <target name="build-tomcat-jdbc-src">
++ <target name="build-tomcat-jdbc-src" unless="noget">
+ <!-- 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}"
+@@ -1202,10 +1207,11 @@
+
+ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+ <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+ <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
+ failonerror="false"/>
+ <copy file="${jdt.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. -->
+@@ -1542,7 +1548,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}"/>
+@@ -1681,7 +1687,7 @@
+
+ <target name="extras-webservices-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">
+ <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -1882,6 +1888,7 @@
+
+ <target name="javadoc" depends="dist-source,extras-webservices-prepare"
+ description="Create the Tomcat javadoc" >
++<!--
+ <javadoc packagenames="javax.servlet.*"
+ excludepackagenames="javax.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -1940,6 +1947,7 @@
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="javax.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -1970,15 +1978,17 @@
+ docencoding="UTF-8"
+ charset="UTF-8"
+ additionalparam="-breakiterator -notimestamp"
+- maxmemory="256m" >
++ maxmemory="512m" >
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path refid="tomcat.webservices.classpath"/>
+ <path location="${ant.core.lib}"/>
+ </classpath>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <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/"/>
+@@ -2739,7 +2749,7 @@
+ </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}"/>
+@@ -2773,7 +2783,7 @@
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -2819,7 +2829,7 @@
+ </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}"/>
+@@ -2845,18 +2855,18 @@
+
+ <!-- =============== Utility Targets to support downloads ================ -->
+
+- <target name="setproxy" if="${proxy.use}">
++ <target name="setproxy" if="${proxy.use}" unless="noget">
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+ proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+ </target>
+
+- <target name="testexist">
++ <target name="testexist" unless="noget">
+ <echo message="Testing for ${destfile}"/>
+ <available file="${destfile}" property="exist"/>
+ </target>
+
+- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
++ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2868,7 +2878,7 @@
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadgz-2" unless="exist" depends="testexist">
++ <target name="downloadgz-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2887,7 +2897,7 @@
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
++ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2898,7 +2908,7 @@
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadzip-2" unless="exist" depends="testexist">
++ <target name="downloadzip-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2916,7 +2926,7 @@
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
++ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
+ <!-- Download the file -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2926,7 +2936,7 @@
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="downloadfile-2" unless="exist" depends="testexist">
++ <target name="downloadfile-2" unless="noget" depends="testexist">
+ <!-- Download the file from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2949,7 +2959,7 @@
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="trydownload.check" depends="setproxy">
++ <target name="trydownload.check" depends="setproxy" unless="noget">
+ <condition property="trydownload.run">
+ <and>
+ <not>
+@@ -2960,7 +2970,7 @@
+ </condition>
+ </target>
+
+- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+ <!-- Downloads a file if not yet downloaded and the source URL is available -->
+ <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+ </target>
+@@ -2971,7 +2981,7 @@
+
+ <target name="ide-eclipse"
+ depends="download-compile, extras-webservices-prepare, download-test-compile"
+- description="Prepares the source tree to be built in Eclipse">
++ description="Prepares the source tree to be built in Eclipse" unless="noget">
+
+ <!-- Copy the sample project files into the root directory -->
+ <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-8.0.29.ebuild b/www-servers/tomcat/tomcat-8.0.29.ebuild
new file mode 100644
index 0000000..3595c57
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.0.29.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3 Container"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+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.4"
+SAPI_SLOT="3.1"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ dev-java/oracle-javamail:0
+ dev-java/tomcat-servlet-api:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+ !<dev-java/tomcat-native-1.1.24
+ >=virtual/jre-1.7"
+DEPEND="${COMMON_DEP}
+ app-admin/pwgen
+ >=virtual/jdk-1.7
+ test? (
+ >=dev-java/ant-junit-1.9:0
+ dev-java/easymock:3.2
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup tomcat 265
+ enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+java_prepare() {
+ find -name '*.jar' -type f -delete -print || die
+
+ # Remove bundled javamail, servlet-api
+ rm -rv java/javax/{el,mail,servlet} || die
+
+ epatch "${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}\`" \
+ bin/catalina.sh || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},oracle-javamail,tomcat-servlet-api-${SAPI_SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+ java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ # add missing docBase
+ local apps="host-manager manager"
+ for app in ${apps}; do
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+ output/build/webapps/${app}/META-INF/context.xml || die
+ done
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw="$(pwgen -s -B 15 1)"
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2015-12-04 18:11 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2015-12-04 18:11 UTC (permalink / raw
To: gentoo-commits
commit: 4f4acfe995ddcb78b424ca24151d2b02ad5755e0
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 4 18:04:20 2015 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Dec 4 18:04:20 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f4acfe9
www-servers/tomcat: version bump - slot 9 milestone 1
Package-Manager: portage-2.2.26
www-servers/tomcat/Manifest | 1 +
.../files/tomcat-9.0.0_alpha1-build.xml.patch | 266 +++++++++++++++++++++
www-servers/tomcat/tomcat-9.0.0_alpha1.ebuild | 156 ++++++++++++
3 files changed, 423 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 0ea45d7..5132be6 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -5,3 +5,4 @@ DIST apache-tomcat-7.0.65-src.tar.gz 4600718 SHA256 38c266a21ff27560ba4c213dd646
DIST apache-tomcat-8.0.26-src.tar.gz 4904717 SHA256 3725621a73501a6e09438f177acfab7ce11fabeb2b0380a909273410f3b50b3b SHA512 70ef253889916bcca309a8f80675c4c588fef1cc5dc0360c45347107fb56fd546a334ca01e1109775410f7642acf6c75d9887f9403ad4c1d0e30f041f9ce34fb WHIRLPOOL 3c29a5418dfefc12157d8656dfa15a2937668f52d18c21f6dd4a278d2bc4c84d5b6d542daf6244040eabeab57cb759a510b7b1d0e41440a2d9ad62586723dafc
DIST apache-tomcat-8.0.28-src.tar.gz 4913153 SHA256 441a0a0459b6c2dacab3bcf68a9e512b4bb62f7251a27bd15b909ee31b659367 SHA512 60f9a9f643595cdc87598169b8b66cc1e445445a530cad88d2957e90ca99e7c77be9d3576c7fa3a0e7051166f2a960a1c3bf4103f902d1da122825d41e1154c7 WHIRLPOOL 5867ec0c128fe5247c7b874baf05fba9fc9a5663e1c16ecd60bc6ae1e3c411a43f4d8784db5c915fe6c54bc2ec728a01773708738aede30e5abaf1f77072cdcb
DIST apache-tomcat-8.0.29-src.tar.gz 4933339 SHA256 5cb87ae9afd145d68906e93b825a6a41303d7975bafe3d57530e9a8ec01c7c80 SHA512 279c971529f0e7513885a0a201753bc94b1ed7a4f035cb33943bf6ae769102630b94144c65236e8b42c666ded7cc843db54c155e8b5cd1ae175b6385d9c2789b WHIRLPOOL 8cfb5402b877be4bd4306cf5d14cf76302b1904e3530de108f262f9bb3de6f1377882fb5a1406e4b2ffc5c239c541f64df55fc98945157edafbd14586deb26bd
+DIST apache-tomcat-9.0.0.M1-src.tar.gz 4984318 SHA256 62fb16ed9743916b643a7b406c4b98b8b9b2df15504e9a66d4a609f6d539b34c SHA512 f47a018e30a0ceb382187de2fef443ea1ef9d6e319ef4f3a027824b7e95fb4b5e9d73531f03357b2a89c5f3baf568ac4cfde83969f9603299dd0cf742c4f6efa WHIRLPOOL ab796c7484fd2c1d5060998910e1bd1cfb4f478b6740d9d105255b1e1b36fc9118048d0089a873699b978be91adbe7e024afcb3a4fc2d5121b17089998cb9210
diff --git a/www-servers/tomcat/files/tomcat-9.0.0_alpha1-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.0_alpha1-build.xml.patch
new file mode 100644
index 0000000..f5d49c7
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-9.0.0_alpha1-build.xml.patch
@@ -0,0 +1,266 @@
+diff --git a/apache-tomcat-9.0.0.M1-src/build.xml b/apache-tomcat-9.0.0.M1-src/build.xml
+index eab0c45..63ac495 100644
+--- a/apache-tomcat-9.0.0.M1-src/build.xml
++++ b/apache-tomcat-9.0.0.M1-src/build.xml
+@@ -711,24 +711,30 @@
+ manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+
+ <!-- Servlet 4.0 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+ 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}"
+ filesDir="${tomcat.classes}"
+ filesId="files.jsp-api"
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
++-->
+
+ <!-- EL 3.0 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 -->
+ <jarIt jarfile="${websocket-api.jar}"
+@@ -1002,14 +1008,14 @@
+
+ <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">
+@@ -1069,7 +1075,7 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
+- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+@@ -1103,7 +1109,7 @@
+ </javac>
+ </target>
+
+- <target name="build-tomcat-jdbc" depends="package">
++ <target name="build-tomcat-jdbc" depends="package" unless="noget">
+ <!-- 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}"
+@@ -1118,7 +1124,7 @@
+ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+ </target>
+
+- <target name="build-tomcat-jdbc-src">
++ <target name="build-tomcat-jdbc-src" unless="noget">
+ <!-- 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}"
+@@ -1222,10 +1228,11 @@
+
+ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+ <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+ <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
+ failonerror="false"/>
+ <copy file="${jdt.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. -->
+@@ -1606,7 +1613,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}"/>
+@@ -1745,7 +1752,7 @@
+
+ <target name="extras-webservices-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">
+ <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -1940,6 +1947,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" >
++<!--
+ <javadoc packagenames="javax.servlet.*"
+ excludepackagenames="javax.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -1998,6 +2006,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="javax.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -2028,15 +2037,17 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ docencoding="UTF-8"
+ charset="UTF-8"
+ additionalparam="-breakiterator -notimestamp"
+- maxmemory="256m" >
++ maxmemory="512m" >
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path refid="tomcat.webservices.classpath"/>
+ <path location="${ant.core.lib}"/>
+ </classpath>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <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/"/>
+@@ -2775,7 +2786,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}"/>
+@@ -2809,7 +2820,7 @@ skip.installer property in build.properties" />
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -2866,7 +2877,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}"/>
+@@ -2892,18 +2903,18 @@ skip.installer property in build.properties" />
+
+ <!-- =============== Utility Targets to support downloads ================ -->
+
+- <target name="setproxy" if="${proxy.use}">
++ <target name="setproxy" if="${proxy.use}" unless="noget">
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+ proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+ </target>
+
+- <target name="testexist">
++ <target name="testexist" unless="noget">
+ <echo message="Testing for ${destfile}"/>
+ <available file="${destfile}" property="exist"/>
+ </target>
+
+- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
++ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2915,7 +2926,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadgz-2" unless="exist" depends="testexist">
++ <target name="downloadgz-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2934,7 +2945,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
++ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2945,7 +2956,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadzip-2" unless="exist" depends="testexist">
++ <target name="downloadzip-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2963,7 +2974,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
++ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
+ <!-- Download the file -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2973,7 +2984,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="downloadfile-2" unless="exist" depends="testexist">
++ <target name="downloadfile-2" unless="noget" depends="testexist">
+ <!-- Download the file from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2996,7 +3007,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="trydownload.check" depends="setproxy">
++ <target name="trydownload.check" depends="setproxy" unless="noget">
+ <condition property="trydownload.run">
+ <and>
+ <not>
+@@ -3007,7 +3018,7 @@ skip.installer property in build.properties" />
+ </condition>
+ </target>
+
+- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+ <!-- Downloads a file if not yet downloaded and the source URL is available -->
+ <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+ </target>
+@@ -3018,7 +3029,7 @@ skip.installer property in build.properties" />
+
+ <target name="ide-eclipse"
+ depends="download-compile, extras-webservices-prepare, download-test-compile"
+- description="Prepares the source tree to be built in Eclipse">
++ description="Prepares the source tree to be built in Eclipse" unless="noget">
+
+ <!-- Copy the sample project files into the root directory -->
+ <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-9.0.0_alpha1.ebuild b/www-servers/tomcat/tomcat-9.0.0_alpha1.ebuild
new file mode 100644
index 0000000..881e9a9
--- /dev/null
+++ b/www-servers/tomcat/tomcat-9.0.0_alpha1.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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"
+
+DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3 Container"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-9/v${MY_PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="9"
+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"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ dev-java/oracle-javamail:0
+ dev-java/tomcat-servlet-api:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+ !<dev-java/tomcat-native-1.1.24
+ >=virtual/jre-1.8"
+DEPEND="${COMMON_DEP}
+ app-admin/pwgen
+ >=virtual/jdk-1.8
+ test? (
+ >=dev-java/ant-junit-1.9:0
+ dev-java/easymock:3.2
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup tomcat 265
+ enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+java_prepare() {
+ find -name '*.jar' -type f -delete -print || die
+
+ # Remove bundled javamail, servlet-api
+ rm -rv java/javax/{el,mail,servlet} || die
+
+ epatch "${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}\`" \
+ bin/catalina.sh || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},oracle-javamail,tomcat-servlet-api-${SAPI_SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+ java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ # add missing docBase
+ local apps="host-manager manager"
+ for app in ${apps}; do
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+ output/build/webapps/${app}/META-INF/context.xml || die
+ done
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw="$(pwgen -s -B 15 1)"
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2015-12-11 9:50 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2015-12-11 9:50 UTC (permalink / raw
To: gentoo-commits
commit: 5f0f7e1a65aead924edb8b855b56b2b597f4999a
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 11 09:50:02 2015 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Dec 11 09:50:02 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f0f7e1a
www-servers/tomcat: version bump
Package-Manager: portage-2.2.26
www-servers/tomcat/Manifest | 1 +
.../tomcat/files/tomcat-7.0.67-build.xml.patch | 149 +++++++++++++++++++++
www-servers/tomcat/tomcat-7.0.67.ebuild | 146 ++++++++++++++++++++
3 files changed, 296 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 3d8f978..454e909 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -2,6 +2,7 @@ DIST apache-tomcat-6.0.44-src.tar.gz 3447711 SHA256 c6f01526d58f2ba7b9da496e959d
DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 3a1dedda4019db87464fca3aeb4e800a538f0baee96d8b14c9d64967b0d2ea44 SHA512 acc322eee1446dd1bff72910ae9f40a62f88332ee69d6057b3c684e2abf8f28e6df6ab9505900f0b0cf7a5e2e0e80e64b0a790b3b78594ce595ce897706b4bcb WHIRLPOOL 4948964c1746e6ee912ac72c901ba271793610f402bf082455d104e2e8d6dbfa0bf5371d42d48d8ad7c826271fa60d989119a01e700497099022d0cf3564fdff
DIST apache-tomcat-7.0.64-src.tar.gz 4592198 SHA256 d805dec3b387a244c4285ce1f9fc5028bb836716db52f1b1b5036a97dd9ec4dc SHA512 180479b0f5b5604597f850676235fab1f3e63051b503cfa3b4da1e6820505dece73f502249b6e032cfaaad18c9e2d4c057c9854ae5cbf088b214b51e0687ed8c WHIRLPOOL a461d7deae890227052bd83ac97c698821b1f6d6ff97c179b124de9b1b7ccdf1498651a391a03008b840fac730c080682f207db4d44e76d15dba63b266ddee51
DIST apache-tomcat-7.0.65-src.tar.gz 4600718 SHA256 38c266a21ff27560ba4c213dd64628a1ed35b22289d37b5d7f250010e963cc39 SHA512 6eb420a3067783a6ffee781c834dc363d6638d6e79182886594249a0ef810b2ab721f2a44f84b4ea90372a7e2e5171caf49697945d359e9c877a2db640fc3da2 WHIRLPOOL db678b899455ef977d893eec01ba50687c7563646321dbe511be6c55f03859a08778e4f6da14021a9ed051c1f3573edf9d0de527383aaf4ee6114f3a027b281d
+DIST apache-tomcat-7.0.67-src.tar.gz 4624303 SHA256 0464ebbeec17fb15103cad9f6639edc826f4eca246dd58a5cb1c5d46aff58e0a SHA512 dd299cab7a172860f51bae19e3490432af874b94825de289095647026a91b27cb3544ba85ab1f786bf4696dc59475ca85d051841ebaa221e3b46079e139a6e52 WHIRLPOOL ae7ec13ffd3bd0964496060413924854c5b956dc88b8d0f1de4ac094e8fb5595ccfc7c2eaa7051f082c575253ed9fdadc8833f494281770f8f72b8c64d9b9593
DIST apache-tomcat-8.0.26-src.tar.gz 4904717 SHA256 3725621a73501a6e09438f177acfab7ce11fabeb2b0380a909273410f3b50b3b SHA512 70ef253889916bcca309a8f80675c4c588fef1cc5dc0360c45347107fb56fd546a334ca01e1109775410f7642acf6c75d9887f9403ad4c1d0e30f041f9ce34fb WHIRLPOOL 3c29a5418dfefc12157d8656dfa15a2937668f52d18c21f6dd4a278d2bc4c84d5b6d542daf6244040eabeab57cb759a510b7b1d0e41440a2d9ad62586723dafc
DIST apache-tomcat-8.0.28-src.tar.gz 4913153 SHA256 441a0a0459b6c2dacab3bcf68a9e512b4bb62f7251a27bd15b909ee31b659367 SHA512 60f9a9f643595cdc87598169b8b66cc1e445445a530cad88d2957e90ca99e7c77be9d3576c7fa3a0e7051166f2a960a1c3bf4103f902d1da122825d41e1154c7 WHIRLPOOL 5867ec0c128fe5247c7b874baf05fba9fc9a5663e1c16ecd60bc6ae1e3c411a43f4d8784db5c915fe6c54bc2ec728a01773708738aede30e5abaf1f77072cdcb
DIST apache-tomcat-8.0.29-src.tar.gz 4933339 SHA256 5cb87ae9afd145d68906e93b825a6a41303d7975bafe3d57530e9a8ec01c7c80 SHA512 279c971529f0e7513885a0a201753bc94b1ed7a4f035cb33943bf6ae769102630b94144c65236e8b42c666ded7cc843db54c155e8b5cd1ae175b6385d9c2789b WHIRLPOOL 8cfb5402b877be4bd4306cf5d14cf76302b1904e3530de108f262f9bb3de6f1377882fb5a1406e4b2ffc5c239c541f64df55fc98945157edafbd14586deb26bd
diff --git a/www-servers/tomcat/files/tomcat-7.0.67-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.67-build.xml.patch
new file mode 100644
index 0000000..481591f
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-7.0.67-build.xml.patch
@@ -0,0 +1,149 @@
+diff -Naur apache-tomcat-7.0.63-src.orig/build.xml apache-tomcat-7.0.63-src/build.xml
+--- apache-tomcat-7.0.63-src.orig/build.xml 2015-06-30 09:15:44.000000000 +0100
++++ apache-tomcat-7.0.63-src/build.xml 2015-08-22 21:13:12.453038827 +0100
+@@ -660,12 +660,14 @@
+ </fileset>
+ </copy>
+ <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
++<!--
+ <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1">
+ <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
+ <include name="*" />
+ <exclude name="jspxml*" />
+ </fileset>
+ </copy>
++-->
+
+ </target>
+
+@@ -721,26 +723,32 @@
+ manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+
+ <!-- Servlet 3.0 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+ manifest="${tomcat.manifests}/servlet-api.jar.manifest"
+ notice="${tomcat.manifests}/servlet-api.jar.notice"
+ license="${tomcat.manifests}/servlet-api.jar.license" />
++-->
+
+ <!-- JSP 2.2 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${jsp-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.jsp-api"
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest"
+ notice="${tomcat.manifests}/jsp-api.jar.notice"
+ license="${tomcat.manifests}/jsp-api.jar.license" />
++-->
+
+ <!-- JSP 2.2 EL Implementation JAR File -->
++<!--
+ <jarIt jarfile="${el-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.el-api"
+ manifest="${tomcat.manifests}/el-api.jar.manifest" />
++-->
+
+ <!-- Bootstrap JAR File -->
+ <jarIt jarfile="${bootstrap.jar}"
+@@ -986,12 +994,14 @@
+ <target name="deploy" depends="package,build-docs,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">
+@@ -1051,14 +1061,15 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
++<!--
+ <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
+-
++-->
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+-
++<!--
+ <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
+ failonerror="false"/>
+-
++-->
+ <!-- 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}"
+@@ -1681,7 +1692,7 @@
+
+ <target name="extras-webservices-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">
+ <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -1886,6 +1897,7 @@
+ description="Create the Tomcat javadoc" >
+ <fail unless="java.7.home"
+ message="The java.7.home property must be set for javadoc build"/>
++<!--
+ <javadoc packagenames="javax.servlet.*"
+ excludepackagenames="javax.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -1947,6 +1959,7 @@
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="javax.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -1985,9 +1998,11 @@
+ <path refid="tomcat.webservices.classpath"/>
+ <path location="${ant.core.lib}"/>
+ </classpath>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <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/"/>
+@@ -2642,7 +2657,7 @@
+ </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}"/>
+@@ -2699,7 +2714,7 @@
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -2727,7 +2742,7 @@
+ </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}"/>
diff --git a/www-servers/tomcat/tomcat-7.0.67.ebuild b/www-servers/tomcat/tomcat-7.0.67.ebuild
new file mode 100644
index 0000000..2bcc444
--- /dev/null
+++ b/www-servers/tomcat/tomcat-7.0.67.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="7"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps websockets"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.4"
+SAPI_SLOT="3.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ dev-java/oracle-javamail:0
+ dev-java/tomcat-servlet-api:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+ websockets? ( >=virtual/jre-1.7 )
+ !websockets? ( >=virtual/jre-1.6 )
+ !<dev-java/tomcat-native-1.1.24"
+DEPEND="${COMMON_DEP}
+ websockets? ( >=virtual/jdk-1.7 )
+ !websockets? ( >=virtual/jdk-1.6 )
+ test? ( dev-java/ant-junit:0 )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup tomcat 265
+ enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+java_prepare() {
+ # Remove bundled javamail, servlet-api
+ rm -rv java/javax/{el,mail,servlet} || die
+
+ java-pkg_clean
+
+ epatch "${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}\`" \
+ bin/catalina.sh || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},oracle-javamail,tomcat-servlet-api-${SAPI_SLOT}"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r1"
+INIT_REV="-r1"
+
+src_compile() {
+ use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+ java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2016-01-18 15:18 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2016-01-18 15:18 UTC (permalink / raw
To: gentoo-commits
commit: f347301d53214267cd623ace883e505d454837df
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 18 15:18:11 2016 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 15:18:42 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f347301d
www-servers/tomcat: removed obsolete ebuilds
Package-Manager: portage-2.2.26
www-servers/tomcat/Manifest | 3 -
.../tomcat/files/tomcat-7.0.64-build.xml.patch | 149 ------------
.../tomcat/files/tomcat-8.0.29-build.xml.patch | 265 ---------------------
www-servers/tomcat/tomcat-7.0.64.ebuild | 146 ------------
www-servers/tomcat/tomcat-8.0.26.ebuild | 147 ------------
www-servers/tomcat/tomcat-8.0.29.ebuild | 155 ------------
6 files changed, 865 deletions(-)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 454e909..3e93ba0 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,10 +1,7 @@
DIST apache-tomcat-6.0.44-src.tar.gz 3447711 SHA256 c6f01526d58f2ba7b9da496e959d9e68cc49183006077704ab91c36ebebf5a4a SHA512 0d6a1539b28fa8ca3442557889d7d21cc523b18136f6998820ba13f41420536aba65ce78bac526002ee1dd86df3cbc80d9f043a3f765d7cf0b79e58e516030be WHIRLPOOL c65e704466191a0f98ec777e95dda889599ff6a545e7c013fd04bc0b72e0d0edf4491415f243d6a4de60cf76abe5c13ffbcc6d98f78b51490f7b7b43b24ecb97
DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 3a1dedda4019db87464fca3aeb4e800a538f0baee96d8b14c9d64967b0d2ea44 SHA512 acc322eee1446dd1bff72910ae9f40a62f88332ee69d6057b3c684e2abf8f28e6df6ab9505900f0b0cf7a5e2e0e80e64b0a790b3b78594ce595ce897706b4bcb WHIRLPOOL 4948964c1746e6ee912ac72c901ba271793610f402bf082455d104e2e8d6dbfa0bf5371d42d48d8ad7c826271fa60d989119a01e700497099022d0cf3564fdff
-DIST apache-tomcat-7.0.64-src.tar.gz 4592198 SHA256 d805dec3b387a244c4285ce1f9fc5028bb836716db52f1b1b5036a97dd9ec4dc SHA512 180479b0f5b5604597f850676235fab1f3e63051b503cfa3b4da1e6820505dece73f502249b6e032cfaaad18c9e2d4c057c9854ae5cbf088b214b51e0687ed8c WHIRLPOOL a461d7deae890227052bd83ac97c698821b1f6d6ff97c179b124de9b1b7ccdf1498651a391a03008b840fac730c080682f207db4d44e76d15dba63b266ddee51
DIST apache-tomcat-7.0.65-src.tar.gz 4600718 SHA256 38c266a21ff27560ba4c213dd64628a1ed35b22289d37b5d7f250010e963cc39 SHA512 6eb420a3067783a6ffee781c834dc363d6638d6e79182886594249a0ef810b2ab721f2a44f84b4ea90372a7e2e5171caf49697945d359e9c877a2db640fc3da2 WHIRLPOOL db678b899455ef977d893eec01ba50687c7563646321dbe511be6c55f03859a08778e4f6da14021a9ed051c1f3573edf9d0de527383aaf4ee6114f3a027b281d
DIST apache-tomcat-7.0.67-src.tar.gz 4624303 SHA256 0464ebbeec17fb15103cad9f6639edc826f4eca246dd58a5cb1c5d46aff58e0a SHA512 dd299cab7a172860f51bae19e3490432af874b94825de289095647026a91b27cb3544ba85ab1f786bf4696dc59475ca85d051841ebaa221e3b46079e139a6e52 WHIRLPOOL ae7ec13ffd3bd0964496060413924854c5b956dc88b8d0f1de4ac094e8fb5595ccfc7c2eaa7051f082c575253ed9fdadc8833f494281770f8f72b8c64d9b9593
-DIST apache-tomcat-8.0.26-src.tar.gz 4904717 SHA256 3725621a73501a6e09438f177acfab7ce11fabeb2b0380a909273410f3b50b3b SHA512 70ef253889916bcca309a8f80675c4c588fef1cc5dc0360c45347107fb56fd546a334ca01e1109775410f7642acf6c75d9887f9403ad4c1d0e30f041f9ce34fb WHIRLPOOL 3c29a5418dfefc12157d8656dfa15a2937668f52d18c21f6dd4a278d2bc4c84d5b6d542daf6244040eabeab57cb759a510b7b1d0e41440a2d9ad62586723dafc
DIST apache-tomcat-8.0.28-src.tar.gz 4913153 SHA256 441a0a0459b6c2dacab3bcf68a9e512b4bb62f7251a27bd15b909ee31b659367 SHA512 60f9a9f643595cdc87598169b8b66cc1e445445a530cad88d2957e90ca99e7c77be9d3576c7fa3a0e7051166f2a960a1c3bf4103f902d1da122825d41e1154c7 WHIRLPOOL 5867ec0c128fe5247c7b874baf05fba9fc9a5663e1c16ecd60bc6ae1e3c411a43f4d8784db5c915fe6c54bc2ec728a01773708738aede30e5abaf1f77072cdcb
-DIST apache-tomcat-8.0.29-src.tar.gz 4933339 SHA256 5cb87ae9afd145d68906e93b825a6a41303d7975bafe3d57530e9a8ec01c7c80 SHA512 279c971529f0e7513885a0a201753bc94b1ed7a4f035cb33943bf6ae769102630b94144c65236e8b42c666ded7cc843db54c155e8b5cd1ae175b6385d9c2789b WHIRLPOOL 8cfb5402b877be4bd4306cf5d14cf76302b1904e3530de108f262f9bb3de6f1377882fb5a1406e4b2ffc5c239c541f64df55fc98945157edafbd14586deb26bd
DIST apache-tomcat-8.0.30-src.tar.gz 4939771 SHA256 0f79b74f303cce809ea63a85586efb5d4bb67ea53622f1b44ecffff0f1aa9cf6 SHA512 cc1546292e6b674e251bf5c92b2f63f9fe96f979753a74991dd6e851f7da44743415c3bfc06525071b89faa35c90abb4129cb76dffdc75945a2ea94c3bb92110 WHIRLPOOL a20d1f1e6a290d174e5f7181655d555a5b39296e4c059fcd4833709e0ee635d9c02cf319be29aef9b5442db0283c8590c6d062d5f6eae09136ccb77c4610a5fc
DIST apache-tomcat-9.0.0.M1-src.tar.gz 4984318 SHA256 62fb16ed9743916b643a7b406c4b98b8b9b2df15504e9a66d4a609f6d539b34c SHA512 f47a018e30a0ceb382187de2fef443ea1ef9d6e319ef4f3a027824b7e95fb4b5e9d73531f03357b2a89c5f3baf568ac4cfde83969f9603299dd0cf742c4f6efa WHIRLPOOL ab796c7484fd2c1d5060998910e1bd1cfb4f478b6740d9d105255b1e1b36fc9118048d0089a873699b978be91adbe7e024afcb3a4fc2d5121b17089998cb9210
diff --git a/www-servers/tomcat/files/tomcat-7.0.64-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.64-build.xml.patch
deleted file mode 100644
index 481591f..0000000
--- a/www-servers/tomcat/files/tomcat-7.0.64-build.xml.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-diff -Naur apache-tomcat-7.0.63-src.orig/build.xml apache-tomcat-7.0.63-src/build.xml
---- apache-tomcat-7.0.63-src.orig/build.xml 2015-06-30 09:15:44.000000000 +0100
-+++ apache-tomcat-7.0.63-src/build.xml 2015-08-22 21:13:12.453038827 +0100
-@@ -660,12 +660,14 @@
- </fileset>
- </copy>
- <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
-+<!--
- <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1">
- <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
- <include name="*" />
- <exclude name="jspxml*" />
- </fileset>
- </copy>
-+-->
-
- </target>
-
-@@ -721,26 +723,32 @@
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
- <!-- Servlet 3.0 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- manifest="${tomcat.manifests}/servlet-api.jar.manifest"
- notice="${tomcat.manifests}/servlet-api.jar.notice"
- license="${tomcat.manifests}/servlet-api.jar.license" />
-+-->
-
- <!-- JSP 2.2 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${jsp-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest"
- notice="${tomcat.manifests}/jsp-api.jar.notice"
- license="${tomcat.manifests}/jsp-api.jar.license" />
-+-->
-
- <!-- JSP 2.2 EL Implementation JAR File -->
-+<!--
- <jarIt jarfile="${el-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.el-api"
- manifest="${tomcat.manifests}/el-api.jar.manifest" />
-+-->
-
- <!-- Bootstrap JAR File -->
- <jarIt jarfile="${bootstrap.jar}"
-@@ -986,12 +994,14 @@
- <target name="deploy" depends="package,build-docs,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">
-@@ -1051,14 +1061,15 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-+<!--
- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
--
-+-->
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
--
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
- failonerror="false"/>
--
-+-->
- <!-- 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}"
-@@ -1681,7 +1692,7 @@
-
- <target name="extras-webservices-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">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1886,6 +1897,7 @@
- description="Create the Tomcat javadoc" >
- <fail unless="java.7.home"
- message="The java.7.home property must be set for javadoc build"/>
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1947,6 +1959,7 @@
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -1985,9 +1998,11 @@
- <path refid="tomcat.webservices.classpath"/>
- <path location="${ant.core.lib}"/>
- </classpath>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2642,7 +2657,7 @@
- </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}"/>
-@@ -2699,7 +2714,7 @@
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2727,7 +2742,7 @@
- </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}"/>
diff --git a/www-servers/tomcat/files/tomcat-8.0.29-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.29-build.xml.patch
deleted file mode 100644
index 1923d23..0000000
--- a/www-servers/tomcat/files/tomcat-8.0.29-build.xml.patch
+++ /dev/null
@@ -1,265 +0,0 @@
-diff -Naur apache-tomcat-8.0.24-src.orig/build.xml apache-tomcat-8.0.24-src/build.xml
---- apache-tomcat-8.0.24-src.orig/build.xml 2015-07-01 21:25:21.000000000 +0100
-+++ apache-tomcat-8.0.24-src/build.xml 2015-08-22 21:17:05.825564599 +0100
-@@ -697,24 +697,29 @@
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
- <!-- Servlet 3.1 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- 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}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
- <!-- EL 3.0 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 -->
- <jarIt jarfile="${websocket-api.jar}"
-@@ -982,14 +987,14 @@
-
- <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">
-@@ -1049,7 +1054,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1083,7 +1088,7 @@
- </javac>
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- 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}"
-@@ -1098,7 +1103,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- 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}"
-@@ -1202,10 +1207,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
- failonerror="false"/>
- <copy file="${jdt.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. -->
-@@ -1542,7 +1548,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}"/>
-@@ -1681,7 +1687,7 @@
-
- <target name="extras-webservices-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">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1882,6 +1888,7 @@
-
- <target name="javadoc" depends="dist-source,extras-webservices-prepare"
- description="Create the Tomcat javadoc" >
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1940,6 +1947,7 @@
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -1970,15 +1978,17 @@
- docencoding="UTF-8"
- charset="UTF-8"
- additionalparam="-breakiterator -notimestamp"
-- maxmemory="256m" >
-+ maxmemory="512m" >
- <classpath>
- <path refid="compile.classpath"/>
- <path refid="tomcat.webservices.classpath"/>
- <path location="${ant.core.lib}"/>
- </classpath>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2739,7 +2749,7 @@
- </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}"/>
-@@ -2773,7 +2783,7 @@
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2819,7 +2829,7 @@
- </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}"/>
-@@ -2845,18 +2855,18 @@
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2868,7 +2878,7 @@
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2887,7 +2897,7 @@
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2898,7 +2908,7 @@
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2916,7 +2926,7 @@
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2926,7 +2936,7 @@
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2949,7 +2959,7 @@
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -2960,7 +2970,7 @@
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -2971,7 +2981,7 @@
-
- <target name="ide-eclipse"
- depends="download-compile, extras-webservices-prepare, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-7.0.64.ebuild b/www-servers/tomcat/tomcat-7.0.64.ebuild
deleted file mode 100644
index 4b1dde5..0000000
--- a/www-servers/tomcat/tomcat-7.0.64.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="7"
-KEYWORDS="amd64 ~ppc64 x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps websockets"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.4"
-SAPI_SLOT="3.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- dev-java/oracle-javamail:0
- dev-java/tomcat-servlet-api:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- websockets? ( >=virtual/jre-1.7 )
- !websockets? ( >=virtual/jre-1.6 )
- !<dev-java/tomcat-native-1.1.24"
-DEPEND="${COMMON_DEP}
- websockets? ( >=virtual/jdk-1.7 )
- !websockets? ( >=virtual/jdk-1.6 )
- test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled javamail, servlet-api
- rm -rv java/javax/{el,mail,servlet} || die
-
- epatch "${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}\`" \
- bin/catalina.sh || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},oracle-javamail,tomcat-servlet-api-${SAPI_SLOT}"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r1"
-INIT_REV="-r1"
-
-src_compile() {
- use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.0.26.ebuild b/www-servers/tomcat/tomcat-8.0.26.ebuild
deleted file mode 100644
index 3b71c0d..0000000
--- a/www-servers/tomcat/tomcat-8.0.26.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3 Container"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-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.4"
-SAPI_SLOT="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- dev-java/oracle-javamail:0
- dev-java/tomcat-servlet-api:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- !<dev-java/tomcat-native-1.1.24
- >=virtual/jre-1.7"
-DEPEND="${COMMON_DEP}
- >=virtual/jdk-1.7
- test? (
- >=dev-java/ant-junit-1.9:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled javamail, servlet-api
- rm -rv java/javax/{el,mail,servlet} || die
-
- epatch "${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}\`" \
- bin/catalina.sh || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},oracle-javamail,tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r1"
-INIT_REV="-r1"
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.0.29.ebuild b/www-servers/tomcat/tomcat-8.0.29.ebuild
deleted file mode 100644
index 3595c57..0000000
--- a/www-servers/tomcat/tomcat-8.0.29.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3 Container"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-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.4"
-SAPI_SLOT="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- dev-java/oracle-javamail:0
- dev-java/tomcat-servlet-api:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- !<dev-java/tomcat-native-1.1.24
- >=virtual/jre-1.7"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- >=virtual/jdk-1.7
- test? (
- >=dev-java/ant-junit-1.9:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled javamail, servlet-api
- rm -rv java/javax/{el,mail,servlet} || die
-
- epatch "${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}\`" \
- bin/catalina.sh || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},oracle-javamail,tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2016-02-10 14:40 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2016-02-10 14:40 UTC (permalink / raw
To: gentoo-commits
commit: 2c6b3f3b7d16e77cd2d391362ae6e7e454e9e460
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 10 14:38:28 2016 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Feb 10 14:40:09 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c6b3f3b
www-servers/tomcat: removed obsolete ebuilds
Package-Manager: portage-2.2.27
www-servers/tomcat/Manifest | 2 -
.../tomcat/files/tomcat-7.0.65-build.xml.patch | 149 ------------
.../tomcat/files/tomcat-8.0.28-build.xml.patch | 265 --------------------
.../files/tomcat-9.0.0_alpha1-build.xml.patch | 266 ---------------------
www-servers/tomcat/tomcat-7.0.65.ebuild | 146 -----------
www-servers/tomcat/tomcat-8.0.28-r2.ebuild | 155 ------------
6 files changed, 983 deletions(-)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 96230f4..22a9c8a 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,7 +1,5 @@
DIST apache-tomcat-6.0.44-src.tar.gz 3447711 SHA256 c6f01526d58f2ba7b9da496e959d9e68cc49183006077704ab91c36ebebf5a4a SHA512 0d6a1539b28fa8ca3442557889d7d21cc523b18136f6998820ba13f41420536aba65ce78bac526002ee1dd86df3cbc80d9f043a3f765d7cf0b79e58e516030be WHIRLPOOL c65e704466191a0f98ec777e95dda889599ff6a545e7c013fd04bc0b72e0d0edf4491415f243d6a4de60cf76abe5c13ffbcc6d98f78b51490f7b7b43b24ecb97
DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 3a1dedda4019db87464fca3aeb4e800a538f0baee96d8b14c9d64967b0d2ea44 SHA512 acc322eee1446dd1bff72910ae9f40a62f88332ee69d6057b3c684e2abf8f28e6df6ab9505900f0b0cf7a5e2e0e80e64b0a790b3b78594ce595ce897706b4bcb WHIRLPOOL 4948964c1746e6ee912ac72c901ba271793610f402bf082455d104e2e8d6dbfa0bf5371d42d48d8ad7c826271fa60d989119a01e700497099022d0cf3564fdff
-DIST apache-tomcat-7.0.65-src.tar.gz 4600718 SHA256 38c266a21ff27560ba4c213dd64628a1ed35b22289d37b5d7f250010e963cc39 SHA512 6eb420a3067783a6ffee781c834dc363d6638d6e79182886594249a0ef810b2ab721f2a44f84b4ea90372a7e2e5171caf49697945d359e9c877a2db640fc3da2 WHIRLPOOL db678b899455ef977d893eec01ba50687c7563646321dbe511be6c55f03859a08778e4f6da14021a9ed051c1f3573edf9d0de527383aaf4ee6114f3a027b281d
DIST apache-tomcat-7.0.67-src.tar.gz 4624303 SHA256 0464ebbeec17fb15103cad9f6639edc826f4eca246dd58a5cb1c5d46aff58e0a SHA512 dd299cab7a172860f51bae19e3490432af874b94825de289095647026a91b27cb3544ba85ab1f786bf4696dc59475ca85d051841ebaa221e3b46079e139a6e52 WHIRLPOOL ae7ec13ffd3bd0964496060413924854c5b956dc88b8d0f1de4ac094e8fb5595ccfc7c2eaa7051f082c575253ed9fdadc8833f494281770f8f72b8c64d9b9593
-DIST apache-tomcat-8.0.28-src.tar.gz 4913153 SHA256 441a0a0459b6c2dacab3bcf68a9e512b4bb62f7251a27bd15b909ee31b659367 SHA512 60f9a9f643595cdc87598169b8b66cc1e445445a530cad88d2957e90ca99e7c77be9d3576c7fa3a0e7051166f2a960a1c3bf4103f902d1da122825d41e1154c7 WHIRLPOOL 5867ec0c128fe5247c7b874baf05fba9fc9a5663e1c16ecd60bc6ae1e3c411a43f4d8784db5c915fe6c54bc2ec728a01773708738aede30e5abaf1f77072cdcb
DIST apache-tomcat-8.0.30-src.tar.gz 4939771 SHA256 0f79b74f303cce809ea63a85586efb5d4bb67ea53622f1b44ecffff0f1aa9cf6 SHA512 cc1546292e6b674e251bf5c92b2f63f9fe96f979753a74991dd6e851f7da44743415c3bfc06525071b89faa35c90abb4129cb76dffdc75945a2ea94c3bb92110 WHIRLPOOL a20d1f1e6a290d174e5f7181655d555a5b39296e4c059fcd4833709e0ee635d9c02cf319be29aef9b5442db0283c8590c6d062d5f6eae09136ccb77c4610a5fc
DIST apache-tomcat-9.0.0.M3-src.tar.gz 4987071 SHA256 b4d7ed751f556e77fd53fe9d02d69ceba9709e0a44c47f4f59a84e8b5059f5b7 SHA512 3436e64f5c3c77d041091456bce29c1bb5259d25079ffc87560e5e0e90b422c7ff04b94561a1001ab483100074be8b2c2af5622f36823083423f5b44b0e30b81 WHIRLPOOL 79f89ca17fb71293d6e6db741586ac4a481449cac758099569396f6e22ac8255b5554196d9bef7a74c6d49a9f27d0a46012abe687cd04bf874eae397ce48d8a8
diff --git a/www-servers/tomcat/files/tomcat-7.0.65-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.65-build.xml.patch
deleted file mode 100644
index 481591f..0000000
--- a/www-servers/tomcat/files/tomcat-7.0.65-build.xml.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-diff -Naur apache-tomcat-7.0.63-src.orig/build.xml apache-tomcat-7.0.63-src/build.xml
---- apache-tomcat-7.0.63-src.orig/build.xml 2015-06-30 09:15:44.000000000 +0100
-+++ apache-tomcat-7.0.63-src/build.xml 2015-08-22 21:13:12.453038827 +0100
-@@ -660,12 +660,14 @@
- </fileset>
- </copy>
- <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
-+<!--
- <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1">
- <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
- <include name="*" />
- <exclude name="jspxml*" />
- </fileset>
- </copy>
-+-->
-
- </target>
-
-@@ -721,26 +723,32 @@
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
- <!-- Servlet 3.0 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- manifest="${tomcat.manifests}/servlet-api.jar.manifest"
- notice="${tomcat.manifests}/servlet-api.jar.notice"
- license="${tomcat.manifests}/servlet-api.jar.license" />
-+-->
-
- <!-- JSP 2.2 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${jsp-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest"
- notice="${tomcat.manifests}/jsp-api.jar.notice"
- license="${tomcat.manifests}/jsp-api.jar.license" />
-+-->
-
- <!-- JSP 2.2 EL Implementation JAR File -->
-+<!--
- <jarIt jarfile="${el-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.el-api"
- manifest="${tomcat.manifests}/el-api.jar.manifest" />
-+-->
-
- <!-- Bootstrap JAR File -->
- <jarIt jarfile="${bootstrap.jar}"
-@@ -986,12 +994,14 @@
- <target name="deploy" depends="package,build-docs,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">
-@@ -1051,14 +1061,15 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-+<!--
- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
--
-+-->
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
--
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
- failonerror="false"/>
--
-+-->
- <!-- 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}"
-@@ -1681,7 +1692,7 @@
-
- <target name="extras-webservices-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">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1886,6 +1897,7 @@
- description="Create the Tomcat javadoc" >
- <fail unless="java.7.home"
- message="The java.7.home property must be set for javadoc build"/>
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1947,6 +1959,7 @@
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -1985,9 +1998,11 @@
- <path refid="tomcat.webservices.classpath"/>
- <path location="${ant.core.lib}"/>
- </classpath>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2642,7 +2657,7 @@
- </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}"/>
-@@ -2699,7 +2714,7 @@
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2727,7 +2742,7 @@
- </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}"/>
diff --git a/www-servers/tomcat/files/tomcat-8.0.28-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.28-build.xml.patch
deleted file mode 100644
index 1923d23..0000000
--- a/www-servers/tomcat/files/tomcat-8.0.28-build.xml.patch
+++ /dev/null
@@ -1,265 +0,0 @@
-diff -Naur apache-tomcat-8.0.24-src.orig/build.xml apache-tomcat-8.0.24-src/build.xml
---- apache-tomcat-8.0.24-src.orig/build.xml 2015-07-01 21:25:21.000000000 +0100
-+++ apache-tomcat-8.0.24-src/build.xml 2015-08-22 21:17:05.825564599 +0100
-@@ -697,24 +697,29 @@
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
- <!-- Servlet 3.1 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- 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}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
- <!-- EL 3.0 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 -->
- <jarIt jarfile="${websocket-api.jar}"
-@@ -982,14 +987,14 @@
-
- <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">
-@@ -1049,7 +1054,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1083,7 +1088,7 @@
- </javac>
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- 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}"
-@@ -1098,7 +1103,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- 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}"
-@@ -1202,10 +1207,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
- failonerror="false"/>
- <copy file="${jdt.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. -->
-@@ -1542,7 +1548,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}"/>
-@@ -1681,7 +1687,7 @@
-
- <target name="extras-webservices-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">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1882,6 +1888,7 @@
-
- <target name="javadoc" depends="dist-source,extras-webservices-prepare"
- description="Create the Tomcat javadoc" >
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1940,6 +1947,7 @@
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -1970,15 +1978,17 @@
- docencoding="UTF-8"
- charset="UTF-8"
- additionalparam="-breakiterator -notimestamp"
-- maxmemory="256m" >
-+ maxmemory="512m" >
- <classpath>
- <path refid="compile.classpath"/>
- <path refid="tomcat.webservices.classpath"/>
- <path location="${ant.core.lib}"/>
- </classpath>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2739,7 +2749,7 @@
- </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}"/>
-@@ -2773,7 +2783,7 @@
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2819,7 +2829,7 @@
- </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}"/>
-@@ -2845,18 +2855,18 @@
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2868,7 +2878,7 @@
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2887,7 +2897,7 @@
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2898,7 +2908,7 @@
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2916,7 +2926,7 @@
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2926,7 +2936,7 @@
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2949,7 +2959,7 @@
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -2960,7 +2970,7 @@
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -2971,7 +2981,7 @@
-
- <target name="ide-eclipse"
- depends="download-compile, extras-webservices-prepare, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/files/tomcat-9.0.0_alpha1-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.0_alpha1-build.xml.patch
deleted file mode 100644
index f5d49c7..0000000
--- a/www-servers/tomcat/files/tomcat-9.0.0_alpha1-build.xml.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-diff --git a/apache-tomcat-9.0.0.M1-src/build.xml b/apache-tomcat-9.0.0.M1-src/build.xml
-index eab0c45..63ac495 100644
---- a/apache-tomcat-9.0.0.M1-src/build.xml
-+++ b/apache-tomcat-9.0.0.M1-src/build.xml
-@@ -711,24 +711,30 @@
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
- <!-- Servlet 4.0 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- 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}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
- <!-- EL 3.0 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 -->
- <jarIt jarfile="${websocket-api.jar}"
-@@ -1002,14 +1008,14 @@
-
- <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">
-@@ -1069,7 +1075,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1103,7 +1109,7 @@
- </javac>
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- 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}"
-@@ -1118,7 +1124,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- 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}"
-@@ -1222,10 +1228,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
- failonerror="false"/>
- <copy file="${jdt.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. -->
-@@ -1606,7 +1613,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}"/>
-@@ -1745,7 +1752,7 @@
-
- <target name="extras-webservices-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">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1940,6 +1947,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" >
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1998,6 +2006,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -2028,15 +2037,17 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- docencoding="UTF-8"
- charset="UTF-8"
- additionalparam="-breakiterator -notimestamp"
-- maxmemory="256m" >
-+ maxmemory="512m" >
- <classpath>
- <path refid="compile.classpath"/>
- <path refid="tomcat.webservices.classpath"/>
- <path location="${ant.core.lib}"/>
- </classpath>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2775,7 +2786,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}"/>
-@@ -2809,7 +2820,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2866,7 +2877,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}"/>
-@@ -2892,18 +2903,18 @@ skip.installer property in build.properties" />
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2915,7 +2926,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2934,7 +2945,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2945,7 +2956,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2963,7 +2974,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2973,7 +2984,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2996,7 +3007,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -3007,7 +3018,7 @@ skip.installer property in build.properties" />
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -3018,7 +3029,7 @@ skip.installer property in build.properties" />
-
- <target name="ide-eclipse"
- depends="download-compile, extras-webservices-prepare, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-7.0.65.ebuild b/www-servers/tomcat/tomcat-7.0.65.ebuild
deleted file mode 100644
index dc45221..0000000
--- a/www-servers/tomcat/tomcat-7.0.65.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="7"
-KEYWORDS="amd64 ~ppc64 x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps websockets"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.4"
-SAPI_SLOT="3.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- dev-java/oracle-javamail:0
- dev-java/tomcat-servlet-api:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- websockets? ( >=virtual/jre-1.7 )
- !websockets? ( >=virtual/jre-1.6 )
- !<dev-java/tomcat-native-1.1.24"
-DEPEND="${COMMON_DEP}
- websockets? ( >=virtual/jdk-1.7 )
- !websockets? ( >=virtual/jdk-1.6 )
- test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
- # Remove bundled javamail, servlet-api
- rm -rv java/javax/{el,mail,servlet} || die
-
- java-pkg_clean
-
- epatch "${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}\`" \
- bin/catalina.sh || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},oracle-javamail,tomcat-servlet-api-${SAPI_SLOT}"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r1"
-INIT_REV="-r1"
-
-src_compile() {
- use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.0.28-r2.ebuild b/www-servers/tomcat/tomcat-8.0.28-r2.ebuild
deleted file mode 100644
index 014b879..0000000
--- a/www-servers/tomcat/tomcat-8.0.28-r2.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3 Container"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-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.4"
-SAPI_SLOT="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- dev-java/oracle-javamail:0
- dev-java/tomcat-servlet-api:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- !<dev-java/tomcat-native-1.1.24
- >=virtual/jre-1.7"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- >=virtual/jdk-1.7
- test? (
- >=dev-java/ant-junit-1.9:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled javamail, servlet-api
- rm -rv java/javax/{el,mail,servlet} || die
-
- epatch "${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}\`" \
- bin/catalina.sh || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},oracle-javamail,tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2016-02-12 18:28 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2016-02-12 18:28 UTC (permalink / raw
To: gentoo-commits
commit: 7834d1af5bc1735fa51b588a66ceade49ebfcb7b
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 12 18:27:35 2016 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Feb 12 18:28:04 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7834d1af
www-servers/tomcat: version bump
Package-Manager: portage-2.2.27
www-servers/tomcat/Manifest | 1 +
.../tomcat/files/tomcat-6.0.45-build.xml.patch | 71 ++++++++++
www-servers/tomcat/tomcat-6.0.45.ebuild | 143 +++++++++++++++++++++
3 files changed, 215 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 9b782e8..e3193d2 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,4 +1,5 @@
DIST apache-tomcat-6.0.44-src.tar.gz 3447711 SHA256 c6f01526d58f2ba7b9da496e959d9e68cc49183006077704ab91c36ebebf5a4a SHA512 0d6a1539b28fa8ca3442557889d7d21cc523b18136f6998820ba13f41420536aba65ce78bac526002ee1dd86df3cbc80d9f043a3f765d7cf0b79e58e516030be WHIRLPOOL c65e704466191a0f98ec777e95dda889599ff6a545e7c013fd04bc0b72e0d0edf4491415f243d6a4de60cf76abe5c13ffbcc6d98f78b51490f7b7b43b24ecb97
+DIST apache-tomcat-6.0.45-src.tar.gz 3494054 SHA256 d464b3e770197f026bf802d19be0195b941e8c3be7e552dc2f8eb563f9cc010e SHA512 d300e6b805bb70fc348133467b2aeac728dc0ae44f2fc1f309c3b2971987c1e46b81f156ebd7ddfda38f6746e90af1402c4e16a2d30bc7b081b761c87df8ffab WHIRLPOOL 144678884f75034f1d692619ea8064daf02aee03bcac62fb0b666b5c0283f5abf93414d636c03c94488632cd13081cf00e69a9ddf19f4c8bafd80e7eca5a69da
DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 3a1dedda4019db87464fca3aeb4e800a538f0baee96d8b14c9d64967b0d2ea44 SHA512 acc322eee1446dd1bff72910ae9f40a62f88332ee69d6057b3c684e2abf8f28e6df6ab9505900f0b0cf7a5e2e0e80e64b0a790b3b78594ce595ce897706b4bcb WHIRLPOOL 4948964c1746e6ee912ac72c901ba271793610f402bf082455d104e2e8d6dbfa0bf5371d42d48d8ad7c826271fa60d989119a01e700497099022d0cf3564fdff
DIST apache-tomcat-7.0.67-src.tar.gz 4624303 SHA256 0464ebbeec17fb15103cad9f6639edc826f4eca246dd58a5cb1c5d46aff58e0a SHA512 dd299cab7a172860f51bae19e3490432af874b94825de289095647026a91b27cb3544ba85ab1f786bf4696dc59475ca85d051841ebaa221e3b46079e139a6e52 WHIRLPOOL ae7ec13ffd3bd0964496060413924854c5b956dc88b8d0f1de4ac094e8fb5595ccfc7c2eaa7051f082c575253ed9fdadc8833f494281770f8f72b8c64d9b9593
DIST apache-tomcat-8.0.30-src.tar.gz 4939771 SHA256 0f79b74f303cce809ea63a85586efb5d4bb67ea53622f1b44ecffff0f1aa9cf6 SHA512 cc1546292e6b674e251bf5c92b2f63f9fe96f979753a74991dd6e851f7da44743415c3bfc06525071b89faa35c90abb4129cb76dffdc75945a2ea94c3bb92110 WHIRLPOOL a20d1f1e6a290d174e5f7181655d555a5b39296e4c059fcd4833709e0ee635d9c02cf319be29aef9b5442db0283c8590c6d062d5f6eae09136ccb77c4610a5fc
diff --git a/www-servers/tomcat/files/tomcat-6.0.45-build.xml.patch b/www-servers/tomcat/files/tomcat-6.0.45-build.xml.patch
new file mode 100644
index 0000000..7430651
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-6.0.45-build.xml.patch
@@ -0,0 +1,71 @@
+diff -Naur apache-tomcat-6.0.44-src.orig/build.xml apache-tomcat-6.0.44-src/build.xml
+--- apache-tomcat-6.0.44-src.orig/build.xml 2015-05-08 13:22:05.000000000 +0100
++++ apache-tomcat-6.0.44-src/build.xml 2015-08-25 23:38:46.147332131 +0100
+@@ -159,12 +159,14 @@
+ </fileset>
+ </copy>
+ <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
++<!--
+ <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1">
+ <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
+ <include name="*" />
+ <exclude name="jspxml*" />
+ </fileset>
+ </copy>
++ -->
+
+ </target>
+
+@@ -307,19 +309,25 @@
+ manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+
+ <!-- Servlet 2.5 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}" filesId="files.servlet-api"
+ manifest="${tomcat.manifests}/servlet-api.jar.manifest"
+ license="${tomcat.manifests}/servlet-api.jar.license"
+ notice="${tomcat.manifests}/servlet-api.jar.notice" />
++-->
+
+ <!-- JSP 2.1 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${jsp-api.jar}" filesId="files.jsp-api"
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
++-->
+
+
+ <!-- JSP 2.1 EL Implementation JAR File -->
++<!--
+ <jarIt jarfile="${el-api.jar}" filesId="files.el-api"
+ manifest="${tomcat.manifests}/el-api.jar.manifest" />
++-->
+
+ <!-- Bootstrap JAR File -->
+ <jarIt jarfile="${bootstrap.jar}" filesId="files.bootstrap"
+@@ -492,12 +500,14 @@
+
+ <target name="deploy" depends="build-only,build-docs,warn.dbcp">
+
++<!--
+ <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">
+@@ -649,9 +659,11 @@
+ </fileset>
+ </txt2html>
+
++<!--
+ <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
+ failonerror="false"/>
+ <copy file="${jdt.jar}" todir="${tomcat.build}/lib" />
++-->
+
+ </target>
+
diff --git a/www-servers/tomcat/tomcat-6.0.45.ebuild b/www-servers/tomcat/tomcat-6.0.45.ebuild
new file mode 100644
index 0000000..4c91dda
--- /dev/null
+++ b/www-servers/tomcat/tomcat-6.0.45.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-2.5/JSP-2.1 Container"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-6/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="6"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
+IUSE="extra-webapps"
+
+ECJ_SLOT="3.7"
+SAPI_SLOT="2.5"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ dev-java/oracle-javamail:0
+ >=dev-java/tomcat-servlet-api-6.0.44-r1:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+ >=virtual/jre-1.6
+ !<dev-java/tomcat-native-1.1.20"
+DEPEND="${COMMON_DEP}
+ >=virtual/jdk-1.6
+ test? ( dev-java/ant-junit:0 )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup tomcat 265
+ enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+java_prepare() {
+ find -name '*.jar' -type f -delete -print || die
+
+ # Remove bundled javamail, servlet-api
+ rm -rv java/javax/{el,mail,servlet} || die
+
+ epatch \
+ "${FILESDIR}/${P}-build.xml.patch" \
+ "${FILESDIR}/tomcat-6-sysprop.patch"
+
+ # For use of catalina.sh in netbeans
+ sed -i -e "/^# ----- Execute The Requested Command/ a\
+ CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
+ bin/catalina.sh || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_TEST_TARGET="all"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},oracle-javamail,tomcat-servlet-api-${SAPI_SLOT}"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r1"
+INIT_REV="-r1"
+
+src_compile() {
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+ java-pkg-2_src_compile
+}
+
+src_test() {
+ EANT_BUILD_XML="test/build.xml" java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<6.0.36), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2016-02-18 9:13 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2016-02-18 9:13 UTC (permalink / raw
To: gentoo-commits
commit: a3920a5c5c238bcb9b459dc8fb9cf4e569534fc7
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 18 09:12:28 2016 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Feb 18 09:13:03 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3920a5c
www-servers/tomcat: version bump
Package-Manager: portage-2.2.27
www-servers/tomcat/Manifest | 1 +
.../tomcat/files/tomcat-7.0.68-build.xml.patch | 149 +++++++++++++++++++++
www-servers/tomcat/tomcat-7.0.68.ebuild | 146 ++++++++++++++++++++
3 files changed, 296 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index e3193d2..d2754a6 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -2,6 +2,7 @@ DIST apache-tomcat-6.0.44-src.tar.gz 3447711 SHA256 c6f01526d58f2ba7b9da496e959d
DIST apache-tomcat-6.0.45-src.tar.gz 3494054 SHA256 d464b3e770197f026bf802d19be0195b941e8c3be7e552dc2f8eb563f9cc010e SHA512 d300e6b805bb70fc348133467b2aeac728dc0ae44f2fc1f309c3b2971987c1e46b81f156ebd7ddfda38f6746e90af1402c4e16a2d30bc7b081b761c87df8ffab WHIRLPOOL 144678884f75034f1d692619ea8064daf02aee03bcac62fb0b666b5c0283f5abf93414d636c03c94488632cd13081cf00e69a9ddf19f4c8bafd80e7eca5a69da
DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 3a1dedda4019db87464fca3aeb4e800a538f0baee96d8b14c9d64967b0d2ea44 SHA512 acc322eee1446dd1bff72910ae9f40a62f88332ee69d6057b3c684e2abf8f28e6df6ab9505900f0b0cf7a5e2e0e80e64b0a790b3b78594ce595ce897706b4bcb WHIRLPOOL 4948964c1746e6ee912ac72c901ba271793610f402bf082455d104e2e8d6dbfa0bf5371d42d48d8ad7c826271fa60d989119a01e700497099022d0cf3564fdff
DIST apache-tomcat-7.0.67-src.tar.gz 4624303 SHA256 0464ebbeec17fb15103cad9f6639edc826f4eca246dd58a5cb1c5d46aff58e0a SHA512 dd299cab7a172860f51bae19e3490432af874b94825de289095647026a91b27cb3544ba85ab1f786bf4696dc59475ca85d051841ebaa221e3b46079e139a6e52 WHIRLPOOL ae7ec13ffd3bd0964496060413924854c5b956dc88b8d0f1de4ac094e8fb5595ccfc7c2eaa7051f082c575253ed9fdadc8833f494281770f8f72b8c64d9b9593
+DIST apache-tomcat-7.0.68-src.tar.gz 4641238 SHA256 abb5d2cc7e34a18f968ec2535bdeeae919c53fa7feffe4d617db95e12e94b210 SHA512 dd97205044b03c6466c78bd165509ed9cd37c4d84de34c2170e67c475b28b72bfeda512f14f583c9983c045888d4704cdf7ba7c434f1d4bad9022428b0a0de1c WHIRLPOOL 594cdf5584ea49faebfbea174e67bf85e761365717d56762138d07186c595195df2899a94d897578d1d20201ed4706b51a4d8870d9a6a4ca74c2436ba4283a05
DIST apache-tomcat-8.0.30-src.tar.gz 4939771 SHA256 0f79b74f303cce809ea63a85586efb5d4bb67ea53622f1b44ecffff0f1aa9cf6 SHA512 cc1546292e6b674e251bf5c92b2f63f9fe96f979753a74991dd6e851f7da44743415c3bfc06525071b89faa35c90abb4129cb76dffdc75945a2ea94c3bb92110 WHIRLPOOL a20d1f1e6a290d174e5f7181655d555a5b39296e4c059fcd4833709e0ee635d9c02cf319be29aef9b5442db0283c8590c6d062d5f6eae09136ccb77c4610a5fc
DIST apache-tomcat-8.0.32-src.tar.gz 4957920 SHA256 b8f7770ae947a0c0aed9b5a6f3e2ff18fd27a07f068cc6029f019b5d4c6de560 SHA512 4c18b9ae77963d96ff59891564c4bc8f6aaba582776c319825e9b944dd8cf10747dfc5b3cbc9cfa2ff10f6d889b404902fecd6b49fdde7b3741f9ba90dc6221c WHIRLPOOL 77be9ea10ffd2e606367d477ba13c717294fe49b65ecef6fdc910e53fa2d987f38a8b299c28a340ea7684a16feb6ca3bd0b5e662e3875af73f4735e1ff623a79
DIST apache-tomcat-9.0.0.M3-src.tar.gz 4987071 SHA256 b4d7ed751f556e77fd53fe9d02d69ceba9709e0a44c47f4f59a84e8b5059f5b7 SHA512 3436e64f5c3c77d041091456bce29c1bb5259d25079ffc87560e5e0e90b422c7ff04b94561a1001ab483100074be8b2c2af5622f36823083423f5b44b0e30b81 WHIRLPOOL 79f89ca17fb71293d6e6db741586ac4a481449cac758099569396f6e22ac8255b5554196d9bef7a74c6d49a9f27d0a46012abe687cd04bf874eae397ce48d8a8
diff --git a/www-servers/tomcat/files/tomcat-7.0.68-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.68-build.xml.patch
new file mode 100644
index 0000000..481591f
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-7.0.68-build.xml.patch
@@ -0,0 +1,149 @@
+diff -Naur apache-tomcat-7.0.63-src.orig/build.xml apache-tomcat-7.0.63-src/build.xml
+--- apache-tomcat-7.0.63-src.orig/build.xml 2015-06-30 09:15:44.000000000 +0100
++++ apache-tomcat-7.0.63-src/build.xml 2015-08-22 21:13:12.453038827 +0100
+@@ -660,12 +660,14 @@
+ </fileset>
+ </copy>
+ <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
++<!--
+ <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1">
+ <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
+ <include name="*" />
+ <exclude name="jspxml*" />
+ </fileset>
+ </copy>
++-->
+
+ </target>
+
+@@ -721,26 +723,32 @@
+ manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+
+ <!-- Servlet 3.0 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+ manifest="${tomcat.manifests}/servlet-api.jar.manifest"
+ notice="${tomcat.manifests}/servlet-api.jar.notice"
+ license="${tomcat.manifests}/servlet-api.jar.license" />
++-->
+
+ <!-- JSP 2.2 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${jsp-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.jsp-api"
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest"
+ notice="${tomcat.manifests}/jsp-api.jar.notice"
+ license="${tomcat.manifests}/jsp-api.jar.license" />
++-->
+
+ <!-- JSP 2.2 EL Implementation JAR File -->
++<!--
+ <jarIt jarfile="${el-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.el-api"
+ manifest="${tomcat.manifests}/el-api.jar.manifest" />
++-->
+
+ <!-- Bootstrap JAR File -->
+ <jarIt jarfile="${bootstrap.jar}"
+@@ -986,12 +994,14 @@
+ <target name="deploy" depends="package,build-docs,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">
+@@ -1051,14 +1061,15 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
++<!--
+ <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
+-
++-->
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+-
++<!--
+ <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
+ failonerror="false"/>
+-
++-->
+ <!-- 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}"
+@@ -1681,7 +1692,7 @@
+
+ <target name="extras-webservices-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">
+ <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -1886,6 +1897,7 @@
+ description="Create the Tomcat javadoc" >
+ <fail unless="java.7.home"
+ message="The java.7.home property must be set for javadoc build"/>
++<!--
+ <javadoc packagenames="javax.servlet.*"
+ excludepackagenames="javax.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -1947,6 +1959,7 @@
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="javax.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -1985,9 +1998,11 @@
+ <path refid="tomcat.webservices.classpath"/>
+ <path location="${ant.core.lib}"/>
+ </classpath>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <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/"/>
+@@ -2642,7 +2657,7 @@
+ </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}"/>
+@@ -2699,7 +2714,7 @@
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -2727,7 +2742,7 @@
+ </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}"/>
diff --git a/www-servers/tomcat/tomcat-7.0.68.ebuild b/www-servers/tomcat/tomcat-7.0.68.ebuild
new file mode 100644
index 0000000..cfc0661
--- /dev/null
+++ b/www-servers/tomcat/tomcat-7.0.68.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="7"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps websockets"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.4"
+SAPI_SLOT="3.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ dev-java/oracle-javamail:0
+ dev-java/tomcat-servlet-api:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+ websockets? ( >=virtual/jre-1.7 )
+ !websockets? ( >=virtual/jre-1.6 )
+ !<dev-java/tomcat-native-1.1.24"
+DEPEND="${COMMON_DEP}
+ websockets? ( >=virtual/jdk-1.7 )
+ !websockets? ( >=virtual/jdk-1.6 )
+ test? ( dev-java/ant-junit:0 )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup tomcat 265
+ enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+java_prepare() {
+ # Remove bundled javamail, servlet-api
+ rm -rv java/javax/{el,mail,servlet} || die
+
+ java-pkg_clean
+
+ epatch "${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}\`" \
+ bin/catalina.sh || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},oracle-javamail,tomcat-servlet-api-${SAPI_SLOT}"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r1"
+INIT_REV="-r1"
+
+src_compile() {
+ use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+ java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2016-05-25 20:10 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2016-05-25 20:10 UTC (permalink / raw
To: gentoo-commits
commit: 202b44b3f90b48b7256f09476c234e35cf95ba8d
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed May 25 20:09:55 2016 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed May 25 20:10:14 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=202b44b3
www-servers/tomcat: version bump
Package-Manager: portage-2.3.0_rc1
www-servers/tomcat/Manifest | 1 +
.../tomcat/files/tomcat-8.0.35-build.xml.patch | 265 +++++++++++++++++++++
www-servers/tomcat/tomcat-8.0.35.ebuild | 154 ++++++++++++
3 files changed, 420 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 31d766f..3eb7012 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -3,4 +3,5 @@ DIST apache-tomcat-7.0.68-src.tar.gz 4641238 SHA256 abb5d2cc7e34a18f968ec2535bde
DIST apache-tomcat-7.0.69-src.tar.gz 4653637 SHA256 fd29dc7ecd4796a693fdd7fc568ef4fde91debfd22f50a8d7d1676c018cf330b SHA512 14025071497dd3d1b601958297dcce5f4e4d2ec192ece3484fcdedfe0ca8d5e9a37941e8db857e90716c73484a2415c0aadc9334a292d8a15b5181dda23b05ce WHIRLPOOL 1713fdfcffcc454d9b04cdd108b14cb49daf790f60a607fba22d828183f3f8c1c53d99a225da838d9cadbf5890d81789f0d1c5636ef30afb4e721d1bec4e9667
DIST apache-tomcat-8.0.32-src.tar.gz 4957920 SHA256 b8f7770ae947a0c0aed9b5a6f3e2ff18fd27a07f068cc6029f019b5d4c6de560 SHA512 4c18b9ae77963d96ff59891564c4bc8f6aaba582776c319825e9b944dd8cf10747dfc5b3cbc9cfa2ff10f6d889b404902fecd6b49fdde7b3741f9ba90dc6221c WHIRLPOOL 77be9ea10ffd2e606367d477ba13c717294fe49b65ecef6fdc910e53fa2d987f38a8b299c28a340ea7684a16feb6ca3bd0b5e662e3875af73f4735e1ff623a79
DIST apache-tomcat-8.0.33-src.tar.gz 4969308 SHA256 1a141b90111347640df57fe506d9da29ca959e44b5885795df603b621c2ccb4f SHA512 f781c90dd0932082f0d9b154b634f147c909415ebf49242f047d29430e24e16086d392b982e16d13b4d5f848dc98fd6834c0768e1f9c60d99a35d7dad262265d WHIRLPOOL b1ca10a4c0ead57b75bade8f135eb943f4ca291bf85eae75d523b65e9538bd5b25a270a3f27c37d2c7ea6e1e847ed15e9fdcac923ceb8069282189976f9e8727
+DIST apache-tomcat-8.0.35-src.tar.gz 4980657 SHA256 420036fde5e1bfe0a3d27299e355ee153b7c547d17c7b52fe4b15a1315d9c4e9 SHA512 c56ba4339fc114cda9a784c7f37be99c82238bbe043f69a3bed2ec86a0bf60325af9105d74cfcffa144636fecc7f4730cee08eca3a22ed035dd5e3e483fa1742 WHIRLPOOL 38d2382eabe19be8b008eb8975ddf95e086b482eb58cb56f566cf4ec7c7628663260a550b611f4db57803e503ab6746aedaac279bff24868c5997eaee3514966
DIST apache-tomcat-9.0.0.M6-src.tar.gz 5023823 SHA256 7217416b1c6470f3653d978bbfdb153693aef74929da21c5823117a168992b2a SHA512 712a93d71bef2f6dbdd35d32cbf200045bacc1a27426cb9f92e3a645a7f59f3611adebebdc24168de569cea2c64500ea893acfba05670947f53d72abec0988f1 WHIRLPOOL fb98d23ac462cef450d1ed8c88eb8be88a0aad32b24cf1b5c8437e51966bfb3d5222a3368ea54a2f19b0be38118b3148bf7549d2d59f1c8267aaa29246ef1d62
diff --git a/www-servers/tomcat/files/tomcat-8.0.35-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.35-build.xml.patch
new file mode 100644
index 0000000..1923d23
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.0.35-build.xml.patch
@@ -0,0 +1,265 @@
+diff -Naur apache-tomcat-8.0.24-src.orig/build.xml apache-tomcat-8.0.24-src/build.xml
+--- apache-tomcat-8.0.24-src.orig/build.xml 2015-07-01 21:25:21.000000000 +0100
++++ apache-tomcat-8.0.24-src/build.xml 2015-08-22 21:17:05.825564599 +0100
+@@ -697,24 +697,29 @@
+ manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+
+ <!-- Servlet 3.1 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+ 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}"
+ filesDir="${tomcat.classes}"
+ filesId="files.jsp-api"
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
++-->
+
+ <!-- EL 3.0 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 -->
+ <jarIt jarfile="${websocket-api.jar}"
+@@ -982,14 +987,14 @@
+
+ <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">
+@@ -1049,7 +1054,7 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
+- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+@@ -1083,7 +1088,7 @@
+ </javac>
+ </target>
+
+- <target name="build-tomcat-jdbc" depends="package">
++ <target name="build-tomcat-jdbc" depends="package" unless="noget">
+ <!-- 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}"
+@@ -1098,7 +1103,7 @@
+ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+ </target>
+
+- <target name="build-tomcat-jdbc-src">
++ <target name="build-tomcat-jdbc-src" unless="noget">
+ <!-- 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}"
+@@ -1202,10 +1207,11 @@
+
+ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+ <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+ <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
+ failonerror="false"/>
+ <copy file="${jdt.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. -->
+@@ -1542,7 +1548,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}"/>
+@@ -1681,7 +1687,7 @@
+
+ <target name="extras-webservices-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">
+ <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -1882,6 +1888,7 @@
+
+ <target name="javadoc" depends="dist-source,extras-webservices-prepare"
+ description="Create the Tomcat javadoc" >
++<!--
+ <javadoc packagenames="javax.servlet.*"
+ excludepackagenames="javax.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -1940,6 +1947,7 @@
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="javax.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -1970,15 +1978,17 @@
+ docencoding="UTF-8"
+ charset="UTF-8"
+ additionalparam="-breakiterator -notimestamp"
+- maxmemory="256m" >
++ maxmemory="512m" >
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path refid="tomcat.webservices.classpath"/>
+ <path location="${ant.core.lib}"/>
+ </classpath>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <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/"/>
+@@ -2739,7 +2749,7 @@
+ </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}"/>
+@@ -2773,7 +2783,7 @@
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -2819,7 +2829,7 @@
+ </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}"/>
+@@ -2845,18 +2855,18 @@
+
+ <!-- =============== Utility Targets to support downloads ================ -->
+
+- <target name="setproxy" if="${proxy.use}">
++ <target name="setproxy" if="${proxy.use}" unless="noget">
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+ proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+ </target>
+
+- <target name="testexist">
++ <target name="testexist" unless="noget">
+ <echo message="Testing for ${destfile}"/>
+ <available file="${destfile}" property="exist"/>
+ </target>
+
+- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
++ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2868,7 +2878,7 @@
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadgz-2" unless="exist" depends="testexist">
++ <target name="downloadgz-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2887,7 +2897,7 @@
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
++ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2898,7 +2908,7 @@
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadzip-2" unless="exist" depends="testexist">
++ <target name="downloadzip-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2916,7 +2926,7 @@
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
++ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
+ <!-- Download the file -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2926,7 +2936,7 @@
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="downloadfile-2" unless="exist" depends="testexist">
++ <target name="downloadfile-2" unless="noget" depends="testexist">
+ <!-- Download the file from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2949,7 +2959,7 @@
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="trydownload.check" depends="setproxy">
++ <target name="trydownload.check" depends="setproxy" unless="noget">
+ <condition property="trydownload.run">
+ <and>
+ <not>
+@@ -2960,7 +2970,7 @@
+ </condition>
+ </target>
+
+- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+ <!-- Downloads a file if not yet downloaded and the source URL is available -->
+ <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+ </target>
+@@ -2971,7 +2981,7 @@
+
+ <target name="ide-eclipse"
+ depends="download-compile, extras-webservices-prepare, download-test-compile"
+- description="Prepares the source tree to be built in Eclipse">
++ description="Prepares the source tree to be built in Eclipse" unless="noget">
+
+ <!-- Copy the sample project files into the root directory -->
+ <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-8.0.35.ebuild b/www-servers/tomcat/tomcat-8.0.35.ebuild
new file mode 100644
index 0000000..75d1b2d
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.0.35.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3 Container"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+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="3.1"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ dev-java/tomcat-servlet-api:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+ !<dev-java/tomcat-native-1.1.24
+ >=virtual/jre-1.7"
+DEPEND="${COMMON_DEP}
+ app-admin/pwgen
+ >=virtual/jdk-1.7
+ test? (
+ >=dev-java/ant-junit-1.9:0
+ dev-java/easymock:3.2
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup tomcat 265
+ enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+java_prepare() {
+ find -name '*.jar' -type f -delete -print || die
+
+ # Remove bundled servlet-api
+ rm -rv java/javax/{el,servlet} || die
+
+ epatch "${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}\`" \
+ bin/catalina.sh || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+ java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ # add missing docBase
+ local apps="host-manager manager"
+ for app in ${apps}; do
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+ output/build/webapps/${app}/META-INF/context.xml || die
+ done
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw="$(pwgen -s -B 15 1)"
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2016-06-14 12:18 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2016-06-14 12:18 UTC (permalink / raw
To: gentoo-commits
commit: 93bd6b7857d3d4c61ec86e1dcfcba5f1e3d5fbc1
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 14 12:16:36 2016 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 12:18:36 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93bd6b78
www-servers/tomcat: version bump in slot 8
Package-Manager: portage-2.3.0_rc1
www-servers/tomcat/Manifest | 1 +
.../tomcat/files/tomcat-8.0.36-build.xml.patch | 259 +++++++++++++++++++++
www-servers/tomcat/tomcat-8.0.36.ebuild | 154 ++++++++++++
3 files changed, 414 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index d103932..f3fa956 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -4,4 +4,5 @@ DIST apache-tomcat-7.0.69-src.tar.gz 4653637 SHA256 fd29dc7ecd4796a693fdd7fc568e
DIST apache-tomcat-8.0.32-src.tar.gz 4957920 SHA256 b8f7770ae947a0c0aed9b5a6f3e2ff18fd27a07f068cc6029f019b5d4c6de560 SHA512 4c18b9ae77963d96ff59891564c4bc8f6aaba582776c319825e9b944dd8cf10747dfc5b3cbc9cfa2ff10f6d889b404902fecd6b49fdde7b3741f9ba90dc6221c WHIRLPOOL 77be9ea10ffd2e606367d477ba13c717294fe49b65ecef6fdc910e53fa2d987f38a8b299c28a340ea7684a16feb6ca3bd0b5e662e3875af73f4735e1ff623a79
DIST apache-tomcat-8.0.33-src.tar.gz 4969308 SHA256 1a141b90111347640df57fe506d9da29ca959e44b5885795df603b621c2ccb4f SHA512 f781c90dd0932082f0d9b154b634f147c909415ebf49242f047d29430e24e16086d392b982e16d13b4d5f848dc98fd6834c0768e1f9c60d99a35d7dad262265d WHIRLPOOL b1ca10a4c0ead57b75bade8f135eb943f4ca291bf85eae75d523b65e9538bd5b25a270a3f27c37d2c7ea6e1e847ed15e9fdcac923ceb8069282189976f9e8727
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-9.0.0.M8-src.tar.gz 5024499 SHA256 bef36f9ead80188a8859fc1fa9846e77e570c54c99c05388857dc6dd29f526f8 SHA512 b1778709bddf6b0d1263115a57c743fcb58286b58dda384b06079ddcab8188a63de48efd3f47b6314c92154dd01c7bd1c8858ac2ea82d20a3d90c80899edcf87 WHIRLPOOL 8083b108a49ac0e066104a5849fcc6ef6c1355c09d9854d50a4108df769384664d0b37aa0cc85f59361a080e73fb585de36916855e1fcef1a441c4225653aca6
diff --git a/www-servers/tomcat/files/tomcat-8.0.36-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.36-build.xml.patch
new file mode 100644
index 0000000..cefd59f
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.0.36-build.xml.patch
@@ -0,0 +1,259 @@
+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 3.1 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+ 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}"
+ filesDir="${tomcat.classes}"
+ filesId="files.jsp-api"
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
++-->
+
+ <!-- EL 3.0 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 -->
+ <jarIt jarfile="${websocket-api.jar}"
+@@ -986,14 +991,14 @@
+
+ <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">
+@@ -1053,7 +1058,7 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
+- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+@@ -1087,7 +1092,7 @@
+ </javac>
+ </target>
+
+- <target name="build-tomcat-jdbc" depends="package">
++ <target name="build-tomcat-jdbc" depends="package" unless="noget">
+ <!-- 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 +1107,7 @@
+ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+ </target>
+
+- <target name="build-tomcat-jdbc-src">
++ <target name="build-tomcat-jdbc-src" unless="noget">
+ <!-- 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 +1211,11 @@
+
+ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+ <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+ <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
+ failonerror="false"/>
+ <copy file="${jdt.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. -->
+@@ -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"
+- description="Prepare to build web services extras package">
++ description="Prepare to build web services extras package" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -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" >
++<!--
+ <javadoc packagenames="javax.servlet.*"
+ excludepackagenames="javax.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -1989,6 +1996,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="javax.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -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>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <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/"/>
+@@ -2757,7 +2767,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}"/>
+@@ -2791,7 +2801,7 @@ skip.installer property in build.properties" />
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -2848,7 +2858,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}"/>
+@@ -2874,18 +2884,18 @@ skip.installer property in build.properties" />
+
+ <!-- =============== Utility Targets to support downloads ================ -->
+
+- <target name="setproxy" if="${proxy.use}">
++ <target name="setproxy" if="${proxy.use}" unless="noget">
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+ proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+ </target>
+
+- <target name="testexist">
++ <target name="testexist" unless="noget">
+ <echo message="Testing for ${destfile}"/>
+ <available file="${destfile}" property="exist"/>
+ </target>
+
+- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
++ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2897,7 +2907,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadgz-2" unless="exist" depends="testexist">
++ <target name="downloadgz-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2916,7 +2926,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
++ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2927,7 +2937,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadzip-2" unless="exist" depends="testexist">
++ <target name="downloadzip-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2945,7 +2955,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
++ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
+ <!-- Download the file -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2955,7 +2965,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="downloadfile-2" unless="exist" depends="testexist">
++ <target name="downloadfile-2" unless="noget" depends="testexist">
+ <!-- Download the file from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2978,7 +2988,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="trydownload.check" depends="setproxy">
++ <target name="trydownload.check" depends="setproxy" unless="noget">
+ <condition property="trydownload.run">
+ <and>
+ <not>
+@@ -2989,7 +2999,7 @@ skip.installer property in build.properties" />
+ </condition>
+ </target>
+
+- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+ <!-- Downloads a file if not yet downloaded and the source URL is available -->
+ <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+ </target>
+@@ -3000,7 +3010,7 @@ skip.installer property in build.properties" />
+
+ <target name="ide-eclipse"
+ depends="download-compile, extras-webservices-prepare, download-test-compile"
+- description="Prepares the source tree to be built in Eclipse">
++ description="Prepares the source tree to be built in Eclipse" unless="noget">
+
+ <!-- Copy the sample project files into the root directory -->
+ <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-8.0.36.ebuild b/www-servers/tomcat/tomcat-8.0.36.ebuild
new file mode 100644
index 0000000..d990243
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.0.36.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+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-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+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="3.1"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ dev-java/tomcat-servlet-api:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+ !<dev-java/tomcat-native-1.1.24
+ >=virtual/jre-1.7"
+DEPEND="${COMMON_DEP}
+ app-admin/pwgen
+ >=virtual/jdk-1.7
+ test? (
+ >=dev-java/ant-junit-1.9:0
+ dev-java/easymock:3.2
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup tomcat 265
+ enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+java_prepare() {
+ find -name '*.jar' -type f -delete -print || die
+
+ # Remove bundled servlet-api
+ rm -rv java/javax/{el,servlet} || die
+
+ epatch "${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}\`" \
+ bin/catalina.sh || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+ java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ # add missing docBase
+ local apps="host-manager manager"
+ for app in ${apps}; do
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+ output/build/webapps/${app}/META-INF/context.xml || die
+ done
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw="$(pwgen -s -B 15 1)"
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2016-06-14 12:34 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2016-06-14 12:34 UTC (permalink / raw
To: gentoo-commits
commit: 377bf7ba3d1afd0cfb8274544e25938ff6ea3018
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 14 12:33:39 2016 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 12:33:39 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=377bf7ba
www-servers/tomcat: added new slot 8.5
Package-Manager: portage-2.3.0_rc1
www-servers/tomcat/Manifest | 1 +
.../tomcat/files/tomcat-8.5.3-build.xml.patch | 259 +++++++++++++++++++++
www-servers/tomcat/tomcat-8.5.3.ebuild | 154 ++++++++++++
3 files changed, 414 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index f3fa956..4c677ff 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -5,4 +5,5 @@ DIST apache-tomcat-8.0.32-src.tar.gz 4957920 SHA256 b8f7770ae947a0c0aed9b5a6f3e2
DIST apache-tomcat-8.0.33-src.tar.gz 4969308 SHA256 1a141b90111347640df57fe506d9da29ca959e44b5885795df603b621c2ccb4f SHA512 f781c90dd0932082f0d9b154b634f147c909415ebf49242f047d29430e24e16086d392b982e16d13b4d5f848dc98fd6834c0768e1f9c60d99a35d7dad262265d WHIRLPOOL b1ca10a4c0ead57b75bade8f135eb943f4ca291bf85eae75d523b65e9538bd5b25a270a3f27c37d2c7ea6e1e847ed15e9fdcac923ceb8069282189976f9e8727
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.5.3-src.tar.gz 5001008 SHA256 d0d1ecfd88d733cf3666cc39483ea092627840cd2cfab8fae09f93b7bf05d21d SHA512 7c4da46725c6e34669f538f406e699c235b99b4ec47a289f4fcbf93b49a35082cea3e041bee8a2772a29c240521d8720b2b50b5cda7afe0ec0f2b4f5cb29bda5 WHIRLPOOL 2ad999e8ee068d66164e2a256ee58f47799251fab60cf9af3a67128b131a07116a2faf2da6eef132e13f5df6ed78f1c44ac69bf5615178b63452fbffc62a4852
DIST apache-tomcat-9.0.0.M8-src.tar.gz 5024499 SHA256 bef36f9ead80188a8859fc1fa9846e77e570c54c99c05388857dc6dd29f526f8 SHA512 b1778709bddf6b0d1263115a57c743fcb58286b58dda384b06079ddcab8188a63de48efd3f47b6314c92154dd01c7bd1c8858ac2ea82d20a3d90c80899edcf87 WHIRLPOOL 8083b108a49ac0e066104a5849fcc6ef6c1355c09d9854d50a4108df769384664d0b37aa0cc85f59361a080e73fb585de36916855e1fcef1a441c4225653aca6
diff --git a/www-servers/tomcat/files/tomcat-8.5.3-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.3-build.xml.patch
new file mode 100644
index 0000000..cefd59f
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.5.3-build.xml.patch
@@ -0,0 +1,259 @@
+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 3.1 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+ 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}"
+ filesDir="${tomcat.classes}"
+ filesId="files.jsp-api"
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
++-->
+
+ <!-- EL 3.0 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 -->
+ <jarIt jarfile="${websocket-api.jar}"
+@@ -986,14 +991,14 @@
+
+ <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">
+@@ -1053,7 +1058,7 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
+- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+@@ -1087,7 +1092,7 @@
+ </javac>
+ </target>
+
+- <target name="build-tomcat-jdbc" depends="package">
++ <target name="build-tomcat-jdbc" depends="package" unless="noget">
+ <!-- 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 +1107,7 @@
+ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+ </target>
+
+- <target name="build-tomcat-jdbc-src">
++ <target name="build-tomcat-jdbc-src" unless="noget">
+ <!-- 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 +1211,11 @@
+
+ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+ <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+ <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
+ failonerror="false"/>
+ <copy file="${jdt.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. -->
+@@ -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"
+- description="Prepare to build web services extras package">
++ description="Prepare to build web services extras package" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -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" >
++<!--
+ <javadoc packagenames="javax.servlet.*"
+ excludepackagenames="javax.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -1989,6 +1996,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="javax.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -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>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <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/"/>
+@@ -2757,7 +2767,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}"/>
+@@ -2791,7 +2801,7 @@ skip.installer property in build.properties" />
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -2848,7 +2858,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}"/>
+@@ -2874,18 +2884,18 @@ skip.installer property in build.properties" />
+
+ <!-- =============== Utility Targets to support downloads ================ -->
+
+- <target name="setproxy" if="${proxy.use}">
++ <target name="setproxy" if="${proxy.use}" unless="noget">
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+ proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+ </target>
+
+- <target name="testexist">
++ <target name="testexist" unless="noget">
+ <echo message="Testing for ${destfile}"/>
+ <available file="${destfile}" property="exist"/>
+ </target>
+
+- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
++ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2897,7 +2907,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadgz-2" unless="exist" depends="testexist">
++ <target name="downloadgz-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2916,7 +2926,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
++ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2927,7 +2937,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadzip-2" unless="exist" depends="testexist">
++ <target name="downloadzip-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2945,7 +2955,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
++ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
+ <!-- Download the file -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2955,7 +2965,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="downloadfile-2" unless="exist" depends="testexist">
++ <target name="downloadfile-2" unless="noget" depends="testexist">
+ <!-- Download the file from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2978,7 +2988,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="trydownload.check" depends="setproxy">
++ <target name="trydownload.check" depends="setproxy" unless="noget">
+ <condition property="trydownload.run">
+ <and>
+ <not>
+@@ -2989,7 +2999,7 @@ skip.installer property in build.properties" />
+ </condition>
+ </target>
+
+- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+ <!-- Downloads a file if not yet downloaded and the source URL is available -->
+ <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+ </target>
+@@ -3000,7 +3010,7 @@ skip.installer property in build.properties" />
+
+ <target name="ide-eclipse"
+ depends="download-compile, extras-webservices-prepare, download-test-compile"
+- description="Prepares the source tree to be built in Eclipse">
++ description="Prepares the source tree to be built in Eclipse" unless="noget">
+
+ <!-- Copy the sample project files into the root directory -->
+ <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-8.5.3.ebuild b/www-servers/tomcat/tomcat-8.5.3.ebuild
new file mode 100644
index 0000000..b0508e4
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.5.3.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+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-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+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="3.1"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+ !<dev-java/tomcat-native-1.1.24
+ >=virtual/jre-1.7"
+DEPEND="${COMMON_DEP}
+ app-admin/pwgen
+ >=virtual/jdk-1.7
+ test? (
+ >=dev-java/ant-junit-1.9:0
+ dev-java/easymock:3.2
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup tomcat 265
+ enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+java_prepare() {
+ find -name '*.jar' -type f -delete -print || die
+
+ # Remove bundled servlet-api
+ rm -rv java/javax/{el,servlet} || die
+
+ epatch "${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}\`" \
+ bin/catalina.sh || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+ java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ # add missing docBase
+ local apps="host-manager manager"
+ for app in ${apps}; do
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+ output/build/webapps/${app}/META-INF/context.xml || die
+ done
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw="$(pwgen -s -B 15 1)"
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2016-07-13 21:39 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2016-07-13 21:39 UTC (permalink / raw
To: gentoo-commits
commit: 37fc3fe4905a6536624ba3e8a9f179d4713c8111
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 13 21:36:01 2016 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 21:39:45 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37fc3fe4
www-servers/tomcat: version bump in slot 8.5
Package-Manager: portage-2.3.0
www-servers/tomcat/Manifest | 1 +
.../tomcat/files/tomcat-8.5.4-build.xml.patch | 250 +++++++++++++++++++++
www-servers/tomcat/tomcat-8.5.4.ebuild | 154 +++++++++++++
3 files changed, 405 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index cbdd234..b1f3b24 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -7,4 +7,5 @@ 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.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-9.0.0.M8-src.tar.gz 5024499 SHA256 bef36f9ead80188a8859fc1fa9846e77e570c54c99c05388857dc6dd29f526f8 SHA512 b1778709bddf6b0d1263115a57c743fcb58286b58dda384b06079ddcab8188a63de48efd3f47b6314c92154dd01c7bd1c8858ac2ea82d20a3d90c80899edcf87 WHIRLPOOL 8083b108a49ac0e066104a5849fcc6ef6c1355c09d9854d50a4108df769384664d0b37aa0cc85f59361a080e73fb585de36916855e1fcef1a441c4225653aca6
diff --git a/www-servers/tomcat/files/tomcat-8.5.4-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.4-build.xml.patch
new file mode 100644
index 0000000..611c99d
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.5.4-build.xml.patch
@@ -0,0 +1,250 @@
+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 3.1 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+ 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}"
+ filesDir="${tomcat.classes}"
+ filesId="files.jsp-api"
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
++-->
+
+ <!-- EL 3.0 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 -->
+ <jarIt jarfile="${websocket-api.jar}"
+@@ -982,14 +987,14 @@
+
+ <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">
+@@ -1049,7 +1054,7 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
+- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+@@ -1083,7 +1088,7 @@
+ </javac>
+ </target>
+
+- <target name="build-tomcat-jdbc" depends="package">
++ <target name="build-tomcat-jdbc" depends="package" unless="noget">
+ <!-- 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}"
+@@ -1098,7 +1103,7 @@
+ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+ </target>
+
+- <target name="build-tomcat-jdbc-src">
++ <target name="build-tomcat-jdbc-src" unless="noget">
+ <!-- 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}"
+@@ -1202,10 +1207,11 @@
+
+ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+ <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+ <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
+ failonerror="false"/>
+ <copy file="${jdt.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. -->
+@@ -1579,7 +1585,7 @@
+
+ <target name="extras-webservices-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">
+ <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -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" >
++<!--
+ <javadoc packagenames="javax.servlet.*"
+ excludepackagenames="javax.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -1791,6 +1798,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="javax.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -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>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <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/"/>
+@@ -2574,7 +2584,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}"/>
+@@ -2608,7 +2618,7 @@ skip.installer property in build.properties" />
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -2665,7 +2675,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}"/>
+@@ -2691,18 +2701,18 @@ skip.installer property in build.properties" />
+
+ <!-- =============== Utility Targets to support downloads ================ -->
+
+- <target name="setproxy" if="${proxy.use}">
++ <target name="setproxy" if="${proxy.use}" unless="noget">
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+ proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+ </target>
+
+- <target name="testexist">
++ <target name="testexist" unless="noget">
+ <echo message="Testing for ${destfile}"/>
+ <available file="${destfile}" property="exist"/>
+ </target>
+
+- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
++ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2714,7 +2724,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadgz-2" unless="exist" depends="testexist">
++ <target name="downloadgz-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2733,7 +2743,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
++ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2744,7 +2754,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadzip-2" unless="exist" depends="testexist">
++ <target name="downloadzip-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2762,7 +2772,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
++ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
+ <!-- Download the file -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2772,7 +2782,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="downloadfile-2" unless="exist" depends="testexist">
++ <target name="downloadfile-2" unless="noget" depends="testexist">
+ <!-- Download the file from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2795,7 +2805,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="trydownload.check" depends="setproxy">
++ <target name="trydownload.check" depends="setproxy" unless="noget">
+ <condition property="trydownload.run">
+ <and>
+ <not>
+@@ -2806,7 +2816,7 @@ skip.installer property in build.properties" />
+ </condition>
+ </target>
+
+- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+ <!-- Downloads a file if not yet downloaded and the source URL is available -->
+ <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+ </target>
+@@ -2817,7 +2827,7 @@ skip.installer property in build.properties" />
+
+ <target name="ide-eclipse"
+ depends="download-compile, extras-webservices-prepare, download-test-compile"
+- description="Prepares the source tree to be built in Eclipse">
++ description="Prepares the source tree to be built in Eclipse" unless="noget">
+
+ <!-- Copy the sample project files into the root directory -->
+ <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-8.5.4.ebuild b/www-servers/tomcat/tomcat-8.5.4.ebuild
new file mode 100644
index 0000000..b0508e4
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.5.4.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+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-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+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="3.1"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+ !<dev-java/tomcat-native-1.1.24
+ >=virtual/jre-1.7"
+DEPEND="${COMMON_DEP}
+ app-admin/pwgen
+ >=virtual/jdk-1.7
+ test? (
+ >=dev-java/ant-junit-1.9:0
+ dev-java/easymock:3.2
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup tomcat 265
+ enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+java_prepare() {
+ find -name '*.jar' -type f -delete -print || die
+
+ # Remove bundled servlet-api
+ rm -rv java/javax/{el,servlet} || die
+
+ epatch "${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}\`" \
+ bin/catalina.sh || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+ java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ # add missing docBase
+ local apps="host-manager manager"
+ for app in ${apps}; do
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+ output/build/webapps/${app}/META-INF/context.xml || die
+ done
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw="$(pwgen -s -B 15 1)"
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2016-07-13 21:39 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2016-07-13 21:39 UTC (permalink / raw
To: gentoo-commits
commit: 8692922d26e2f8d84301901aaaa396129227d18a
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 13 21:39:25 2016 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 21:39:49 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8692922d
www-servers/tomcat: version bump in slot 9
Package-Manager: portage-2.3.0
www-servers/tomcat/Manifest | 2 +-
...9.0.0_alpha8-build.xml.patch => tomcat-9.0.0_alpha9-build.xml.patch} | 0
.../tomcat/{tomcat-9.0.0_alpha8.ebuild => tomcat-9.0.0_alpha9.ebuild} | 0
3 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index b1f3b24..be4796c 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -8,4 +8,4 @@ DIST apache-tomcat-8.0.35-src.tar.gz 4980657 SHA256 420036fde5e1bfe0a3d27299e355
DIST apache-tomcat-8.0.36-src.tar.gz 4988679 SHA256 36db67592adda575fc08dd5f0cd3532934d2edb117028e29bdd9f702bf31ab10 SHA512 192a31eb42afdc345fa5ea5f05b03766e70a67841fca9bd9c76bcd47ae1d505fd3cd1fde6bc64e145add2b6a9e88ecc50ab1a0954942704c139ec3c7a6bf7286 WHIRLPOOL da1bb6570d62caedfe83948f2e850ec7e8bdba36925d1f000067864c98b1bd780aabf2f1cbcb66cb544db292156a98819e9cc6dfa42a345064f09dcc4471a7c3
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-9.0.0.M8-src.tar.gz 5024499 SHA256 bef36f9ead80188a8859fc1fa9846e77e570c54c99c05388857dc6dd29f526f8 SHA512 b1778709bddf6b0d1263115a57c743fcb58286b58dda384b06079ddcab8188a63de48efd3f47b6314c92154dd01c7bd1c8858ac2ea82d20a3d90c80899edcf87 WHIRLPOOL 8083b108a49ac0e066104a5849fcc6ef6c1355c09d9854d50a4108df769384664d0b37aa0cc85f59361a080e73fb585de36916855e1fcef1a441c4225653aca6
+DIST apache-tomcat-9.0.0.M9-src.tar.gz 5024180 SHA256 aa7e3bc52be5f94ed01c3ecbfe2663452152c996f0104d755cd339a15beb99d4 SHA512 66484a58b97dd5511e6ff3a56db4d290ab7c0dd0c8f661f85b8166905072ac6d5bb6c410aa170457fe09c967175eb881f044421dc75a9561e4609094c6aa0116 WHIRLPOOL 497bdb5dca49f138d4f905ea35a364f07ec5de851096f4b6aa5919bd4f2802ed015d8a762131631bb787434cb63d1ca1047411afba97ad6c55b677873ff241f2
diff --git a/www-servers/tomcat/files/tomcat-9.0.0_alpha8-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.0_alpha9-build.xml.patch
similarity index 100%
rename from www-servers/tomcat/files/tomcat-9.0.0_alpha8-build.xml.patch
rename to www-servers/tomcat/files/tomcat-9.0.0_alpha9-build.xml.patch
diff --git a/www-servers/tomcat/tomcat-9.0.0_alpha8.ebuild b/www-servers/tomcat/tomcat-9.0.0_alpha9.ebuild
similarity index 100%
rename from www-servers/tomcat/tomcat-9.0.0_alpha8.ebuild
rename to www-servers/tomcat/tomcat-9.0.0_alpha9.ebuild
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2016-09-06 17:23 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2016-09-06 17:23 UTC (permalink / raw
To: gentoo-commits
commit: 3de55fc614b7eb6aa2edebb09e059cbc0a0ab1e2
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 6 17:21:41 2016 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Sep 6 17:22:34 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3de55fc6
www-servers/tomcat: bump for main versions 8.0, 8.5 and 9.0
Package-Manager: portage-2.3.0
www-servers/tomcat/Manifest | 4 +-
...ild.xml.patch => tomcat-8.0.37-build.xml.patch} | 65 ++++++++++++----------
...uild.xml.patch => tomcat-8.5.5-build.xml.patch} | 56 +++++++++----------
....patch => tomcat-9.0.0_alpha10-build.xml.patch} | 0
...at-9.0.0_alpha9.ebuild => tomcat-8.0.37.ebuild} | 17 +++---
...cat-9.0.0_alpha9.ebuild => tomcat-8.5.5.ebuild} | 17 +++---
...0_alpha9.ebuild => tomcat-9.0.0_alpha10.ebuild} | 0
7 files changed, 84 insertions(+), 75 deletions(-)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index be4796c..05e8497 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -6,6 +6,8 @@ DIST apache-tomcat-8.0.32-src.tar.gz 4957920 SHA256 b8f7770ae947a0c0aed9b5a6f3e2
DIST apache-tomcat-8.0.33-src.tar.gz 4969308 SHA256 1a141b90111347640df57fe506d9da29ca959e44b5885795df603b621c2ccb4f SHA512 f781c90dd0932082f0d9b154b634f147c909415ebf49242f047d29430e24e16086d392b982e16d13b4d5f848dc98fd6834c0768e1f9c60d99a35d7dad262265d WHIRLPOOL b1ca10a4c0ead57b75bade8f135eb943f4ca291bf85eae75d523b65e9538bd5b25a270a3f27c37d2c7ea6e1e847ed15e9fdcac923ceb8069282189976f9e8727
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.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-9.0.0.M9-src.tar.gz 5024180 SHA256 aa7e3bc52be5f94ed01c3ecbfe2663452152c996f0104d755cd339a15beb99d4 SHA512 66484a58b97dd5511e6ff3a56db4d290ab7c0dd0c8f661f85b8166905072ac6d5bb6c410aa170457fe09c967175eb881f044421dc75a9561e4609094c6aa0116 WHIRLPOOL 497bdb5dca49f138d4f905ea35a364f07ec5de851096f4b6aa5919bd4f2802ed015d8a762131631bb787434cb63d1ca1047411afba97ad6c55b677873ff241f2
+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
diff --git a/www-servers/tomcat/files/tomcat-9.0.0_alpha9-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.37-build.xml.patch
similarity index 83%
copy from www-servers/tomcat/files/tomcat-9.0.0_alpha9-build.xml.patch
copy to www-servers/tomcat/files/tomcat-8.0.37-build.xml.patch
index 3c4e5c2..cefd59f 100644
--- a/www-servers/tomcat/files/tomcat-9.0.0_alpha9-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-8.0.37-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_alpha9-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.5-build.xml.patch
similarity index 86%
copy from www-servers/tomcat/files/tomcat-9.0.0_alpha9-build.xml.patch
copy to www-servers/tomcat/files/tomcat-8.5.5-build.xml.patch
index 3c4e5c2..611c99d 100644
--- a/www-servers/tomcat/files/tomcat-9.0.0_alpha9-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-8.5.5-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_alpha9-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.0_alpha10-build.xml.patch
similarity index 100%
rename from www-servers/tomcat/files/tomcat-9.0.0_alpha9-build.xml.patch
rename to www-servers/tomcat/files/tomcat-9.0.0_alpha10-build.xml.patch
diff --git a/www-servers/tomcat/tomcat-9.0.0_alpha9.ebuild b/www-servers/tomcat/tomcat-8.0.37.ebuild
similarity index 92%
copy from www-servers/tomcat/tomcat-9.0.0_alpha9.ebuild
copy to www-servers/tomcat/tomcat-8.0.37.ebuild
index 76dbdc9..d990243 100644
--- a/www-servers/tomcat/tomcat-9.0.0_alpha9.ebuild
+++ b/www-servers/tomcat/tomcat-8.0.37.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_alpha9.ebuild b/www-servers/tomcat/tomcat-8.5.5.ebuild
similarity index 92%
copy from www-servers/tomcat/tomcat-9.0.0_alpha9.ebuild
copy to www-servers/tomcat/tomcat-8.5.5.ebuild
index 76dbdc9..b0508e4 100644
--- a/www-servers/tomcat/tomcat-9.0.0_alpha9.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.5.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_alpha9.ebuild b/www-servers/tomcat/tomcat-9.0.0_alpha10.ebuild
similarity index 100%
rename from www-servers/tomcat/tomcat-9.0.0_alpha9.ebuild
rename to www-servers/tomcat/tomcat-9.0.0_alpha10.ebuild
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2016-10-13 17:10 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2016-10-13 17:10 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2016-11-10 16:03 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2016-11-10 16:03 UTC (permalink / raw
To: gentoo-commits
commit: b441b5103ee47af54304e569ec41bfc93bdf7b2f
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 10 16:02:58 2016 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Nov 10 16:02:58 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b441b510
www-servers/tomcat: version bump for version 8.5.x and slot 9
Package-Manager: portage-2.3.2
www-servers/tomcat/Manifest | 3 +-
...uild.xml.patch => tomcat-8.5.8-build.xml.patch} | 56 +++++++++++-----------
....patch => tomcat-9.0.0_alpha13-build.xml.patch} | 0
...at-9.0.0_alpha11.ebuild => tomcat-8.5.8.ebuild} | 17 ++++---
..._alpha11.ebuild => tomcat-9.0.0_alpha13.ebuild} | 0
5 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 539b526..f1ef5e9 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -12,4 +12,5 @@ DIST apache-tomcat-8.5.3-src.tar.gz 5001008 SHA256 d0d1ecfd88d733cf3666cc39483ea
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-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
+DIST apache-tomcat-8.5.8-src.tar.gz 5051497 SHA256 ee58ee69d536d7a8f748ed7b334eb2161d3d75664f0c87178b12fe5eebbbe45f SHA512 b10ef601d5abb1ce9cd50eec25cbec33d1a11da82df7cbcb7b152c5fdd36a36b95b2e8819421ae0145b2c2a6be662a774e2ee672b6540f9962285a436ffa84b7 WHIRLPOOL 21040a1c309ed96487fbc7e81a01e15d689c2d41229d3d72cc0a80753413b64ec8cf2aeab8783758d603d87ada3e0a1a4b7825eb282ececf576dea63dbb34fda
+DIST apache-tomcat-9.0.0.M13-src.tar.gz 5065756 SHA256 9297bc76cd8f5b3d1bb7d154257ced77580b09db18a14fd29ab1659eb0663580 SHA512 dafb6fba3faca905cd082076ba6d2f270b51627d63ba241cffecba5027c15d3045c8090102f2fbb3d6dba7ee11a082d448b118dafc80457117ad3d4af0748ace WHIRLPOOL 4542761ed7d8283cac11efaef321e390399ed5cb79b63a61e1255b52e9bf69c0f9117552a8b171443d33c40c6ddcf2eccbcc2c2f0961c89cf8aedda3134d07c4
diff --git a/www-servers/tomcat/files/tomcat-9.0.0_alpha11-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.8-build.xml.patch
similarity index 86%
copy from www-servers/tomcat/files/tomcat-9.0.0_alpha11-build.xml.patch
copy to www-servers/tomcat/files/tomcat-8.5.8-build.xml.patch
index 3c4e5c2..611c99d 100644
--- a/www-servers/tomcat/files/tomcat-9.0.0_alpha11-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-8.5.8-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_alpha11-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.0_alpha13-build.xml.patch
similarity index 100%
rename from www-servers/tomcat/files/tomcat-9.0.0_alpha11-build.xml.patch
rename to www-servers/tomcat/files/tomcat-9.0.0_alpha13-build.xml.patch
diff --git a/www-servers/tomcat/tomcat-9.0.0_alpha11.ebuild b/www-servers/tomcat/tomcat-8.5.8.ebuild
similarity index 92%
copy from www-servers/tomcat/tomcat-9.0.0_alpha11.ebuild
copy to www-servers/tomcat/tomcat-8.5.8.ebuild
index 76dbdc9..b0508e4 100644
--- a/www-servers/tomcat/tomcat-9.0.0_alpha11.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.8.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_alpha11.ebuild b/www-servers/tomcat/tomcat-9.0.0_alpha13.ebuild
similarity index 100%
rename from www-servers/tomcat/tomcat-9.0.0_alpha11.ebuild
rename to www-servers/tomcat/tomcat-9.0.0_alpha13.ebuild
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2016-12-13 8:34 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2016-12-13 8:34 UTC (permalink / raw
To: gentoo-commits
commit: bd2992a6247d06c03672c0b9372af5190ca564a1
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 13 08:31:50 2016 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Dec 13 08:31:50 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd2992a6
www-servers/tomcat: removed obsolete ebuilds (also affected by various security issues)
Package-Manager: Portage-2.3.3, Repoman-2.3.1
www-servers/tomcat/Manifest | 11 -
.../tomcat/files/tomcat-7.0.69-build.xml.patch | 149 ------------
.../tomcat/files/tomcat-7.0.70-build.xml.patch | 149 ------------
.../tomcat/files/tomcat-8.0.30-build.xml.patch | 265 ---------------------
.../tomcat/files/tomcat-8.0.33-build.xml.patch | 265 ---------------------
.../tomcat/files/tomcat-8.0.35-build.xml.patch | 265 ---------------------
.../tomcat/files/tomcat-8.0.37-build.xml.patch | 259 --------------------
.../tomcat/files/tomcat-8.0.38-build.xml.patch | 259 --------------------
.../tomcat/files/tomcat-8.5.3-build.xml.patch | 259 --------------------
.../tomcat/files/tomcat-8.5.4-build.xml.patch | 250 -------------------
.../tomcat/files/tomcat-8.5.5-build.xml.patch | 250 -------------------
.../tomcat/files/tomcat-8.5.6-build.xml.patch | 250 -------------------
.../tomcat/files/tomcat-8.5.8-build.xml.patch | 250 -------------------
www-servers/tomcat/tomcat-7.0.69.ebuild | 145 -----------
www-servers/tomcat/tomcat-7.0.70.ebuild | 145 -----------
www-servers/tomcat/tomcat-8.0.33.ebuild | 154 ------------
www-servers/tomcat/tomcat-8.0.35.ebuild | 154 ------------
www-servers/tomcat/tomcat-8.0.37.ebuild | 154 ------------
www-servers/tomcat/tomcat-8.0.38.ebuild | 154 ------------
www-servers/tomcat/tomcat-8.5.3.ebuild | 154 ------------
www-servers/tomcat/tomcat-8.5.4.ebuild | 154 ------------
www-servers/tomcat/tomcat-8.5.5.ebuild | 154 ------------
www-servers/tomcat/tomcat-8.5.6.ebuild | 154 ------------
www-servers/tomcat/tomcat-8.5.8.ebuild | 154 ------------
24 files changed, 4557 deletions(-)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 28bc50a..5cbd94d 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,19 +1,8 @@
DIST apache-tomcat-7.0.67-src.tar.gz 4624303 SHA256 0464ebbeec17fb15103cad9f6639edc826f4eca246dd58a5cb1c5d46aff58e0a SHA512 dd299cab7a172860f51bae19e3490432af874b94825de289095647026a91b27cb3544ba85ab1f786bf4696dc59475ca85d051841ebaa221e3b46079e139a6e52 WHIRLPOOL ae7ec13ffd3bd0964496060413924854c5b956dc88b8d0f1de4ac094e8fb5595ccfc7c2eaa7051f082c575253ed9fdadc8833f494281770f8f72b8c64d9b9593
DIST apache-tomcat-7.0.68-src.tar.gz 4641238 SHA256 abb5d2cc7e34a18f968ec2535bdeeae919c53fa7feffe4d617db95e12e94b210 SHA512 dd97205044b03c6466c78bd165509ed9cd37c4d84de34c2170e67c475b28b72bfeda512f14f583c9983c045888d4704cdf7ba7c434f1d4bad9022428b0a0de1c WHIRLPOOL 594cdf5584ea49faebfbea174e67bf85e761365717d56762138d07186c595195df2899a94d897578d1d20201ed4706b51a4d8870d9a6a4ca74c2436ba4283a05
-DIST apache-tomcat-7.0.69-src.tar.gz 4653637 SHA256 fd29dc7ecd4796a693fdd7fc568ef4fde91debfd22f50a8d7d1676c018cf330b SHA512 14025071497dd3d1b601958297dcce5f4e4d2ec192ece3484fcdedfe0ca8d5e9a37941e8db857e90716c73484a2415c0aadc9334a292d8a15b5181dda23b05ce WHIRLPOOL 1713fdfcffcc454d9b04cdd108b14cb49daf790f60a607fba22d828183f3f8c1c53d99a225da838d9cadbf5890d81789f0d1c5636ef30afb4e721d1bec4e9667
-DIST apache-tomcat-7.0.70-src.tar.gz 4661050 SHA256 c15b193a2f3ed22d460fa135dd8719381bdddde0e59eb359c50d5a9c61868251 SHA512 e7a6108d2c5c5e66ac9c8c55493445d6d8eaf9a3949006e0f3f445d8dbae5a1e8a0e99106545a9048434968c945616377f63af5351765ce340e2df35eb5f1ef1 WHIRLPOOL 42ddd71b768f205a981e50ed6daa5b7c0d2342f7bae901f996695224a749bae1973c2859988e6db24d7692f66b868ae2632976983655bde3fdec5efd3cf5126d
DIST apache-tomcat-7.0.73-src.tar.gz 4674971 SHA256 e3e236fb551ae9deb85024d8472fd08a76b14380e3ddaa2a1aff1fc670de5d87 SHA512 4754628c271d0aed3572ac0961c47653c10fcdfd0d13d8d1bc1b5774e961e6327cbb6b11b0e7e2f8eff525e2e60f741da49aeb855bb9d94e84cc87f346cf9ce6 WHIRLPOOL b9e75f53e41f1e9b9767fe8bc603ee5b7db2d3b1b7d2d900d430f4c0b73881a7ad36e0a0bfce773432b73ea8743865e933363ceec037d11d8f1008d8619ac1f1
DIST apache-tomcat-8.0.32-src.tar.gz 4957920 SHA256 b8f7770ae947a0c0aed9b5a6f3e2ff18fd27a07f068cc6029f019b5d4c6de560 SHA512 4c18b9ae77963d96ff59891564c4bc8f6aaba582776c319825e9b944dd8cf10747dfc5b3cbc9cfa2ff10f6d889b404902fecd6b49fdde7b3741f9ba90dc6221c WHIRLPOOL 77be9ea10ffd2e606367d477ba13c717294fe49b65ecef6fdc910e53fa2d987f38a8b299c28a340ea7684a16feb6ca3bd0b5e662e3875af73f4735e1ff623a79
-DIST apache-tomcat-8.0.33-src.tar.gz 4969308 SHA256 1a141b90111347640df57fe506d9da29ca959e44b5885795df603b621c2ccb4f SHA512 f781c90dd0932082f0d9b154b634f147c909415ebf49242f047d29430e24e16086d392b982e16d13b4d5f848dc98fd6834c0768e1f9c60d99a35d7dad262265d WHIRLPOOL b1ca10a4c0ead57b75bade8f135eb943f4ca291bf85eae75d523b65e9538bd5b25a270a3f27c37d2c7ea6e1e847ed15e9fdcac923ceb8069282189976f9e8727
-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.0.39-src.tar.gz 5019148 SHA256 566bf43a50f42af9c5b46be60f68e571a56c41f8e93647cf9f68e5f93870be96 SHA512 0f58f2ef0dc047189672107b1f2586731e9455c3e665210d5634f5f5a16b0afd7ef5c35beaf02e22b874d4898ab62d33638785d9f18714893674bc691b0f9330 WHIRLPOOL 62baaba90f588c43ea503eb336d1b385b3a00b86686c1e232a836975f10d12241416b688279ffcd60dd42afb9d9660b6385e749c0c4d0877217f7494539f2752
-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-8.5.6-src.tar.gz 5028904 SHA256 7690e985544f30bd9cfdec2d0b1088f9cd2f2fbd1575116cb92c79cfed863fc6 SHA512 3b9d3b6edf4f3832891207d38d9f4a5aed9aa53fad895fccce2f6311d197aa1e0877052ad5fc8239b53cc671e373c8ae3c6d284a8b17bb15bf427bda7111a508 WHIRLPOOL a74bfc20efa0a44433205c514124496d17289f109e7b2cd2ad90f7556c8e4dc235531137f7dfc22085f46f9ed7d026d4e5d8ebd42101c4815acb631008849eb6
-DIST apache-tomcat-8.5.8-src.tar.gz 5051497 SHA256 ee58ee69d536d7a8f748ed7b334eb2161d3d75664f0c87178b12fe5eebbbe45f SHA512 b10ef601d5abb1ce9cd50eec25cbec33d1a11da82df7cbcb7b152c5fdd36a36b95b2e8819421ae0145b2c2a6be662a774e2ee672b6540f9962285a436ffa84b7 WHIRLPOOL 21040a1c309ed96487fbc7e81a01e15d689c2d41229d3d72cc0a80753413b64ec8cf2aeab8783758d603d87ada3e0a1a4b7825eb282ececf576dea63dbb34fda
DIST apache-tomcat-8.5.9-src.tar.gz 5059352 SHA256 65b4ed45950263cb4e4ca82a9b469943053eb85656a7568d6e0eb446ab34afe5 SHA512 85534e88467b298dfbf6d3ec274592da4e73c34ee3f8e84582f95aa7f69959b47076a7fd9e31c705b12e914fefad53ffc954a09c7d7f3da0203752033e70bf17 WHIRLPOOL 0dbcbc1bc0c9fdb8ca50dc7d630dc86d92c606a0e554e6fd8f68c1d34682e2581d4b730198161f75e64340c857f251244237ae0dcbc406caa90585236b5d69df
DIST apache-tomcat-9.0.0.M15-src.tar.gz 5075694 SHA256 c8101177073c2a4aa63cf04ef58226a2768b1cfacb14861d74966881a2791251 SHA512 76d68ebe49f8d5f3c1dcfc629b901453eda58410d071db1e5c1e339fb6aeda54d1402f00a4056e368ea8495841d462d46d4d62dbedb52dc538dc587fdc4f3757 WHIRLPOOL c098ee812b84ca617b710a154a3505ef0c0fcc9616c69db0e6396e300e2b90a3ed684507e407aaab6efdccbb5ea109b8e3d203f09062d25df7479296a5dfe049
diff --git a/www-servers/tomcat/files/tomcat-7.0.69-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.69-build.xml.patch
deleted file mode 100644
index 481591f..00000000
--- a/www-servers/tomcat/files/tomcat-7.0.69-build.xml.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-diff -Naur apache-tomcat-7.0.63-src.orig/build.xml apache-tomcat-7.0.63-src/build.xml
---- apache-tomcat-7.0.63-src.orig/build.xml 2015-06-30 09:15:44.000000000 +0100
-+++ apache-tomcat-7.0.63-src/build.xml 2015-08-22 21:13:12.453038827 +0100
-@@ -660,12 +660,14 @@
- </fileset>
- </copy>
- <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
-+<!--
- <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1">
- <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
- <include name="*" />
- <exclude name="jspxml*" />
- </fileset>
- </copy>
-+-->
-
- </target>
-
-@@ -721,26 +723,32 @@
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
- <!-- Servlet 3.0 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- manifest="${tomcat.manifests}/servlet-api.jar.manifest"
- notice="${tomcat.manifests}/servlet-api.jar.notice"
- license="${tomcat.manifests}/servlet-api.jar.license" />
-+-->
-
- <!-- JSP 2.2 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${jsp-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest"
- notice="${tomcat.manifests}/jsp-api.jar.notice"
- license="${tomcat.manifests}/jsp-api.jar.license" />
-+-->
-
- <!-- JSP 2.2 EL Implementation JAR File -->
-+<!--
- <jarIt jarfile="${el-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.el-api"
- manifest="${tomcat.manifests}/el-api.jar.manifest" />
-+-->
-
- <!-- Bootstrap JAR File -->
- <jarIt jarfile="${bootstrap.jar}"
-@@ -986,12 +994,14 @@
- <target name="deploy" depends="package,build-docs,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">
-@@ -1051,14 +1061,15 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-+<!--
- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
--
-+-->
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
--
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
- failonerror="false"/>
--
-+-->
- <!-- 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}"
-@@ -1681,7 +1692,7 @@
-
- <target name="extras-webservices-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">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1886,6 +1897,7 @@
- description="Create the Tomcat javadoc" >
- <fail unless="java.7.home"
- message="The java.7.home property must be set for javadoc build"/>
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1947,6 +1959,7 @@
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -1985,9 +1998,11 @@
- <path refid="tomcat.webservices.classpath"/>
- <path location="${ant.core.lib}"/>
- </classpath>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2642,7 +2657,7 @@
- </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}"/>
-@@ -2699,7 +2714,7 @@
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2727,7 +2742,7 @@
- </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}"/>
diff --git a/www-servers/tomcat/files/tomcat-7.0.70-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.70-build.xml.patch
deleted file mode 100644
index 481591f..00000000
--- a/www-servers/tomcat/files/tomcat-7.0.70-build.xml.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-diff -Naur apache-tomcat-7.0.63-src.orig/build.xml apache-tomcat-7.0.63-src/build.xml
---- apache-tomcat-7.0.63-src.orig/build.xml 2015-06-30 09:15:44.000000000 +0100
-+++ apache-tomcat-7.0.63-src/build.xml 2015-08-22 21:13:12.453038827 +0100
-@@ -660,12 +660,14 @@
- </fileset>
- </copy>
- <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
-+<!--
- <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1">
- <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
- <include name="*" />
- <exclude name="jspxml*" />
- </fileset>
- </copy>
-+-->
-
- </target>
-
-@@ -721,26 +723,32 @@
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
- <!-- Servlet 3.0 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- manifest="${tomcat.manifests}/servlet-api.jar.manifest"
- notice="${tomcat.manifests}/servlet-api.jar.notice"
- license="${tomcat.manifests}/servlet-api.jar.license" />
-+-->
-
- <!-- JSP 2.2 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${jsp-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest"
- notice="${tomcat.manifests}/jsp-api.jar.notice"
- license="${tomcat.manifests}/jsp-api.jar.license" />
-+-->
-
- <!-- JSP 2.2 EL Implementation JAR File -->
-+<!--
- <jarIt jarfile="${el-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.el-api"
- manifest="${tomcat.manifests}/el-api.jar.manifest" />
-+-->
-
- <!-- Bootstrap JAR File -->
- <jarIt jarfile="${bootstrap.jar}"
-@@ -986,12 +994,14 @@
- <target name="deploy" depends="package,build-docs,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">
-@@ -1051,14 +1061,15 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-+<!--
- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
--
-+-->
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
--
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
- failonerror="false"/>
--
-+-->
- <!-- 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}"
-@@ -1681,7 +1692,7 @@
-
- <target name="extras-webservices-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">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1886,6 +1897,7 @@
- description="Create the Tomcat javadoc" >
- <fail unless="java.7.home"
- message="The java.7.home property must be set for javadoc build"/>
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1947,6 +1959,7 @@
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -1985,9 +1998,11 @@
- <path refid="tomcat.webservices.classpath"/>
- <path location="${ant.core.lib}"/>
- </classpath>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2642,7 +2657,7 @@
- </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}"/>
-@@ -2699,7 +2714,7 @@
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2727,7 +2742,7 @@
- </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}"/>
diff --git a/www-servers/tomcat/files/tomcat-8.0.30-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.30-build.xml.patch
deleted file mode 100644
index 1923d23..00000000
--- a/www-servers/tomcat/files/tomcat-8.0.30-build.xml.patch
+++ /dev/null
@@ -1,265 +0,0 @@
-diff -Naur apache-tomcat-8.0.24-src.orig/build.xml apache-tomcat-8.0.24-src/build.xml
---- apache-tomcat-8.0.24-src.orig/build.xml 2015-07-01 21:25:21.000000000 +0100
-+++ apache-tomcat-8.0.24-src/build.xml 2015-08-22 21:17:05.825564599 +0100
-@@ -697,24 +697,29 @@
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
- <!-- Servlet 3.1 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- 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}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
- <!-- EL 3.0 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 -->
- <jarIt jarfile="${websocket-api.jar}"
-@@ -982,14 +987,14 @@
-
- <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">
-@@ -1049,7 +1054,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1083,7 +1088,7 @@
- </javac>
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- 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}"
-@@ -1098,7 +1103,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- 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}"
-@@ -1202,10 +1207,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
- failonerror="false"/>
- <copy file="${jdt.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. -->
-@@ -1542,7 +1548,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}"/>
-@@ -1681,7 +1687,7 @@
-
- <target name="extras-webservices-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">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1882,6 +1888,7 @@
-
- <target name="javadoc" depends="dist-source,extras-webservices-prepare"
- description="Create the Tomcat javadoc" >
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1940,6 +1947,7 @@
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -1970,15 +1978,17 @@
- docencoding="UTF-8"
- charset="UTF-8"
- additionalparam="-breakiterator -notimestamp"
-- maxmemory="256m" >
-+ maxmemory="512m" >
- <classpath>
- <path refid="compile.classpath"/>
- <path refid="tomcat.webservices.classpath"/>
- <path location="${ant.core.lib}"/>
- </classpath>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2739,7 +2749,7 @@
- </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}"/>
-@@ -2773,7 +2783,7 @@
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2819,7 +2829,7 @@
- </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}"/>
-@@ -2845,18 +2855,18 @@
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2868,7 +2878,7 @@
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2887,7 +2897,7 @@
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2898,7 +2908,7 @@
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2916,7 +2926,7 @@
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2926,7 +2936,7 @@
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2949,7 +2959,7 @@
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -2960,7 +2970,7 @@
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -2971,7 +2981,7 @@
-
- <target name="ide-eclipse"
- depends="download-compile, extras-webservices-prepare, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/files/tomcat-8.0.33-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.33-build.xml.patch
deleted file mode 100644
index 1923d23..00000000
--- a/www-servers/tomcat/files/tomcat-8.0.33-build.xml.patch
+++ /dev/null
@@ -1,265 +0,0 @@
-diff -Naur apache-tomcat-8.0.24-src.orig/build.xml apache-tomcat-8.0.24-src/build.xml
---- apache-tomcat-8.0.24-src.orig/build.xml 2015-07-01 21:25:21.000000000 +0100
-+++ apache-tomcat-8.0.24-src/build.xml 2015-08-22 21:17:05.825564599 +0100
-@@ -697,24 +697,29 @@
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
- <!-- Servlet 3.1 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- 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}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
- <!-- EL 3.0 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 -->
- <jarIt jarfile="${websocket-api.jar}"
-@@ -982,14 +987,14 @@
-
- <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">
-@@ -1049,7 +1054,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1083,7 +1088,7 @@
- </javac>
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- 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}"
-@@ -1098,7 +1103,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- 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}"
-@@ -1202,10 +1207,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
- failonerror="false"/>
- <copy file="${jdt.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. -->
-@@ -1542,7 +1548,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}"/>
-@@ -1681,7 +1687,7 @@
-
- <target name="extras-webservices-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">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1882,6 +1888,7 @@
-
- <target name="javadoc" depends="dist-source,extras-webservices-prepare"
- description="Create the Tomcat javadoc" >
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1940,6 +1947,7 @@
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -1970,15 +1978,17 @@
- docencoding="UTF-8"
- charset="UTF-8"
- additionalparam="-breakiterator -notimestamp"
-- maxmemory="256m" >
-+ maxmemory="512m" >
- <classpath>
- <path refid="compile.classpath"/>
- <path refid="tomcat.webservices.classpath"/>
- <path location="${ant.core.lib}"/>
- </classpath>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2739,7 +2749,7 @@
- </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}"/>
-@@ -2773,7 +2783,7 @@
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2819,7 +2829,7 @@
- </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}"/>
-@@ -2845,18 +2855,18 @@
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2868,7 +2878,7 @@
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2887,7 +2897,7 @@
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2898,7 +2908,7 @@
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2916,7 +2926,7 @@
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2926,7 +2936,7 @@
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2949,7 +2959,7 @@
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -2960,7 +2970,7 @@
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -2971,7 +2981,7 @@
-
- <target name="ide-eclipse"
- depends="download-compile, extras-webservices-prepare, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/files/tomcat-8.0.35-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.35-build.xml.patch
deleted file mode 100644
index 1923d23..00000000
--- a/www-servers/tomcat/files/tomcat-8.0.35-build.xml.patch
+++ /dev/null
@@ -1,265 +0,0 @@
-diff -Naur apache-tomcat-8.0.24-src.orig/build.xml apache-tomcat-8.0.24-src/build.xml
---- apache-tomcat-8.0.24-src.orig/build.xml 2015-07-01 21:25:21.000000000 +0100
-+++ apache-tomcat-8.0.24-src/build.xml 2015-08-22 21:17:05.825564599 +0100
-@@ -697,24 +697,29 @@
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
- <!-- Servlet 3.1 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- 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}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
- <!-- EL 3.0 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 -->
- <jarIt jarfile="${websocket-api.jar}"
-@@ -982,14 +987,14 @@
-
- <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">
-@@ -1049,7 +1054,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1083,7 +1088,7 @@
- </javac>
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- 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}"
-@@ -1098,7 +1103,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- 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}"
-@@ -1202,10 +1207,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
- failonerror="false"/>
- <copy file="${jdt.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. -->
-@@ -1542,7 +1548,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}"/>
-@@ -1681,7 +1687,7 @@
-
- <target name="extras-webservices-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">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1882,6 +1888,7 @@
-
- <target name="javadoc" depends="dist-source,extras-webservices-prepare"
- description="Create the Tomcat javadoc" >
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1940,6 +1947,7 @@
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -1970,15 +1978,17 @@
- docencoding="UTF-8"
- charset="UTF-8"
- additionalparam="-breakiterator -notimestamp"
-- maxmemory="256m" >
-+ maxmemory="512m" >
- <classpath>
- <path refid="compile.classpath"/>
- <path refid="tomcat.webservices.classpath"/>
- <path location="${ant.core.lib}"/>
- </classpath>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2739,7 +2749,7 @@
- </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}"/>
-@@ -2773,7 +2783,7 @@
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2819,7 +2829,7 @@
- </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}"/>
-@@ -2845,18 +2855,18 @@
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2868,7 +2878,7 @@
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2887,7 +2897,7 @@
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2898,7 +2908,7 @@
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2916,7 +2926,7 @@
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2926,7 +2936,7 @@
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2949,7 +2959,7 @@
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -2960,7 +2970,7 @@
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -2971,7 +2981,7 @@
-
- <target name="ide-eclipse"
- depends="download-compile, extras-webservices-prepare, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/files/tomcat-8.0.37-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.37-build.xml.patch
deleted file mode 100644
index cefd59f..00000000
--- a/www-servers/tomcat/files/tomcat-8.0.37-build.xml.patch
+++ /dev/null
@@ -1,259 +0,0 @@
-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 3.1 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- 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}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
- <!-- EL 3.0 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 -->
- <jarIt jarfile="${websocket-api.jar}"
-@@ -986,14 +991,14 @@
-
- <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">
-@@ -1053,7 +1058,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1087,7 +1092,7 @@
- </javac>
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- 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 +1107,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- 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 +1211,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
- failonerror="false"/>
- <copy file="${jdt.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. -->
-@@ -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"
-- description="Prepare to build web services extras package">
-+ description="Prepare to build web services extras package" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -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" >
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1989,6 +1996,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -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>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2757,7 +2767,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}"/>
-@@ -2791,7 +2801,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2848,7 +2858,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}"/>
-@@ -2874,18 +2884,18 @@ skip.installer property in build.properties" />
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2897,7 +2907,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2916,7 +2926,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2927,7 +2937,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2945,7 +2955,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2955,7 +2965,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2978,7 +2988,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -2989,7 +2999,7 @@ skip.installer property in build.properties" />
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -3000,7 +3010,7 @@ skip.installer property in build.properties" />
-
- <target name="ide-eclipse"
- depends="download-compile, extras-webservices-prepare, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/files/tomcat-8.0.38-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.38-build.xml.patch
deleted file mode 100644
index cefd59f..00000000
--- a/www-servers/tomcat/files/tomcat-8.0.38-build.xml.patch
+++ /dev/null
@@ -1,259 +0,0 @@
-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 3.1 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- 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}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
- <!-- EL 3.0 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 -->
- <jarIt jarfile="${websocket-api.jar}"
-@@ -986,14 +991,14 @@
-
- <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">
-@@ -1053,7 +1058,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1087,7 +1092,7 @@
- </javac>
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- 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 +1107,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- 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 +1211,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
- failonerror="false"/>
- <copy file="${jdt.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. -->
-@@ -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"
-- description="Prepare to build web services extras package">
-+ description="Prepare to build web services extras package" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -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" >
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1989,6 +1996,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -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>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2757,7 +2767,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}"/>
-@@ -2791,7 +2801,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2848,7 +2858,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}"/>
-@@ -2874,18 +2884,18 @@ skip.installer property in build.properties" />
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2897,7 +2907,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2916,7 +2926,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2927,7 +2937,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2945,7 +2955,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2955,7 +2965,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2978,7 +2988,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -2989,7 +2999,7 @@ skip.installer property in build.properties" />
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -3000,7 +3010,7 @@ skip.installer property in build.properties" />
-
- <target name="ide-eclipse"
- depends="download-compile, extras-webservices-prepare, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/files/tomcat-8.5.3-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.3-build.xml.patch
deleted file mode 100644
index cefd59f..00000000
--- a/www-servers/tomcat/files/tomcat-8.5.3-build.xml.patch
+++ /dev/null
@@ -1,259 +0,0 @@
-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 3.1 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- 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}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
- <!-- EL 3.0 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 -->
- <jarIt jarfile="${websocket-api.jar}"
-@@ -986,14 +991,14 @@
-
- <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">
-@@ -1053,7 +1058,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1087,7 +1092,7 @@
- </javac>
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- 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 +1107,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- 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 +1211,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
- failonerror="false"/>
- <copy file="${jdt.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. -->
-@@ -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"
-- description="Prepare to build web services extras package">
-+ description="Prepare to build web services extras package" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -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" >
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1989,6 +1996,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -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>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2757,7 +2767,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}"/>
-@@ -2791,7 +2801,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2848,7 +2858,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}"/>
-@@ -2874,18 +2884,18 @@ skip.installer property in build.properties" />
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2897,7 +2907,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2916,7 +2926,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2927,7 +2937,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2945,7 +2955,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2955,7 +2965,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2978,7 +2988,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -2989,7 +2999,7 @@ skip.installer property in build.properties" />
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -3000,7 +3010,7 @@ skip.installer property in build.properties" />
-
- <target name="ide-eclipse"
- depends="download-compile, extras-webservices-prepare, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/files/tomcat-8.5.4-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.4-build.xml.patch
deleted file mode 100644
index 611c99d..00000000
--- a/www-servers/tomcat/files/tomcat-8.5.4-build.xml.patch
+++ /dev/null
@@ -1,250 +0,0 @@
-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 3.1 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- 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}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
- <!-- EL 3.0 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 -->
- <jarIt jarfile="${websocket-api.jar}"
-@@ -982,14 +987,14 @@
-
- <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">
-@@ -1049,7 +1054,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1083,7 +1088,7 @@
- </javac>
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- 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}"
-@@ -1098,7 +1103,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- 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}"
-@@ -1202,10 +1207,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
- failonerror="false"/>
- <copy file="${jdt.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. -->
-@@ -1579,7 +1585,7 @@
-
- <target name="extras-webservices-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">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -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" >
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1791,6 +1798,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -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>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2574,7 +2584,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}"/>
-@@ -2608,7 +2618,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2665,7 +2675,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}"/>
-@@ -2691,18 +2701,18 @@ skip.installer property in build.properties" />
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2714,7 +2724,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2733,7 +2743,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2744,7 +2754,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2762,7 +2772,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2772,7 +2782,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2795,7 +2805,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -2806,7 +2816,7 @@ skip.installer property in build.properties" />
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -2817,7 +2827,7 @@ skip.installer property in build.properties" />
-
- <target name="ide-eclipse"
- depends="download-compile, extras-webservices-prepare, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/files/tomcat-8.5.5-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.5-build.xml.patch
deleted file mode 100644
index 611c99d..00000000
--- a/www-servers/tomcat/files/tomcat-8.5.5-build.xml.patch
+++ /dev/null
@@ -1,250 +0,0 @@
-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 3.1 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- 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}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
- <!-- EL 3.0 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 -->
- <jarIt jarfile="${websocket-api.jar}"
-@@ -982,14 +987,14 @@
-
- <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">
-@@ -1049,7 +1054,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1083,7 +1088,7 @@
- </javac>
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- 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}"
-@@ -1098,7 +1103,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- 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}"
-@@ -1202,10 +1207,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
- failonerror="false"/>
- <copy file="${jdt.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. -->
-@@ -1579,7 +1585,7 @@
-
- <target name="extras-webservices-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">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -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" >
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1791,6 +1798,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -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>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2574,7 +2584,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}"/>
-@@ -2608,7 +2618,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2665,7 +2675,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}"/>
-@@ -2691,18 +2701,18 @@ skip.installer property in build.properties" />
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2714,7 +2724,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2733,7 +2743,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2744,7 +2754,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2762,7 +2772,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2772,7 +2782,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2795,7 +2805,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -2806,7 +2816,7 @@ skip.installer property in build.properties" />
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -2817,7 +2827,7 @@ skip.installer property in build.properties" />
-
- <target name="ide-eclipse"
- depends="download-compile, extras-webservices-prepare, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/files/tomcat-8.5.6-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.6-build.xml.patch
deleted file mode 100644
index 611c99d..00000000
--- a/www-servers/tomcat/files/tomcat-8.5.6-build.xml.patch
+++ /dev/null
@@ -1,250 +0,0 @@
-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 3.1 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- 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}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
- <!-- EL 3.0 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 -->
- <jarIt jarfile="${websocket-api.jar}"
-@@ -982,14 +987,14 @@
-
- <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">
-@@ -1049,7 +1054,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1083,7 +1088,7 @@
- </javac>
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- 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}"
-@@ -1098,7 +1103,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- 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}"
-@@ -1202,10 +1207,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
- failonerror="false"/>
- <copy file="${jdt.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. -->
-@@ -1579,7 +1585,7 @@
-
- <target name="extras-webservices-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">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -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" >
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1791,6 +1798,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -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>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2574,7 +2584,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}"/>
-@@ -2608,7 +2618,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2665,7 +2675,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}"/>
-@@ -2691,18 +2701,18 @@ skip.installer property in build.properties" />
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2714,7 +2724,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2733,7 +2743,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2744,7 +2754,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2762,7 +2772,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2772,7 +2782,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2795,7 +2805,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -2806,7 +2816,7 @@ skip.installer property in build.properties" />
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -2817,7 +2827,7 @@ skip.installer property in build.properties" />
-
- <target name="ide-eclipse"
- depends="download-compile, extras-webservices-prepare, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/files/tomcat-8.5.8-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.8-build.xml.patch
deleted file mode 100644
index 611c99d..00000000
--- a/www-servers/tomcat/files/tomcat-8.5.8-build.xml.patch
+++ /dev/null
@@ -1,250 +0,0 @@
-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 3.1 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- 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}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
- <!-- EL 3.0 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 -->
- <jarIt jarfile="${websocket-api.jar}"
-@@ -982,14 +987,14 @@
-
- <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">
-@@ -1049,7 +1054,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1083,7 +1088,7 @@
- </javac>
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- 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}"
-@@ -1098,7 +1103,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- 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}"
-@@ -1202,10 +1207,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
- failonerror="false"/>
- <copy file="${jdt.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. -->
-@@ -1579,7 +1585,7 @@
-
- <target name="extras-webservices-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">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -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" >
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1791,6 +1798,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -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>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2574,7 +2584,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}"/>
-@@ -2608,7 +2618,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2665,7 +2675,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}"/>
-@@ -2691,18 +2701,18 @@ skip.installer property in build.properties" />
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2714,7 +2724,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2733,7 +2743,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2744,7 +2754,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2762,7 +2772,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2772,7 +2782,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2795,7 +2805,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -2806,7 +2816,7 @@ skip.installer property in build.properties" />
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -2817,7 +2827,7 @@ skip.installer property in build.properties" />
-
- <target name="ide-eclipse"
- depends="download-compile, extras-webservices-prepare, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-7.0.69.ebuild b/www-servers/tomcat/tomcat-7.0.69.ebuild
deleted file mode 100644
index 268c291..00000000
--- a/www-servers/tomcat/tomcat-7.0.69.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="7"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps websockets"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.5"
-SAPI_SLOT="3.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- dev-java/tomcat-servlet-api:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- websockets? ( >=virtual/jre-1.7 )
- !websockets? ( >=virtual/jre-1.6 )
- !<dev-java/tomcat-native-1.1.24"
-DEPEND="${COMMON_DEP}
- websockets? ( >=virtual/jdk-1.7 )
- !websockets? ( >=virtual/jdk-1.6 )
- test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- java-pkg_clean
-
- epatch "${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}\`" \
- bin/catalina.sh || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r1"
-INIT_REV="-r1"
-
-src_compile() {
- use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
diff --git a/www-servers/tomcat/tomcat-7.0.70.ebuild b/www-servers/tomcat/tomcat-7.0.70.ebuild
deleted file mode 100644
index 268c291..00000000
--- a/www-servers/tomcat/tomcat-7.0.70.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="7"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps websockets"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.5"
-SAPI_SLOT="3.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- dev-java/tomcat-servlet-api:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- websockets? ( >=virtual/jre-1.7 )
- !websockets? ( >=virtual/jre-1.6 )
- !<dev-java/tomcat-native-1.1.24"
-DEPEND="${COMMON_DEP}
- websockets? ( >=virtual/jdk-1.7 )
- !websockets? ( >=virtual/jdk-1.6 )
- test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- java-pkg_clean
-
- epatch "${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}\`" \
- bin/catalina.sh || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r1"
-INIT_REV="-r1"
-
-src_compile() {
- use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.0.33.ebuild b/www-servers/tomcat/tomcat-8.0.33.ebuild
deleted file mode 100644
index 75d1b2d..00000000
--- a/www-servers/tomcat/tomcat-8.0.33.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3 Container"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-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="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- dev-java/tomcat-servlet-api:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- !<dev-java/tomcat-native-1.1.24
- >=virtual/jre-1.7"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- >=virtual/jdk-1.7
- test? (
- >=dev-java/ant-junit-1.9:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- epatch "${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}\`" \
- bin/catalina.sh || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.0.35.ebuild b/www-servers/tomcat/tomcat-8.0.35.ebuild
deleted file mode 100644
index 75d1b2d..00000000
--- a/www-servers/tomcat/tomcat-8.0.35.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3 Container"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-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="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- dev-java/tomcat-servlet-api:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- !<dev-java/tomcat-native-1.1.24
- >=virtual/jre-1.7"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- >=virtual/jdk-1.7
- test? (
- >=dev-java/ant-junit-1.9:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- epatch "${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}\`" \
- bin/catalina.sh || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.0.37.ebuild b/www-servers/tomcat/tomcat-8.0.37.ebuild
deleted file mode 100644
index d990243..00000000
--- a/www-servers/tomcat/tomcat-8.0.37.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-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-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-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="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- dev-java/tomcat-servlet-api:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- !<dev-java/tomcat-native-1.1.24
- >=virtual/jre-1.7"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- >=virtual/jdk-1.7
- test? (
- >=dev-java/ant-junit-1.9:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- epatch "${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}\`" \
- bin/catalina.sh || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.0.38.ebuild b/www-servers/tomcat/tomcat-8.0.38.ebuild
deleted file mode 100644
index d990243..00000000
--- a/www-servers/tomcat/tomcat-8.0.38.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-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-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-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="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- dev-java/tomcat-servlet-api:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- !<dev-java/tomcat-native-1.1.24
- >=virtual/jre-1.7"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- >=virtual/jdk-1.7
- test? (
- >=dev-java/ant-junit-1.9:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- epatch "${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}\`" \
- bin/catalina.sh || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.5.3.ebuild b/www-servers/tomcat/tomcat-8.5.3.ebuild
deleted file mode 100644
index b0508e4..00000000
--- a/www-servers/tomcat/tomcat-8.5.3.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-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-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-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="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- !<dev-java/tomcat-native-1.1.24
- >=virtual/jre-1.7"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- >=virtual/jdk-1.7
- test? (
- >=dev-java/ant-junit-1.9:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- epatch "${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}\`" \
- bin/catalina.sh || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.5.4.ebuild b/www-servers/tomcat/tomcat-8.5.4.ebuild
deleted file mode 100644
index b0508e4..00000000
--- a/www-servers/tomcat/tomcat-8.5.4.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-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-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-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="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- !<dev-java/tomcat-native-1.1.24
- >=virtual/jre-1.7"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- >=virtual/jdk-1.7
- test? (
- >=dev-java/ant-junit-1.9:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- epatch "${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}\`" \
- bin/catalina.sh || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.5.5.ebuild b/www-servers/tomcat/tomcat-8.5.5.ebuild
deleted file mode 100644
index b0508e4..00000000
--- a/www-servers/tomcat/tomcat-8.5.5.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-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-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-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="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- !<dev-java/tomcat-native-1.1.24
- >=virtual/jre-1.7"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- >=virtual/jdk-1.7
- test? (
- >=dev-java/ant-junit-1.9:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- epatch "${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}\`" \
- bin/catalina.sh || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.5.6.ebuild b/www-servers/tomcat/tomcat-8.5.6.ebuild
deleted file mode 100644
index b0508e4..00000000
--- a/www-servers/tomcat/tomcat-8.5.6.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-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-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-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="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- !<dev-java/tomcat-native-1.1.24
- >=virtual/jre-1.7"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- >=virtual/jdk-1.7
- test? (
- >=dev-java/ant-junit-1.9:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- epatch "${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}\`" \
- bin/catalina.sh || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.5.8.ebuild b/www-servers/tomcat/tomcat-8.5.8.ebuild
deleted file mode 100644
index b0508e4..00000000
--- a/www-servers/tomcat/tomcat-8.5.8.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-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-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-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="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- !<dev-java/tomcat-native-1.1.24
- >=virtual/jre-1.7"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- >=virtual/jdk-1.7
- test? (
- >=dev-java/ant-junit-1.9:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- epatch "${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}\`" \
- bin/catalina.sh || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2016-12-13 12:22 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2016-12-13 12:22 UTC (permalink / raw
To: gentoo-commits
commit: b60e9eb5c086adcff8001cf8f9f050a15e3d77ef
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 13 12:21:02 2016 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Dec 13 12:21:02 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b60e9eb5
www-servers/tomcat: removed old stable vulnerable versions
Package-Manager: Portage-2.3.3, Repoman-2.3.1
www-servers/tomcat/Manifest | 4 -
.../tomcat/files/tomcat-7.0.67-build.xml.patch | 149 ------------
.../tomcat/files/tomcat-7.0.68-build.xml.patch | 149 ------------
.../tomcat/files/tomcat-8.0.32-build.xml.patch | 265 ---------------------
.../tomcat/files/tomcat-8.0.36-build.xml.patch | 259 --------------------
www-servers/tomcat/tomcat-7.0.67.ebuild | 146 ------------
www-servers/tomcat/tomcat-7.0.68-r1.ebuild | 145 -----------
www-servers/tomcat/tomcat-8.0.32-r1.ebuild | 154 ------------
www-servers/tomcat/tomcat-8.0.36.ebuild | 154 ------------
9 files changed, 1425 deletions(-)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 5cbd94d..135d50b 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,8 +1,4 @@
-DIST apache-tomcat-7.0.67-src.tar.gz 4624303 SHA256 0464ebbeec17fb15103cad9f6639edc826f4eca246dd58a5cb1c5d46aff58e0a SHA512 dd299cab7a172860f51bae19e3490432af874b94825de289095647026a91b27cb3544ba85ab1f786bf4696dc59475ca85d051841ebaa221e3b46079e139a6e52 WHIRLPOOL ae7ec13ffd3bd0964496060413924854c5b956dc88b8d0f1de4ac094e8fb5595ccfc7c2eaa7051f082c575253ed9fdadc8833f494281770f8f72b8c64d9b9593
-DIST apache-tomcat-7.0.68-src.tar.gz 4641238 SHA256 abb5d2cc7e34a18f968ec2535bdeeae919c53fa7feffe4d617db95e12e94b210 SHA512 dd97205044b03c6466c78bd165509ed9cd37c4d84de34c2170e67c475b28b72bfeda512f14f583c9983c045888d4704cdf7ba7c434f1d4bad9022428b0a0de1c WHIRLPOOL 594cdf5584ea49faebfbea174e67bf85e761365717d56762138d07186c595195df2899a94d897578d1d20201ed4706b51a4d8870d9a6a4ca74c2436ba4283a05
DIST apache-tomcat-7.0.73-src.tar.gz 4674971 SHA256 e3e236fb551ae9deb85024d8472fd08a76b14380e3ddaa2a1aff1fc670de5d87 SHA512 4754628c271d0aed3572ac0961c47653c10fcdfd0d13d8d1bc1b5774e961e6327cbb6b11b0e7e2f8eff525e2e60f741da49aeb855bb9d94e84cc87f346cf9ce6 WHIRLPOOL b9e75f53e41f1e9b9767fe8bc603ee5b7db2d3b1b7d2d900d430f4c0b73881a7ad36e0a0bfce773432b73ea8743865e933363ceec037d11d8f1008d8619ac1f1
-DIST apache-tomcat-8.0.32-src.tar.gz 4957920 SHA256 b8f7770ae947a0c0aed9b5a6f3e2ff18fd27a07f068cc6029f019b5d4c6de560 SHA512 4c18b9ae77963d96ff59891564c4bc8f6aaba582776c319825e9b944dd8cf10747dfc5b3cbc9cfa2ff10f6d889b404902fecd6b49fdde7b3741f9ba90dc6221c WHIRLPOOL 77be9ea10ffd2e606367d477ba13c717294fe49b65ecef6fdc910e53fa2d987f38a8b299c28a340ea7684a16feb6ca3bd0b5e662e3875af73f4735e1ff623a79
-DIST apache-tomcat-8.0.36-src.tar.gz 4988679 SHA256 36db67592adda575fc08dd5f0cd3532934d2edb117028e29bdd9f702bf31ab10 SHA512 192a31eb42afdc345fa5ea5f05b03766e70a67841fca9bd9c76bcd47ae1d505fd3cd1fde6bc64e145add2b6a9e88ecc50ab1a0954942704c139ec3c7a6bf7286 WHIRLPOOL da1bb6570d62caedfe83948f2e850ec7e8bdba36925d1f000067864c98b1bd780aabf2f1cbcb66cb544db292156a98819e9cc6dfa42a345064f09dcc4471a7c3
DIST apache-tomcat-8.0.39-src.tar.gz 5019148 SHA256 566bf43a50f42af9c5b46be60f68e571a56c41f8e93647cf9f68e5f93870be96 SHA512 0f58f2ef0dc047189672107b1f2586731e9455c3e665210d5634f5f5a16b0afd7ef5c35beaf02e22b874d4898ab62d33638785d9f18714893674bc691b0f9330 WHIRLPOOL 62baaba90f588c43ea503eb336d1b385b3a00b86686c1e232a836975f10d12241416b688279ffcd60dd42afb9d9660b6385e749c0c4d0877217f7494539f2752
DIST apache-tomcat-8.5.9-src.tar.gz 5059352 SHA256 65b4ed45950263cb4e4ca82a9b469943053eb85656a7568d6e0eb446ab34afe5 SHA512 85534e88467b298dfbf6d3ec274592da4e73c34ee3f8e84582f95aa7f69959b47076a7fd9e31c705b12e914fefad53ffc954a09c7d7f3da0203752033e70bf17 WHIRLPOOL 0dbcbc1bc0c9fdb8ca50dc7d630dc86d92c606a0e554e6fd8f68c1d34682e2581d4b730198161f75e64340c857f251244237ae0dcbc406caa90585236b5d69df
DIST apache-tomcat-9.0.0.M15-src.tar.gz 5075694 SHA256 c8101177073c2a4aa63cf04ef58226a2768b1cfacb14861d74966881a2791251 SHA512 76d68ebe49f8d5f3c1dcfc629b901453eda58410d071db1e5c1e339fb6aeda54d1402f00a4056e368ea8495841d462d46d4d62dbedb52dc538dc587fdc4f3757 WHIRLPOOL c098ee812b84ca617b710a154a3505ef0c0fcc9616c69db0e6396e300e2b90a3ed684507e407aaab6efdccbb5ea109b8e3d203f09062d25df7479296a5dfe049
diff --git a/www-servers/tomcat/files/tomcat-7.0.67-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.67-build.xml.patch
deleted file mode 100644
index 481591f..00000000
--- a/www-servers/tomcat/files/tomcat-7.0.67-build.xml.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-diff -Naur apache-tomcat-7.0.63-src.orig/build.xml apache-tomcat-7.0.63-src/build.xml
---- apache-tomcat-7.0.63-src.orig/build.xml 2015-06-30 09:15:44.000000000 +0100
-+++ apache-tomcat-7.0.63-src/build.xml 2015-08-22 21:13:12.453038827 +0100
-@@ -660,12 +660,14 @@
- </fileset>
- </copy>
- <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
-+<!--
- <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1">
- <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
- <include name="*" />
- <exclude name="jspxml*" />
- </fileset>
- </copy>
-+-->
-
- </target>
-
-@@ -721,26 +723,32 @@
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
- <!-- Servlet 3.0 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- manifest="${tomcat.manifests}/servlet-api.jar.manifest"
- notice="${tomcat.manifests}/servlet-api.jar.notice"
- license="${tomcat.manifests}/servlet-api.jar.license" />
-+-->
-
- <!-- JSP 2.2 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${jsp-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest"
- notice="${tomcat.manifests}/jsp-api.jar.notice"
- license="${tomcat.manifests}/jsp-api.jar.license" />
-+-->
-
- <!-- JSP 2.2 EL Implementation JAR File -->
-+<!--
- <jarIt jarfile="${el-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.el-api"
- manifest="${tomcat.manifests}/el-api.jar.manifest" />
-+-->
-
- <!-- Bootstrap JAR File -->
- <jarIt jarfile="${bootstrap.jar}"
-@@ -986,12 +994,14 @@
- <target name="deploy" depends="package,build-docs,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">
-@@ -1051,14 +1061,15 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-+<!--
- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
--
-+-->
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
--
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
- failonerror="false"/>
--
-+-->
- <!-- 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}"
-@@ -1681,7 +1692,7 @@
-
- <target name="extras-webservices-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">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1886,6 +1897,7 @@
- description="Create the Tomcat javadoc" >
- <fail unless="java.7.home"
- message="The java.7.home property must be set for javadoc build"/>
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1947,6 +1959,7 @@
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -1985,9 +1998,11 @@
- <path refid="tomcat.webservices.classpath"/>
- <path location="${ant.core.lib}"/>
- </classpath>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2642,7 +2657,7 @@
- </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}"/>
-@@ -2699,7 +2714,7 @@
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2727,7 +2742,7 @@
- </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}"/>
diff --git a/www-servers/tomcat/files/tomcat-7.0.68-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.68-build.xml.patch
deleted file mode 100644
index 481591f..00000000
--- a/www-servers/tomcat/files/tomcat-7.0.68-build.xml.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-diff -Naur apache-tomcat-7.0.63-src.orig/build.xml apache-tomcat-7.0.63-src/build.xml
---- apache-tomcat-7.0.63-src.orig/build.xml 2015-06-30 09:15:44.000000000 +0100
-+++ apache-tomcat-7.0.63-src/build.xml 2015-08-22 21:13:12.453038827 +0100
-@@ -660,12 +660,14 @@
- </fileset>
- </copy>
- <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
-+<!--
- <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1">
- <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
- <include name="*" />
- <exclude name="jspxml*" />
- </fileset>
- </copy>
-+-->
-
- </target>
-
-@@ -721,26 +723,32 @@
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
- <!-- Servlet 3.0 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- manifest="${tomcat.manifests}/servlet-api.jar.manifest"
- notice="${tomcat.manifests}/servlet-api.jar.notice"
- license="${tomcat.manifests}/servlet-api.jar.license" />
-+-->
-
- <!-- JSP 2.2 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${jsp-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest"
- notice="${tomcat.manifests}/jsp-api.jar.notice"
- license="${tomcat.manifests}/jsp-api.jar.license" />
-+-->
-
- <!-- JSP 2.2 EL Implementation JAR File -->
-+<!--
- <jarIt jarfile="${el-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.el-api"
- manifest="${tomcat.manifests}/el-api.jar.manifest" />
-+-->
-
- <!-- Bootstrap JAR File -->
- <jarIt jarfile="${bootstrap.jar}"
-@@ -986,12 +994,14 @@
- <target name="deploy" depends="package,build-docs,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">
-@@ -1051,14 +1061,15 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-+<!--
- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
--
-+-->
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
--
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
- failonerror="false"/>
--
-+-->
- <!-- 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}"
-@@ -1681,7 +1692,7 @@
-
- <target name="extras-webservices-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">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1886,6 +1897,7 @@
- description="Create the Tomcat javadoc" >
- <fail unless="java.7.home"
- message="The java.7.home property must be set for javadoc build"/>
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1947,6 +1959,7 @@
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -1985,9 +1998,11 @@
- <path refid="tomcat.webservices.classpath"/>
- <path location="${ant.core.lib}"/>
- </classpath>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2642,7 +2657,7 @@
- </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}"/>
-@@ -2699,7 +2714,7 @@
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2727,7 +2742,7 @@
- </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}"/>
diff --git a/www-servers/tomcat/files/tomcat-8.0.32-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.32-build.xml.patch
deleted file mode 100644
index 1923d23..00000000
--- a/www-servers/tomcat/files/tomcat-8.0.32-build.xml.patch
+++ /dev/null
@@ -1,265 +0,0 @@
-diff -Naur apache-tomcat-8.0.24-src.orig/build.xml apache-tomcat-8.0.24-src/build.xml
---- apache-tomcat-8.0.24-src.orig/build.xml 2015-07-01 21:25:21.000000000 +0100
-+++ apache-tomcat-8.0.24-src/build.xml 2015-08-22 21:17:05.825564599 +0100
-@@ -697,24 +697,29 @@
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
- <!-- Servlet 3.1 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- 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}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
- <!-- EL 3.0 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 -->
- <jarIt jarfile="${websocket-api.jar}"
-@@ -982,14 +987,14 @@
-
- <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">
-@@ -1049,7 +1054,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1083,7 +1088,7 @@
- </javac>
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- 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}"
-@@ -1098,7 +1103,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- 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}"
-@@ -1202,10 +1207,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
- failonerror="false"/>
- <copy file="${jdt.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. -->
-@@ -1542,7 +1548,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}"/>
-@@ -1681,7 +1687,7 @@
-
- <target name="extras-webservices-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">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1882,6 +1888,7 @@
-
- <target name="javadoc" depends="dist-source,extras-webservices-prepare"
- description="Create the Tomcat javadoc" >
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1940,6 +1947,7 @@
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -1970,15 +1978,17 @@
- docencoding="UTF-8"
- charset="UTF-8"
- additionalparam="-breakiterator -notimestamp"
-- maxmemory="256m" >
-+ maxmemory="512m" >
- <classpath>
- <path refid="compile.classpath"/>
- <path refid="tomcat.webservices.classpath"/>
- <path location="${ant.core.lib}"/>
- </classpath>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2739,7 +2749,7 @@
- </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}"/>
-@@ -2773,7 +2783,7 @@
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2819,7 +2829,7 @@
- </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}"/>
-@@ -2845,18 +2855,18 @@
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2868,7 +2878,7 @@
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2887,7 +2897,7 @@
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2898,7 +2908,7 @@
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2916,7 +2926,7 @@
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2926,7 +2936,7 @@
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2949,7 +2959,7 @@
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -2960,7 +2970,7 @@
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -2971,7 +2981,7 @@
-
- <target name="ide-eclipse"
- depends="download-compile, extras-webservices-prepare, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/files/tomcat-8.0.36-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.36-build.xml.patch
deleted file mode 100644
index cefd59f..00000000
--- a/www-servers/tomcat/files/tomcat-8.0.36-build.xml.patch
+++ /dev/null
@@ -1,259 +0,0 @@
-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 3.1 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- 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}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
- <!-- EL 3.0 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 -->
- <jarIt jarfile="${websocket-api.jar}"
-@@ -986,14 +991,14 @@
-
- <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">
-@@ -1053,7 +1058,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1087,7 +1092,7 @@
- </javac>
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- 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 +1107,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- 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 +1211,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
- failonerror="false"/>
- <copy file="${jdt.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. -->
-@@ -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"
-- description="Prepare to build web services extras package">
-+ description="Prepare to build web services extras package" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -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" >
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1989,6 +1996,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -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>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2757,7 +2767,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}"/>
-@@ -2791,7 +2801,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2848,7 +2858,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}"/>
-@@ -2874,18 +2884,18 @@ skip.installer property in build.properties" />
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2897,7 +2907,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2916,7 +2926,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2927,7 +2937,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2945,7 +2955,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2955,7 +2965,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2978,7 +2988,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -2989,7 +2999,7 @@ skip.installer property in build.properties" />
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -3000,7 +3010,7 @@ skip.installer property in build.properties" />
-
- <target name="ide-eclipse"
- depends="download-compile, extras-webservices-prepare, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-7.0.67.ebuild b/www-servers/tomcat/tomcat-7.0.67.ebuild
deleted file mode 100644
index b6cb15e..00000000
--- a/www-servers/tomcat/tomcat-7.0.67.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="7"
-KEYWORDS="amd64 ppc64 x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps websockets"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.4"
-SAPI_SLOT="3.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- dev-java/oracle-javamail:0
- dev-java/tomcat-servlet-api:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- websockets? ( >=virtual/jre-1.7 )
- !websockets? ( >=virtual/jre-1.6 )
- !<dev-java/tomcat-native-1.1.24"
-DEPEND="${COMMON_DEP}
- websockets? ( >=virtual/jdk-1.7 )
- !websockets? ( >=virtual/jdk-1.6 )
- test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
- # Remove bundled javamail, servlet-api
- rm -rv java/javax/{el,mail,servlet} || die
-
- java-pkg_clean
-
- epatch "${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}\`" \
- bin/catalina.sh || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},oracle-javamail,tomcat-servlet-api-${SAPI_SLOT}"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r1"
-INIT_REV="-r1"
-
-src_compile() {
- use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
diff --git a/www-servers/tomcat/tomcat-7.0.68-r1.ebuild b/www-servers/tomcat/tomcat-7.0.68-r1.ebuild
deleted file mode 100644
index d854d46..00000000
--- a/www-servers/tomcat/tomcat-7.0.68-r1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="7"
-KEYWORDS="amd64 ~ppc64 x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps websockets"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.4"
-SAPI_SLOT="3.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- dev-java/tomcat-servlet-api:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- websockets? ( >=virtual/jre-1.7 )
- !websockets? ( >=virtual/jre-1.6 )
- !<dev-java/tomcat-native-1.1.24"
-DEPEND="${COMMON_DEP}
- websockets? ( >=virtual/jdk-1.7 )
- !websockets? ( >=virtual/jdk-1.6 )
- test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- java-pkg_clean
-
- epatch "${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}\`" \
- bin/catalina.sh || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r1"
-INIT_REV="-r1"
-
-src_compile() {
- use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.0.32-r1.ebuild b/www-servers/tomcat/tomcat-8.0.32-r1.ebuild
deleted file mode 100644
index b7fdf45..00000000
--- a/www-servers/tomcat/tomcat-8.0.32-r1.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3 Container"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-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.4"
-SAPI_SLOT="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- dev-java/tomcat-servlet-api:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- !<dev-java/tomcat-native-1.1.24
- >=virtual/jre-1.7"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- >=virtual/jdk-1.7
- test? (
- >=dev-java/ant-junit-1.9:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- epatch "${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}\`" \
- bin/catalina.sh || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.0.36.ebuild b/www-servers/tomcat/tomcat-8.0.36.ebuild
deleted file mode 100644
index d990243..00000000
--- a/www-servers/tomcat/tomcat-8.0.36.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-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-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-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="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- dev-java/tomcat-servlet-api:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- !<dev-java/tomcat-native-1.1.24
- >=virtual/jre-1.7"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- >=virtual/jdk-1.7
- test? (
- >=dev-java/ant-junit-1.9:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- epatch "${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}\`" \
- bin/catalina.sh || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2017-01-25 15:56 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2017-01-25 15:56 UTC (permalink / raw
To: gentoo-commits
commit: 47d5387634153185ea3fa2b4deeb0bdcad03a122
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 25 15:55:40 2017 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Jan 25 15:56:49 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47d53876
www-servers/tomcat: version bump for slot 7
Package-Manager: Portage-2.3.3, Repoman-2.3.1
www-servers/tomcat/Manifest | 1 +
.../tomcat/files/tomcat-7.0.75-build.xml.patch | 149 +++++++++++++++++++++
www-servers/tomcat/tomcat-7.0.75.ebuild | 149 +++++++++++++++++++++
3 files changed, 299 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 135d50b..04643d9 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,4 +1,5 @@
DIST apache-tomcat-7.0.73-src.tar.gz 4674971 SHA256 e3e236fb551ae9deb85024d8472fd08a76b14380e3ddaa2a1aff1fc670de5d87 SHA512 4754628c271d0aed3572ac0961c47653c10fcdfd0d13d8d1bc1b5774e961e6327cbb6b11b0e7e2f8eff525e2e60f741da49aeb855bb9d94e84cc87f346cf9ce6 WHIRLPOOL b9e75f53e41f1e9b9767fe8bc603ee5b7db2d3b1b7d2d900d430f4c0b73881a7ad36e0a0bfce773432b73ea8743865e933363ceec037d11d8f1008d8619ac1f1
+DIST apache-tomcat-7.0.75-src.tar.gz 4657629 SHA256 ffa9489ecd9aa0750598e5db0dc3275ce7e29de13f16d7bf863e0477bf338463 SHA512 2b7a0fc64ca58849713435993768b1f77666ad23f22cfb6091503bc1393f2c4fd3a61dac518efe4ccb22738d82fa81b1a1597ba148f4f829a0c642d131270117 WHIRLPOOL eada3af432dd943ca494ab3fbedfeaf655dbe621b639791e224cd0f58d1c26f8e6e99496757c21073249ef0af2bfa101dd8374f9d708777b331c31da663c435a
DIST apache-tomcat-8.0.39-src.tar.gz 5019148 SHA256 566bf43a50f42af9c5b46be60f68e571a56c41f8e93647cf9f68e5f93870be96 SHA512 0f58f2ef0dc047189672107b1f2586731e9455c3e665210d5634f5f5a16b0afd7ef5c35beaf02e22b874d4898ab62d33638785d9f18714893674bc691b0f9330 WHIRLPOOL 62baaba90f588c43ea503eb336d1b385b3a00b86686c1e232a836975f10d12241416b688279ffcd60dd42afb9d9660b6385e749c0c4d0877217f7494539f2752
DIST apache-tomcat-8.5.9-src.tar.gz 5059352 SHA256 65b4ed45950263cb4e4ca82a9b469943053eb85656a7568d6e0eb446ab34afe5 SHA512 85534e88467b298dfbf6d3ec274592da4e73c34ee3f8e84582f95aa7f69959b47076a7fd9e31c705b12e914fefad53ffc954a09c7d7f3da0203752033e70bf17 WHIRLPOOL 0dbcbc1bc0c9fdb8ca50dc7d630dc86d92c606a0e554e6fd8f68c1d34682e2581d4b730198161f75e64340c857f251244237ae0dcbc406caa90585236b5d69df
DIST apache-tomcat-9.0.0.M15-src.tar.gz 5075694 SHA256 c8101177073c2a4aa63cf04ef58226a2768b1cfacb14861d74966881a2791251 SHA512 76d68ebe49f8d5f3c1dcfc629b901453eda58410d071db1e5c1e339fb6aeda54d1402f00a4056e368ea8495841d462d46d4d62dbedb52dc538dc587fdc4f3757 WHIRLPOOL c098ee812b84ca617b710a154a3505ef0c0fcc9616c69db0e6396e300e2b90a3ed684507e407aaab6efdccbb5ea109b8e3d203f09062d25df7479296a5dfe049
diff --git a/www-servers/tomcat/files/tomcat-7.0.75-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.75-build.xml.patch
new file mode 100644
index 00000000..481591f
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-7.0.75-build.xml.patch
@@ -0,0 +1,149 @@
+diff -Naur apache-tomcat-7.0.63-src.orig/build.xml apache-tomcat-7.0.63-src/build.xml
+--- apache-tomcat-7.0.63-src.orig/build.xml 2015-06-30 09:15:44.000000000 +0100
++++ apache-tomcat-7.0.63-src/build.xml 2015-08-22 21:13:12.453038827 +0100
+@@ -660,12 +660,14 @@
+ </fileset>
+ </copy>
+ <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
++<!--
+ <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1">
+ <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
+ <include name="*" />
+ <exclude name="jspxml*" />
+ </fileset>
+ </copy>
++-->
+
+ </target>
+
+@@ -721,26 +723,32 @@
+ manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+
+ <!-- Servlet 3.0 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+ manifest="${tomcat.manifests}/servlet-api.jar.manifest"
+ notice="${tomcat.manifests}/servlet-api.jar.notice"
+ license="${tomcat.manifests}/servlet-api.jar.license" />
++-->
+
+ <!-- JSP 2.2 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${jsp-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.jsp-api"
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest"
+ notice="${tomcat.manifests}/jsp-api.jar.notice"
+ license="${tomcat.manifests}/jsp-api.jar.license" />
++-->
+
+ <!-- JSP 2.2 EL Implementation JAR File -->
++<!--
+ <jarIt jarfile="${el-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.el-api"
+ manifest="${tomcat.manifests}/el-api.jar.manifest" />
++-->
+
+ <!-- Bootstrap JAR File -->
+ <jarIt jarfile="${bootstrap.jar}"
+@@ -986,12 +994,14 @@
+ <target name="deploy" depends="package,build-docs,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">
+@@ -1051,14 +1061,15 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
++<!--
+ <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
+-
++-->
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+-
++<!--
+ <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
+ failonerror="false"/>
+-
++-->
+ <!-- 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}"
+@@ -1681,7 +1692,7 @@
+
+ <target name="extras-webservices-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">
+ <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -1886,6 +1897,7 @@
+ description="Create the Tomcat javadoc" >
+ <fail unless="java.7.home"
+ message="The java.7.home property must be set for javadoc build"/>
++<!--
+ <javadoc packagenames="javax.servlet.*"
+ excludepackagenames="javax.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -1947,6 +1959,7 @@
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="javax.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -1985,9 +1998,11 @@
+ <path refid="tomcat.webservices.classpath"/>
+ <path location="${ant.core.lib}"/>
+ </classpath>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <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/"/>
+@@ -2642,7 +2657,7 @@
+ </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}"/>
+@@ -2699,7 +2714,7 @@
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -2727,7 +2742,7 @@
+ </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}"/>
diff --git a/www-servers/tomcat/tomcat-7.0.75.ebuild b/www-servers/tomcat/tomcat-7.0.75.ebuild
new file mode 100644
index 00000000..82056e8
--- /dev/null
+++ b/www-servers/tomcat/tomcat-7.0.75.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="7"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps websockets"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.5"
+SAPI_SLOT="3.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ dev-java/tomcat-servlet-api:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+ websockets? ( >=virtual/jre-1.7 )
+ !websockets? ( >=virtual/jre-1.6 )
+ !<dev-java/tomcat-native-1.1.24"
+DEPEND="${COMMON_DEP}
+ websockets? ( >=virtual/jdk-1.7 )
+ !websockets? ( >=virtual/jdk-1.6 )
+ test? ( dev-java/ant-junit:0 )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup tomcat 265
+ enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+src_prepare() {
+ default
+
+ # Remove bundled servlet-api
+ rm -rv java/javax/{el,servlet} || die
+
+ java-pkg_clean
+
+ epatch "${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}\`" \
+ bin/catalina.sh || die
+
+ java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r1"
+INIT_REV="-r1"
+
+src_compile() {
+ use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+ java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2017-02-10 10:11 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2017-02-10 10:11 UTC (permalink / raw
To: gentoo-commits
commit: 4e4ba6f0f2fc4e3e97a72e421d69e49cc3ba50ae
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 10 10:10:58 2017 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Feb 10 10:10:58 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e4ba6f0
www-servers/tomcat: version bump in slot 8.5
Package-Manager: Portage-2.3.3, Repoman-2.3.1
www-servers/tomcat/Manifest | 1 +
.../tomcat/files/tomcat-8.5.11-build.xml.patch | 250 +++++++++++++++++++++
www-servers/tomcat/tomcat-8.5.11.ebuild | 158 +++++++++++++
3 files changed, 409 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index b279e9e1a4..d448b71351 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -2,5 +2,6 @@ DIST apache-tomcat-7.0.73-src.tar.gz 4674971 SHA256 e3e236fb551ae9deb85024d8472f
DIST apache-tomcat-7.0.75-src.tar.gz 4657629 SHA256 ffa9489ecd9aa0750598e5db0dc3275ce7e29de13f16d7bf863e0477bf338463 SHA512 2b7a0fc64ca58849713435993768b1f77666ad23f22cfb6091503bc1393f2c4fd3a61dac518efe4ccb22738d82fa81b1a1597ba148f4f829a0c642d131270117 WHIRLPOOL eada3af432dd943ca494ab3fbedfeaf655dbe621b639791e224cd0f58d1c26f8e6e99496757c21073249ef0af2bfa101dd8374f9d708777b331c31da663c435a
DIST apache-tomcat-8.0.39-src.tar.gz 5019148 SHA256 566bf43a50f42af9c5b46be60f68e571a56c41f8e93647cf9f68e5f93870be96 SHA512 0f58f2ef0dc047189672107b1f2586731e9455c3e665210d5634f5f5a16b0afd7ef5c35beaf02e22b874d4898ab62d33638785d9f18714893674bc691b0f9330 WHIRLPOOL 62baaba90f588c43ea503eb336d1b385b3a00b86686c1e232a836975f10d12241416b688279ffcd60dd42afb9d9660b6385e749c0c4d0877217f7494539f2752
DIST apache-tomcat-8.0.41-src.tar.gz 4950440 SHA256 2bbaf50e9c9ffe8d79369c0c16cad04ea256cccde85658d15a011c8f8d1c2b77 SHA512 6d2d104be33f203a5c45e6d0d8a8631542830462da932f1d11eadfb9927ba82e3fa5245321197e610f55ed34622b50743cb3af4699c7cedfb91b9dd2b35f338d WHIRLPOOL 758104c1e2f7aa57ffff07f8711b6c08c67674c4c9b8702f8da2d48839da1802f158aa158aef6386af27e6c95b430c6060436cafbd7accc48c7bced376c5cef8
+DIST apache-tomcat-8.5.11-src.tar.gz 4996153 SHA256 81fb94243600d950375c4622f76b39c06c5615b7a8a6f70d387ea249bed1dddf SHA512 d1a9513535773805c26825f8843fa502e044c9f1ccc22176db5418a7a0abb6d1bcff3db401b449a5867065359abbc8277d14085d807fe00c95dd267d9091620d WHIRLPOOL 41ff9daec144c2481d3bb7a49bcd071eb2d21b34c11356a9911a139b404779971c31282f73b7b336b7e02d16156749e8e816dca8d5c727ef871ff0216577398d
DIST apache-tomcat-8.5.9-src.tar.gz 5059352 SHA256 65b4ed45950263cb4e4ca82a9b469943053eb85656a7568d6e0eb446ab34afe5 SHA512 85534e88467b298dfbf6d3ec274592da4e73c34ee3f8e84582f95aa7f69959b47076a7fd9e31c705b12e914fefad53ffc954a09c7d7f3da0203752033e70bf17 WHIRLPOOL 0dbcbc1bc0c9fdb8ca50dc7d630dc86d92c606a0e554e6fd8f68c1d34682e2581d4b730198161f75e64340c857f251244237ae0dcbc406caa90585236b5d69df
DIST apache-tomcat-9.0.0.M15-src.tar.gz 5075694 SHA256 c8101177073c2a4aa63cf04ef58226a2768b1cfacb14861d74966881a2791251 SHA512 76d68ebe49f8d5f3c1dcfc629b901453eda58410d071db1e5c1e339fb6aeda54d1402f00a4056e368ea8495841d462d46d4d62dbedb52dc538dc587fdc4f3757 WHIRLPOOL c098ee812b84ca617b710a154a3505ef0c0fcc9616c69db0e6396e300e2b90a3ed684507e407aaab6efdccbb5ea109b8e3d203f09062d25df7479296a5dfe049
diff --git a/www-servers/tomcat/files/tomcat-8.5.11-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.11-build.xml.patch
new file mode 100644
index 0000000000..611c99d7a0
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.5.11-build.xml.patch
@@ -0,0 +1,250 @@
+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 3.1 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+ 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}"
+ filesDir="${tomcat.classes}"
+ filesId="files.jsp-api"
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
++-->
+
+ <!-- EL 3.0 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 -->
+ <jarIt jarfile="${websocket-api.jar}"
+@@ -982,14 +987,14 @@
+
+ <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">
+@@ -1049,7 +1054,7 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
+- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+@@ -1083,7 +1088,7 @@
+ </javac>
+ </target>
+
+- <target name="build-tomcat-jdbc" depends="package">
++ <target name="build-tomcat-jdbc" depends="package" unless="noget">
+ <!-- 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}"
+@@ -1098,7 +1103,7 @@
+ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+ </target>
+
+- <target name="build-tomcat-jdbc-src">
++ <target name="build-tomcat-jdbc-src" unless="noget">
+ <!-- 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}"
+@@ -1202,10 +1207,11 @@
+
+ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+ <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+ <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
+ failonerror="false"/>
+ <copy file="${jdt.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. -->
+@@ -1579,7 +1585,7 @@
+
+ <target name="extras-webservices-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">
+ <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -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" >
++<!--
+ <javadoc packagenames="javax.servlet.*"
+ excludepackagenames="javax.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -1791,6 +1798,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="javax.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -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>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <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/"/>
+@@ -2574,7 +2584,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}"/>
+@@ -2608,7 +2618,7 @@ skip.installer property in build.properties" />
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -2665,7 +2675,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}"/>
+@@ -2691,18 +2701,18 @@ skip.installer property in build.properties" />
+
+ <!-- =============== Utility Targets to support downloads ================ -->
+
+- <target name="setproxy" if="${proxy.use}">
++ <target name="setproxy" if="${proxy.use}" unless="noget">
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+ proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+ </target>
+
+- <target name="testexist">
++ <target name="testexist" unless="noget">
+ <echo message="Testing for ${destfile}"/>
+ <available file="${destfile}" property="exist"/>
+ </target>
+
+- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
++ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2714,7 +2724,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadgz-2" unless="exist" depends="testexist">
++ <target name="downloadgz-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2733,7 +2743,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
++ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2744,7 +2754,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadzip-2" unless="exist" depends="testexist">
++ <target name="downloadzip-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2762,7 +2772,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
++ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
+ <!-- Download the file -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2772,7 +2782,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="downloadfile-2" unless="exist" depends="testexist">
++ <target name="downloadfile-2" unless="noget" depends="testexist">
+ <!-- Download the file from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2795,7 +2805,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="trydownload.check" depends="setproxy">
++ <target name="trydownload.check" depends="setproxy" unless="noget">
+ <condition property="trydownload.run">
+ <and>
+ <not>
+@@ -2806,7 +2816,7 @@ skip.installer property in build.properties" />
+ </condition>
+ </target>
+
+- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+ <!-- Downloads a file if not yet downloaded and the source URL is available -->
+ <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+ </target>
+@@ -2817,7 +2827,7 @@ skip.installer property in build.properties" />
+
+ <target name="ide-eclipse"
+ depends="download-compile, extras-webservices-prepare, download-test-compile"
+- description="Prepares the source tree to be built in Eclipse">
++ description="Prepares the source tree to be built in Eclipse" unless="noget">
+
+ <!-- Copy the sample project files into the root directory -->
+ <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-8.5.11.ebuild b/www-servers/tomcat/tomcat-8.5.11.ebuild
new file mode 100644
index 0000000000..3415222a48
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.5.11.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+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-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="8.5"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~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="3.1"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+ !<dev-java/tomcat-native-1.1.24
+ >=virtual/jre-1.7"
+DEPEND="${COMMON_DEP}
+ app-admin/pwgen
+ >=virtual/jdk-1.7
+ test? (
+ >=dev-java/ant-junit-1.9:0
+ dev-java/easymock:3.2
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup tomcat 265
+ enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+src_prepare() {
+ default
+
+ find -name '*.jar' -type f -delete -print || die
+
+ # Remove bundled servlet-api
+ rm -rv java/javax/{el,servlet} || die
+
+ epatch "${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}\`" \
+ bin/catalina.sh || die
+
+ java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+ java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ # add missing docBase
+ local apps="host-manager manager"
+ for app in ${apps}; do
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+ output/build/webapps/${app}/META-INF/context.xml || die
+ done
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw="$(pwgen -s -B 15 1)"
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2017-03-14 15:15 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2017-03-14 15:15 UTC (permalink / raw
To: gentoo-commits
commit: 3ab2e1a203546c1527a9dcb90d37a5b183aa43a0
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 14 15:13:32 2017 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Mar 14 15:14:14 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ab2e1a2
www-servers/tomcat: version bump in slot 9.0
Package-Manager: Portage-2.3.4, Repoman-2.3.2
www-servers/tomcat/Manifest | 2 +-
...0.0_alpha15-build.xml.patch => tomcat-9.0.0_alpha18-build.xml.patch} | 0
.../tomcat/{tomcat-9.0.0_alpha15.ebuild => tomcat-9.0.0_alpha18.ebuild} | 0
3 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 3629bcc393a..dc42e6bba73 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -5,4 +5,4 @@ DIST apache-tomcat-8.0.41-src.tar.gz 4950440 SHA256 2bbaf50e9c9ffe8d79369c0c16ca
DIST apache-tomcat-8.5.11-src.tar.gz 4996153 SHA256 81fb94243600d950375c4622f76b39c06c5615b7a8a6f70d387ea249bed1dddf SHA512 d1a9513535773805c26825f8843fa502e044c9f1ccc22176db5418a7a0abb6d1bcff3db401b449a5867065359abbc8277d14085d807fe00c95dd267d9091620d WHIRLPOOL 41ff9daec144c2481d3bb7a49bcd071eb2d21b34c11356a9911a139b404779971c31282f73b7b336b7e02d16156749e8e816dca8d5c727ef871ff0216577398d
DIST apache-tomcat-8.5.12-src.tar.gz 5009933 SHA256 af8b7ab3cc3ba17a667fd1fdd943ce5a459e8e887d30902030af7c42e3af2b07 SHA512 de8e928db261143629e415cb3532fbe762620d0500eca021d9a888671e9a609f82039b14db3d64371076be13e2ca6affc045f62bcd38c1608e968cb07d3e77d1 WHIRLPOOL eb927ed655ee49417203264b5cf45bd39629df2e29387a78d9db43f1c9e6376adad641d779a1243a109695aedcaa0a4a886c7edad523488ab02aef0cf94475a5
DIST apache-tomcat-8.5.9-src.tar.gz 5059352 SHA256 65b4ed45950263cb4e4ca82a9b469943053eb85656a7568d6e0eb446ab34afe5 SHA512 85534e88467b298dfbf6d3ec274592da4e73c34ee3f8e84582f95aa7f69959b47076a7fd9e31c705b12e914fefad53ffc954a09c7d7f3da0203752033e70bf17 WHIRLPOOL 0dbcbc1bc0c9fdb8ca50dc7d630dc86d92c606a0e554e6fd8f68c1d34682e2581d4b730198161f75e64340c857f251244237ae0dcbc406caa90585236b5d69df
-DIST apache-tomcat-9.0.0.M15-src.tar.gz 5075694 SHA256 c8101177073c2a4aa63cf04ef58226a2768b1cfacb14861d74966881a2791251 SHA512 76d68ebe49f8d5f3c1dcfc629b901453eda58410d071db1e5c1e339fb6aeda54d1402f00a4056e368ea8495841d462d46d4d62dbedb52dc538dc587fdc4f3757 WHIRLPOOL c098ee812b84ca617b710a154a3505ef0c0fcc9616c69db0e6396e300e2b90a3ed684507e407aaab6efdccbb5ea109b8e3d203f09062d25df7479296a5dfe049
+DIST apache-tomcat-9.0.0.M18-src.tar.gz 4941860 SHA256 b1e94928835aac40a004bd052ef8c927065581c7bf69a3989867d048ea262648 SHA512 bb950b1efb5eb498a8cde542a13b0eec21209ed971f288b1372948cf67f54243650fbf4dc5b6a512d314b2c6b8d04db6e9ae52cdae2fd46a1d9d8ba7578c7e44 WHIRLPOOL 144c62573a2d0093e870ae93b681922de222867d075b52348e94cc815889f8fdb30127d3e292320e9b4787528446f0cdf4e183a840eeb2a50e7dd74154e30cee
diff --git a/www-servers/tomcat/files/tomcat-9.0.0_alpha15-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.0_alpha18-build.xml.patch
similarity index 100%
rename from www-servers/tomcat/files/tomcat-9.0.0_alpha15-build.xml.patch
rename to www-servers/tomcat/files/tomcat-9.0.0_alpha18-build.xml.patch
diff --git a/www-servers/tomcat/tomcat-9.0.0_alpha15.ebuild b/www-servers/tomcat/tomcat-9.0.0_alpha18.ebuild
similarity index 100%
rename from www-servers/tomcat/tomcat-9.0.0_alpha15.ebuild
rename to www-servers/tomcat/tomcat-9.0.0_alpha18.ebuild
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2017-03-31 17:40 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2017-03-31 17:40 UTC (permalink / raw
To: gentoo-commits
commit: 3dc6fcabfb2a37baf00a31a4ef6df5feba8061f2
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 31 17:34:29 2017 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Mar 31 17:34:29 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dc6fcab
www-servers/tomcat: version bump in slot 7.0
Package-Manager: Portage-2.3.5, Repoman-2.3.2
www-servers/tomcat/Manifest | 1 +
.../tomcat/files/tomcat-7.0.76-build.xml.patch | 149 +++++++++++++++++++++
www-servers/tomcat/tomcat-7.0.76.ebuild | 148 ++++++++++++++++++++
3 files changed, 298 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 4c9191a6e33..792758574ca 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,5 +1,6 @@
DIST apache-tomcat-7.0.73-src.tar.gz 4674971 SHA256 e3e236fb551ae9deb85024d8472fd08a76b14380e3ddaa2a1aff1fc670de5d87 SHA512 4754628c271d0aed3572ac0961c47653c10fcdfd0d13d8d1bc1b5774e961e6327cbb6b11b0e7e2f8eff525e2e60f741da49aeb855bb9d94e84cc87f346cf9ce6 WHIRLPOOL b9e75f53e41f1e9b9767fe8bc603ee5b7db2d3b1b7d2d900d430f4c0b73881a7ad36e0a0bfce773432b73ea8743865e933363ceec037d11d8f1008d8619ac1f1
DIST apache-tomcat-7.0.75-src.tar.gz 4657629 SHA256 ffa9489ecd9aa0750598e5db0dc3275ce7e29de13f16d7bf863e0477bf338463 SHA512 2b7a0fc64ca58849713435993768b1f77666ad23f22cfb6091503bc1393f2c4fd3a61dac518efe4ccb22738d82fa81b1a1597ba148f4f829a0c642d131270117 WHIRLPOOL eada3af432dd943ca494ab3fbedfeaf655dbe621b639791e224cd0f58d1c26f8e6e99496757c21073249ef0af2bfa101dd8374f9d708777b331c31da663c435a
+DIST apache-tomcat-7.0.76-src.tar.gz 4662334 SHA256 67e8449ed9e5e33251e19c38f6dbb47593395d4f956882175651da5aee45bc83 SHA512 5f469723fbbf77bb1cb7d3939cd8ab47e200bba4fcc0d6cb53ea8d1447ca126987f870b063b22f9bffa083601f0e3ac69fb2c32be723d8c7055a6acb93a749e1 WHIRLPOOL a3d1abd5232ef7e8f7822c4238383a74b45b5d614aa74b7c1e0f140d9523b4d0de8f860bf828d116b150fdc910e23643015939f5041623b46b818808a87efbbb
DIST apache-tomcat-8.0.39-src.tar.gz 5019148 SHA256 566bf43a50f42af9c5b46be60f68e571a56c41f8e93647cf9f68e5f93870be96 SHA512 0f58f2ef0dc047189672107b1f2586731e9455c3e665210d5634f5f5a16b0afd7ef5c35beaf02e22b874d4898ab62d33638785d9f18714893674bc691b0f9330 WHIRLPOOL 62baaba90f588c43ea503eb336d1b385b3a00b86686c1e232a836975f10d12241416b688279ffcd60dd42afb9d9660b6385e749c0c4d0877217f7494539f2752
DIST apache-tomcat-8.0.41-src.tar.gz 4950440 SHA256 2bbaf50e9c9ffe8d79369c0c16cad04ea256cccde85658d15a011c8f8d1c2b77 SHA512 6d2d104be33f203a5c45e6d0d8a8631542830462da932f1d11eadfb9927ba82e3fa5245321197e610f55ed34622b50743cb3af4699c7cedfb91b9dd2b35f338d WHIRLPOOL 758104c1e2f7aa57ffff07f8711b6c08c67674c4c9b8702f8da2d48839da1802f158aa158aef6386af27e6c95b430c6060436cafbd7accc48c7bced376c5cef8
DIST apache-tomcat-8.5.11-src.tar.gz 4996153 SHA256 81fb94243600d950375c4622f76b39c06c5615b7a8a6f70d387ea249bed1dddf SHA512 d1a9513535773805c26825f8843fa502e044c9f1ccc22176db5418a7a0abb6d1bcff3db401b449a5867065359abbc8277d14085d807fe00c95dd267d9091620d WHIRLPOOL 41ff9daec144c2481d3bb7a49bcd071eb2d21b34c11356a9911a139b404779971c31282f73b7b336b7e02d16156749e8e816dca8d5c727ef871ff0216577398d
diff --git a/www-servers/tomcat/files/tomcat-7.0.76-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.76-build.xml.patch
new file mode 100644
index 00000000000..481591fb6ff
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-7.0.76-build.xml.patch
@@ -0,0 +1,149 @@
+diff -Naur apache-tomcat-7.0.63-src.orig/build.xml apache-tomcat-7.0.63-src/build.xml
+--- apache-tomcat-7.0.63-src.orig/build.xml 2015-06-30 09:15:44.000000000 +0100
++++ apache-tomcat-7.0.63-src/build.xml 2015-08-22 21:13:12.453038827 +0100
+@@ -660,12 +660,14 @@
+ </fileset>
+ </copy>
+ <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
++<!--
+ <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1">
+ <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
+ <include name="*" />
+ <exclude name="jspxml*" />
+ </fileset>
+ </copy>
++-->
+
+ </target>
+
+@@ -721,26 +723,32 @@
+ manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+
+ <!-- Servlet 3.0 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+ manifest="${tomcat.manifests}/servlet-api.jar.manifest"
+ notice="${tomcat.manifests}/servlet-api.jar.notice"
+ license="${tomcat.manifests}/servlet-api.jar.license" />
++-->
+
+ <!-- JSP 2.2 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${jsp-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.jsp-api"
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest"
+ notice="${tomcat.manifests}/jsp-api.jar.notice"
+ license="${tomcat.manifests}/jsp-api.jar.license" />
++-->
+
+ <!-- JSP 2.2 EL Implementation JAR File -->
++<!--
+ <jarIt jarfile="${el-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.el-api"
+ manifest="${tomcat.manifests}/el-api.jar.manifest" />
++-->
+
+ <!-- Bootstrap JAR File -->
+ <jarIt jarfile="${bootstrap.jar}"
+@@ -986,12 +994,14 @@
+ <target name="deploy" depends="package,build-docs,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">
+@@ -1051,14 +1061,15 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
++<!--
+ <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
+-
++-->
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+-
++<!--
+ <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
+ failonerror="false"/>
+-
++-->
+ <!-- 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}"
+@@ -1681,7 +1692,7 @@
+
+ <target name="extras-webservices-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">
+ <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -1886,6 +1897,7 @@
+ description="Create the Tomcat javadoc" >
+ <fail unless="java.7.home"
+ message="The java.7.home property must be set for javadoc build"/>
++<!--
+ <javadoc packagenames="javax.servlet.*"
+ excludepackagenames="javax.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -1947,6 +1959,7 @@
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="javax.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -1985,9 +1998,11 @@
+ <path refid="tomcat.webservices.classpath"/>
+ <path location="${ant.core.lib}"/>
+ </classpath>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <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/"/>
+@@ -2642,7 +2657,7 @@
+ </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}"/>
+@@ -2699,7 +2714,7 @@
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -2727,7 +2742,7 @@
+ </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}"/>
diff --git a/www-servers/tomcat/tomcat-7.0.76.ebuild b/www-servers/tomcat/tomcat-7.0.76.ebuild
new file mode 100644
index 00000000000..407d62aa7f8
--- /dev/null
+++ b/www-servers/tomcat/tomcat-7.0.76.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="7"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps websockets"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.5"
+SAPI_SLOT="3.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ dev-java/tomcat-servlet-api:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+ websockets? ( >=virtual/jre-1.7 )
+ !websockets? ( >=virtual/jre-1.6 )
+ !<dev-java/tomcat-native-1.1.24"
+DEPEND="${COMMON_DEP}
+ websockets? ( >=virtual/jdk-1.7 )
+ !websockets? ( >=virtual/jdk-1.6 )
+ test? ( dev-java/ant-junit:0 )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup tomcat 265
+ enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+src_prepare() {
+ default
+
+ # Remove bundled servlet-api
+ rm -rv java/javax/{el,servlet} || die
+
+ java-pkg_clean
+
+ epatch "${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}\`" \
+ bin/catalina.sh || die
+
+ java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r1"
+INIT_REV="-r1"
+
+src_compile() {
+ use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+ java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2017-03-31 17:40 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2017-03-31 17:40 UTC (permalink / raw
To: gentoo-commits
commit: 8ee0e4ef846cd6219be4d153202140503b402e49
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 31 17:18:10 2017 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Mar 31 17:18:10 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ee0e4ef
www-servers/tomcat: version bump in slot 8.5
Package-Manager: Portage-2.3.5, Repoman-2.3.2
www-servers/tomcat/Manifest | 1 +
.../tomcat/files/tomcat-8.5.13-build.xml.patch | 250 +++++++++++++++++++++
www-servers/tomcat/tomcat-8.5.13.ebuild | 157 +++++++++++++
3 files changed, 408 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index dc42e6bba73..153e79658d0 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -4,5 +4,6 @@ DIST apache-tomcat-8.0.39-src.tar.gz 5019148 SHA256 566bf43a50f42af9c5b46be60f68
DIST apache-tomcat-8.0.41-src.tar.gz 4950440 SHA256 2bbaf50e9c9ffe8d79369c0c16cad04ea256cccde85658d15a011c8f8d1c2b77 SHA512 6d2d104be33f203a5c45e6d0d8a8631542830462da932f1d11eadfb9927ba82e3fa5245321197e610f55ed34622b50743cb3af4699c7cedfb91b9dd2b35f338d WHIRLPOOL 758104c1e2f7aa57ffff07f8711b6c08c67674c4c9b8702f8da2d48839da1802f158aa158aef6386af27e6c95b430c6060436cafbd7accc48c7bced376c5cef8
DIST apache-tomcat-8.5.11-src.tar.gz 4996153 SHA256 81fb94243600d950375c4622f76b39c06c5615b7a8a6f70d387ea249bed1dddf SHA512 d1a9513535773805c26825f8843fa502e044c9f1ccc22176db5418a7a0abb6d1bcff3db401b449a5867065359abbc8277d14085d807fe00c95dd267d9091620d WHIRLPOOL 41ff9daec144c2481d3bb7a49bcd071eb2d21b34c11356a9911a139b404779971c31282f73b7b336b7e02d16156749e8e816dca8d5c727ef871ff0216577398d
DIST apache-tomcat-8.5.12-src.tar.gz 5009933 SHA256 af8b7ab3cc3ba17a667fd1fdd943ce5a459e8e887d30902030af7c42e3af2b07 SHA512 de8e928db261143629e415cb3532fbe762620d0500eca021d9a888671e9a609f82039b14db3d64371076be13e2ca6affc045f62bcd38c1608e968cb07d3e77d1 WHIRLPOOL eb927ed655ee49417203264b5cf45bd39629df2e29387a78d9db43f1c9e6376adad641d779a1243a109695aedcaa0a4a886c7edad523488ab02aef0cf94475a5
+DIST apache-tomcat-8.5.13-src.tar.gz 5021333 SHA256 70db8d68f3a702e0997220a91d0c1ed59de4bbdc32d8482532412c1e31666a0b SHA512 4855e0b686dcdc10224e3bba804c7c944a8b2f48761dd0e4fca12a59cfc308fd5f26db6a02b3b7c39b595506c920fdf8f19eedb26a8acb7f1580f4e4b597fb5b WHIRLPOOL 6ad3150416e17396c81e6b638e035f55e695388fb2cdfd65a6803195894dee3391aac56243879faa850b2765d29f3ae13c74cefd66c349bd53bf14900e59dea6
DIST apache-tomcat-8.5.9-src.tar.gz 5059352 SHA256 65b4ed45950263cb4e4ca82a9b469943053eb85656a7568d6e0eb446ab34afe5 SHA512 85534e88467b298dfbf6d3ec274592da4e73c34ee3f8e84582f95aa7f69959b47076a7fd9e31c705b12e914fefad53ffc954a09c7d7f3da0203752033e70bf17 WHIRLPOOL 0dbcbc1bc0c9fdb8ca50dc7d630dc86d92c606a0e554e6fd8f68c1d34682e2581d4b730198161f75e64340c857f251244237ae0dcbc406caa90585236b5d69df
DIST apache-tomcat-9.0.0.M18-src.tar.gz 4941860 SHA256 b1e94928835aac40a004bd052ef8c927065581c7bf69a3989867d048ea262648 SHA512 bb950b1efb5eb498a8cde542a13b0eec21209ed971f288b1372948cf67f54243650fbf4dc5b6a512d314b2c6b8d04db6e9ae52cdae2fd46a1d9d8ba7578c7e44 WHIRLPOOL 144c62573a2d0093e870ae93b681922de222867d075b52348e94cc815889f8fdb30127d3e292320e9b4787528446f0cdf4e183a840eeb2a50e7dd74154e30cee
diff --git a/www-servers/tomcat/files/tomcat-8.5.13-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.13-build.xml.patch
new file mode 100644
index 00000000000..611c99d7a0e
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.5.13-build.xml.patch
@@ -0,0 +1,250 @@
+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 3.1 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+ 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}"
+ filesDir="${tomcat.classes}"
+ filesId="files.jsp-api"
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
++-->
+
+ <!-- EL 3.0 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 -->
+ <jarIt jarfile="${websocket-api.jar}"
+@@ -982,14 +987,14 @@
+
+ <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">
+@@ -1049,7 +1054,7 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
+- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+@@ -1083,7 +1088,7 @@
+ </javac>
+ </target>
+
+- <target name="build-tomcat-jdbc" depends="package">
++ <target name="build-tomcat-jdbc" depends="package" unless="noget">
+ <!-- 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}"
+@@ -1098,7 +1103,7 @@
+ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+ </target>
+
+- <target name="build-tomcat-jdbc-src">
++ <target name="build-tomcat-jdbc-src" unless="noget">
+ <!-- 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}"
+@@ -1202,10 +1207,11 @@
+
+ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+ <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+ <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
+ failonerror="false"/>
+ <copy file="${jdt.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. -->
+@@ -1579,7 +1585,7 @@
+
+ <target name="extras-webservices-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">
+ <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -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" >
++<!--
+ <javadoc packagenames="javax.servlet.*"
+ excludepackagenames="javax.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -1791,6 +1798,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="javax.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -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>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <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/"/>
+@@ -2574,7 +2584,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}"/>
+@@ -2608,7 +2618,7 @@ skip.installer property in build.properties" />
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -2665,7 +2675,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}"/>
+@@ -2691,18 +2701,18 @@ skip.installer property in build.properties" />
+
+ <!-- =============== Utility Targets to support downloads ================ -->
+
+- <target name="setproxy" if="${proxy.use}">
++ <target name="setproxy" if="${proxy.use}" unless="noget">
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+ proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+ </target>
+
+- <target name="testexist">
++ <target name="testexist" unless="noget">
+ <echo message="Testing for ${destfile}"/>
+ <available file="${destfile}" property="exist"/>
+ </target>
+
+- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
++ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2714,7 +2724,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadgz-2" unless="exist" depends="testexist">
++ <target name="downloadgz-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2733,7 +2743,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
++ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2744,7 +2754,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadzip-2" unless="exist" depends="testexist">
++ <target name="downloadzip-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2762,7 +2772,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
++ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
+ <!-- Download the file -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2772,7 +2782,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="downloadfile-2" unless="exist" depends="testexist">
++ <target name="downloadfile-2" unless="noget" depends="testexist">
+ <!-- Download the file from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2795,7 +2805,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="trydownload.check" depends="setproxy">
++ <target name="trydownload.check" depends="setproxy" unless="noget">
+ <condition property="trydownload.run">
+ <and>
+ <not>
+@@ -2806,7 +2816,7 @@ skip.installer property in build.properties" />
+ </condition>
+ </target>
+
+- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+ <!-- Downloads a file if not yet downloaded and the source URL is available -->
+ <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+ </target>
+@@ -2817,7 +2827,7 @@ skip.installer property in build.properties" />
+
+ <target name="ide-eclipse"
+ depends="download-compile, extras-webservices-prepare, download-test-compile"
+- description="Prepares the source tree to be built in Eclipse">
++ description="Prepares the source tree to be built in Eclipse" unless="noget">
+
+ <!-- Copy the sample project files into the root directory -->
+ <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-8.5.13.ebuild b/www-servers/tomcat/tomcat-8.5.13.ebuild
new file mode 100644
index 00000000000..f76cec3287c
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.5.13.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+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-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="8.5"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~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="3.1"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+ !<dev-java/tomcat-native-1.1.24
+ >=virtual/jre-1.7"
+DEPEND="${COMMON_DEP}
+ app-admin/pwgen
+ >=virtual/jdk-1.7
+ test? (
+ >=dev-java/ant-junit-1.9:0
+ dev-java/easymock:3.2
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup tomcat 265
+ enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+src_prepare() {
+ default
+
+ find -name '*.jar' -type f -delete -print || die
+
+ # Remove bundled servlet-api
+ rm -rv java/javax/{el,servlet} || die
+
+ epatch "${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}\`" \
+ bin/catalina.sh || die
+
+ java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+ java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ # add missing docBase
+ local apps="host-manager manager"
+ for app in ${apps}; do
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+ output/build/webapps/${app}/META-INF/context.xml || die
+ done
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw="$(pwgen -s -B 15 1)"
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2017-03-31 17:40 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2017-03-31 17:40 UTC (permalink / raw
To: gentoo-commits
commit: 5e9ff196a54593a10d13643d9b3c1313276ab28a
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 31 17:31:24 2017 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Mar 31 17:31:24 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e9ff196
www-servers/tomcat: version bump in slot 9.0
Package-Manager: Portage-2.3.5, Repoman-2.3.2
www-servers/tomcat/Manifest | 2 +-
...0.0_alpha18-build.xml.patch => tomcat-9.0.0_alpha19-build.xml.patch} | 0
.../tomcat/{tomcat-9.0.0_alpha18.ebuild => tomcat-9.0.0_alpha19.ebuild} | 0
3 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 153e79658d0..4c9191a6e33 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -6,4 +6,4 @@ DIST apache-tomcat-8.5.11-src.tar.gz 4996153 SHA256 81fb94243600d950375c4622f76b
DIST apache-tomcat-8.5.12-src.tar.gz 5009933 SHA256 af8b7ab3cc3ba17a667fd1fdd943ce5a459e8e887d30902030af7c42e3af2b07 SHA512 de8e928db261143629e415cb3532fbe762620d0500eca021d9a888671e9a609f82039b14db3d64371076be13e2ca6affc045f62bcd38c1608e968cb07d3e77d1 WHIRLPOOL eb927ed655ee49417203264b5cf45bd39629df2e29387a78d9db43f1c9e6376adad641d779a1243a109695aedcaa0a4a886c7edad523488ab02aef0cf94475a5
DIST apache-tomcat-8.5.13-src.tar.gz 5021333 SHA256 70db8d68f3a702e0997220a91d0c1ed59de4bbdc32d8482532412c1e31666a0b SHA512 4855e0b686dcdc10224e3bba804c7c944a8b2f48761dd0e4fca12a59cfc308fd5f26db6a02b3b7c39b595506c920fdf8f19eedb26a8acb7f1580f4e4b597fb5b WHIRLPOOL 6ad3150416e17396c81e6b638e035f55e695388fb2cdfd65a6803195894dee3391aac56243879faa850b2765d29f3ae13c74cefd66c349bd53bf14900e59dea6
DIST apache-tomcat-8.5.9-src.tar.gz 5059352 SHA256 65b4ed45950263cb4e4ca82a9b469943053eb85656a7568d6e0eb446ab34afe5 SHA512 85534e88467b298dfbf6d3ec274592da4e73c34ee3f8e84582f95aa7f69959b47076a7fd9e31c705b12e914fefad53ffc954a09c7d7f3da0203752033e70bf17 WHIRLPOOL 0dbcbc1bc0c9fdb8ca50dc7d630dc86d92c606a0e554e6fd8f68c1d34682e2581d4b730198161f75e64340c857f251244237ae0dcbc406caa90585236b5d69df
-DIST apache-tomcat-9.0.0.M18-src.tar.gz 4941860 SHA256 b1e94928835aac40a004bd052ef8c927065581c7bf69a3989867d048ea262648 SHA512 bb950b1efb5eb498a8cde542a13b0eec21209ed971f288b1372948cf67f54243650fbf4dc5b6a512d314b2c6b8d04db6e9ae52cdae2fd46a1d9d8ba7578c7e44 WHIRLPOOL 144c62573a2d0093e870ae93b681922de222867d075b52348e94cc815889f8fdb30127d3e292320e9b4787528446f0cdf4e183a840eeb2a50e7dd74154e30cee
+DIST apache-tomcat-9.0.0.M19-src.tar.gz 4954415 SHA256 4ceb9481903cda8775c788bc2513cf7260764f72d55854cbef6f25dd3446b51e SHA512 fd397712d4398f86ed52afb7777e7e4f7cfd368421971a34069d7fe329f09990f97286bb095c369e1606ec9a3ba24489a5a086c670ca7d43ed47995bb03eac42 WHIRLPOOL 0bcb2c532ab7412d1ce09c721be09c1b2a1e3cf619733c806470887335e3071577a5303c505b5d7e5aca93c47f8f27c3cac5bf360671e96169419e814b87b4b0
diff --git a/www-servers/tomcat/files/tomcat-9.0.0_alpha18-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.0_alpha19-build.xml.patch
similarity index 100%
rename from www-servers/tomcat/files/tomcat-9.0.0_alpha18-build.xml.patch
rename to www-servers/tomcat/files/tomcat-9.0.0_alpha19-build.xml.patch
diff --git a/www-servers/tomcat/tomcat-9.0.0_alpha18.ebuild b/www-servers/tomcat/tomcat-9.0.0_alpha19.ebuild
similarity index 100%
rename from www-servers/tomcat/tomcat-9.0.0_alpha18.ebuild
rename to www-servers/tomcat/tomcat-9.0.0_alpha19.ebuild
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2017-04-09 14:28 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2017-04-09 14:28 UTC (permalink / raw
To: gentoo-commits
commit: 67cd607bd511d9e805431f376b97996908f3951c
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 9 14:27:52 2017 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Apr 9 14:27:52 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67cd607b
www-servers/tomcat: version bump in slot 7
Package-Manager: Portage-2.3.5, Repoman-2.3.2
www-servers/tomcat/Manifest | 1 +
.../tomcat/files/tomcat-7.0.77-build.xml.patch | 149 +++++++++++++++++++++
www-servers/tomcat/tomcat-7.0.77.ebuild | 148 ++++++++++++++++++++
3 files changed, 298 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 792758574ca..59cf8dc4425 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,6 +1,7 @@
DIST apache-tomcat-7.0.73-src.tar.gz 4674971 SHA256 e3e236fb551ae9deb85024d8472fd08a76b14380e3ddaa2a1aff1fc670de5d87 SHA512 4754628c271d0aed3572ac0961c47653c10fcdfd0d13d8d1bc1b5774e961e6327cbb6b11b0e7e2f8eff525e2e60f741da49aeb855bb9d94e84cc87f346cf9ce6 WHIRLPOOL b9e75f53e41f1e9b9767fe8bc603ee5b7db2d3b1b7d2d900d430f4c0b73881a7ad36e0a0bfce773432b73ea8743865e933363ceec037d11d8f1008d8619ac1f1
DIST apache-tomcat-7.0.75-src.tar.gz 4657629 SHA256 ffa9489ecd9aa0750598e5db0dc3275ce7e29de13f16d7bf863e0477bf338463 SHA512 2b7a0fc64ca58849713435993768b1f77666ad23f22cfb6091503bc1393f2c4fd3a61dac518efe4ccb22738d82fa81b1a1597ba148f4f829a0c642d131270117 WHIRLPOOL eada3af432dd943ca494ab3fbedfeaf655dbe621b639791e224cd0f58d1c26f8e6e99496757c21073249ef0af2bfa101dd8374f9d708777b331c31da663c435a
DIST apache-tomcat-7.0.76-src.tar.gz 4662334 SHA256 67e8449ed9e5e33251e19c38f6dbb47593395d4f956882175651da5aee45bc83 SHA512 5f469723fbbf77bb1cb7d3939cd8ab47e200bba4fcc0d6cb53ea8d1447ca126987f870b063b22f9bffa083601f0e3ac69fb2c32be723d8c7055a6acb93a749e1 WHIRLPOOL a3d1abd5232ef7e8f7822c4238383a74b45b5d614aa74b7c1e0f140d9523b4d0de8f860bf828d116b150fdc910e23643015939f5041623b46b818808a87efbbb
+DIST apache-tomcat-7.0.77-src.tar.gz 4664884 SHA256 7db04b3bf8898d9f9facee9c53ae7a2c78f13dfd4d14e931d78cee2d0813cc43 SHA512 19507de7f499df7269d8f819c30dc8194528555e9d6d430dad4b7ff3dc0c5c865d432eaef75bb2c157170cc5ebf76da5884296bf4e089c118448088a46f5e428 WHIRLPOOL c17fe412d5c1db530287111624dbebfffe100639cd4bbc78be8e7e5b9be130ac23dd2978bbababd2981c1c91c00570f80e05b34e505af9a49646835334867bc6
DIST apache-tomcat-8.0.39-src.tar.gz 5019148 SHA256 566bf43a50f42af9c5b46be60f68e571a56c41f8e93647cf9f68e5f93870be96 SHA512 0f58f2ef0dc047189672107b1f2586731e9455c3e665210d5634f5f5a16b0afd7ef5c35beaf02e22b874d4898ab62d33638785d9f18714893674bc691b0f9330 WHIRLPOOL 62baaba90f588c43ea503eb336d1b385b3a00b86686c1e232a836975f10d12241416b688279ffcd60dd42afb9d9660b6385e749c0c4d0877217f7494539f2752
DIST apache-tomcat-8.0.41-src.tar.gz 4950440 SHA256 2bbaf50e9c9ffe8d79369c0c16cad04ea256cccde85658d15a011c8f8d1c2b77 SHA512 6d2d104be33f203a5c45e6d0d8a8631542830462da932f1d11eadfb9927ba82e3fa5245321197e610f55ed34622b50743cb3af4699c7cedfb91b9dd2b35f338d WHIRLPOOL 758104c1e2f7aa57ffff07f8711b6c08c67674c4c9b8702f8da2d48839da1802f158aa158aef6386af27e6c95b430c6060436cafbd7accc48c7bced376c5cef8
DIST apache-tomcat-8.5.11-src.tar.gz 4996153 SHA256 81fb94243600d950375c4622f76b39c06c5615b7a8a6f70d387ea249bed1dddf SHA512 d1a9513535773805c26825f8843fa502e044c9f1ccc22176db5418a7a0abb6d1bcff3db401b449a5867065359abbc8277d14085d807fe00c95dd267d9091620d WHIRLPOOL 41ff9daec144c2481d3bb7a49bcd071eb2d21b34c11356a9911a139b404779971c31282f73b7b336b7e02d16156749e8e816dca8d5c727ef871ff0216577398d
diff --git a/www-servers/tomcat/files/tomcat-7.0.77-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.77-build.xml.patch
new file mode 100644
index 00000000000..481591fb6ff
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-7.0.77-build.xml.patch
@@ -0,0 +1,149 @@
+diff -Naur apache-tomcat-7.0.63-src.orig/build.xml apache-tomcat-7.0.63-src/build.xml
+--- apache-tomcat-7.0.63-src.orig/build.xml 2015-06-30 09:15:44.000000000 +0100
++++ apache-tomcat-7.0.63-src/build.xml 2015-08-22 21:13:12.453038827 +0100
+@@ -660,12 +660,14 @@
+ </fileset>
+ </copy>
+ <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
++<!--
+ <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1">
+ <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
+ <include name="*" />
+ <exclude name="jspxml*" />
+ </fileset>
+ </copy>
++-->
+
+ </target>
+
+@@ -721,26 +723,32 @@
+ manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+
+ <!-- Servlet 3.0 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+ manifest="${tomcat.manifests}/servlet-api.jar.manifest"
+ notice="${tomcat.manifests}/servlet-api.jar.notice"
+ license="${tomcat.manifests}/servlet-api.jar.license" />
++-->
+
+ <!-- JSP 2.2 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${jsp-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.jsp-api"
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest"
+ notice="${tomcat.manifests}/jsp-api.jar.notice"
+ license="${tomcat.manifests}/jsp-api.jar.license" />
++-->
+
+ <!-- JSP 2.2 EL Implementation JAR File -->
++<!--
+ <jarIt jarfile="${el-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.el-api"
+ manifest="${tomcat.manifests}/el-api.jar.manifest" />
++-->
+
+ <!-- Bootstrap JAR File -->
+ <jarIt jarfile="${bootstrap.jar}"
+@@ -986,12 +994,14 @@
+ <target name="deploy" depends="package,build-docs,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">
+@@ -1051,14 +1061,15 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
++<!--
+ <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
+-
++-->
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+-
++<!--
+ <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
+ failonerror="false"/>
+-
++-->
+ <!-- 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}"
+@@ -1681,7 +1692,7 @@
+
+ <target name="extras-webservices-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">
+ <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -1886,6 +1897,7 @@
+ description="Create the Tomcat javadoc" >
+ <fail unless="java.7.home"
+ message="The java.7.home property must be set for javadoc build"/>
++<!--
+ <javadoc packagenames="javax.servlet.*"
+ excludepackagenames="javax.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -1947,6 +1959,7 @@
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="javax.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -1985,9 +1998,11 @@
+ <path refid="tomcat.webservices.classpath"/>
+ <path location="${ant.core.lib}"/>
+ </classpath>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <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/"/>
+@@ -2642,7 +2657,7 @@
+ </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}"/>
+@@ -2699,7 +2714,7 @@
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -2727,7 +2742,7 @@
+ </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}"/>
diff --git a/www-servers/tomcat/tomcat-7.0.77.ebuild b/www-servers/tomcat/tomcat-7.0.77.ebuild
new file mode 100644
index 00000000000..407d62aa7f8
--- /dev/null
+++ b/www-servers/tomcat/tomcat-7.0.77.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="7"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps websockets"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.5"
+SAPI_SLOT="3.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ dev-java/tomcat-servlet-api:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+ websockets? ( >=virtual/jre-1.7 )
+ !websockets? ( >=virtual/jre-1.6 )
+ !<dev-java/tomcat-native-1.1.24"
+DEPEND="${COMMON_DEP}
+ websockets? ( >=virtual/jdk-1.7 )
+ !websockets? ( >=virtual/jdk-1.6 )
+ test? ( dev-java/ant-junit:0 )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup tomcat 265
+ enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+src_prepare() {
+ default
+
+ # Remove bundled servlet-api
+ rm -rv java/javax/{el,servlet} || die
+
+ java-pkg_clean
+
+ epatch "${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}\`" \
+ bin/catalina.sh || die
+
+ java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r1"
+INIT_REV="-r1"
+
+src_compile() {
+ use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+ java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2017-04-09 14:56 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2017-04-09 14:56 UTC (permalink / raw
To: gentoo-commits
commit: 23f2ba7e6d66da6a2e9fd7734032b9a066745ed3
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 9 14:56:29 2017 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Apr 9 14:56:29 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23f2ba7e
www-servers/tomcat: replaced java_prepare with src_prepare in versions 8.0.x and version bump in slot 8
Package-Manager: Portage-2.3.5, Repoman-2.3.2
www-servers/tomcat/Manifest | 1 +
.../tomcat/files/tomcat-8.0.41-build.xml.patch | 259 +++++++++++++++++++++
.../tomcat/files/tomcat-8.0.43-build.xml.patch | 259 +++++++++++++++++++++
www-servers/tomcat/tomcat-8.0.39.ebuild | 6 +-
www-servers/tomcat/tomcat-8.0.41.ebuild | 6 +-
.../{tomcat-8.0.41.ebuild => tomcat-8.0.43.ebuild} | 6 +-
6 files changed, 534 insertions(+), 3 deletions(-)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 59cf8dc4425..9c4b1f71406 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -4,6 +4,7 @@ DIST apache-tomcat-7.0.76-src.tar.gz 4662334 SHA256 67e8449ed9e5e33251e19c38f6db
DIST apache-tomcat-7.0.77-src.tar.gz 4664884 SHA256 7db04b3bf8898d9f9facee9c53ae7a2c78f13dfd4d14e931d78cee2d0813cc43 SHA512 19507de7f499df7269d8f819c30dc8194528555e9d6d430dad4b7ff3dc0c5c865d432eaef75bb2c157170cc5ebf76da5884296bf4e089c118448088a46f5e428 WHIRLPOOL c17fe412d5c1db530287111624dbebfffe100639cd4bbc78be8e7e5b9be130ac23dd2978bbababd2981c1c91c00570f80e05b34e505af9a49646835334867bc6
DIST apache-tomcat-8.0.39-src.tar.gz 5019148 SHA256 566bf43a50f42af9c5b46be60f68e571a56c41f8e93647cf9f68e5f93870be96 SHA512 0f58f2ef0dc047189672107b1f2586731e9455c3e665210d5634f5f5a16b0afd7ef5c35beaf02e22b874d4898ab62d33638785d9f18714893674bc691b0f9330 WHIRLPOOL 62baaba90f588c43ea503eb336d1b385b3a00b86686c1e232a836975f10d12241416b688279ffcd60dd42afb9d9660b6385e749c0c4d0877217f7494539f2752
DIST apache-tomcat-8.0.41-src.tar.gz 4950440 SHA256 2bbaf50e9c9ffe8d79369c0c16cad04ea256cccde85658d15a011c8f8d1c2b77 SHA512 6d2d104be33f203a5c45e6d0d8a8631542830462da932f1d11eadfb9927ba82e3fa5245321197e610f55ed34622b50743cb3af4699c7cedfb91b9dd2b35f338d WHIRLPOOL 758104c1e2f7aa57ffff07f8711b6c08c67674c4c9b8702f8da2d48839da1802f158aa158aef6386af27e6c95b430c6060436cafbd7accc48c7bced376c5cef8
+DIST apache-tomcat-8.0.43-src.tar.gz 4962788 SHA256 5ca1feb8ae5bd637a379ed409300fac0d463a8ec878d60f1ca54d3e7f2013f43 SHA512 aa15046ba3404c206b7983f42837d30debca69b18b85345d1376a853ad6e9fb5c0cbf42732f835779b10d39e2eae77f6d1688dadc5280b50236bf3432e251e9b WHIRLPOOL d1517c25b56a2ef4dd41977daf4ab5639b991ce38b6f5279a4e09f9232d73625be623beb678de8b3ec4e718cb50284cbebae67726622699738ad28be6d735414
DIST apache-tomcat-8.5.11-src.tar.gz 4996153 SHA256 81fb94243600d950375c4622f76b39c06c5615b7a8a6f70d387ea249bed1dddf SHA512 d1a9513535773805c26825f8843fa502e044c9f1ccc22176db5418a7a0abb6d1bcff3db401b449a5867065359abbc8277d14085d807fe00c95dd267d9091620d WHIRLPOOL 41ff9daec144c2481d3bb7a49bcd071eb2d21b34c11356a9911a139b404779971c31282f73b7b336b7e02d16156749e8e816dca8d5c727ef871ff0216577398d
DIST apache-tomcat-8.5.12-src.tar.gz 5009933 SHA256 af8b7ab3cc3ba17a667fd1fdd943ce5a459e8e887d30902030af7c42e3af2b07 SHA512 de8e928db261143629e415cb3532fbe762620d0500eca021d9a888671e9a609f82039b14db3d64371076be13e2ca6affc045f62bcd38c1608e968cb07d3e77d1 WHIRLPOOL eb927ed655ee49417203264b5cf45bd39629df2e29387a78d9db43f1c9e6376adad641d779a1243a109695aedcaa0a4a886c7edad523488ab02aef0cf94475a5
DIST apache-tomcat-8.5.13-src.tar.gz 5021333 SHA256 70db8d68f3a702e0997220a91d0c1ed59de4bbdc32d8482532412c1e31666a0b SHA512 4855e0b686dcdc10224e3bba804c7c944a8b2f48761dd0e4fca12a59cfc308fd5f26db6a02b3b7c39b595506c920fdf8f19eedb26a8acb7f1580f4e4b597fb5b WHIRLPOOL 6ad3150416e17396c81e6b638e035f55e695388fb2cdfd65a6803195894dee3391aac56243879faa850b2765d29f3ae13c74cefd66c349bd53bf14900e59dea6
diff --git a/www-servers/tomcat/files/tomcat-8.0.41-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.41-build.xml.patch
new file mode 100644
index 00000000000..cefd59f55ae
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.0.41-build.xml.patch
@@ -0,0 +1,259 @@
+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 3.1 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+ 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}"
+ filesDir="${tomcat.classes}"
+ filesId="files.jsp-api"
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
++-->
+
+ <!-- EL 3.0 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 -->
+ <jarIt jarfile="${websocket-api.jar}"
+@@ -986,14 +991,14 @@
+
+ <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">
+@@ -1053,7 +1058,7 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
+- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+@@ -1087,7 +1092,7 @@
+ </javac>
+ </target>
+
+- <target name="build-tomcat-jdbc" depends="package">
++ <target name="build-tomcat-jdbc" depends="package" unless="noget">
+ <!-- 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 +1107,7 @@
+ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+ </target>
+
+- <target name="build-tomcat-jdbc-src">
++ <target name="build-tomcat-jdbc-src" unless="noget">
+ <!-- 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 +1211,11 @@
+
+ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+ <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+ <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
+ failonerror="false"/>
+ <copy file="${jdt.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. -->
+@@ -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"
+- description="Prepare to build web services extras package">
++ description="Prepare to build web services extras package" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -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" >
++<!--
+ <javadoc packagenames="javax.servlet.*"
+ excludepackagenames="javax.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -1989,6 +1996,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="javax.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -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>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <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/"/>
+@@ -2757,7 +2767,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}"/>
+@@ -2791,7 +2801,7 @@ skip.installer property in build.properties" />
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -2848,7 +2858,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}"/>
+@@ -2874,18 +2884,18 @@ skip.installer property in build.properties" />
+
+ <!-- =============== Utility Targets to support downloads ================ -->
+
+- <target name="setproxy" if="${proxy.use}">
++ <target name="setproxy" if="${proxy.use}" unless="noget">
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+ proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+ </target>
+
+- <target name="testexist">
++ <target name="testexist" unless="noget">
+ <echo message="Testing for ${destfile}"/>
+ <available file="${destfile}" property="exist"/>
+ </target>
+
+- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
++ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2897,7 +2907,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadgz-2" unless="exist" depends="testexist">
++ <target name="downloadgz-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2916,7 +2926,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
++ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2927,7 +2937,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadzip-2" unless="exist" depends="testexist">
++ <target name="downloadzip-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2945,7 +2955,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
++ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
+ <!-- Download the file -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2955,7 +2965,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="downloadfile-2" unless="exist" depends="testexist">
++ <target name="downloadfile-2" unless="noget" depends="testexist">
+ <!-- Download the file from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2978,7 +2988,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="trydownload.check" depends="setproxy">
++ <target name="trydownload.check" depends="setproxy" unless="noget">
+ <condition property="trydownload.run">
+ <and>
+ <not>
+@@ -2989,7 +2999,7 @@ skip.installer property in build.properties" />
+ </condition>
+ </target>
+
+- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+ <!-- Downloads a file if not yet downloaded and the source URL is available -->
+ <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+ </target>
+@@ -3000,7 +3010,7 @@ skip.installer property in build.properties" />
+
+ <target name="ide-eclipse"
+ depends="download-compile, extras-webservices-prepare, download-test-compile"
+- description="Prepares the source tree to be built in Eclipse">
++ description="Prepares the source tree to be built in Eclipse" unless="noget">
+
+ <!-- Copy the sample project files into the root directory -->
+ <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/files/tomcat-8.0.43-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.43-build.xml.patch
new file mode 100644
index 00000000000..cefd59f55ae
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.0.43-build.xml.patch
@@ -0,0 +1,259 @@
+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 3.1 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+ 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}"
+ filesDir="${tomcat.classes}"
+ filesId="files.jsp-api"
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
++-->
+
+ <!-- EL 3.0 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 -->
+ <jarIt jarfile="${websocket-api.jar}"
+@@ -986,14 +991,14 @@
+
+ <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">
+@@ -1053,7 +1058,7 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
+- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+@@ -1087,7 +1092,7 @@
+ </javac>
+ </target>
+
+- <target name="build-tomcat-jdbc" depends="package">
++ <target name="build-tomcat-jdbc" depends="package" unless="noget">
+ <!-- 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 +1107,7 @@
+ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+ </target>
+
+- <target name="build-tomcat-jdbc-src">
++ <target name="build-tomcat-jdbc-src" unless="noget">
+ <!-- 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 +1211,11 @@
+
+ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+ <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+ <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
+ failonerror="false"/>
+ <copy file="${jdt.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. -->
+@@ -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"
+- description="Prepare to build web services extras package">
++ description="Prepare to build web services extras package" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -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" >
++<!--
+ <javadoc packagenames="javax.servlet.*"
+ excludepackagenames="javax.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -1989,6 +1996,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="javax.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -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>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <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/"/>
+@@ -2757,7 +2767,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}"/>
+@@ -2791,7 +2801,7 @@ skip.installer property in build.properties" />
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -2848,7 +2858,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}"/>
+@@ -2874,18 +2884,18 @@ skip.installer property in build.properties" />
+
+ <!-- =============== Utility Targets to support downloads ================ -->
+
+- <target name="setproxy" if="${proxy.use}">
++ <target name="setproxy" if="${proxy.use}" unless="noget">
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+ proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+ </target>
+
+- <target name="testexist">
++ <target name="testexist" unless="noget">
+ <echo message="Testing for ${destfile}"/>
+ <available file="${destfile}" property="exist"/>
+ </target>
+
+- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
++ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2897,7 +2907,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadgz-2" unless="exist" depends="testexist">
++ <target name="downloadgz-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2916,7 +2926,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
++ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2927,7 +2937,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadzip-2" unless="exist" depends="testexist">
++ <target name="downloadzip-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2945,7 +2955,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
++ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
+ <!-- Download the file -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2955,7 +2965,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="downloadfile-2" unless="exist" depends="testexist">
++ <target name="downloadfile-2" unless="noget" depends="testexist">
+ <!-- Download the file from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2978,7 +2988,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="trydownload.check" depends="setproxy">
++ <target name="trydownload.check" depends="setproxy" unless="noget">
+ <condition property="trydownload.run">
+ <and>
+ <not>
+@@ -2989,7 +2999,7 @@ skip.installer property in build.properties" />
+ </condition>
+ </target>
+
+- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+ <!-- Downloads a file if not yet downloaded and the source URL is available -->
+ <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+ </target>
+@@ -3000,7 +3010,7 @@ skip.installer property in build.properties" />
+
+ <target name="ide-eclipse"
+ depends="download-compile, extras-webservices-prepare, download-test-compile"
+- description="Prepares the source tree to be built in Eclipse">
++ description="Prepares the source tree to be built in Eclipse" unless="noget">
+
+ <!-- Copy the sample project files into the root directory -->
+ <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-8.0.39.ebuild b/www-servers/tomcat/tomcat-8.0.39.ebuild
index 81596bae336..4fffdde7178 100644
--- a/www-servers/tomcat/tomcat-8.0.39.ebuild
+++ b/www-servers/tomcat/tomcat-8.0.39.ebuild
@@ -44,7 +44,9 @@ pkg_setup() {
enewuser tomcat 265 -1 /dev/null tomcat
}
-java_prepare() {
+src_prepare() {
+ default
+
find -name '*.jar' -type f -delete -print || die
# Remove bundled servlet-api
@@ -56,6 +58,8 @@ java_prepare() {
sed -i -e "/^# ----- Execute The Requested Command/ a\
CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
bin/catalina.sh || die
+
+ java-pkg-2_src_prepare
}
JAVA_ANT_REWRITE_CLASSPATH="true"
diff --git a/www-servers/tomcat/tomcat-8.0.41.ebuild b/www-servers/tomcat/tomcat-8.0.41.ebuild
index 9ef90f30cda..9d2c9ff6392 100644
--- a/www-servers/tomcat/tomcat-8.0.41.ebuild
+++ b/www-servers/tomcat/tomcat-8.0.41.ebuild
@@ -44,7 +44,9 @@ pkg_setup() {
enewuser tomcat 265 -1 /dev/null tomcat
}
-java_prepare() {
+src_prepare() {
+ default
+
find -name '*.jar' -type f -delete -print || die
# Remove bundled servlet-api
@@ -56,6 +58,8 @@ java_prepare() {
sed -i -e "/^# ----- Execute The Requested Command/ a\
CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
bin/catalina.sh || die
+
+ java-pkg-2_src_prepare
}
JAVA_ANT_REWRITE_CLASSPATH="true"
diff --git a/www-servers/tomcat/tomcat-8.0.41.ebuild b/www-servers/tomcat/tomcat-8.0.43.ebuild
similarity index 98%
copy from www-servers/tomcat/tomcat-8.0.41.ebuild
copy to www-servers/tomcat/tomcat-8.0.43.ebuild
index 9ef90f30cda..9d2c9ff6392 100644
--- a/www-servers/tomcat/tomcat-8.0.41.ebuild
+++ b/www-servers/tomcat/tomcat-8.0.43.ebuild
@@ -44,7 +44,9 @@ pkg_setup() {
enewuser tomcat 265 -1 /dev/null tomcat
}
-java_prepare() {
+src_prepare() {
+ default
+
find -name '*.jar' -type f -delete -print || die
# Remove bundled servlet-api
@@ -56,6 +58,8 @@ java_prepare() {
sed -i -e "/^# ----- Execute The Requested Command/ a\
CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
bin/catalina.sh || die
+
+ java-pkg-2_src_prepare
}
JAVA_ANT_REWRITE_CLASSPATH="true"
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2017-04-25 10:12 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2017-04-25 10:12 UTC (permalink / raw
To: gentoo-commits
commit: 1514d80ba137ed71cc6158719dcfd072aa9da6dd
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 25 10:10:35 2017 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Apr 25 10:11:04 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1514d80b
www-servers/tomcat: version bump in slot 9
Package-Manager: Portage-2.3.5, Repoman-2.3.2
www-servers/tomcat/Manifest | 2 +-
...0.0_alpha19-build.xml.patch => tomcat-9.0.0_alpha20-build.xml.patch} | 0
.../tomcat/{tomcat-9.0.0_alpha19.ebuild => tomcat-9.0.0_alpha20.ebuild} | 0
3 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 9c4b1f71406..c4e21655348 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -9,4 +9,4 @@ DIST apache-tomcat-8.5.11-src.tar.gz 4996153 SHA256 81fb94243600d950375c4622f76b
DIST apache-tomcat-8.5.12-src.tar.gz 5009933 SHA256 af8b7ab3cc3ba17a667fd1fdd943ce5a459e8e887d30902030af7c42e3af2b07 SHA512 de8e928db261143629e415cb3532fbe762620d0500eca021d9a888671e9a609f82039b14db3d64371076be13e2ca6affc045f62bcd38c1608e968cb07d3e77d1 WHIRLPOOL eb927ed655ee49417203264b5cf45bd39629df2e29387a78d9db43f1c9e6376adad641d779a1243a109695aedcaa0a4a886c7edad523488ab02aef0cf94475a5
DIST apache-tomcat-8.5.13-src.tar.gz 5021333 SHA256 70db8d68f3a702e0997220a91d0c1ed59de4bbdc32d8482532412c1e31666a0b SHA512 4855e0b686dcdc10224e3bba804c7c944a8b2f48761dd0e4fca12a59cfc308fd5f26db6a02b3b7c39b595506c920fdf8f19eedb26a8acb7f1580f4e4b597fb5b WHIRLPOOL 6ad3150416e17396c81e6b638e035f55e695388fb2cdfd65a6803195894dee3391aac56243879faa850b2765d29f3ae13c74cefd66c349bd53bf14900e59dea6
DIST apache-tomcat-8.5.9-src.tar.gz 5059352 SHA256 65b4ed45950263cb4e4ca82a9b469943053eb85656a7568d6e0eb446ab34afe5 SHA512 85534e88467b298dfbf6d3ec274592da4e73c34ee3f8e84582f95aa7f69959b47076a7fd9e31c705b12e914fefad53ffc954a09c7d7f3da0203752033e70bf17 WHIRLPOOL 0dbcbc1bc0c9fdb8ca50dc7d630dc86d92c606a0e554e6fd8f68c1d34682e2581d4b730198161f75e64340c857f251244237ae0dcbc406caa90585236b5d69df
-DIST apache-tomcat-9.0.0.M19-src.tar.gz 4954415 SHA256 4ceb9481903cda8775c788bc2513cf7260764f72d55854cbef6f25dd3446b51e SHA512 fd397712d4398f86ed52afb7777e7e4f7cfd368421971a34069d7fe329f09990f97286bb095c369e1606ec9a3ba24489a5a086c670ca7d43ed47995bb03eac42 WHIRLPOOL 0bcb2c532ab7412d1ce09c721be09c1b2a1e3cf619733c806470887335e3071577a5303c505b5d7e5aca93c47f8f27c3cac5bf360671e96169419e814b87b4b0
+DIST apache-tomcat-9.0.0.M20-src.tar.gz 4957933 SHA256 58c6333e2cfdfdee74e7832c421bc63ab32487d9cb0fb7f2f534566b1d2a4564 SHA512 344ed515d81e7561213538fc40072730ca899c9065e92ef6aae7c22049fc49e7d1bfb6f52615176689b3a412a875e5c867fb38d67b2bd2e7bc3e5108817d5fb1 WHIRLPOOL 74d9cd6cc68305df7fe01abb39b24f92e403a76cce7dde77b4f6b2300c62dc1f60fd8dda83e31ecfad336032715d96e7ea1b90352ed0904fd2509ed662665acd
diff --git a/www-servers/tomcat/files/tomcat-9.0.0_alpha19-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.0_alpha20-build.xml.patch
similarity index 100%
rename from www-servers/tomcat/files/tomcat-9.0.0_alpha19-build.xml.patch
rename to www-servers/tomcat/files/tomcat-9.0.0_alpha20-build.xml.patch
diff --git a/www-servers/tomcat/tomcat-9.0.0_alpha19.ebuild b/www-servers/tomcat/tomcat-9.0.0_alpha20.ebuild
similarity index 100%
rename from www-servers/tomcat/tomcat-9.0.0_alpha19.ebuild
rename to www-servers/tomcat/tomcat-9.0.0_alpha20.ebuild
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2017-05-09 13:27 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2017-05-09 13:27 UTC (permalink / raw
To: gentoo-commits
commit: d4326129c72bcf9e3190c0ed148687ae4a5b6fc6
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue May 9 13:22:43 2017 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue May 9 13:22:43 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4326129
www-servers/tomcat: removed vurnelable versions per bug #615868
Package-Manager: Portage-2.3.5, Repoman-2.3.2
www-servers/tomcat/Manifest | 8 -
.../tomcat/files/tomcat-7.0.73-build.xml.patch | 149 ------------
.../tomcat/files/tomcat-7.0.75-build.xml.patch | 149 ------------
.../tomcat/files/tomcat-7.0.76-build.xml.patch | 149 ------------
.../tomcat/files/tomcat-8.0.39-build.xml.patch | 259 ---------------------
.../tomcat/files/tomcat-8.0.41-build.xml.patch | 259 ---------------------
.../tomcat/files/tomcat-8.5.11-build.xml.patch | 250 --------------------
.../tomcat/files/tomcat-8.5.12-build.xml.patch | 250 --------------------
.../tomcat/files/tomcat-8.5.9-build.xml.patch | 250 --------------------
www-servers/tomcat/tomcat-7.0.73.ebuild | 148 ------------
www-servers/tomcat/tomcat-7.0.75.ebuild | 148 ------------
www-servers/tomcat/tomcat-7.0.76.ebuild | 148 ------------
www-servers/tomcat/tomcat-8.0.39.ebuild | 157 -------------
www-servers/tomcat/tomcat-8.0.41.ebuild | 157 -------------
www-servers/tomcat/tomcat-8.5.11.ebuild | 157 -------------
www-servers/tomcat/tomcat-8.5.12.ebuild | 157 -------------
www-servers/tomcat/tomcat-8.5.9.ebuild | 157 -------------
17 files changed, 2952 deletions(-)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 5a59dd41d62..7e94645f1bb 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,13 +1,5 @@
-DIST apache-tomcat-7.0.73-src.tar.gz 4674971 SHA256 e3e236fb551ae9deb85024d8472fd08a76b14380e3ddaa2a1aff1fc670de5d87 SHA512 4754628c271d0aed3572ac0961c47653c10fcdfd0d13d8d1bc1b5774e961e6327cbb6b11b0e7e2f8eff525e2e60f741da49aeb855bb9d94e84cc87f346cf9ce6 WHIRLPOOL b9e75f53e41f1e9b9767fe8bc603ee5b7db2d3b1b7d2d900d430f4c0b73881a7ad36e0a0bfce773432b73ea8743865e933363ceec037d11d8f1008d8619ac1f1
-DIST apache-tomcat-7.0.75-src.tar.gz 4657629 SHA256 ffa9489ecd9aa0750598e5db0dc3275ce7e29de13f16d7bf863e0477bf338463 SHA512 2b7a0fc64ca58849713435993768b1f77666ad23f22cfb6091503bc1393f2c4fd3a61dac518efe4ccb22738d82fa81b1a1597ba148f4f829a0c642d131270117 WHIRLPOOL eada3af432dd943ca494ab3fbedfeaf655dbe621b639791e224cd0f58d1c26f8e6e99496757c21073249ef0af2bfa101dd8374f9d708777b331c31da663c435a
-DIST apache-tomcat-7.0.76-src.tar.gz 4662334 SHA256 67e8449ed9e5e33251e19c38f6dbb47593395d4f956882175651da5aee45bc83 SHA512 5f469723fbbf77bb1cb7d3939cd8ab47e200bba4fcc0d6cb53ea8d1447ca126987f870b063b22f9bffa083601f0e3ac69fb2c32be723d8c7055a6acb93a749e1 WHIRLPOOL a3d1abd5232ef7e8f7822c4238383a74b45b5d614aa74b7c1e0f140d9523b4d0de8f860bf828d116b150fdc910e23643015939f5041623b46b818808a87efbbb
DIST apache-tomcat-7.0.77-src.tar.gz 4664884 SHA256 7db04b3bf8898d9f9facee9c53ae7a2c78f13dfd4d14e931d78cee2d0813cc43 SHA512 19507de7f499df7269d8f819c30dc8194528555e9d6d430dad4b7ff3dc0c5c865d432eaef75bb2c157170cc5ebf76da5884296bf4e089c118448088a46f5e428 WHIRLPOOL c17fe412d5c1db530287111624dbebfffe100639cd4bbc78be8e7e5b9be130ac23dd2978bbababd2981c1c91c00570f80e05b34e505af9a49646835334867bc6
-DIST apache-tomcat-8.0.39-src.tar.gz 5019148 SHA256 566bf43a50f42af9c5b46be60f68e571a56c41f8e93647cf9f68e5f93870be96 SHA512 0f58f2ef0dc047189672107b1f2586731e9455c3e665210d5634f5f5a16b0afd7ef5c35beaf02e22b874d4898ab62d33638785d9f18714893674bc691b0f9330 WHIRLPOOL 62baaba90f588c43ea503eb336d1b385b3a00b86686c1e232a836975f10d12241416b688279ffcd60dd42afb9d9660b6385e749c0c4d0877217f7494539f2752
-DIST apache-tomcat-8.0.41-src.tar.gz 4950440 SHA256 2bbaf50e9c9ffe8d79369c0c16cad04ea256cccde85658d15a011c8f8d1c2b77 SHA512 6d2d104be33f203a5c45e6d0d8a8631542830462da932f1d11eadfb9927ba82e3fa5245321197e610f55ed34622b50743cb3af4699c7cedfb91b9dd2b35f338d WHIRLPOOL 758104c1e2f7aa57ffff07f8711b6c08c67674c4c9b8702f8da2d48839da1802f158aa158aef6386af27e6c95b430c6060436cafbd7accc48c7bced376c5cef8
DIST apache-tomcat-8.0.43-src.tar.gz 4962788 SHA256 5ca1feb8ae5bd637a379ed409300fac0d463a8ec878d60f1ca54d3e7f2013f43 SHA512 aa15046ba3404c206b7983f42837d30debca69b18b85345d1376a853ad6e9fb5c0cbf42732f835779b10d39e2eae77f6d1688dadc5280b50236bf3432e251e9b WHIRLPOOL d1517c25b56a2ef4dd41977daf4ab5639b991ce38b6f5279a4e09f9232d73625be623beb678de8b3ec4e718cb50284cbebae67726622699738ad28be6d735414
-DIST apache-tomcat-8.5.11-src.tar.gz 4996153 SHA256 81fb94243600d950375c4622f76b39c06c5615b7a8a6f70d387ea249bed1dddf SHA512 d1a9513535773805c26825f8843fa502e044c9f1ccc22176db5418a7a0abb6d1bcff3db401b449a5867065359abbc8277d14085d807fe00c95dd267d9091620d WHIRLPOOL 41ff9daec144c2481d3bb7a49bcd071eb2d21b34c11356a9911a139b404779971c31282f73b7b336b7e02d16156749e8e816dca8d5c727ef871ff0216577398d
-DIST apache-tomcat-8.5.12-src.tar.gz 5009933 SHA256 af8b7ab3cc3ba17a667fd1fdd943ce5a459e8e887d30902030af7c42e3af2b07 SHA512 de8e928db261143629e415cb3532fbe762620d0500eca021d9a888671e9a609f82039b14db3d64371076be13e2ca6affc045f62bcd38c1608e968cb07d3e77d1 WHIRLPOOL eb927ed655ee49417203264b5cf45bd39629df2e29387a78d9db43f1c9e6376adad641d779a1243a109695aedcaa0a4a886c7edad523488ab02aef0cf94475a5
DIST apache-tomcat-8.5.13-src.tar.gz 5021333 SHA256 70db8d68f3a702e0997220a91d0c1ed59de4bbdc32d8482532412c1e31666a0b SHA512 4855e0b686dcdc10224e3bba804c7c944a8b2f48761dd0e4fca12a59cfc308fd5f26db6a02b3b7c39b595506c920fdf8f19eedb26a8acb7f1580f4e4b597fb5b WHIRLPOOL 6ad3150416e17396c81e6b638e035f55e695388fb2cdfd65a6803195894dee3391aac56243879faa850b2765d29f3ae13c74cefd66c349bd53bf14900e59dea6
DIST apache-tomcat-8.5.14-src.tar.gz 5024579 SHA256 f52ce43e74b9a8b1930971dc0f7ca6f2fd06f517b02541b71f6b54148dff0955 SHA512 f51172f2bd079b18c2aa87a4513e128ab729cb9c80ecfe7ba3e817cc944ab310f2ea934655405c7241aa09e551b63ffe4c663b57ed7d38c756dc193e2acb2cea WHIRLPOOL 8cd9f2100a882619455a4eb914e7a1bc7ecae21f7aaf612ba901ac7c60a0920cd2bf9f7aa3b71eef459d6a981193b763b71e3a4f5489dcd2c87382040afe1dbd
-DIST apache-tomcat-8.5.9-src.tar.gz 5059352 SHA256 65b4ed45950263cb4e4ca82a9b469943053eb85656a7568d6e0eb446ab34afe5 SHA512 85534e88467b298dfbf6d3ec274592da4e73c34ee3f8e84582f95aa7f69959b47076a7fd9e31c705b12e914fefad53ffc954a09c7d7f3da0203752033e70bf17 WHIRLPOOL 0dbcbc1bc0c9fdb8ca50dc7d630dc86d92c606a0e554e6fd8f68c1d34682e2581d4b730198161f75e64340c857f251244237ae0dcbc406caa90585236b5d69df
DIST apache-tomcat-9.0.0.M20-src.tar.gz 4957933 SHA256 58c6333e2cfdfdee74e7832c421bc63ab32487d9cb0fb7f2f534566b1d2a4564 SHA512 344ed515d81e7561213538fc40072730ca899c9065e92ef6aae7c22049fc49e7d1bfb6f52615176689b3a412a875e5c867fb38d67b2bd2e7bc3e5108817d5fb1 WHIRLPOOL 74d9cd6cc68305df7fe01abb39b24f92e403a76cce7dde77b4f6b2300c62dc1f60fd8dda83e31ecfad336032715d96e7ea1b90352ed0904fd2509ed662665acd
diff --git a/www-servers/tomcat/files/tomcat-7.0.73-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.73-build.xml.patch
deleted file mode 100644
index 481591fb6ff..00000000000
--- a/www-servers/tomcat/files/tomcat-7.0.73-build.xml.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-diff -Naur apache-tomcat-7.0.63-src.orig/build.xml apache-tomcat-7.0.63-src/build.xml
---- apache-tomcat-7.0.63-src.orig/build.xml 2015-06-30 09:15:44.000000000 +0100
-+++ apache-tomcat-7.0.63-src/build.xml 2015-08-22 21:13:12.453038827 +0100
-@@ -660,12 +660,14 @@
- </fileset>
- </copy>
- <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
-+<!--
- <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1">
- <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
- <include name="*" />
- <exclude name="jspxml*" />
- </fileset>
- </copy>
-+-->
-
- </target>
-
-@@ -721,26 +723,32 @@
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
- <!-- Servlet 3.0 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- manifest="${tomcat.manifests}/servlet-api.jar.manifest"
- notice="${tomcat.manifests}/servlet-api.jar.notice"
- license="${tomcat.manifests}/servlet-api.jar.license" />
-+-->
-
- <!-- JSP 2.2 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${jsp-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest"
- notice="${tomcat.manifests}/jsp-api.jar.notice"
- license="${tomcat.manifests}/jsp-api.jar.license" />
-+-->
-
- <!-- JSP 2.2 EL Implementation JAR File -->
-+<!--
- <jarIt jarfile="${el-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.el-api"
- manifest="${tomcat.manifests}/el-api.jar.manifest" />
-+-->
-
- <!-- Bootstrap JAR File -->
- <jarIt jarfile="${bootstrap.jar}"
-@@ -986,12 +994,14 @@
- <target name="deploy" depends="package,build-docs,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">
-@@ -1051,14 +1061,15 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-+<!--
- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
--
-+-->
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
--
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
- failonerror="false"/>
--
-+-->
- <!-- 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}"
-@@ -1681,7 +1692,7 @@
-
- <target name="extras-webservices-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">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1886,6 +1897,7 @@
- description="Create the Tomcat javadoc" >
- <fail unless="java.7.home"
- message="The java.7.home property must be set for javadoc build"/>
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1947,6 +1959,7 @@
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -1985,9 +1998,11 @@
- <path refid="tomcat.webservices.classpath"/>
- <path location="${ant.core.lib}"/>
- </classpath>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2642,7 +2657,7 @@
- </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}"/>
-@@ -2699,7 +2714,7 @@
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2727,7 +2742,7 @@
- </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}"/>
diff --git a/www-servers/tomcat/files/tomcat-7.0.75-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.75-build.xml.patch
deleted file mode 100644
index 481591fb6ff..00000000000
--- a/www-servers/tomcat/files/tomcat-7.0.75-build.xml.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-diff -Naur apache-tomcat-7.0.63-src.orig/build.xml apache-tomcat-7.0.63-src/build.xml
---- apache-tomcat-7.0.63-src.orig/build.xml 2015-06-30 09:15:44.000000000 +0100
-+++ apache-tomcat-7.0.63-src/build.xml 2015-08-22 21:13:12.453038827 +0100
-@@ -660,12 +660,14 @@
- </fileset>
- </copy>
- <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
-+<!--
- <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1">
- <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
- <include name="*" />
- <exclude name="jspxml*" />
- </fileset>
- </copy>
-+-->
-
- </target>
-
-@@ -721,26 +723,32 @@
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
- <!-- Servlet 3.0 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- manifest="${tomcat.manifests}/servlet-api.jar.manifest"
- notice="${tomcat.manifests}/servlet-api.jar.notice"
- license="${tomcat.manifests}/servlet-api.jar.license" />
-+-->
-
- <!-- JSP 2.2 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${jsp-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest"
- notice="${tomcat.manifests}/jsp-api.jar.notice"
- license="${tomcat.manifests}/jsp-api.jar.license" />
-+-->
-
- <!-- JSP 2.2 EL Implementation JAR File -->
-+<!--
- <jarIt jarfile="${el-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.el-api"
- manifest="${tomcat.manifests}/el-api.jar.manifest" />
-+-->
-
- <!-- Bootstrap JAR File -->
- <jarIt jarfile="${bootstrap.jar}"
-@@ -986,12 +994,14 @@
- <target name="deploy" depends="package,build-docs,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">
-@@ -1051,14 +1061,15 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-+<!--
- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
--
-+-->
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
--
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
- failonerror="false"/>
--
-+-->
- <!-- 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}"
-@@ -1681,7 +1692,7 @@
-
- <target name="extras-webservices-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">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1886,6 +1897,7 @@
- description="Create the Tomcat javadoc" >
- <fail unless="java.7.home"
- message="The java.7.home property must be set for javadoc build"/>
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1947,6 +1959,7 @@
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -1985,9 +1998,11 @@
- <path refid="tomcat.webservices.classpath"/>
- <path location="${ant.core.lib}"/>
- </classpath>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2642,7 +2657,7 @@
- </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}"/>
-@@ -2699,7 +2714,7 @@
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2727,7 +2742,7 @@
- </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}"/>
diff --git a/www-servers/tomcat/files/tomcat-7.0.76-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.76-build.xml.patch
deleted file mode 100644
index 481591fb6ff..00000000000
--- a/www-servers/tomcat/files/tomcat-7.0.76-build.xml.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-diff -Naur apache-tomcat-7.0.63-src.orig/build.xml apache-tomcat-7.0.63-src/build.xml
---- apache-tomcat-7.0.63-src.orig/build.xml 2015-06-30 09:15:44.000000000 +0100
-+++ apache-tomcat-7.0.63-src/build.xml 2015-08-22 21:13:12.453038827 +0100
-@@ -660,12 +660,14 @@
- </fileset>
- </copy>
- <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
-+<!--
- <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1">
- <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
- <include name="*" />
- <exclude name="jspxml*" />
- </fileset>
- </copy>
-+-->
-
- </target>
-
-@@ -721,26 +723,32 @@
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
- <!-- Servlet 3.0 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- manifest="${tomcat.manifests}/servlet-api.jar.manifest"
- notice="${tomcat.manifests}/servlet-api.jar.notice"
- license="${tomcat.manifests}/servlet-api.jar.license" />
-+-->
-
- <!-- JSP 2.2 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${jsp-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest"
- notice="${tomcat.manifests}/jsp-api.jar.notice"
- license="${tomcat.manifests}/jsp-api.jar.license" />
-+-->
-
- <!-- JSP 2.2 EL Implementation JAR File -->
-+<!--
- <jarIt jarfile="${el-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.el-api"
- manifest="${tomcat.manifests}/el-api.jar.manifest" />
-+-->
-
- <!-- Bootstrap JAR File -->
- <jarIt jarfile="${bootstrap.jar}"
-@@ -986,12 +994,14 @@
- <target name="deploy" depends="package,build-docs,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">
-@@ -1051,14 +1061,15 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-+<!--
- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
--
-+-->
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
--
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
- failonerror="false"/>
--
-+-->
- <!-- 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}"
-@@ -1681,7 +1692,7 @@
-
- <target name="extras-webservices-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">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1886,6 +1897,7 @@
- description="Create the Tomcat javadoc" >
- <fail unless="java.7.home"
- message="The java.7.home property must be set for javadoc build"/>
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1947,6 +1959,7 @@
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -1985,9 +1998,11 @@
- <path refid="tomcat.webservices.classpath"/>
- <path location="${ant.core.lib}"/>
- </classpath>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2642,7 +2657,7 @@
- </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}"/>
-@@ -2699,7 +2714,7 @@
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2727,7 +2742,7 @@
- </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}"/>
diff --git a/www-servers/tomcat/files/tomcat-8.0.39-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.39-build.xml.patch
deleted file mode 100644
index cefd59f55ae..00000000000
--- a/www-servers/tomcat/files/tomcat-8.0.39-build.xml.patch
+++ /dev/null
@@ -1,259 +0,0 @@
-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 3.1 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- 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}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
- <!-- EL 3.0 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 -->
- <jarIt jarfile="${websocket-api.jar}"
-@@ -986,14 +991,14 @@
-
- <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">
-@@ -1053,7 +1058,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1087,7 +1092,7 @@
- </javac>
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- 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 +1107,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- 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 +1211,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
- failonerror="false"/>
- <copy file="${jdt.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. -->
-@@ -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"
-- description="Prepare to build web services extras package">
-+ description="Prepare to build web services extras package" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -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" >
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1989,6 +1996,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -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>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2757,7 +2767,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}"/>
-@@ -2791,7 +2801,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2848,7 +2858,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}"/>
-@@ -2874,18 +2884,18 @@ skip.installer property in build.properties" />
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2897,7 +2907,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2916,7 +2926,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2927,7 +2937,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2945,7 +2955,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2955,7 +2965,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2978,7 +2988,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -2989,7 +2999,7 @@ skip.installer property in build.properties" />
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -3000,7 +3010,7 @@ skip.installer property in build.properties" />
-
- <target name="ide-eclipse"
- depends="download-compile, extras-webservices-prepare, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/files/tomcat-8.0.41-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.41-build.xml.patch
deleted file mode 100644
index cefd59f55ae..00000000000
--- a/www-servers/tomcat/files/tomcat-8.0.41-build.xml.patch
+++ /dev/null
@@ -1,259 +0,0 @@
-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 3.1 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- 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}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
- <!-- EL 3.0 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 -->
- <jarIt jarfile="${websocket-api.jar}"
-@@ -986,14 +991,14 @@
-
- <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">
-@@ -1053,7 +1058,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1087,7 +1092,7 @@
- </javac>
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- 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 +1107,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- 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 +1211,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
- failonerror="false"/>
- <copy file="${jdt.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. -->
-@@ -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"
-- description="Prepare to build web services extras package">
-+ description="Prepare to build web services extras package" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -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" >
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1989,6 +1996,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -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>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2757,7 +2767,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}"/>
-@@ -2791,7 +2801,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2848,7 +2858,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}"/>
-@@ -2874,18 +2884,18 @@ skip.installer property in build.properties" />
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2897,7 +2907,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2916,7 +2926,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2927,7 +2937,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2945,7 +2955,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2955,7 +2965,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2978,7 +2988,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -2989,7 +2999,7 @@ skip.installer property in build.properties" />
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -3000,7 +3010,7 @@ skip.installer property in build.properties" />
-
- <target name="ide-eclipse"
- depends="download-compile, extras-webservices-prepare, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/files/tomcat-8.5.11-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.11-build.xml.patch
deleted file mode 100644
index 611c99d7a0e..00000000000
--- a/www-servers/tomcat/files/tomcat-8.5.11-build.xml.patch
+++ /dev/null
@@ -1,250 +0,0 @@
-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 3.1 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- 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}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
- <!-- EL 3.0 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 -->
- <jarIt jarfile="${websocket-api.jar}"
-@@ -982,14 +987,14 @@
-
- <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">
-@@ -1049,7 +1054,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1083,7 +1088,7 @@
- </javac>
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- 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}"
-@@ -1098,7 +1103,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- 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}"
-@@ -1202,10 +1207,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
- failonerror="false"/>
- <copy file="${jdt.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. -->
-@@ -1579,7 +1585,7 @@
-
- <target name="extras-webservices-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">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -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" >
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1791,6 +1798,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -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>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2574,7 +2584,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}"/>
-@@ -2608,7 +2618,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2665,7 +2675,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}"/>
-@@ -2691,18 +2701,18 @@ skip.installer property in build.properties" />
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2714,7 +2724,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2733,7 +2743,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2744,7 +2754,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2762,7 +2772,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2772,7 +2782,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2795,7 +2805,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -2806,7 +2816,7 @@ skip.installer property in build.properties" />
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -2817,7 +2827,7 @@ skip.installer property in build.properties" />
-
- <target name="ide-eclipse"
- depends="download-compile, extras-webservices-prepare, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/files/tomcat-8.5.12-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.12-build.xml.patch
deleted file mode 100644
index 611c99d7a0e..00000000000
--- a/www-servers/tomcat/files/tomcat-8.5.12-build.xml.patch
+++ /dev/null
@@ -1,250 +0,0 @@
-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 3.1 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- 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}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
- <!-- EL 3.0 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 -->
- <jarIt jarfile="${websocket-api.jar}"
-@@ -982,14 +987,14 @@
-
- <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">
-@@ -1049,7 +1054,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1083,7 +1088,7 @@
- </javac>
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- 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}"
-@@ -1098,7 +1103,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- 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}"
-@@ -1202,10 +1207,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
- failonerror="false"/>
- <copy file="${jdt.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. -->
-@@ -1579,7 +1585,7 @@
-
- <target name="extras-webservices-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">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -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" >
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1791,6 +1798,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -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>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2574,7 +2584,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}"/>
-@@ -2608,7 +2618,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2665,7 +2675,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}"/>
-@@ -2691,18 +2701,18 @@ skip.installer property in build.properties" />
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2714,7 +2724,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2733,7 +2743,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2744,7 +2754,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2762,7 +2772,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2772,7 +2782,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2795,7 +2805,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -2806,7 +2816,7 @@ skip.installer property in build.properties" />
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -2817,7 +2827,7 @@ skip.installer property in build.properties" />
-
- <target name="ide-eclipse"
- depends="download-compile, extras-webservices-prepare, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/files/tomcat-8.5.9-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.9-build.xml.patch
deleted file mode 100644
index 611c99d7a0e..00000000000
--- a/www-servers/tomcat/files/tomcat-8.5.9-build.xml.patch
+++ /dev/null
@@ -1,250 +0,0 @@
-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 3.1 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- 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}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
- <!-- EL 3.0 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 -->
- <jarIt jarfile="${websocket-api.jar}"
-@@ -982,14 +987,14 @@
-
- <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">
-@@ -1049,7 +1054,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1083,7 +1088,7 @@
- </javac>
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- 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}"
-@@ -1098,7 +1103,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- 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}"
-@@ -1202,10 +1207,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
- failonerror="false"/>
- <copy file="${jdt.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. -->
-@@ -1579,7 +1585,7 @@
-
- <target name="extras-webservices-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">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -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" >
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1791,6 +1798,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -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>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2574,7 +2584,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}"/>
-@@ -2608,7 +2618,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2665,7 +2675,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}"/>
-@@ -2691,18 +2701,18 @@ skip.installer property in build.properties" />
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2714,7 +2724,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2733,7 +2743,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2744,7 +2754,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2762,7 +2772,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2772,7 +2782,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2795,7 +2805,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -2806,7 +2816,7 @@ skip.installer property in build.properties" />
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -2817,7 +2827,7 @@ skip.installer property in build.properties" />
-
- <target name="ide-eclipse"
- depends="download-compile, extras-webservices-prepare, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-7.0.73.ebuild b/www-servers/tomcat/tomcat-7.0.73.ebuild
deleted file mode 100644
index 0d01aa49b31..00000000000
--- a/www-servers/tomcat/tomcat-7.0.73.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="7"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps websockets"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.5"
-SAPI_SLOT="3.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- dev-java/tomcat-servlet-api:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- websockets? ( >=virtual/jre-1.7 )
- !websockets? ( >=virtual/jre-1.6 )
- !<dev-java/tomcat-native-1.1.24"
-DEPEND="${COMMON_DEP}
- websockets? ( >=virtual/jdk-1.7 )
- !websockets? ( >=virtual/jdk-1.6 )
- test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_prepare() {
- default
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- java-pkg_clean
-
- epatch "${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}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r1"
-INIT_REV="-r1"
-
-src_compile() {
- use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
diff --git a/www-servers/tomcat/tomcat-7.0.75.ebuild b/www-servers/tomcat/tomcat-7.0.75.ebuild
deleted file mode 100644
index 407d62aa7f8..00000000000
--- a/www-servers/tomcat/tomcat-7.0.75.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="7"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps websockets"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.5"
-SAPI_SLOT="3.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- dev-java/tomcat-servlet-api:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- websockets? ( >=virtual/jre-1.7 )
- !websockets? ( >=virtual/jre-1.6 )
- !<dev-java/tomcat-native-1.1.24"
-DEPEND="${COMMON_DEP}
- websockets? ( >=virtual/jdk-1.7 )
- !websockets? ( >=virtual/jdk-1.6 )
- test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_prepare() {
- default
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- java-pkg_clean
-
- epatch "${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}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r1"
-INIT_REV="-r1"
-
-src_compile() {
- use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
diff --git a/www-servers/tomcat/tomcat-7.0.76.ebuild b/www-servers/tomcat/tomcat-7.0.76.ebuild
deleted file mode 100644
index 407d62aa7f8..00000000000
--- a/www-servers/tomcat/tomcat-7.0.76.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="7"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps websockets"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.5"
-SAPI_SLOT="3.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- dev-java/tomcat-servlet-api:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- websockets? ( >=virtual/jre-1.7 )
- !websockets? ( >=virtual/jre-1.6 )
- !<dev-java/tomcat-native-1.1.24"
-DEPEND="${COMMON_DEP}
- websockets? ( >=virtual/jdk-1.7 )
- !websockets? ( >=virtual/jdk-1.6 )
- test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_prepare() {
- default
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- java-pkg_clean
-
- epatch "${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}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r1"
-INIT_REV="-r1"
-
-src_compile() {
- use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.0.39.ebuild b/www-servers/tomcat/tomcat-8.0.39.ebuild
deleted file mode 100644
index 4fffdde7178..00000000000
--- a/www-servers/tomcat/tomcat-8.0.39.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-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-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="8"
-KEYWORDS="amd64 x86 ~x86-fbsd ~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="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- dev-java/tomcat-servlet-api:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- !<dev-java/tomcat-native-1.1.24
- >=virtual/jre-1.7"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- >=virtual/jdk-1.7
- test? (
- >=dev-java/ant-junit-1.9:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_prepare() {
- default
-
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- epatch "${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}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.0.41.ebuild b/www-servers/tomcat/tomcat-8.0.41.ebuild
deleted file mode 100644
index 9d2c9ff6392..00000000000
--- a/www-servers/tomcat/tomcat-8.0.41.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-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-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="8"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~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="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- dev-java/tomcat-servlet-api:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- !<dev-java/tomcat-native-1.1.24
- >=virtual/jre-1.7"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- >=virtual/jdk-1.7
- test? (
- >=dev-java/ant-junit-1.9:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_prepare() {
- default
-
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- epatch "${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}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.5.11.ebuild b/www-servers/tomcat/tomcat-8.5.11.ebuild
deleted file mode 100644
index f76cec3287c..00000000000
--- a/www-servers/tomcat/tomcat-8.5.11.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-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-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="8.5"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~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="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- !<dev-java/tomcat-native-1.1.24
- >=virtual/jre-1.7"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- >=virtual/jdk-1.7
- test? (
- >=dev-java/ant-junit-1.9:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_prepare() {
- default
-
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- epatch "${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}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.5.12.ebuild b/www-servers/tomcat/tomcat-8.5.12.ebuild
deleted file mode 100644
index f76cec3287c..00000000000
--- a/www-servers/tomcat/tomcat-8.5.12.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-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-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="8.5"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~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="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- !<dev-java/tomcat-native-1.1.24
- >=virtual/jre-1.7"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- >=virtual/jdk-1.7
- test? (
- >=dev-java/ant-junit-1.9:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_prepare() {
- default
-
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- epatch "${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}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.5.9.ebuild b/www-servers/tomcat/tomcat-8.5.9.ebuild
deleted file mode 100644
index f76cec3287c..00000000000
--- a/www-servers/tomcat/tomcat-8.5.9.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-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-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="8.5"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~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="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- !<dev-java/tomcat-native-1.1.24
- >=virtual/jre-1.7"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- >=virtual/jdk-1.7
- test? (
- >=dev-java/ant-junit-1.9:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_prepare() {
- default
-
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- epatch "${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}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2017-05-15 17:36 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2017-05-15 17:36 UTC (permalink / raw
To: gentoo-commits
commit: 19fd7f50bef06f142db12aa60875b3a4786a65d0
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon May 15 17:16:10 2017 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon May 15 17:35:49 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19fd7f50
www-servers/tomcat: version bump in slot 9
Package-Manager: Portage-2.3.5, Repoman-2.3.2
www-servers/tomcat/Manifest | 2 +-
...0.0_alpha20-build.xml.patch => tomcat-9.0.0_alpha21-build.xml.patch} | 0
.../tomcat/{tomcat-9.0.0_alpha20.ebuild => tomcat-9.0.0_alpha21.ebuild} | 0
3 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 7e94645f1bb..4e99c2ce40a 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -2,4 +2,4 @@ DIST apache-tomcat-7.0.77-src.tar.gz 4664884 SHA256 7db04b3bf8898d9f9facee9c53ae
DIST apache-tomcat-8.0.43-src.tar.gz 4962788 SHA256 5ca1feb8ae5bd637a379ed409300fac0d463a8ec878d60f1ca54d3e7f2013f43 SHA512 aa15046ba3404c206b7983f42837d30debca69b18b85345d1376a853ad6e9fb5c0cbf42732f835779b10d39e2eae77f6d1688dadc5280b50236bf3432e251e9b WHIRLPOOL d1517c25b56a2ef4dd41977daf4ab5639b991ce38b6f5279a4e09f9232d73625be623beb678de8b3ec4e718cb50284cbebae67726622699738ad28be6d735414
DIST apache-tomcat-8.5.13-src.tar.gz 5021333 SHA256 70db8d68f3a702e0997220a91d0c1ed59de4bbdc32d8482532412c1e31666a0b SHA512 4855e0b686dcdc10224e3bba804c7c944a8b2f48761dd0e4fca12a59cfc308fd5f26db6a02b3b7c39b595506c920fdf8f19eedb26a8acb7f1580f4e4b597fb5b WHIRLPOOL 6ad3150416e17396c81e6b638e035f55e695388fb2cdfd65a6803195894dee3391aac56243879faa850b2765d29f3ae13c74cefd66c349bd53bf14900e59dea6
DIST apache-tomcat-8.5.14-src.tar.gz 5024579 SHA256 f52ce43e74b9a8b1930971dc0f7ca6f2fd06f517b02541b71f6b54148dff0955 SHA512 f51172f2bd079b18c2aa87a4513e128ab729cb9c80ecfe7ba3e817cc944ab310f2ea934655405c7241aa09e551b63ffe4c663b57ed7d38c756dc193e2acb2cea WHIRLPOOL 8cd9f2100a882619455a4eb914e7a1bc7ecae21f7aaf612ba901ac7c60a0920cd2bf9f7aa3b71eef459d6a981193b763b71e3a4f5489dcd2c87382040afe1dbd
-DIST apache-tomcat-9.0.0.M20-src.tar.gz 4957933 SHA256 58c6333e2cfdfdee74e7832c421bc63ab32487d9cb0fb7f2f534566b1d2a4564 SHA512 344ed515d81e7561213538fc40072730ca899c9065e92ef6aae7c22049fc49e7d1bfb6f52615176689b3a412a875e5c867fb38d67b2bd2e7bc3e5108817d5fb1 WHIRLPOOL 74d9cd6cc68305df7fe01abb39b24f92e403a76cce7dde77b4f6b2300c62dc1f60fd8dda83e31ecfad336032715d96e7ea1b90352ed0904fd2509ed662665acd
+DIST apache-tomcat-9.0.0.M21-src.tar.gz 4965516 SHA256 7e48d6c5e8f93d6f2decdb7c60bb8b807094b05897af6c6500957a7ddcdb49ce SHA512 1883b18f6daceae46dd10039343a1431db2407b692228cb0df9aa8cc3978d36ba66b0c0a124029956bdf2a07b38e1628cb76c3621baed848e54bfb2ce94164df WHIRLPOOL f1302d42e596f0eb369e31d4584d5338ca816bf4ffe43f43a2c7866a31ec2ccef6ecd106dc1589af9ba19affdf6128cf1b966169cfc56db44110b60451d2ba78
diff --git a/www-servers/tomcat/files/tomcat-9.0.0_alpha20-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.0_alpha21-build.xml.patch
similarity index 100%
rename from www-servers/tomcat/files/tomcat-9.0.0_alpha20-build.xml.patch
rename to www-servers/tomcat/files/tomcat-9.0.0_alpha21-build.xml.patch
diff --git a/www-servers/tomcat/tomcat-9.0.0_alpha20.ebuild b/www-servers/tomcat/tomcat-9.0.0_alpha21.ebuild
similarity index 100%
rename from www-servers/tomcat/tomcat-9.0.0_alpha20.ebuild
rename to www-servers/tomcat/tomcat-9.0.0_alpha21.ebuild
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2017-07-15 7:50 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2017-07-15 7:50 UTC (permalink / raw
To: gentoo-commits
commit: bd6a9d7b23dfee32a425fc3e4337a91f8bb5c7c6
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 07:42:17 2017 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 07:50:02 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd6a9d7b
www-servers/tomcat: version bump for slot 8
Package-Manager: Portage-2.3.6, Repoman-2.3.2
www-servers/tomcat/Manifest | 1 +
.../tomcat/files/tomcat-8.0.45-build.xml.patch | 259 +++++++++++++++++++++
www-servers/tomcat/tomcat-8.0.45.ebuild | 157 +++++++++++++
3 files changed, 417 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index f8fa2a82a4a..f3ca9147d1f 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,5 +1,6 @@
DIST apache-tomcat-7.0.77-src.tar.gz 4664884 SHA256 7db04b3bf8898d9f9facee9c53ae7a2c78f13dfd4d14e931d78cee2d0813cc43 SHA512 19507de7f499df7269d8f819c30dc8194528555e9d6d430dad4b7ff3dc0c5c865d432eaef75bb2c157170cc5ebf76da5884296bf4e089c118448088a46f5e428 WHIRLPOOL c17fe412d5c1db530287111624dbebfffe100639cd4bbc78be8e7e5b9be130ac23dd2978bbababd2981c1c91c00570f80e05b34e505af9a49646835334867bc6
DIST apache-tomcat-8.0.43-src.tar.gz 4962788 SHA256 5ca1feb8ae5bd637a379ed409300fac0d463a8ec878d60f1ca54d3e7f2013f43 SHA512 aa15046ba3404c206b7983f42837d30debca69b18b85345d1376a853ad6e9fb5c0cbf42732f835779b10d39e2eae77f6d1688dadc5280b50236bf3432e251e9b WHIRLPOOL d1517c25b56a2ef4dd41977daf4ab5639b991ce38b6f5279a4e09f9232d73625be623beb678de8b3ec4e718cb50284cbebae67726622699738ad28be6d735414
+DIST apache-tomcat-8.0.45-src.tar.gz 4978313 SHA256 450fd2890b12e56692cb203f95651f9a873dce056b7b4362e142bc817032b291 SHA512 80e4281f5b6e4d6bf607179840bc6cb923ea9f57ec8231a451c3b5a1f8938f72ec1097290059afba0ef7b56edeb56d63636849517b69b91c7093cb15ff0eaa04 WHIRLPOOL c893cd5c26637f8881c19353e269145e33fa11e02eb10ef93a41590ad2e1e6c6ffa1b3f6c3c7c318630765f666be07447fd3a21c70c2c381e75c458b60383ea0
DIST apache-tomcat-8.5.13-src.tar.gz 5021333 SHA256 70db8d68f3a702e0997220a91d0c1ed59de4bbdc32d8482532412c1e31666a0b SHA512 4855e0b686dcdc10224e3bba804c7c944a8b2f48761dd0e4fca12a59cfc308fd5f26db6a02b3b7c39b595506c920fdf8f19eedb26a8acb7f1580f4e4b597fb5b WHIRLPOOL 6ad3150416e17396c81e6b638e035f55e695388fb2cdfd65a6803195894dee3391aac56243879faa850b2765d29f3ae13c74cefd66c349bd53bf14900e59dea6
DIST apache-tomcat-8.5.14-src.tar.gz 5024579 SHA256 f52ce43e74b9a8b1930971dc0f7ca6f2fd06f517b02541b71f6b54148dff0955 SHA512 f51172f2bd079b18c2aa87a4513e128ab729cb9c80ecfe7ba3e817cc944ab310f2ea934655405c7241aa09e551b63ffe4c663b57ed7d38c756dc193e2acb2cea WHIRLPOOL 8cd9f2100a882619455a4eb914e7a1bc7ecae21f7aaf612ba901ac7c60a0920cd2bf9f7aa3b71eef459d6a981193b763b71e3a4f5489dcd2c87382040afe1dbd
DIST apache-tomcat-8.5.15-src.tar.gz 5028654 SHA256 941e1e936af46dbe233e41f770e68b09e2ac0d88b6ee01f7b2116a67220cb323 SHA512 222d53ed53b1b3e18ff42dc0a987627e75de93048d9a36ce08448272f167ed7ab91ac6d44158a2de9f2f960e53c36497841649e941305e583e6b70e13f55c970 WHIRLPOOL c5f63ca2ac4b7f48041bbbbdb93c15dbd224e09998abaa89c79c22537615935b6ce87a1b4667ddd92ec28bfad9d84c723aed8dc20780d966bdf4b094a87fdfa9
diff --git a/www-servers/tomcat/files/tomcat-8.0.45-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.45-build.xml.patch
new file mode 100644
index 00000000000..cefd59f55ae
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.0.45-build.xml.patch
@@ -0,0 +1,259 @@
+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 3.1 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+ 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}"
+ filesDir="${tomcat.classes}"
+ filesId="files.jsp-api"
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
++-->
+
+ <!-- EL 3.0 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 -->
+ <jarIt jarfile="${websocket-api.jar}"
+@@ -986,14 +991,14 @@
+
+ <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">
+@@ -1053,7 +1058,7 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
+- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+@@ -1087,7 +1092,7 @@
+ </javac>
+ </target>
+
+- <target name="build-tomcat-jdbc" depends="package">
++ <target name="build-tomcat-jdbc" depends="package" unless="noget">
+ <!-- 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 +1107,7 @@
+ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+ </target>
+
+- <target name="build-tomcat-jdbc-src">
++ <target name="build-tomcat-jdbc-src" unless="noget">
+ <!-- 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 +1211,11 @@
+
+ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+ <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+ <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
+ failonerror="false"/>
+ <copy file="${jdt.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. -->
+@@ -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"
+- description="Prepare to build web services extras package">
++ description="Prepare to build web services extras package" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -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" >
++<!--
+ <javadoc packagenames="javax.servlet.*"
+ excludepackagenames="javax.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -1989,6 +1996,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="javax.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -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>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <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/"/>
+@@ -2757,7 +2767,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}"/>
+@@ -2791,7 +2801,7 @@ skip.installer property in build.properties" />
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -2848,7 +2858,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}"/>
+@@ -2874,18 +2884,18 @@ skip.installer property in build.properties" />
+
+ <!-- =============== Utility Targets to support downloads ================ -->
+
+- <target name="setproxy" if="${proxy.use}">
++ <target name="setproxy" if="${proxy.use}" unless="noget">
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+ proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+ </target>
+
+- <target name="testexist">
++ <target name="testexist" unless="noget">
+ <echo message="Testing for ${destfile}"/>
+ <available file="${destfile}" property="exist"/>
+ </target>
+
+- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
++ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2897,7 +2907,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadgz-2" unless="exist" depends="testexist">
++ <target name="downloadgz-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2916,7 +2926,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
++ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2927,7 +2937,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadzip-2" unless="exist" depends="testexist">
++ <target name="downloadzip-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2945,7 +2955,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
++ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
+ <!-- Download the file -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2955,7 +2965,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="downloadfile-2" unless="exist" depends="testexist">
++ <target name="downloadfile-2" unless="noget" depends="testexist">
+ <!-- Download the file from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2978,7 +2988,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="trydownload.check" depends="setproxy">
++ <target name="trydownload.check" depends="setproxy" unless="noget">
+ <condition property="trydownload.run">
+ <and>
+ <not>
+@@ -2989,7 +2999,7 @@ skip.installer property in build.properties" />
+ </condition>
+ </target>
+
+- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+ <!-- Downloads a file if not yet downloaded and the source URL is available -->
+ <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+ </target>
+@@ -3000,7 +3010,7 @@ skip.installer property in build.properties" />
+
+ <target name="ide-eclipse"
+ depends="download-compile, extras-webservices-prepare, download-test-compile"
+- description="Prepares the source tree to be built in Eclipse">
++ description="Prepares the source tree to be built in Eclipse" unless="noget">
+
+ <!-- Copy the sample project files into the root directory -->
+ <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-8.0.45.ebuild b/www-servers/tomcat/tomcat-8.0.45.ebuild
new file mode 100644
index 00000000000..9d2c9ff6392
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.0.45.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+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-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="8"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~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="3.1"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ dev-java/tomcat-servlet-api:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+ !<dev-java/tomcat-native-1.1.24
+ >=virtual/jre-1.7"
+DEPEND="${COMMON_DEP}
+ app-admin/pwgen
+ >=virtual/jdk-1.7
+ test? (
+ >=dev-java/ant-junit-1.9:0
+ dev-java/easymock:3.2
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup tomcat 265
+ enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+src_prepare() {
+ default
+
+ find -name '*.jar' -type f -delete -print || die
+
+ # Remove bundled servlet-api
+ rm -rv java/javax/{el,servlet} || die
+
+ epatch "${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}\`" \
+ bin/catalina.sh || die
+
+ java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+ java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ # add missing docBase
+ local apps="host-manager manager"
+ for app in ${apps}; do
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+ output/build/webapps/${app}/META-INF/context.xml || die
+ done
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw="$(pwgen -s -B 15 1)"
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2017-07-15 7:50 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2017-07-15 7:50 UTC (permalink / raw
To: gentoo-commits
commit: 9bbf1a96f160be47b56d022e4fc679f703fb7ad9
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 07:33:02 2017 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 07:49:55 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bbf1a96
www-servers/tomcat: version bump for slot 8.5
Package-Manager: Portage-2.3.6, Repoman-2.3.2
www-servers/tomcat/Manifest | 1 +
.../tomcat/files/tomcat-8.5.16-build.xml.patch | 250 +++++++++++++++++++++
www-servers/tomcat/tomcat-8.5.16.ebuild | 157 +++++++++++++
3 files changed, 408 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 9f5fe387a6c..c0bb964ca9d 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -3,4 +3,5 @@ DIST apache-tomcat-8.0.43-src.tar.gz 4962788 SHA256 5ca1feb8ae5bd637a379ed409300
DIST apache-tomcat-8.5.13-src.tar.gz 5021333 SHA256 70db8d68f3a702e0997220a91d0c1ed59de4bbdc32d8482532412c1e31666a0b SHA512 4855e0b686dcdc10224e3bba804c7c944a8b2f48761dd0e4fca12a59cfc308fd5f26db6a02b3b7c39b595506c920fdf8f19eedb26a8acb7f1580f4e4b597fb5b WHIRLPOOL 6ad3150416e17396c81e6b638e035f55e695388fb2cdfd65a6803195894dee3391aac56243879faa850b2765d29f3ae13c74cefd66c349bd53bf14900e59dea6
DIST apache-tomcat-8.5.14-src.tar.gz 5024579 SHA256 f52ce43e74b9a8b1930971dc0f7ca6f2fd06f517b02541b71f6b54148dff0955 SHA512 f51172f2bd079b18c2aa87a4513e128ab729cb9c80ecfe7ba3e817cc944ab310f2ea934655405c7241aa09e551b63ffe4c663b57ed7d38c756dc193e2acb2cea WHIRLPOOL 8cd9f2100a882619455a4eb914e7a1bc7ecae21f7aaf612ba901ac7c60a0920cd2bf9f7aa3b71eef459d6a981193b763b71e3a4f5489dcd2c87382040afe1dbd
DIST apache-tomcat-8.5.15-src.tar.gz 5028654 SHA256 941e1e936af46dbe233e41f770e68b09e2ac0d88b6ee01f7b2116a67220cb323 SHA512 222d53ed53b1b3e18ff42dc0a987627e75de93048d9a36ce08448272f167ed7ab91ac6d44158a2de9f2f960e53c36497841649e941305e583e6b70e13f55c970 WHIRLPOOL c5f63ca2ac4b7f48041bbbbdb93c15dbd224e09998abaa89c79c22537615935b6ce87a1b4667ddd92ec28bfad9d84c723aed8dc20780d966bdf4b094a87fdfa9
+DIST apache-tomcat-8.5.16-src.tar.gz 5054513 SHA256 0dd3589779bd43624a6027ec5e26262d10128dd46dcd08ed4107b8f453416c23 SHA512 187f32ebeeca9099f2bf679613dd89198268d361d352550e09db23ef8df483543ec67604c58ddebb8259c46ab510519e8fa75a803d2e86ab815b231ae327222e WHIRLPOOL d241aed38921a76f75451f7d3c676e97548b843bec724c8c80a6534638cd27095f4ba790cbef56c8913cd6d96e63536855359c5a271aa41c7d3b97e25de26253
DIST apache-tomcat-9.0.0.M21-src.tar.gz 4965516 SHA256 7e48d6c5e8f93d6f2decdb7c60bb8b807094b05897af6c6500957a7ddcdb49ce SHA512 1883b18f6daceae46dd10039343a1431db2407b692228cb0df9aa8cc3978d36ba66b0c0a124029956bdf2a07b38e1628cb76c3621baed848e54bfb2ce94164df WHIRLPOOL f1302d42e596f0eb369e31d4584d5338ca816bf4ffe43f43a2c7866a31ec2ccef6ecd106dc1589af9ba19affdf6128cf1b966169cfc56db44110b60451d2ba78
diff --git a/www-servers/tomcat/files/tomcat-8.5.16-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.16-build.xml.patch
new file mode 100644
index 00000000000..611c99d7a0e
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.5.16-build.xml.patch
@@ -0,0 +1,250 @@
+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 3.1 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+ 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}"
+ filesDir="${tomcat.classes}"
+ filesId="files.jsp-api"
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
++-->
+
+ <!-- EL 3.0 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 -->
+ <jarIt jarfile="${websocket-api.jar}"
+@@ -982,14 +987,14 @@
+
+ <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">
+@@ -1049,7 +1054,7 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
+- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+@@ -1083,7 +1088,7 @@
+ </javac>
+ </target>
+
+- <target name="build-tomcat-jdbc" depends="package">
++ <target name="build-tomcat-jdbc" depends="package" unless="noget">
+ <!-- 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}"
+@@ -1098,7 +1103,7 @@
+ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+ </target>
+
+- <target name="build-tomcat-jdbc-src">
++ <target name="build-tomcat-jdbc-src" unless="noget">
+ <!-- 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}"
+@@ -1202,10 +1207,11 @@
+
+ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+ <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+ <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
+ failonerror="false"/>
+ <copy file="${jdt.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. -->
+@@ -1579,7 +1585,7 @@
+
+ <target name="extras-webservices-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">
+ <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -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" >
++<!--
+ <javadoc packagenames="javax.servlet.*"
+ excludepackagenames="javax.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -1791,6 +1798,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="javax.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -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>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <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/"/>
+@@ -2574,7 +2584,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}"/>
+@@ -2608,7 +2618,7 @@ skip.installer property in build.properties" />
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -2665,7 +2675,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}"/>
+@@ -2691,18 +2701,18 @@ skip.installer property in build.properties" />
+
+ <!-- =============== Utility Targets to support downloads ================ -->
+
+- <target name="setproxy" if="${proxy.use}">
++ <target name="setproxy" if="${proxy.use}" unless="noget">
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+ proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+ </target>
+
+- <target name="testexist">
++ <target name="testexist" unless="noget">
+ <echo message="Testing for ${destfile}"/>
+ <available file="${destfile}" property="exist"/>
+ </target>
+
+- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
++ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2714,7 +2724,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadgz-2" unless="exist" depends="testexist">
++ <target name="downloadgz-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2733,7 +2743,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
++ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2744,7 +2754,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadzip-2" unless="exist" depends="testexist">
++ <target name="downloadzip-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2762,7 +2772,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
++ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
+ <!-- Download the file -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2772,7 +2782,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="downloadfile-2" unless="exist" depends="testexist">
++ <target name="downloadfile-2" unless="noget" depends="testexist">
+ <!-- Download the file from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2795,7 +2805,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="trydownload.check" depends="setproxy">
++ <target name="trydownload.check" depends="setproxy" unless="noget">
+ <condition property="trydownload.run">
+ <and>
+ <not>
+@@ -2806,7 +2816,7 @@ skip.installer property in build.properties" />
+ </condition>
+ </target>
+
+- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+ <!-- Downloads a file if not yet downloaded and the source URL is available -->
+ <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+ </target>
+@@ -2817,7 +2827,7 @@ skip.installer property in build.properties" />
+
+ <target name="ide-eclipse"
+ depends="download-compile, extras-webservices-prepare, download-test-compile"
+- description="Prepares the source tree to be built in Eclipse">
++ description="Prepares the source tree to be built in Eclipse" unless="noget">
+
+ <!-- Copy the sample project files into the root directory -->
+ <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-8.5.16.ebuild b/www-servers/tomcat/tomcat-8.5.16.ebuild
new file mode 100644
index 00000000000..f76cec3287c
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.5.16.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+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-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="8.5"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~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="3.1"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+ !<dev-java/tomcat-native-1.1.24
+ >=virtual/jre-1.7"
+DEPEND="${COMMON_DEP}
+ app-admin/pwgen
+ >=virtual/jdk-1.7
+ test? (
+ >=dev-java/ant-junit-1.9:0
+ dev-java/easymock:3.2
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup tomcat 265
+ enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+src_prepare() {
+ default
+
+ find -name '*.jar' -type f -delete -print || die
+
+ # Remove bundled servlet-api
+ rm -rv java/javax/{el,servlet} || die
+
+ epatch "${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}\`" \
+ bin/catalina.sh || die
+
+ java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+ java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ # add missing docBase
+ local apps="host-manager manager"
+ for app in ${apps}; do
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+ output/build/webapps/${app}/META-INF/context.xml || die
+ done
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw="$(pwgen -s -B 15 1)"
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2017-07-15 7:50 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2017-07-15 7:50 UTC (permalink / raw
To: gentoo-commits
commit: 8d4e7ae7f65d38f371cf4e06efb70c03006f5d1a
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 07:49:10 2017 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 07:50:06 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d4e7ae7
www-servers/tomcat: version bump for slot 7
Package-Manager: Portage-2.3.6, Repoman-2.3.2
www-servers/tomcat/Manifest | 1 +
.../tomcat/files/tomcat-7.0.79-build.xml.patch | 149 +++++++++++++++++++++
www-servers/tomcat/tomcat-7.0.79.ebuild | 148 ++++++++++++++++++++
3 files changed, 298 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index f3ca9147d1f..23bc5c5a6bf 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,4 +1,5 @@
DIST apache-tomcat-7.0.77-src.tar.gz 4664884 SHA256 7db04b3bf8898d9f9facee9c53ae7a2c78f13dfd4d14e931d78cee2d0813cc43 SHA512 19507de7f499df7269d8f819c30dc8194528555e9d6d430dad4b7ff3dc0c5c865d432eaef75bb2c157170cc5ebf76da5884296bf4e089c118448088a46f5e428 WHIRLPOOL c17fe412d5c1db530287111624dbebfffe100639cd4bbc78be8e7e5b9be130ac23dd2978bbababd2981c1c91c00570f80e05b34e505af9a49646835334867bc6
+DIST apache-tomcat-7.0.79-src.tar.gz 4682119 SHA256 b5373951afe41ffd27348bb57cff80bc7d86a5669bdedb0b4bbe1d567009dc32 SHA512 75c29fd7de8c245502cae4db845a508f320739625d726fe892924b639e7333b76b3446f36cb67b9ad9500e95823b5eadaf056c4cb6bea962a59eb5491696e0b2 WHIRLPOOL 5db799cfbd061a199270b0ebb971c4fe43632522a23f590b7a46e021af5c8b0bce4a711e16bd0416b5baa6f2556cf8178bf14abadf4d493ece44c9eb2c4cdae2
DIST apache-tomcat-8.0.43-src.tar.gz 4962788 SHA256 5ca1feb8ae5bd637a379ed409300fac0d463a8ec878d60f1ca54d3e7f2013f43 SHA512 aa15046ba3404c206b7983f42837d30debca69b18b85345d1376a853ad6e9fb5c0cbf42732f835779b10d39e2eae77f6d1688dadc5280b50236bf3432e251e9b WHIRLPOOL d1517c25b56a2ef4dd41977daf4ab5639b991ce38b6f5279a4e09f9232d73625be623beb678de8b3ec4e718cb50284cbebae67726622699738ad28be6d735414
DIST apache-tomcat-8.0.45-src.tar.gz 4978313 SHA256 450fd2890b12e56692cb203f95651f9a873dce056b7b4362e142bc817032b291 SHA512 80e4281f5b6e4d6bf607179840bc6cb923ea9f57ec8231a451c3b5a1f8938f72ec1097290059afba0ef7b56edeb56d63636849517b69b91c7093cb15ff0eaa04 WHIRLPOOL c893cd5c26637f8881c19353e269145e33fa11e02eb10ef93a41590ad2e1e6c6ffa1b3f6c3c7c318630765f666be07447fd3a21c70c2c381e75c458b60383ea0
DIST apache-tomcat-8.5.13-src.tar.gz 5021333 SHA256 70db8d68f3a702e0997220a91d0c1ed59de4bbdc32d8482532412c1e31666a0b SHA512 4855e0b686dcdc10224e3bba804c7c944a8b2f48761dd0e4fca12a59cfc308fd5f26db6a02b3b7c39b595506c920fdf8f19eedb26a8acb7f1580f4e4b597fb5b WHIRLPOOL 6ad3150416e17396c81e6b638e035f55e695388fb2cdfd65a6803195894dee3391aac56243879faa850b2765d29f3ae13c74cefd66c349bd53bf14900e59dea6
diff --git a/www-servers/tomcat/files/tomcat-7.0.79-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.79-build.xml.patch
new file mode 100644
index 00000000000..481591fb6ff
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-7.0.79-build.xml.patch
@@ -0,0 +1,149 @@
+diff -Naur apache-tomcat-7.0.63-src.orig/build.xml apache-tomcat-7.0.63-src/build.xml
+--- apache-tomcat-7.0.63-src.orig/build.xml 2015-06-30 09:15:44.000000000 +0100
++++ apache-tomcat-7.0.63-src/build.xml 2015-08-22 21:13:12.453038827 +0100
+@@ -660,12 +660,14 @@
+ </fileset>
+ </copy>
+ <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
++<!--
+ <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1">
+ <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
+ <include name="*" />
+ <exclude name="jspxml*" />
+ </fileset>
+ </copy>
++-->
+
+ </target>
+
+@@ -721,26 +723,32 @@
+ manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+
+ <!-- Servlet 3.0 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+ manifest="${tomcat.manifests}/servlet-api.jar.manifest"
+ notice="${tomcat.manifests}/servlet-api.jar.notice"
+ license="${tomcat.manifests}/servlet-api.jar.license" />
++-->
+
+ <!-- JSP 2.2 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${jsp-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.jsp-api"
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest"
+ notice="${tomcat.manifests}/jsp-api.jar.notice"
+ license="${tomcat.manifests}/jsp-api.jar.license" />
++-->
+
+ <!-- JSP 2.2 EL Implementation JAR File -->
++<!--
+ <jarIt jarfile="${el-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.el-api"
+ manifest="${tomcat.manifests}/el-api.jar.manifest" />
++-->
+
+ <!-- Bootstrap JAR File -->
+ <jarIt jarfile="${bootstrap.jar}"
+@@ -986,12 +994,14 @@
+ <target name="deploy" depends="package,build-docs,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">
+@@ -1051,14 +1061,15 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
++<!--
+ <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
+-
++-->
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+-
++<!--
+ <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
+ failonerror="false"/>
+-
++-->
+ <!-- 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}"
+@@ -1681,7 +1692,7 @@
+
+ <target name="extras-webservices-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">
+ <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -1886,6 +1897,7 @@
+ description="Create the Tomcat javadoc" >
+ <fail unless="java.7.home"
+ message="The java.7.home property must be set for javadoc build"/>
++<!--
+ <javadoc packagenames="javax.servlet.*"
+ excludepackagenames="javax.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -1947,6 +1959,7 @@
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="javax.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -1985,9 +1998,11 @@
+ <path refid="tomcat.webservices.classpath"/>
+ <path location="${ant.core.lib}"/>
+ </classpath>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <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/"/>
+@@ -2642,7 +2657,7 @@
+ </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}"/>
+@@ -2699,7 +2714,7 @@
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -2727,7 +2742,7 @@
+ </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}"/>
diff --git a/www-servers/tomcat/tomcat-7.0.79.ebuild b/www-servers/tomcat/tomcat-7.0.79.ebuild
new file mode 100644
index 00000000000..407d62aa7f8
--- /dev/null
+++ b/www-servers/tomcat/tomcat-7.0.79.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="7"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps websockets"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.5"
+SAPI_SLOT="3.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ dev-java/tomcat-servlet-api:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+ websockets? ( >=virtual/jre-1.7 )
+ !websockets? ( >=virtual/jre-1.6 )
+ !<dev-java/tomcat-native-1.1.24"
+DEPEND="${COMMON_DEP}
+ websockets? ( >=virtual/jdk-1.7 )
+ !websockets? ( >=virtual/jdk-1.6 )
+ test? ( dev-java/ant-junit:0 )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup tomcat 265
+ enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+src_prepare() {
+ default
+
+ # Remove bundled servlet-api
+ rm -rv java/javax/{el,servlet} || die
+
+ java-pkg_clean
+
+ epatch "${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}\`" \
+ bin/catalina.sh || die
+
+ java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r1"
+INIT_REV="-r1"
+
+src_compile() {
+ use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+ java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2017-08-10 10:35 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2017-08-10 10:35 UTC (permalink / raw
To: gentoo-commits
commit: 8780475f4cd106c85bc732fd1b9a689999d47940
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 10 10:35:08 2017 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Aug 10 10:35:39 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8780475f
www-servers/tomcat: bumped for slot 8.5
Package-Manager: Portage-2.3.6, Repoman-2.3.3
www-servers/tomcat/Manifest | 1 +
.../tomcat/files/tomcat-8.5.20-build.xml.patch | 250 +++++++++++++++++++++
www-servers/tomcat/tomcat-8.5.20.ebuild | 157 +++++++++++++
3 files changed, 408 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 2a07679026c..fbd44f47f7f 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -3,4 +3,5 @@ DIST apache-tomcat-7.0.79-src.tar.gz 4682119 SHA256 b5373951afe41ffd27348bb57cff
DIST apache-tomcat-8.0.43-src.tar.gz 4962788 SHA256 5ca1feb8ae5bd637a379ed409300fac0d463a8ec878d60f1ca54d3e7f2013f43 SHA512 aa15046ba3404c206b7983f42837d30debca69b18b85345d1376a853ad6e9fb5c0cbf42732f835779b10d39e2eae77f6d1688dadc5280b50236bf3432e251e9b WHIRLPOOL d1517c25b56a2ef4dd41977daf4ab5639b991ce38b6f5279a4e09f9232d73625be623beb678de8b3ec4e718cb50284cbebae67726622699738ad28be6d735414
DIST apache-tomcat-8.0.45-src.tar.gz 4978313 SHA256 450fd2890b12e56692cb203f95651f9a873dce056b7b4362e142bc817032b291 SHA512 80e4281f5b6e4d6bf607179840bc6cb923ea9f57ec8231a451c3b5a1f8938f72ec1097290059afba0ef7b56edeb56d63636849517b69b91c7093cb15ff0eaa04 WHIRLPOOL c893cd5c26637f8881c19353e269145e33fa11e02eb10ef93a41590ad2e1e6c6ffa1b3f6c3c7c318630765f666be07447fd3a21c70c2c381e75c458b60383ea0
DIST apache-tomcat-8.5.16-src.tar.gz 5054513 SHA256 0dd3589779bd43624a6027ec5e26262d10128dd46dcd08ed4107b8f453416c23 SHA512 187f32ebeeca9099f2bf679613dd89198268d361d352550e09db23ef8df483543ec67604c58ddebb8259c46ab510519e8fa75a803d2e86ab815b231ae327222e WHIRLPOOL d241aed38921a76f75451f7d3c676e97548b843bec724c8c80a6534638cd27095f4ba790cbef56c8913cd6d96e63536855359c5a271aa41c7d3b97e25de26253
+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
diff --git a/www-servers/tomcat/files/tomcat-8.5.20-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.20-build.xml.patch
new file mode 100644
index 00000000000..611c99d7a0e
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.5.20-build.xml.patch
@@ -0,0 +1,250 @@
+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 3.1 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+ 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}"
+ filesDir="${tomcat.classes}"
+ filesId="files.jsp-api"
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
++-->
+
+ <!-- EL 3.0 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 -->
+ <jarIt jarfile="${websocket-api.jar}"
+@@ -982,14 +987,14 @@
+
+ <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">
+@@ -1049,7 +1054,7 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
+- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+@@ -1083,7 +1088,7 @@
+ </javac>
+ </target>
+
+- <target name="build-tomcat-jdbc" depends="package">
++ <target name="build-tomcat-jdbc" depends="package" unless="noget">
+ <!-- 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}"
+@@ -1098,7 +1103,7 @@
+ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+ </target>
+
+- <target name="build-tomcat-jdbc-src">
++ <target name="build-tomcat-jdbc-src" unless="noget">
+ <!-- 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}"
+@@ -1202,10 +1207,11 @@
+
+ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+ <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+ <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
+ failonerror="false"/>
+ <copy file="${jdt.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. -->
+@@ -1579,7 +1585,7 @@
+
+ <target name="extras-webservices-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">
+ <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -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" >
++<!--
+ <javadoc packagenames="javax.servlet.*"
+ excludepackagenames="javax.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -1791,6 +1798,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="javax.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -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>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <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/"/>
+@@ -2574,7 +2584,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}"/>
+@@ -2608,7 +2618,7 @@ skip.installer property in build.properties" />
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -2665,7 +2675,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}"/>
+@@ -2691,18 +2701,18 @@ skip.installer property in build.properties" />
+
+ <!-- =============== Utility Targets to support downloads ================ -->
+
+- <target name="setproxy" if="${proxy.use}">
++ <target name="setproxy" if="${proxy.use}" unless="noget">
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+ proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+ </target>
+
+- <target name="testexist">
++ <target name="testexist" unless="noget">
+ <echo message="Testing for ${destfile}"/>
+ <available file="${destfile}" property="exist"/>
+ </target>
+
+- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
++ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2714,7 +2724,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadgz-2" unless="exist" depends="testexist">
++ <target name="downloadgz-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2733,7 +2743,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
++ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2744,7 +2754,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadzip-2" unless="exist" depends="testexist">
++ <target name="downloadzip-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2762,7 +2772,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
++ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
+ <!-- Download the file -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2772,7 +2782,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="downloadfile-2" unless="exist" depends="testexist">
++ <target name="downloadfile-2" unless="noget" depends="testexist">
+ <!-- Download the file from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2795,7 +2805,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="trydownload.check" depends="setproxy">
++ <target name="trydownload.check" depends="setproxy" unless="noget">
+ <condition property="trydownload.run">
+ <and>
+ <not>
+@@ -2806,7 +2816,7 @@ skip.installer property in build.properties" />
+ </condition>
+ </target>
+
+- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+ <!-- Downloads a file if not yet downloaded and the source URL is available -->
+ <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+ </target>
+@@ -2817,7 +2827,7 @@ skip.installer property in build.properties" />
+
+ <target name="ide-eclipse"
+ depends="download-compile, extras-webservices-prepare, download-test-compile"
+- description="Prepares the source tree to be built in Eclipse">
++ description="Prepares the source tree to be built in Eclipse" unless="noget">
+
+ <!-- Copy the sample project files into the root directory -->
+ <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-8.5.20.ebuild b/www-servers/tomcat/tomcat-8.5.20.ebuild
new file mode 100644
index 00000000000..f76cec3287c
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.5.20.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+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-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="8.5"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~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="3.1"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+ !<dev-java/tomcat-native-1.1.24
+ >=virtual/jre-1.7"
+DEPEND="${COMMON_DEP}
+ app-admin/pwgen
+ >=virtual/jdk-1.7
+ test? (
+ >=dev-java/ant-junit-1.9:0
+ dev-java/easymock:3.2
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup tomcat 265
+ enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+src_prepare() {
+ default
+
+ find -name '*.jar' -type f -delete -print || die
+
+ # Remove bundled servlet-api
+ rm -rv java/javax/{el,servlet} || die
+
+ epatch "${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}\`" \
+ bin/catalina.sh || die
+
+ java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+ java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ # add missing docBase
+ local apps="host-manager manager"
+ for app in ${apps}; do
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+ output/build/webapps/${app}/META-INF/context.xml || die
+ done
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw="$(pwgen -s -B 15 1)"
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2017-08-10 10:35 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2017-08-10 10:35 UTC (permalink / raw
To: gentoo-commits
commit: a11f536a28d001e90184e40d2907153ed3fad797
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 10 10:28:20 2017 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Aug 10 10:35:32 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a11f536a
www-servers/tomcat: removed obsolete ebuilds for slot 8.5
Package-Manager: Portage-2.3.6, Repoman-2.3.3
www-servers/tomcat/Manifest | 3 -
.../tomcat/files/tomcat-8.5.13-build.xml.patch | 250 ---------------------
.../tomcat/files/tomcat-8.5.14-build.xml.patch | 250 ---------------------
.../tomcat/files/tomcat-8.5.15-build.xml.patch | 250 ---------------------
www-servers/tomcat/tomcat-8.5.13.ebuild | 157 -------------
www-servers/tomcat/tomcat-8.5.14.ebuild | 157 -------------
www-servers/tomcat/tomcat-8.5.15.ebuild | 157 -------------
7 files changed, 1224 deletions(-)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index e520ba148f3..2a07679026c 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -2,8 +2,5 @@ DIST apache-tomcat-7.0.77-src.tar.gz 4664884 SHA256 7db04b3bf8898d9f9facee9c53ae
DIST apache-tomcat-7.0.79-src.tar.gz 4682119 SHA256 b5373951afe41ffd27348bb57cff80bc7d86a5669bdedb0b4bbe1d567009dc32 SHA512 75c29fd7de8c245502cae4db845a508f320739625d726fe892924b639e7333b76b3446f36cb67b9ad9500e95823b5eadaf056c4cb6bea962a59eb5491696e0b2 WHIRLPOOL 5db799cfbd061a199270b0ebb971c4fe43632522a23f590b7a46e021af5c8b0bce4a711e16bd0416b5baa6f2556cf8178bf14abadf4d493ece44c9eb2c4cdae2
DIST apache-tomcat-8.0.43-src.tar.gz 4962788 SHA256 5ca1feb8ae5bd637a379ed409300fac0d463a8ec878d60f1ca54d3e7f2013f43 SHA512 aa15046ba3404c206b7983f42837d30debca69b18b85345d1376a853ad6e9fb5c0cbf42732f835779b10d39e2eae77f6d1688dadc5280b50236bf3432e251e9b WHIRLPOOL d1517c25b56a2ef4dd41977daf4ab5639b991ce38b6f5279a4e09f9232d73625be623beb678de8b3ec4e718cb50284cbebae67726622699738ad28be6d735414
DIST apache-tomcat-8.0.45-src.tar.gz 4978313 SHA256 450fd2890b12e56692cb203f95651f9a873dce056b7b4362e142bc817032b291 SHA512 80e4281f5b6e4d6bf607179840bc6cb923ea9f57ec8231a451c3b5a1f8938f72ec1097290059afba0ef7b56edeb56d63636849517b69b91c7093cb15ff0eaa04 WHIRLPOOL c893cd5c26637f8881c19353e269145e33fa11e02eb10ef93a41590ad2e1e6c6ffa1b3f6c3c7c318630765f666be07447fd3a21c70c2c381e75c458b60383ea0
-DIST apache-tomcat-8.5.13-src.tar.gz 5021333 SHA256 70db8d68f3a702e0997220a91d0c1ed59de4bbdc32d8482532412c1e31666a0b SHA512 4855e0b686dcdc10224e3bba804c7c944a8b2f48761dd0e4fca12a59cfc308fd5f26db6a02b3b7c39b595506c920fdf8f19eedb26a8acb7f1580f4e4b597fb5b WHIRLPOOL 6ad3150416e17396c81e6b638e035f55e695388fb2cdfd65a6803195894dee3391aac56243879faa850b2765d29f3ae13c74cefd66c349bd53bf14900e59dea6
-DIST apache-tomcat-8.5.14-src.tar.gz 5024579 SHA256 f52ce43e74b9a8b1930971dc0f7ca6f2fd06f517b02541b71f6b54148dff0955 SHA512 f51172f2bd079b18c2aa87a4513e128ab729cb9c80ecfe7ba3e817cc944ab310f2ea934655405c7241aa09e551b63ffe4c663b57ed7d38c756dc193e2acb2cea WHIRLPOOL 8cd9f2100a882619455a4eb914e7a1bc7ecae21f7aaf612ba901ac7c60a0920cd2bf9f7aa3b71eef459d6a981193b763b71e3a4f5489dcd2c87382040afe1dbd
-DIST apache-tomcat-8.5.15-src.tar.gz 5028654 SHA256 941e1e936af46dbe233e41f770e68b09e2ac0d88b6ee01f7b2116a67220cb323 SHA512 222d53ed53b1b3e18ff42dc0a987627e75de93048d9a36ce08448272f167ed7ab91ac6d44158a2de9f2f960e53c36497841649e941305e583e6b70e13f55c970 WHIRLPOOL c5f63ca2ac4b7f48041bbbbdb93c15dbd224e09998abaa89c79c22537615935b6ce87a1b4667ddd92ec28bfad9d84c723aed8dc20780d966bdf4b094a87fdfa9
DIST apache-tomcat-8.5.16-src.tar.gz 5054513 SHA256 0dd3589779bd43624a6027ec5e26262d10128dd46dcd08ed4107b8f453416c23 SHA512 187f32ebeeca9099f2bf679613dd89198268d361d352550e09db23ef8df483543ec67604c58ddebb8259c46ab510519e8fa75a803d2e86ab815b231ae327222e WHIRLPOOL d241aed38921a76f75451f7d3c676e97548b843bec724c8c80a6534638cd27095f4ba790cbef56c8913cd6d96e63536855359c5a271aa41c7d3b97e25de26253
DIST apache-tomcat-9.0.0.M26-src.tar.gz 5011957 SHA256 02ba2c9a3a2d78994fc14f2b304c3b3f46615538a48a9193e475b08565cb9b7e SHA512 8c25932aa244edb46eee26aa837636e78c8104ca6617cb5ba924e0e45c2f9dbcd7d196ddf69ee2f1c1b6053dda818a3b92f8f46c156f3048c46cee919fc22c13 WHIRLPOOL 11e00a6e6a5822bd4e357e375b026dd732bf33319e30dde25f11bc1b99994617be3ce6d4976870f725e56646e5ffee92acb6fc23f46b53a46ebbf6c53707ea07
diff --git a/www-servers/tomcat/files/tomcat-8.5.13-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.13-build.xml.patch
deleted file mode 100644
index 611c99d7a0e..00000000000
--- a/www-servers/tomcat/files/tomcat-8.5.13-build.xml.patch
+++ /dev/null
@@ -1,250 +0,0 @@
-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 3.1 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- 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}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
- <!-- EL 3.0 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 -->
- <jarIt jarfile="${websocket-api.jar}"
-@@ -982,14 +987,14 @@
-
- <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">
-@@ -1049,7 +1054,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1083,7 +1088,7 @@
- </javac>
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- 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}"
-@@ -1098,7 +1103,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- 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}"
-@@ -1202,10 +1207,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
- failonerror="false"/>
- <copy file="${jdt.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. -->
-@@ -1579,7 +1585,7 @@
-
- <target name="extras-webservices-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">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -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" >
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1791,6 +1798,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -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>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2574,7 +2584,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}"/>
-@@ -2608,7 +2618,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2665,7 +2675,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}"/>
-@@ -2691,18 +2701,18 @@ skip.installer property in build.properties" />
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2714,7 +2724,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2733,7 +2743,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2744,7 +2754,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2762,7 +2772,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2772,7 +2782,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2795,7 +2805,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -2806,7 +2816,7 @@ skip.installer property in build.properties" />
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -2817,7 +2827,7 @@ skip.installer property in build.properties" />
-
- <target name="ide-eclipse"
- depends="download-compile, extras-webservices-prepare, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/files/tomcat-8.5.14-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.14-build.xml.patch
deleted file mode 100644
index 611c99d7a0e..00000000000
--- a/www-servers/tomcat/files/tomcat-8.5.14-build.xml.patch
+++ /dev/null
@@ -1,250 +0,0 @@
-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 3.1 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- 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}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
- <!-- EL 3.0 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 -->
- <jarIt jarfile="${websocket-api.jar}"
-@@ -982,14 +987,14 @@
-
- <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">
-@@ -1049,7 +1054,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1083,7 +1088,7 @@
- </javac>
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- 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}"
-@@ -1098,7 +1103,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- 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}"
-@@ -1202,10 +1207,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
- failonerror="false"/>
- <copy file="${jdt.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. -->
-@@ -1579,7 +1585,7 @@
-
- <target name="extras-webservices-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">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -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" >
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1791,6 +1798,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -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>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2574,7 +2584,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}"/>
-@@ -2608,7 +2618,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2665,7 +2675,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}"/>
-@@ -2691,18 +2701,18 @@ skip.installer property in build.properties" />
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2714,7 +2724,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2733,7 +2743,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2744,7 +2754,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2762,7 +2772,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2772,7 +2782,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2795,7 +2805,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -2806,7 +2816,7 @@ skip.installer property in build.properties" />
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -2817,7 +2827,7 @@ skip.installer property in build.properties" />
-
- <target name="ide-eclipse"
- depends="download-compile, extras-webservices-prepare, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/files/tomcat-8.5.15-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.15-build.xml.patch
deleted file mode 100644
index 611c99d7a0e..00000000000
--- a/www-servers/tomcat/files/tomcat-8.5.15-build.xml.patch
+++ /dev/null
@@ -1,250 +0,0 @@
-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 3.1 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- 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}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
- <!-- EL 3.0 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 -->
- <jarIt jarfile="${websocket-api.jar}"
-@@ -982,14 +987,14 @@
-
- <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">
-@@ -1049,7 +1054,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1083,7 +1088,7 @@
- </javac>
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- 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}"
-@@ -1098,7 +1103,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- 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}"
-@@ -1202,10 +1207,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
- failonerror="false"/>
- <copy file="${jdt.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. -->
-@@ -1579,7 +1585,7 @@
-
- <target name="extras-webservices-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">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -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" >
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1791,6 +1798,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -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>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2574,7 +2584,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}"/>
-@@ -2608,7 +2618,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2665,7 +2675,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}"/>
-@@ -2691,18 +2701,18 @@ skip.installer property in build.properties" />
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2714,7 +2724,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2733,7 +2743,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2744,7 +2754,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2762,7 +2772,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2772,7 +2782,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2795,7 +2805,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -2806,7 +2816,7 @@ skip.installer property in build.properties" />
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -2817,7 +2827,7 @@ skip.installer property in build.properties" />
-
- <target name="ide-eclipse"
- depends="download-compile, extras-webservices-prepare, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-8.5.13.ebuild b/www-servers/tomcat/tomcat-8.5.13.ebuild
deleted file mode 100644
index f76cec3287c..00000000000
--- a/www-servers/tomcat/tomcat-8.5.13.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-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-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="8.5"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~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="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- !<dev-java/tomcat-native-1.1.24
- >=virtual/jre-1.7"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- >=virtual/jdk-1.7
- test? (
- >=dev-java/ant-junit-1.9:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_prepare() {
- default
-
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- epatch "${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}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.5.14.ebuild b/www-servers/tomcat/tomcat-8.5.14.ebuild
deleted file mode 100644
index f76cec3287c..00000000000
--- a/www-servers/tomcat/tomcat-8.5.14.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-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-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="8.5"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~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="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- !<dev-java/tomcat-native-1.1.24
- >=virtual/jre-1.7"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- >=virtual/jdk-1.7
- test? (
- >=dev-java/ant-junit-1.9:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_prepare() {
- default
-
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- epatch "${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}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.5.15.ebuild b/www-servers/tomcat/tomcat-8.5.15.ebuild
deleted file mode 100644
index f76cec3287c..00000000000
--- a/www-servers/tomcat/tomcat-8.5.15.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-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-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="8.5"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~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="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- !<dev-java/tomcat-native-1.1.24
- >=virtual/jre-1.7"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- >=virtual/jdk-1.7
- test? (
- >=dev-java/ant-junit-1.9:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_prepare() {
- default
-
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- epatch "${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}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2017-10-11 14:27 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2017-10-11 14:27 UTC (permalink / raw
To: gentoo-commits
commit: 5563b3f50e0df4d21c7d8d2db5e4a865ddd52553
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 11 14:25:42 2017 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Oct 11 14:26:11 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5563b3f5
www-servers/tomcat: version bump for slot 9
Package-Manager: Portage-2.3.11, Repoman-2.3.3
www-servers/tomcat/Manifest | 2 +-
...xml.patch => tomcat-9.0.1_beta-build.xml.patch} | 57 +++++++++++-----------
...0.0_alpha26.ebuild => tomcat-9.0.1_beta.ebuild} | 2 +-
3 files changed, 30 insertions(+), 31 deletions(-)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 0f5333ff3d2..18dbcb4bc28 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
similarity index 86%
rename from www-servers/tomcat/files/tomcat-9.0.0_alpha26-build.xml.patch
rename to www-servers/tomcat/files/tomcat-9.0.1_beta-build.xml.patch
index 3c4e5c2a9d4..3f55c285e23 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
similarity index 99%
rename from www-servers/tomcat/tomcat-9.0.0_alpha26.ebuild
rename to www-servers/tomcat/tomcat-9.0.1_beta.ebuild
index 8090b4f5c01..4fc6821dab5 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"
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2017-10-19 7:41 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2017-10-19 7:41 UTC (permalink / raw
To: gentoo-commits
commit: 9c25d93ce8052dafeeb18787424467d00e4e872b
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 19 07:40:45 2017 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Oct 19 07:41:11 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c25d93c
www-servers/tomcat: removed x86 stable version 7.0.79 per bug #631420
Package-Manager: Portage-2.3.11, Repoman-2.3.3
www-servers/tomcat/Manifest | 1 -
.../tomcat/files/tomcat-7.0.79-build.xml.patch | 149 ---------------------
www-servers/tomcat/tomcat-7.0.79.ebuild | 148 --------------------
3 files changed, 298 deletions(-)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 1e5c7f1d781..f53fd96b2d5 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,4 +1,3 @@
-DIST apache-tomcat-7.0.79-src.tar.gz 4682119 SHA256 b5373951afe41ffd27348bb57cff80bc7d86a5669bdedb0b4bbe1d567009dc32 SHA512 75c29fd7de8c245502cae4db845a508f320739625d726fe892924b639e7333b76b3446f36cb67b9ad9500e95823b5eadaf056c4cb6bea962a59eb5491696e0b2 WHIRLPOOL 5db799cfbd061a199270b0ebb971c4fe43632522a23f590b7a46e021af5c8b0bce4a711e16bd0416b5baa6f2556cf8178bf14abadf4d493ece44c9eb2c4cdae2
DIST apache-tomcat-7.0.81-src.tar.gz 4689428 SHA256 fca79afb210cfbc8f9ebcdebdd048ecb7ea370ac0f94040cbcc0287fe5d85e66 SHA512 25e237aa7189cf9a9617badf8936fd7ec64550bcac3bab2e2afe51d5e199eddfe17e0d6d27ac7ebf3543d1601467fcd8362ddf9a5b708c50b223d7c8d18bbb3b WHIRLPOOL 1016a02b4a30b7e02eb2f7fad3080153012dd3e3f84df34d006c89bc2c89b7b3d370334800170008482d3dbf339c62f249064eb48ab24ca17588026ba515d487
DIST apache-tomcat-7.0.82-src.tar.gz 4697342 SHA256 3c6ff0bf2770b169493b25b97ee7502d44bee286176ecd187caaebf1f4e2fcf7 SHA512 fc92388d81316de0246df4074c417ffa341eab55308c0694e9ea71c5497c863b42019cd1f38628ff640114c501a06c4e9c428cb2b6f1bc1c16fb337a286718db WHIRLPOOL aef92cb2cf82c87a1b20ef7eedb30aae052882e99e74b9c33500b3a30f5c32df7a4dd23e3c79d3031ff7f0dd8abf9e2b3e061805a3b32f3e78b6b7c52db9d3c1
DIST apache-tomcat-8.0.45-src.tar.gz 4978313 SHA256 450fd2890b12e56692cb203f95651f9a873dce056b7b4362e142bc817032b291 SHA512 80e4281f5b6e4d6bf607179840bc6cb923ea9f57ec8231a451c3b5a1f8938f72ec1097290059afba0ef7b56edeb56d63636849517b69b91c7093cb15ff0eaa04 WHIRLPOOL c893cd5c26637f8881c19353e269145e33fa11e02eb10ef93a41590ad2e1e6c6ffa1b3f6c3c7c318630765f666be07447fd3a21c70c2c381e75c458b60383ea0
diff --git a/www-servers/tomcat/files/tomcat-7.0.79-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.79-build.xml.patch
deleted file mode 100644
index 481591fb6ff..00000000000
--- a/www-servers/tomcat/files/tomcat-7.0.79-build.xml.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-diff -Naur apache-tomcat-7.0.63-src.orig/build.xml apache-tomcat-7.0.63-src/build.xml
---- apache-tomcat-7.0.63-src.orig/build.xml 2015-06-30 09:15:44.000000000 +0100
-+++ apache-tomcat-7.0.63-src/build.xml 2015-08-22 21:13:12.453038827 +0100
-@@ -660,12 +660,14 @@
- </fileset>
- </copy>
- <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
-+<!--
- <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1">
- <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
- <include name="*" />
- <exclude name="jspxml*" />
- </fileset>
- </copy>
-+-->
-
- </target>
-
-@@ -721,26 +723,32 @@
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
- <!-- Servlet 3.0 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- manifest="${tomcat.manifests}/servlet-api.jar.manifest"
- notice="${tomcat.manifests}/servlet-api.jar.notice"
- license="${tomcat.manifests}/servlet-api.jar.license" />
-+-->
-
- <!-- JSP 2.2 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${jsp-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest"
- notice="${tomcat.manifests}/jsp-api.jar.notice"
- license="${tomcat.manifests}/jsp-api.jar.license" />
-+-->
-
- <!-- JSP 2.2 EL Implementation JAR File -->
-+<!--
- <jarIt jarfile="${el-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.el-api"
- manifest="${tomcat.manifests}/el-api.jar.manifest" />
-+-->
-
- <!-- Bootstrap JAR File -->
- <jarIt jarfile="${bootstrap.jar}"
-@@ -986,12 +994,14 @@
- <target name="deploy" depends="package,build-docs,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">
-@@ -1051,14 +1061,15 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-+<!--
- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
--
-+-->
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
--
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
- failonerror="false"/>
--
-+-->
- <!-- 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}"
-@@ -1681,7 +1692,7 @@
-
- <target name="extras-webservices-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">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1886,6 +1897,7 @@
- description="Create the Tomcat javadoc" >
- <fail unless="java.7.home"
- message="The java.7.home property must be set for javadoc build"/>
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1947,6 +1959,7 @@
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -1985,9 +1998,11 @@
- <path refid="tomcat.webservices.classpath"/>
- <path location="${ant.core.lib}"/>
- </classpath>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2642,7 +2657,7 @@
- </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}"/>
-@@ -2699,7 +2714,7 @@
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2727,7 +2742,7 @@
- </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}"/>
diff --git a/www-servers/tomcat/tomcat-7.0.79.ebuild b/www-servers/tomcat/tomcat-7.0.79.ebuild
deleted file mode 100644
index 0d01aa49b31..00000000000
--- a/www-servers/tomcat/tomcat-7.0.79.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="7"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps websockets"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.5"
-SAPI_SLOT="3.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- dev-java/tomcat-servlet-api:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- websockets? ( >=virtual/jre-1.7 )
- !websockets? ( >=virtual/jre-1.6 )
- !<dev-java/tomcat-native-1.1.24"
-DEPEND="${COMMON_DEP}
- websockets? ( >=virtual/jdk-1.7 )
- !websockets? ( >=virtual/jdk-1.6 )
- test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_prepare() {
- default
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- java-pkg_clean
-
- epatch "${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}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r1"
-INIT_REV="-r1"
-
-src_compile() {
- use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2017-11-16 8:54 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2017-11-16 8:54 UTC (permalink / raw
To: gentoo-commits
commit: 6254bf28831cb4b0888988099fb1b27821163f24
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 16 08:42:35 2017 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Nov 16 08:54:23 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6254bf28
www-servers/tomcat: removed older version, dropping x86 on slot 7 and 8 to ~x86
Package-Manager: Portage-2.3.14, Repoman-2.3.6
www-servers/tomcat/Manifest | 4 -
.../tomcat/files/tomcat-7.0.81-build.xml.patch | 149 ------------
.../tomcat/files/tomcat-8.0.45-build.xml.patch | 259 ---------------------
.../tomcat/files/tomcat-8.0.46-build.xml.patch | 259 ---------------------
.../tomcat/files/tomcat-8.5.20-build.xml.patch | 250 --------------------
www-servers/tomcat/tomcat-7.0.81.ebuild | 148 ------------
www-servers/tomcat/tomcat-8.0.45.ebuild | 157 -------------
www-servers/tomcat/tomcat-8.0.46.ebuild | 157 -------------
www-servers/tomcat/tomcat-8.5.20.ebuild | 157 -------------
9 files changed, 1540 deletions(-)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index f53fd96b2d5..73ab7d6d336 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,8 +1,4 @@
-DIST apache-tomcat-7.0.81-src.tar.gz 4689428 SHA256 fca79afb210cfbc8f9ebcdebdd048ecb7ea370ac0f94040cbcc0287fe5d85e66 SHA512 25e237aa7189cf9a9617badf8936fd7ec64550bcac3bab2e2afe51d5e199eddfe17e0d6d27ac7ebf3543d1601467fcd8362ddf9a5b708c50b223d7c8d18bbb3b WHIRLPOOL 1016a02b4a30b7e02eb2f7fad3080153012dd3e3f84df34d006c89bc2c89b7b3d370334800170008482d3dbf339c62f249064eb48ab24ca17588026ba515d487
DIST apache-tomcat-7.0.82-src.tar.gz 4697342 SHA256 3c6ff0bf2770b169493b25b97ee7502d44bee286176ecd187caaebf1f4e2fcf7 SHA512 fc92388d81316de0246df4074c417ffa341eab55308c0694e9ea71c5497c863b42019cd1f38628ff640114c501a06c4e9c428cb2b6f1bc1c16fb337a286718db WHIRLPOOL aef92cb2cf82c87a1b20ef7eedb30aae052882e99e74b9c33500b3a30f5c32df7a4dd23e3c79d3031ff7f0dd8abf9e2b3e061805a3b32f3e78b6b7c52db9d3c1
-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.0.47-src.tar.gz 4996505 SHA256 a2e34a707f1d2ab03aae194db2aed7aa525e62ee3cd648e7058bee49ac1b578c SHA512 135de73b8ca7d4003fcecc19a17a8a86ab85fc1054e89638d26e57263249438d8e8aebfca0a2791eaec2bc835baa57e6a05b60e11595aa373fdc03e278b31702 WHIRLPOOL 7add2b564ca9dfac647cd8338ef90229dd61e97d2ad7420f883c98b62760952904ad170f72029153da592a6f2c8c003d7229b4b32a1e870b6e7c2c99d34566c8
-DIST apache-tomcat-8.5.20-src.tar.gz 5063310 SHA256 6bc40ae61b77906325bf8bdb2b0767aeb96f4c5a7a9b618aa496db59387d6610 SHA512 dea3095792de76a3a56bd6fd6c9ed5702ca539856d0e07a5de2600f456e7255929d14748a2dc9b3c626b3a67aaac8795ef3f5a6a1351991a0e89443e0c9d0807 WHIRLPOOL 1924f12c5068574424587d5b8b7261efb7496dbc53915d8cb2558b4a643aedecc98823ac7dec238fe7cb1a1874734e05de2dc6b7b28e48ffdae9e8c5c586e895
DIST apache-tomcat-8.5.23-src.tar.gz 5086043 SHA256 eaaf35752841356dec976fa6250cd71680b8b5b9c0bdf4df9a86ac38630bcbd4 SHA512 2848331553f2c1bc51a4113960c6fe7e2beddf9146341dbfde1a27e2232802cfc364c8e8b988ae862371ca1a3be34665a56a28be9eadf80f8b317e0e2525cbef WHIRLPOOL 77b35de4ede2beecab71dcd7c5494bded1516deac4b5c2cbd2f48e1ae728cfa41f4193369bd464946869e9ba4565c0e6f1c7ad57578459d3be67159ea8cd9a64
DIST apache-tomcat-9.0.1-src.tar.gz 5029499 SHA256 f4da8ef7a03dd7280a9a4b6c66cc9bd34dddc6429c33d9db1a8acfc1596c4e90 SHA512 6116b05f448c24e691c4b56372a41cfd8900adc5e759f2f5026c808de48d65705763236fca46f69321d351f37f5dbc7aa49db8c097b8a3155e367fe21aa0d384 WHIRLPOOL 2e0f05001b9f0d57a241db8ddf0212d3adce2c1b829a03318b5cc1b5a250ae32a50d801e23d9b6a2943c208a478dd00d1f5ae07d1c3c736fbf059554a40caf66
diff --git a/www-servers/tomcat/files/tomcat-7.0.81-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.81-build.xml.patch
deleted file mode 100644
index 481591fb6ff..00000000000
--- a/www-servers/tomcat/files/tomcat-7.0.81-build.xml.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-diff -Naur apache-tomcat-7.0.63-src.orig/build.xml apache-tomcat-7.0.63-src/build.xml
---- apache-tomcat-7.0.63-src.orig/build.xml 2015-06-30 09:15:44.000000000 +0100
-+++ apache-tomcat-7.0.63-src/build.xml 2015-08-22 21:13:12.453038827 +0100
-@@ -660,12 +660,14 @@
- </fileset>
- </copy>
- <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
-+<!--
- <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1">
- <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
- <include name="*" />
- <exclude name="jspxml*" />
- </fileset>
- </copy>
-+-->
-
- </target>
-
-@@ -721,26 +723,32 @@
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
- <!-- Servlet 3.0 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- manifest="${tomcat.manifests}/servlet-api.jar.manifest"
- notice="${tomcat.manifests}/servlet-api.jar.notice"
- license="${tomcat.manifests}/servlet-api.jar.license" />
-+-->
-
- <!-- JSP 2.2 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${jsp-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest"
- notice="${tomcat.manifests}/jsp-api.jar.notice"
- license="${tomcat.manifests}/jsp-api.jar.license" />
-+-->
-
- <!-- JSP 2.2 EL Implementation JAR File -->
-+<!--
- <jarIt jarfile="${el-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.el-api"
- manifest="${tomcat.manifests}/el-api.jar.manifest" />
-+-->
-
- <!-- Bootstrap JAR File -->
- <jarIt jarfile="${bootstrap.jar}"
-@@ -986,12 +994,14 @@
- <target name="deploy" depends="package,build-docs,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">
-@@ -1051,14 +1061,15 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-+<!--
- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
--
-+-->
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
--
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
- failonerror="false"/>
--
-+-->
- <!-- 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}"
-@@ -1681,7 +1692,7 @@
-
- <target name="extras-webservices-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">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1886,6 +1897,7 @@
- description="Create the Tomcat javadoc" >
- <fail unless="java.7.home"
- message="The java.7.home property must be set for javadoc build"/>
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1947,6 +1959,7 @@
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -1985,9 +1998,11 @@
- <path refid="tomcat.webservices.classpath"/>
- <path location="${ant.core.lib}"/>
- </classpath>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2642,7 +2657,7 @@
- </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}"/>
-@@ -2699,7 +2714,7 @@
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2727,7 +2742,7 @@
- </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}"/>
diff --git a/www-servers/tomcat/files/tomcat-8.0.45-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.45-build.xml.patch
deleted file mode 100644
index cefd59f55ae..00000000000
--- a/www-servers/tomcat/files/tomcat-8.0.45-build.xml.patch
+++ /dev/null
@@ -1,259 +0,0 @@
-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 3.1 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- 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}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
- <!-- EL 3.0 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 -->
- <jarIt jarfile="${websocket-api.jar}"
-@@ -986,14 +991,14 @@
-
- <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">
-@@ -1053,7 +1058,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1087,7 +1092,7 @@
- </javac>
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- 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 +1107,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- 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 +1211,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
- failonerror="false"/>
- <copy file="${jdt.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. -->
-@@ -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"
-- description="Prepare to build web services extras package">
-+ description="Prepare to build web services extras package" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -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" >
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1989,6 +1996,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -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>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2757,7 +2767,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}"/>
-@@ -2791,7 +2801,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2848,7 +2858,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}"/>
-@@ -2874,18 +2884,18 @@ skip.installer property in build.properties" />
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2897,7 +2907,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2916,7 +2926,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2927,7 +2937,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2945,7 +2955,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2955,7 +2965,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2978,7 +2988,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -2989,7 +2999,7 @@ skip.installer property in build.properties" />
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -3000,7 +3010,7 @@ skip.installer property in build.properties" />
-
- <target name="ide-eclipse"
- depends="download-compile, extras-webservices-prepare, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/files/tomcat-8.0.46-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.46-build.xml.patch
deleted file mode 100644
index cefd59f55ae..00000000000
--- a/www-servers/tomcat/files/tomcat-8.0.46-build.xml.patch
+++ /dev/null
@@ -1,259 +0,0 @@
-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 3.1 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- 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}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
- <!-- EL 3.0 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 -->
- <jarIt jarfile="${websocket-api.jar}"
-@@ -986,14 +991,14 @@
-
- <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">
-@@ -1053,7 +1058,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1087,7 +1092,7 @@
- </javac>
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- 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 +1107,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- 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 +1211,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
- failonerror="false"/>
- <copy file="${jdt.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. -->
-@@ -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"
-- description="Prepare to build web services extras package">
-+ description="Prepare to build web services extras package" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -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" >
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1989,6 +1996,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -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>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2757,7 +2767,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}"/>
-@@ -2791,7 +2801,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2848,7 +2858,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}"/>
-@@ -2874,18 +2884,18 @@ skip.installer property in build.properties" />
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2897,7 +2907,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2916,7 +2926,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2927,7 +2937,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2945,7 +2955,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2955,7 +2965,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2978,7 +2988,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -2989,7 +2999,7 @@ skip.installer property in build.properties" />
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -3000,7 +3010,7 @@ skip.installer property in build.properties" />
-
- <target name="ide-eclipse"
- depends="download-compile, extras-webservices-prepare, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/files/tomcat-8.5.20-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.20-build.xml.patch
deleted file mode 100644
index 611c99d7a0e..00000000000
--- a/www-servers/tomcat/files/tomcat-8.5.20-build.xml.patch
+++ /dev/null
@@ -1,250 +0,0 @@
-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 3.1 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- 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}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
- <!-- EL 3.0 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 -->
- <jarIt jarfile="${websocket-api.jar}"
-@@ -982,14 +987,14 @@
-
- <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">
-@@ -1049,7 +1054,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1083,7 +1088,7 @@
- </javac>
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- 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}"
-@@ -1098,7 +1103,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- 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}"
-@@ -1202,10 +1207,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
- failonerror="false"/>
- <copy file="${jdt.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. -->
-@@ -1579,7 +1585,7 @@
-
- <target name="extras-webservices-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">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -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" >
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1791,6 +1798,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -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>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2574,7 +2584,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}"/>
-@@ -2608,7 +2618,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2665,7 +2675,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}"/>
-@@ -2691,18 +2701,18 @@ skip.installer property in build.properties" />
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2714,7 +2724,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2733,7 +2743,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2744,7 +2754,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2762,7 +2772,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2772,7 +2782,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2795,7 +2805,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -2806,7 +2816,7 @@ skip.installer property in build.properties" />
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -2817,7 +2827,7 @@ skip.installer property in build.properties" />
-
- <target name="ide-eclipse"
- depends="download-compile, extras-webservices-prepare, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-7.0.81.ebuild b/www-servers/tomcat/tomcat-7.0.81.ebuild
deleted file mode 100644
index 0d01aa49b31..00000000000
--- a/www-servers/tomcat/tomcat-7.0.81.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="7"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps websockets"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.5"
-SAPI_SLOT="3.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- dev-java/tomcat-servlet-api:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- websockets? ( >=virtual/jre-1.7 )
- !websockets? ( >=virtual/jre-1.6 )
- !<dev-java/tomcat-native-1.1.24"
-DEPEND="${COMMON_DEP}
- websockets? ( >=virtual/jdk-1.7 )
- !websockets? ( >=virtual/jdk-1.6 )
- test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_prepare() {
- default
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- java-pkg_clean
-
- epatch "${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}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r1"
-INIT_REV="-r1"
-
-src_compile() {
- use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.0.45.ebuild b/www-servers/tomcat/tomcat-8.0.45.ebuild
deleted file mode 100644
index 1e01093d259..00000000000
--- a/www-servers/tomcat/tomcat-8.0.45.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-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-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="8"
-KEYWORDS="amd64 x86 ~x86-fbsd ~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="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- dev-java/tomcat-servlet-api:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- !<dev-java/tomcat-native-1.1.24
- >=virtual/jre-1.7"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- >=virtual/jdk-1.7
- test? (
- >=dev-java/ant-junit-1.9:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_prepare() {
- default
-
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- epatch "${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}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.0.46.ebuild b/www-servers/tomcat/tomcat-8.0.46.ebuild
deleted file mode 100644
index 0275eef0064..00000000000
--- a/www-servers/tomcat/tomcat-8.0.46.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="8"
-KEYWORDS="amd64 ~x86 ~x86-fbsd ~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="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- dev-java/tomcat-servlet-api:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- !<dev-java/tomcat-native-1.1.24
- >=virtual/jre-1.7"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- >=virtual/jdk-1.7
- test? (
- >=dev-java/ant-junit-1.9:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_prepare() {
- default
-
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- epatch "${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}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.5.20.ebuild b/www-servers/tomcat/tomcat-8.5.20.ebuild
deleted file mode 100644
index 94c1abd6a55..00000000000
--- a/www-servers/tomcat/tomcat-8.5.20.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-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-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="8.5"
-KEYWORDS="amd64 ~x86 ~x86-fbsd ~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="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- !<dev-java/tomcat-native-1.1.24
- >=virtual/jre-1.7"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- >=virtual/jdk-1.7
- test? (
- >=dev-java/ant-junit-1.9:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_prepare() {
- default
-
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- epatch "${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}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2017-12-04 15:07 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2017-12-04 15:07 UTC (permalink / raw
To: gentoo-commits
commit: 1aa05f7d4d96128c634d80d4f905b07c28a320f7
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 4 15:06:46 2017 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Dec 4 15:06:46 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1aa05f7d
www-servers/tomcat: version bump in slot 9
Package-Manager: Portage-2.3.16, Repoman-2.3.6
www-servers/tomcat/Manifest | 2 +-
...cat-9.0.1_beta-build.xml.patch => tomcat-9.0.2_beta-build.xml.patch} | 0
.../tomcat/{tomcat-9.0.1_beta.ebuild => tomcat-9.0.2_beta.ebuild} | 0
3 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 8b09820cea7..3b8d7903954 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -2,4 +2,4 @@ DIST apache-tomcat-7.0.82-src.tar.gz 4697342 SHA256 3c6ff0bf2770b169493b25b97ee7
DIST apache-tomcat-8.0.47-src.tar.gz 4996505 SHA256 a2e34a707f1d2ab03aae194db2aed7aa525e62ee3cd648e7058bee49ac1b578c SHA512 135de73b8ca7d4003fcecc19a17a8a86ab85fc1054e89638d26e57263249438d8e8aebfca0a2791eaec2bc835baa57e6a05b60e11595aa373fdc03e278b31702 WHIRLPOOL 7add2b564ca9dfac647cd8338ef90229dd61e97d2ad7420f883c98b62760952904ad170f72029153da592a6f2c8c003d7229b4b32a1e870b6e7c2c99d34566c8
DIST apache-tomcat-8.5.23-src.tar.gz 5086043 SHA256 eaaf35752841356dec976fa6250cd71680b8b5b9c0bdf4df9a86ac38630bcbd4 SHA512 2848331553f2c1bc51a4113960c6fe7e2beddf9146341dbfde1a27e2232802cfc364c8e8b988ae862371ca1a3be34665a56a28be9eadf80f8b317e0e2525cbef WHIRLPOOL 77b35de4ede2beecab71dcd7c5494bded1516deac4b5c2cbd2f48e1ae728cfa41f4193369bd464946869e9ba4565c0e6f1c7ad57578459d3be67159ea8cd9a64
DIST apache-tomcat-8.5.24-src.tar.gz 5101516 BLAKE2B c19c46cca562f0c4c4733608ec007dd423f9a8ed0595bfb835554a7d08be06b791933e4beacbb0fe472589feae82f7d1a46934c0fb68930343cb2f4589bf6530 SHA512 f4ef9a66f2cafb3207c5a38c0f88efc1189e72f02fa88ef2a1b3626a03a57d0ba505b099f6185d747d5ab858aa3f8f3446ae60789312a900ec443eac45233efc
-DIST apache-tomcat-9.0.1-src.tar.gz 5029499 SHA256 f4da8ef7a03dd7280a9a4b6c66cc9bd34dddc6429c33d9db1a8acfc1596c4e90 SHA512 6116b05f448c24e691c4b56372a41cfd8900adc5e759f2f5026c808de48d65705763236fca46f69321d351f37f5dbc7aa49db8c097b8a3155e367fe21aa0d384 WHIRLPOOL 2e0f05001b9f0d57a241db8ddf0212d3adce2c1b829a03318b5cc1b5a250ae32a50d801e23d9b6a2943c208a478dd00d1f5ae07d1c3c736fbf059554a40caf66
+DIST apache-tomcat-9.0.2-src.tar.gz 5047832 BLAKE2B 7be9cb7569fc771fab849cfe0b3e8154482fd97c2b74f46ebf457084e7f40d8bc70dd9d96793b6b6b43bcb64537dfab4360ea2fe6d3c437788263871944c19cc SHA512 463c0e8daa656dcd8193b3cdbec89bffa762c90b15933755fa51bc2268c28e142544fe71da1d459befb42b70d14834313de30a7f49a082e5121cf3f553c35cbe
diff --git a/www-servers/tomcat/files/tomcat-9.0.1_beta-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.2_beta-build.xml.patch
similarity index 100%
rename from www-servers/tomcat/files/tomcat-9.0.1_beta-build.xml.patch
rename to www-servers/tomcat/files/tomcat-9.0.2_beta-build.xml.patch
diff --git a/www-servers/tomcat/tomcat-9.0.1_beta.ebuild b/www-servers/tomcat/tomcat-9.0.2_beta.ebuild
similarity index 100%
rename from www-servers/tomcat/tomcat-9.0.1_beta.ebuild
rename to www-servers/tomcat/tomcat-9.0.2_beta.ebuild
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2017-12-15 18:03 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2017-12-15 18:03 UTC (permalink / raw
To: gentoo-commits
commit: 680a28cd6899cf66a627906605c55c342a5752d4
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 15 18:01:35 2017 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Dec 15 18:03:31 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=680a28cd
www-servers/tomcat: version bump for slot 8
Package-Manager: Portage-2.3.18, Repoman-2.3.6
www-servers/tomcat/Manifest | 1 +
.../tomcat/files/tomcat-8.0.48-build.xml.patch | 258 +++++++++++++++++++++
www-servers/tomcat/tomcat-8.0.48.ebuild | 157 +++++++++++++
3 files changed, 416 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 567dbcdc19e..e826fdb793a 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,5 +1,6 @@
DIST apache-tomcat-7.0.82-src.tar.gz 4697342 BLAKE2B 1106ed04dc83e64e395de29f01a7752a0578b0c88046eb59614a7cfc0d8a98e3aebb698c8eb56763eea41620d9b42482971c5093304184b1028c6bd8f9770ada SHA512 fc92388d81316de0246df4074c417ffa341eab55308c0694e9ea71c5497c863b42019cd1f38628ff640114c501a06c4e9c428cb2b6f1bc1c16fb337a286718db
DIST apache-tomcat-8.0.47-src.tar.gz 4996505 BLAKE2B 8024ec5248fed57bf1841a320fc23fa8a7a99b2352ea9635f3d4dc903bd363f3a15adc47f48250a4d732ab9c1724443bcb602b459b6ede2e7908051a5c3fdea5 SHA512 135de73b8ca7d4003fcecc19a17a8a86ab85fc1054e89638d26e57263249438d8e8aebfca0a2791eaec2bc835baa57e6a05b60e11595aa373fdc03e278b31702
+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
diff --git a/www-servers/tomcat/files/tomcat-8.0.48-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.48-build.xml.patch
new file mode 100644
index 00000000000..b0862aef305
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.0.48-build.xml.patch
@@ -0,0 +1,258 @@
+diff --git a/apache-tomcat-8.0.47-src/build.xml b/apache-tomcat-8.0.47-src/build.xml
+index 6b4465a..ab4008d 100644
+--- a/apache-tomcat-8.0.47-src/build.xml
++++ b/apache-tomcat-8.0.47-src/build.xml
+@@ -715,24 +715,29 @@
+ manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+
+ <!-- Servlet 3.1 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+ 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}"
+ filesDir="${tomcat.classes}"
+ filesId="files.jsp-api"
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
++-->
+
+ <!-- EL 3.0 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 -->
+ <jarIt jarfile="${websocket-api.jar}"
+@@ -1000,14 +1005,14 @@
+
+ <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">
+@@ -1067,7 +1072,7 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
+- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+@@ -1101,7 +1106,7 @@
+ </javac>
+ </target>
+
+- <target name="build-tomcat-jdbc" depends="package">
++ <target name="build-tomcat-jdbc" depends="package" unless="noget">
+ <!-- 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}"
+@@ -1116,7 +1121,7 @@
+ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+ </target>
+
+- <target name="build-tomcat-jdbc-src">
++ <target name="build-tomcat-jdbc-src" unless="noget">
+ <!-- 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}"
+@@ -1220,9 +1225,11 @@
+
+ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+ <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+ <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
+@@ -1613,7 +1620,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}"/>
+@@ -1752,7 +1759,7 @@
+
+ <target name="extras-webservices-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">
+ <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -1947,6 +1954,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" >
++<!--
+ <javadoc packagenames="javax.servlet.*"
+ excludepackagenames="javax.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -2008,6 +2016,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="javax.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -2046,9 +2055,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path refid="tomcat.webservices.classpath"/>
+ <path location="${ant.core.lib}"/>
+ </classpath>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <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/"/>
+@@ -2781,7 +2792,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}"/>
+@@ -2815,7 +2826,7 @@ skip.installer property in build.properties" />
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -2872,7 +2883,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}"/>
+@@ -2898,18 +2909,18 @@ skip.installer property in build.properties" />
+
+ <!-- =============== Utility Targets to support downloads ================ -->
+
+- <target name="setproxy" if="${proxy.use}">
++ <target name="setproxy" if="${proxy.use}" unless="noget">
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+ proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+ </target>
+
+- <target name="testexist">
++ <target name="testexist" unless="noget">
+ <echo message="Testing for ${destfile}"/>
+ <available file="${destfile}" property="exist"/>
+ </target>
+
+- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
++ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2921,7 +2932,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadgz-2" unless="exist" depends="testexist">
++ <target name="downloadgz-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2940,7 +2951,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
++ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2951,7 +2962,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadzip-2" unless="exist" depends="testexist">
++ <target name="downloadzip-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2969,7 +2980,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
++ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
+ <!-- Download the file -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2979,7 +2990,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="downloadfile-2" unless="exist" depends="testexist">
++ <target name="downloadfile-2" unless="noget" depends="testexist">
+ <!-- Download the file from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3002,7 +3013,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="trydownload.check" depends="setproxy">
++ <target name="trydownload.check" depends="setproxy" unless="noget">
+ <condition property="trydownload.run">
+ <and>
+ <not>
+@@ -3013,7 +3024,7 @@ skip.installer property in build.properties" />
+ </condition>
+ </target>
+
+- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+ <!-- Downloads a file if not yet downloaded and the source URL is available -->
+ <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+ </target>
+@@ -3024,7 +3035,7 @@ skip.installer property in build.properties" />
+
+ <target name="ide-eclipse"
+ depends="download-compile, extras-webservices-prepare, download-test-compile"
+- description="Prepares the source tree to be built in Eclipse">
++ description="Prepares the source tree to be built in Eclipse" unless="noget">
+
+ <!-- Copy the sample project files into the root directory -->
+ <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-8.0.48.ebuild b/www-servers/tomcat/tomcat-8.0.48.ebuild
new file mode 100644
index 00000000000..424ec1de47d
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.0.48.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="8"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~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="3.1"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ dev-java/tomcat-servlet-api:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+ !<dev-java/tomcat-native-1.1.24
+ >=virtual/jre-1.7"
+DEPEND="${COMMON_DEP}
+ app-admin/pwgen
+ >=virtual/jdk-1.7
+ test? (
+ >=dev-java/ant-junit-1.9:0
+ dev-java/easymock:3.2
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup tomcat 265
+ enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+src_prepare() {
+ default
+
+ find -name '*.jar' -type f -delete -print || die
+
+ # Remove bundled servlet-api
+ rm -rv java/javax/{el,servlet} || die
+
+ epatch "${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}\`" \
+ bin/catalina.sh || die
+
+ java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+ java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ # add missing docBase
+ local apps="host-manager manager"
+ for app in ${apps}; do
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+ output/build/webapps/${app}/META-INF/context.xml || die
+ done
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw="$(pwgen -s -B 15 1)"
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2018-01-23 15:30 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2018-01-23 15:30 UTC (permalink / raw
To: gentoo-commits
commit: c4d909d4442e0347c931039b214f4d66a1dec00a
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 23 15:29:40 2018 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Jan 23 15:30:08 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4d909d4
www-servers/tomcat: version bump in slot 9
Package-Manager: Portage-2.3.20, Repoman-2.3.6
www-servers/tomcat/Manifest | 2 +-
...uild.xml.patch => tomcat-9.0.4-build.xml.patch} | 81 ++++++++++++----------
...omcat-9.0.2_beta.ebuild => tomcat-9.0.4.ebuild} | 7 +-
3 files changed, 49 insertions(+), 41 deletions(-)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index e826fdb793a..98013508714 100644
--- 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 3f55c285e23..87f869dd4c0 100644
--- 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 6151c2e699b..bb86ba9675b 100644
--- 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"
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2018-02-15 17:00 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2018-02-15 17:00 UTC (permalink / raw
To: gentoo-commits
commit: fdfd796061bea1aee965be0d125cdd77041668b0
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 15 16:59:00 2018 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Feb 15 16:59:59 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdfd7960
www-servers/tomcat: version bump for slot 7 and 8
www-servers/tomcat/Manifest | 2 +
.../tomcat/files/tomcat-7.0.85-build.xml.patch | 161 +++++++++++++
.../tomcat/files/tomcat-8.0.50-build.xml.patch | 267 +++++++++++++++++++++
www-servers/tomcat/tomcat-7.0.85.ebuild | 146 +++++++++++
www-servers/tomcat/tomcat-8.0.50.ebuild | 157 ++++++++++++
5 files changed, 733 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 7dff47cf2b3..e16d894bda4 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,7 +1,9 @@
DIST apache-tomcat-7.0.82-src.tar.gz 4697342 BLAKE2B 1106ed04dc83e64e395de29f01a7752a0578b0c88046eb59614a7cfc0d8a98e3aebb698c8eb56763eea41620d9b42482971c5093304184b1028c6bd8f9770ada SHA512 fc92388d81316de0246df4074c417ffa341eab55308c0694e9ea71c5497c863b42019cd1f38628ff640114c501a06c4e9c428cb2b6f1bc1c16fb337a286718db
DIST apache-tomcat-7.0.84-src.tar.gz 4713409 BLAKE2B 3dc7766db1492413bbd3f878a2da7392dd4cfd1ca4c3e8a236e380cdfbc0c4ff075665d39871026e61f0bc88e0a84f372fbcef6914af9dc99e6dda05bafc6e48 SHA512 ca6b3f17f56a0b1befafd2efbfa07cbe094fb4ab022a3b5d704d249e551b44c6ef0d9691bd1b7c48ccda957efb43045209d11ca1a4aa0a7875e516e3a233cd74
+DIST apache-tomcat-7.0.85-src.tar.gz 4718223 BLAKE2B 3067709eb143feee5cc1f31cdd8d41c58fb96ed1330560a4064ac3b3eeb030c76ff066c2a2f950d6f2c1576bde214f963f1a12342536a8e2ab8ac179dd166bfb SHA512 f95383b2c77670845cce577161ecf326c3e0f49d456792a53305640289d049b0de80f4b6901bcda52bc4967895f97772591eee525affee1a1d07aac2e60d2044
DIST apache-tomcat-8.0.48-src.tar.gz 5009969 BLAKE2B 4b1db654d74b02f5fd589590197561496ecfb9b219e445fd18f2e967c78fb95f7fc71a21a6ed9ab5f8c6cee448b74a1729eb3627bcf1a59e2d2748c9c80cc76c SHA512 c56aaa7335c4ef221b2e5de7a7d4946ae1221127f977da5f46a97b062d909abc918b0e6ceb887d98ea5f5b38a26bbe9a3de481972492be593636f6f7e6ef7841
DIST apache-tomcat-8.0.49-src.tar.gz 5017328 BLAKE2B a3494c73fc6b9ffecfe7b09380f9fb3a632e167861f876ac827848e6ae5fd41dc9d3f8a0da9d484edd87b88532de05809c8019941d3a2639e925066ff0a8cc87 SHA512 36ae75d37874430ea6b567d8415a9249f104b57afdd8689621f659f6a2c0b229f207e63cdcdfacb1eabd13af567295ff1335cb052abbefe46efdccc20f2d5a73
+DIST apache-tomcat-8.0.50-src.tar.gz 5023017 BLAKE2B 862799b7f6a227217c93e1b65aacc49a765b6d11886d0f2278a860c3f4e2b89692cfb724e323d3afe074ad3af3ef8cfd780e4be1ad2f55fee381e5054fbb1941 SHA512 c46efe03cfaadbc2b89063c05c5ec9f315a4eeacdfbf6dd43691c3d23a87d75b23b6679550518d825f8ec7ed853a899ca88cc54c61da9983b025ec7042c3bfff
DIST apache-tomcat-8.5.24-src.tar.gz 5101516 BLAKE2B c19c46cca562f0c4c4733608ec007dd423f9a8ed0595bfb835554a7d08be06b791933e4beacbb0fe472589feae82f7d1a46934c0fb68930343cb2f4589bf6530 SHA512 f4ef9a66f2cafb3207c5a38c0f88efc1189e72f02fa88ef2a1b3626a03a57d0ba505b099f6185d747d5ab858aa3f8f3446ae60789312a900ec443eac45233efc
DIST apache-tomcat-8.5.27-src.tar.gz 5123614 BLAKE2B 0051a7b5a9d3529a012338e0b12ed5fca218fc6740a0c576d3195a9c7848a78d93d0a6151541e314d82723de1b533b28024eeb231e33b21c38a2c4f702007415 SHA512 d3cac3d618283f0c26f861df67223fcb889da750f5e42563ec2ebc17d72169a7639d05d4d42fe403f4e49052962da09bc4b312b012c31309d8a096036baec8ab
DIST apache-tomcat-8.5.28-src.tar.gz 5128929 BLAKE2B fe862a44fe57a50502b95d6f31863567b5596b183355a75fb7b75827a697299878920cc5ca5c24ffcdabae885a893266f40f174c76c32f449bec31e7a1be489b SHA512 55970e8babc1fde783e6e9f67a221012cae88e871391aa751e3c87c0fc7e58cd45662f025dc286dd529caced317dada48bb65786f87b44abbc9ce16f0d8fb0b5
diff --git a/www-servers/tomcat/files/tomcat-7.0.85-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.85-build.xml.patch
new file mode 100644
index 00000000000..aa40bd1564a
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-7.0.85-build.xml.patch
@@ -0,0 +1,161 @@
+diff --git a/build.xml b/build.xml
+index 3f1229c..13894ed 100644
+--- a/build.xml
++++ b/build.xml
+@@ -671,12 +671,14 @@
+ </fileset>
+ </copy>
+ <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
++<!--
+ <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1">
+ <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
+ <include name="*" />
+ <exclude name="jspxml*" />
+ </fileset>
+ </copy>
++-->
+
+ </target>
+
+@@ -733,26 +735,32 @@
+ manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+
+ <!-- Servlet 3.0 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+ manifest="${tomcat.manifests}/servlet-api.jar.manifest"
+ notice="${tomcat.manifests}/servlet-api.jar.notice"
+ license="${tomcat.manifests}/servlet-api.jar.license" />
++-->
+
+ <!-- JSP 2.2 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${jsp-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.jsp-api"
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest"
+ notice="${tomcat.manifests}/jsp-api.jar.notice"
+ license="${tomcat.manifests}/jsp-api.jar.license" />
++-->
+
+ <!-- JSP 2.2 EL Implementation JAR File -->
++<!--
+ <jarIt jarfile="${el-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.el-api"
+ manifest="${tomcat.manifests}/el-api.jar.manifest" />
++-->
+
+ <!-- Bootstrap JAR File -->
+ <jarIt jarfile="${bootstrap.jar}"
+@@ -999,9 +1007,9 @@
+
+ <target name="deploy" depends="package,build-docs,compile-webapp-examples"
+ description="Default. Builds a working Tomcat instance">
+-
++<!--
+ <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
++-->
+ <!-- Copy scripts -->
+ <copy todir="${tomcat.build}/bin">
+ <fileset dir="bin">
+@@ -1060,14 +1068,15 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
++<!--
+ <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
+-
++-->
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+-
++<!--
+ <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
+ failonerror="false"/>
+-
++-->
+ <!-- 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}"
+@@ -1697,7 +1706,7 @@
+
+ <target name="extras-webservices-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">
+ <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -1886,11 +1895,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.
+@@ -1902,6 +1912,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ description="Create the Tomcat javadoc" >
+ <fail unless="java.7.home"
+ message="The java.7.home property must be set for javadoc build"/>
++<!--
+ <javadoc packagenames="javax.servlet.*"
+ excludepackagenames="javax.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -1966,6 +1977,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="javax.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -2006,9 +2018,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path refid="tomcat.webservices.classpath"/>
+ <path location="${ant.core.lib}"/>
+ </classpath>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <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/"/>
+@@ -2632,7 +2646,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ </target>
+
+ <target name="download-compile"
+- description="Download (and build) components necessary to compile" >
++ description="Download (and build) components necessary to compile" unless="noget">
+
+ <!-- Download Commons Daemon -->
+ <antcall target="downloadgz-2">
+@@ -2675,7 +2689,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -2721,7 +2735,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ </target>
+
+ <target name="download-dist"
+- description="Download additional components for a distribution" >
++ description="Download additional components for a distribution" unless="noget">
+
+ <antcall target="downloadfile-2">
+ <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
diff --git a/www-servers/tomcat/files/tomcat-8.0.50-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.50-build.xml.patch
new file mode 100644
index 00000000000..b7e0a283fe2
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.0.50-build.xml.patch
@@ -0,0 +1,267 @@
+diff --git a/build.xml b/build.xml
+index 3152712..9e09384 100644
+--- a/build.xml
++++ b/build.xml
+@@ -718,24 +718,29 @@
+ manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+
+ <!-- Servlet 3.1 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+ 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}"
+ filesDir="${tomcat.classes}"
+ filesId="files.jsp-api"
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
++-->
+
+ <!-- EL 3.0 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 -->
+ <jarIt jarfile="${websocket-api.jar}"
+@@ -1005,9 +1010,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/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
++-->
+ <!-- Copy scripts -->
+ <copy todir="${tomcat.build}/bin">
+ <fileset dir="bin">
+@@ -1067,7 +1072,7 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
+- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+@@ -1101,7 +1106,7 @@
+ </javac>
+ </target>
+
+- <target name="build-tomcat-jdbc" depends="package">
++ <target name="build-tomcat-jdbc" depends="package" unless="noget">
+ <!-- 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}"
+@@ -1116,7 +1121,7 @@
+ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+ </target>
+
+- <target name="build-tomcat-jdbc-src">
++ <target name="build-tomcat-jdbc-src" unless="noget">
+ <!-- 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}"
+@@ -1220,9 +1225,11 @@
+
+ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+ <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+ <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
+@@ -1615,7 +1622,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}"/>
+@@ -1754,7 +1761,7 @@
+
+ <target name="extras-webservices-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">
+ <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -1941,11 +1948,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.
+@@ -1955,6 +1963,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" >
++<!--
+ <javadoc packagenames="javax.servlet.*"
+ excludepackagenames="javax.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -2016,6 +2025,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="javax.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -2054,9 +2064,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path refid="tomcat.webservices.classpath"/>
+ <path location="${ant.core.lib}"/>
+ </classpath>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <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/"/>
+@@ -2791,7 +2803,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">
+
+ <!-- Download Commons Daemon -->
+ <antcall target="downloadgz-2">
+@@ -2811,7 +2823,7 @@ skip.installer property in build.properties" />
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -2868,7 +2880,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="downloadfile-2">
+ <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
+@@ -2908,18 +2920,18 @@ skip.installer property in build.properties" />
+
+ <!-- =============== Utility Targets to support downloads ================ -->
+
+- <target name="setproxy" if="${proxy.use}">
++ <target name="setproxy" if="${proxy.use}" unless="noget">
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+ proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+ </target>
+
+- <target name="testexist">
++ <target name="testexist" unless="noget">
+ <echo message="Testing for ${destfile}"/>
+ <available file="${destfile}" property="exist"/>
+ </target>
+
+- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
++ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2931,7 +2943,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadgz-2" unless="exist" depends="testexist">
++ <target name="downloadgz-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2950,7 +2962,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
++ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2961,7 +2973,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadzip-2" unless="exist" depends="testexist">
++ <target name="downloadzip-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2979,7 +2991,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
++ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
+ <!-- Download the file -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2989,7 +3001,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="downloadfile-2" unless="exist" depends="testexist">
++ <target name="downloadfile-2" unless="noget" depends="testexist">
+ <!-- Download the file from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3012,7 +3024,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="trydownload.check" depends="setproxy">
++ <target name="trydownload.check" depends="setproxy" unless="noget">
+ <condition property="trydownload.run">
+ <and>
+ <not>
+@@ -3023,7 +3035,7 @@ skip.installer property in build.properties" />
+ </condition>
+ </target>
+
+- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+ <!-- Downloads a file if not yet downloaded and the source URL is available -->
+ <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+ </target>
+@@ -3034,7 +3046,7 @@ skip.installer property in build.properties" />
+
+ <target name="ide-eclipse"
+ depends="download-compile, extras-webservices-prepare, download-test-compile"
+- description="Prepares the source tree to be built in Eclipse">
++ description="Prepares the source tree to be built in Eclipse" unless="noget">
+
+ <!-- Copy the sample project files into the root directory -->
+ <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-7.0.85.ebuild b/www-servers/tomcat/tomcat-7.0.85.ebuild
new file mode 100644
index 00000000000..4ce5c4efd22
--- /dev/null
+++ b/www-servers/tomcat/tomcat-7.0.85.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="7"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps websockets"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.5"
+SAPI_SLOT="3.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ dev-java/tomcat-servlet-api:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+ virtual/jre
+ !<dev-java/tomcat-native-1.1.24"
+DEPEND="${COMMON_DEP}
+ virtual/jdk:1.8
+ test? ( dev-java/ant-junit:0 )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup tomcat 265
+ enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+src_prepare() {
+ default
+
+ # Remove bundled servlet-api
+ rm -rv java/javax/{el,servlet} || die
+
+ java-pkg_clean
+
+ epatch "${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}\`" \
+ bin/catalina.sh || die
+
+ java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r1"
+INIT_REV="-r1"
+
+src_compile() {
+ use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+ java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}
diff --git a/www-servers/tomcat/tomcat-8.0.50.ebuild b/www-servers/tomcat/tomcat-8.0.50.ebuild
new file mode 100644
index 00000000000..badb0b2ee12
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.0.50.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="8"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~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="3.1"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ dev-java/tomcat-servlet-api:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+ !<dev-java/tomcat-native-1.1.24
+ >=virtual/jre-1.7"
+DEPEND="${COMMON_DEP}
+ app-admin/pwgen
+ >=virtual/jdk-1.7
+ test? (
+ >=dev-java/ant-junit-1.9:0
+ dev-java/easymock:3.2
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup tomcat 265
+ enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+src_prepare() {
+ default
+
+ find -name '*.jar' -type f -delete -print || die
+
+ # Remove bundled servlet-api
+ rm -rv java/javax/{el,servlet} || die
+
+ epatch "${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}\`" \
+ bin/catalina.sh || die
+
+ java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+ java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ # add missing docBase
+ local apps="host-manager manager"
+ for app in ${apps}; do
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+ output/build/webapps/${app}/META-INF/context.xml || die
+ done
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw="$(pwgen -s -B 15 1)"
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2018-04-08 20:15 James Le Cuirot
0 siblings, 0 replies; 73+ messages in thread
From: James Le Cuirot @ 2018-04-08 20:15 UTC (permalink / raw
To: gentoo-commits
commit: 89207d1358e4fd2c23c25adbe4dc1d16d2bcffaf
Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
AuthorDate: Sun Apr 8 19:12:30 2018 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Apr 8 20:15:00 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89207d13
www-servers/tomcat: clean duplicate patches
Also cleaned up the patches to be -p1 applicable where doable for the
eventual epatch->eapply change.
Package-Manager: Portage-2.3.28, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/7888
.../tomcat/files/tomcat-7.0.82-build.xml.patch | 5 +-
.../tomcat/files/tomcat-7.0.84-build.xml.patch | 2 -
.../tomcat/files/tomcat-7.0.85-build.xml.patch | 161 -------------
.../tomcat/files/tomcat-8.0.48-build.xml.patch | 6 +-
.../tomcat/files/tomcat-8.0.49-build.xml.patch | 2 -
.../tomcat/files/tomcat-8.0.50-build.xml.patch | 267 ---------------------
.../tomcat/files/tomcat-8.5.24-build.xml.patch | 6 +-
.../tomcat/files/tomcat-8.5.27-build.xml.patch | 2 -
.../tomcat/files/tomcat-8.5.28-build.xml.patch | 258 --------------------
.../tomcat/files/tomcat-9.0.4-build.xml.patch | 2 -
.../tomcat/files/tomcat-9.0.5-build.xml.patch | 258 --------------------
www-servers/tomcat/tomcat-7.0.84.ebuild | 2 +-
www-servers/tomcat/tomcat-7.0.85.ebuild | 2 +-
www-servers/tomcat/tomcat-8.0.49.ebuild | 2 +-
www-servers/tomcat/tomcat-8.0.50.ebuild | 2 +-
www-servers/tomcat/tomcat-8.5.27.ebuild | 2 +-
www-servers/tomcat/tomcat-8.5.28.ebuild | 2 +-
www-servers/tomcat/tomcat-9.0.4.ebuild | 2 +-
www-servers/tomcat/tomcat-9.0.5.ebuild | 2 +-
19 files changed, 14 insertions(+), 971 deletions(-)
diff --git a/www-servers/tomcat/files/tomcat-7.0.82-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.82-build.xml.patch
index 481591fb6ff..fa05cb73305 100644
--- a/www-servers/tomcat/files/tomcat-7.0.82-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-7.0.82-build.xml.patch
@@ -1,6 +1,5 @@
-diff -Naur apache-tomcat-7.0.63-src.orig/build.xml apache-tomcat-7.0.63-src/build.xml
---- apache-tomcat-7.0.63-src.orig/build.xml 2015-06-30 09:15:44.000000000 +0100
-+++ apache-tomcat-7.0.63-src/build.xml 2015-08-22 21:13:12.453038827 +0100
+--- a/build.xml
++++ b/build.xml
@@ -660,12 +660,14 @@
</fileset>
</copy>
diff --git a/www-servers/tomcat/files/tomcat-7.0.84-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.84-build.xml.patch
index aa40bd1564a..743320010c9 100644
--- a/www-servers/tomcat/files/tomcat-7.0.84-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-7.0.84-build.xml.patch
@@ -1,5 +1,3 @@
-diff --git a/build.xml b/build.xml
-index 3f1229c..13894ed 100644
--- a/build.xml
+++ b/build.xml
@@ -671,12 +671,14 @@
diff --git a/www-servers/tomcat/files/tomcat-7.0.85-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.85-build.xml.patch
deleted file mode 100644
index aa40bd1564a..00000000000
--- a/www-servers/tomcat/files/tomcat-7.0.85-build.xml.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 3f1229c..13894ed 100644
---- a/build.xml
-+++ b/build.xml
-@@ -671,12 +671,14 @@
- </fileset>
- </copy>
- <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
-+<!--
- <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1">
- <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
- <include name="*" />
- <exclude name="jspxml*" />
- </fileset>
- </copy>
-+-->
-
- </target>
-
-@@ -733,26 +735,32 @@
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
- <!-- Servlet 3.0 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- manifest="${tomcat.manifests}/servlet-api.jar.manifest"
- notice="${tomcat.manifests}/servlet-api.jar.notice"
- license="${tomcat.manifests}/servlet-api.jar.license" />
-+-->
-
- <!-- JSP 2.2 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${jsp-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest"
- notice="${tomcat.manifests}/jsp-api.jar.notice"
- license="${tomcat.manifests}/jsp-api.jar.license" />
-+-->
-
- <!-- JSP 2.2 EL Implementation JAR File -->
-+<!--
- <jarIt jarfile="${el-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.el-api"
- manifest="${tomcat.manifests}/el-api.jar.manifest" />
-+-->
-
- <!-- Bootstrap JAR File -->
- <jarIt jarfile="${bootstrap.jar}"
-@@ -999,9 +1007,9 @@
-
- <target name="deploy" depends="package,build-docs,compile-webapp-examples"
- description="Default. Builds a working Tomcat instance">
--
-+<!--
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
- <!-- Copy scripts -->
- <copy todir="${tomcat.build}/bin">
- <fileset dir="bin">
-@@ -1060,14 +1068,15 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-+<!--
- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
--
-+-->
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
--
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
- failonerror="false"/>
--
-+-->
- <!-- 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}"
-@@ -1697,7 +1706,7 @@
-
- <target name="extras-webservices-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">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1886,11 +1895,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.
-@@ -1902,6 +1912,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- description="Create the Tomcat javadoc" >
- <fail unless="java.7.home"
- message="The java.7.home property must be set for javadoc build"/>
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1966,6 +1977,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -2006,9 +2018,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path refid="tomcat.webservices.classpath"/>
- <path location="${ant.core.lib}"/>
- </classpath>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2632,7 +2646,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- </target>
-
- <target name="download-compile"
-- description="Download (and build) components necessary to compile" >
-+ description="Download (and build) components necessary to compile" unless="noget">
-
- <!-- Download Commons Daemon -->
- <antcall target="downloadgz-2">
-@@ -2675,7 +2689,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2721,7 +2735,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- </target>
-
- <target name="download-dist"
-- description="Download additional components for a distribution" >
-+ description="Download additional components for a distribution" unless="noget">
-
- <antcall target="downloadfile-2">
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
diff --git a/www-servers/tomcat/files/tomcat-8.0.48-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.48-build.xml.patch
index b0862aef305..7cb4e1ed527 100644
--- a/www-servers/tomcat/files/tomcat-8.0.48-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-8.0.48-build.xml.patch
@@ -1,7 +1,5 @@
-diff --git a/apache-tomcat-8.0.47-src/build.xml b/apache-tomcat-8.0.47-src/build.xml
-index 6b4465a..ab4008d 100644
---- a/apache-tomcat-8.0.47-src/build.xml
-+++ b/apache-tomcat-8.0.47-src/build.xml
+--- a/build.xml
++++ b/build.xml
@@ -715,24 +715,29 @@
manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
diff --git a/www-servers/tomcat/files/tomcat-8.0.49-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.49-build.xml.patch
index b7e0a283fe2..ab6590d5c12 100644
--- a/www-servers/tomcat/files/tomcat-8.0.49-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-8.0.49-build.xml.patch
@@ -1,5 +1,3 @@
-diff --git a/build.xml b/build.xml
-index 3152712..9e09384 100644
--- a/build.xml
+++ b/build.xml
@@ -718,24 +718,29 @@
diff --git a/www-servers/tomcat/files/tomcat-8.0.50-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.50-build.xml.patch
deleted file mode 100644
index b7e0a283fe2..00000000000
--- a/www-servers/tomcat/files/tomcat-8.0.50-build.xml.patch
+++ /dev/null
@@ -1,267 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 3152712..9e09384 100644
---- a/build.xml
-+++ b/build.xml
-@@ -718,24 +718,29 @@
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
- <!-- Servlet 3.1 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- 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}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
- <!-- EL 3.0 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 -->
- <jarIt jarfile="${websocket-api.jar}"
-@@ -1005,9 +1010,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/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
- <!-- Copy scripts -->
- <copy todir="${tomcat.build}/bin">
- <fileset dir="bin">
-@@ -1067,7 +1072,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1101,7 +1106,7 @@
- </javac>
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- 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}"
-@@ -1116,7 +1121,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- 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}"
-@@ -1220,9 +1225,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <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
-@@ -1615,7 +1622,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}"/>
-@@ -1754,7 +1761,7 @@
-
- <target name="extras-webservices-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">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1941,11 +1948,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.
-@@ -1955,6 +1963,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" >
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -2016,6 +2025,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -2054,9 +2064,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path refid="tomcat.webservices.classpath"/>
- <path location="${ant.core.lib}"/>
- </classpath>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2791,7 +2803,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">
-
- <!-- Download Commons Daemon -->
- <antcall target="downloadgz-2">
-@@ -2811,7 +2823,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2868,7 +2880,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="downloadfile-2">
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2908,18 +2920,18 @@ skip.installer property in build.properties" />
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2931,7 +2943,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2950,7 +2962,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2961,7 +2973,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2979,7 +2991,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2989,7 +3001,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3012,7 +3024,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -3023,7 +3035,7 @@ skip.installer property in build.properties" />
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -3034,7 +3046,7 @@ skip.installer property in build.properties" />
-
- <target name="ide-eclipse"
- depends="download-compile, extras-webservices-prepare, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/files/tomcat-8.5.24-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.24-build.xml.patch
index d83440c0c4d..9db6d404674 100644
--- a/www-servers/tomcat/files/tomcat-8.5.24-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-8.5.24-build.xml.patch
@@ -1,7 +1,5 @@
-diff --git a/apache-tomcat-8.5.23-src/build.xml b/apache-tomcat-8.5.23-src/build.xml
-index b1b2666..263800c 100644
---- a/apache-tomcat-8.5.23-src/build.xml
-+++ b/apache-tomcat-8.5.23-src/build.xml
+--- a/build.xml
++++ b/build.xml
@@ -714,24 +714,29 @@
manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
diff --git a/www-servers/tomcat/files/tomcat-8.5.27-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.27-build.xml.patch
index e08dd17c6cc..c8022bcd5e4 100644
--- a/www-servers/tomcat/files/tomcat-8.5.27-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-8.5.27-build.xml.patch
@@ -1,5 +1,3 @@
-diff --git a/build.xml b/build.xml
-index 2b3c7cf..b8e57e0 100644
--- a/build.xml
+++ b/build.xml
@@ -717,24 +717,29 @@
diff --git a/www-servers/tomcat/files/tomcat-8.5.28-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.28-build.xml.patch
deleted file mode 100644
index e08dd17c6cc..00000000000
--- a/www-servers/tomcat/files/tomcat-8.5.28-build.xml.patch
+++ /dev/null
@@ -1,258 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 2b3c7cf..b8e57e0 100644
---- a/build.xml
-+++ b/build.xml
-@@ -717,24 +717,29 @@
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
- <!-- Servlet 3.1 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- 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}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
- <!-- EL 3.0 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 -->
- <jarIt jarfile="${websocket-api.jar}"
-@@ -1010,9 +1015,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/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
- <!-- Copy scripts -->
- <copy todir="${tomcat.build}/bin">
- <fileset dir="bin">
-@@ -1072,7 +1077,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1106,7 +1111,7 @@
- </javac>
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- 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}"
-@@ -1121,7 +1126,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- 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}"
-@@ -1225,9 +1230,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <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
-@@ -1610,7 +1617,7 @@
-
- <target name="extras-webservices-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">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1750,11 +1757,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.
-@@ -1764,6 +1772,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" >
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1828,6 +1837,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -1868,9 +1878,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path refid="tomcat.webservices.classpath"/>
- <path location="${ant.core.lib}"/>
- </classpath>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2617,7 +2629,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">
-
- <!-- Download Commons Daemon -->
- <antcall target="downloadgz-2">
-@@ -2637,7 +2649,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2694,7 +2706,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="downloadfile-2">
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2734,18 +2746,18 @@ skip.installer property in build.properties" />
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2757,7 +2769,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2776,7 +2788,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2787,7 +2799,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2805,7 +2817,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2815,7 +2827,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2838,7 +2850,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -2849,7 +2861,7 @@ skip.installer property in build.properties" />
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -2860,7 +2872,7 @@ skip.installer property in build.properties" />
-
- <target name="ide-eclipse"
- depends="download-compile, extras-webservices-prepare, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/files/tomcat-9.0.4-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.4-build.xml.patch
index 87f869dd4c0..feb5f126a37 100644
--- a/www-servers/tomcat/files/tomcat-9.0.4-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-9.0.4-build.xml.patch
@@ -1,5 +1,3 @@
-diff --git a/build.xml b/build.xml
-index c1331c9..b664cc3 100644
--- a/build.xml
+++ b/build.xml
@@ -719,24 +719,30 @@
diff --git a/www-servers/tomcat/files/tomcat-9.0.5-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.5-build.xml.patch
deleted file mode 100644
index 87f869dd4c0..00000000000
--- a/www-servers/tomcat/files/tomcat-9.0.5-build.xml.patch
+++ /dev/null
@@ -1,258 +0,0 @@
-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 -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- 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}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
- <!-- EL 3.0 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 -->
- <jarIt jarfile="${websocket-api.jar}"
-@@ -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/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
- <!-- Copy scripts -->
- <copy todir="${tomcat.build}/bin">
- <fileset dir="bin">
-@@ -1074,7 +1080,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1108,7 +1114,7 @@
- </javac>
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- 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}"
-@@ -1123,7 +1129,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- 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}"
-@@ -1227,9 +1233,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <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
-@@ -1612,7 +1620,7 @@
-
- <target name="extras-webservices-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">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -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" >
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1830,6 +1840,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -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>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <link href="../websocketapi"/>
- <link href="http://docs.oracle.com/javase/8/docs/api/"/>
- <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
-@@ -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">
-
- <!-- Download Commons Daemon -->
- <antcall target="downloadgz-2">
-@@ -2637,7 +2650,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -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="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 ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2757,7 +2770,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2776,7 +2789,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2787,7 +2800,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2805,7 +2818,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2815,7 +2828,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2838,7 +2851,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -2849,7 +2862,7 @@ skip.installer property in build.properties" />
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -2860,7 +2873,7 @@ skip.installer property in build.properties" />
-
- <target name="ide-eclipse"
- depends="download-compile, extras-webservices-prepare, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-7.0.84.ebuild b/www-servers/tomcat/tomcat-7.0.84.ebuild
index bebf2f0f814..7917995deab 100644
--- a/www-servers/tomcat/tomcat-7.0.84.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.84.ebuild
@@ -48,7 +48,7 @@ src_prepare() {
java-pkg_clean
- epatch "${FILESDIR}/${P}-build.xml.patch"
+ epatch "${FILESDIR}/${PN}-7.0.84-build.xml.patch"
# For use of catalina.sh in netbeans
sed -i -e "/^# ----- Execute The Requested Command/ a\
diff --git a/www-servers/tomcat/tomcat-7.0.85.ebuild b/www-servers/tomcat/tomcat-7.0.85.ebuild
index bebf2f0f814..7917995deab 100644
--- a/www-servers/tomcat/tomcat-7.0.85.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.85.ebuild
@@ -48,7 +48,7 @@ src_prepare() {
java-pkg_clean
- epatch "${FILESDIR}/${P}-build.xml.patch"
+ epatch "${FILESDIR}/${PN}-7.0.84-build.xml.patch"
# For use of catalina.sh in netbeans
sed -i -e "/^# ----- Execute The Requested Command/ a\
diff --git a/www-servers/tomcat/tomcat-8.0.49.ebuild b/www-servers/tomcat/tomcat-8.0.49.ebuild
index 5f9b5faf780..d75c0ef779c 100644
--- a/www-servers/tomcat/tomcat-8.0.49.ebuild
+++ b/www-servers/tomcat/tomcat-8.0.49.ebuild
@@ -52,7 +52,7 @@ src_prepare() {
# Remove bundled servlet-api
rm -rv java/javax/{el,servlet} || die
- epatch "${FILESDIR}/${P}-build.xml.patch"
+ epatch "${FILESDIR}/${PN}-8.0.49-build.xml.patch"
# For use of catalina.sh in netbeans
sed -i -e "/^# ----- Execute The Requested Command/ a\
diff --git a/www-servers/tomcat/tomcat-8.0.50.ebuild b/www-servers/tomcat/tomcat-8.0.50.ebuild
index 5f9b5faf780..d75c0ef779c 100644
--- a/www-servers/tomcat/tomcat-8.0.50.ebuild
+++ b/www-servers/tomcat/tomcat-8.0.50.ebuild
@@ -52,7 +52,7 @@ src_prepare() {
# Remove bundled servlet-api
rm -rv java/javax/{el,servlet} || die
- epatch "${FILESDIR}/${P}-build.xml.patch"
+ epatch "${FILESDIR}/${PN}-8.0.49-build.xml.patch"
# For use of catalina.sh in netbeans
sed -i -e "/^# ----- Execute The Requested Command/ a\
diff --git a/www-servers/tomcat/tomcat-8.5.27.ebuild b/www-servers/tomcat/tomcat-8.5.27.ebuild
index 889da8d4f23..0fb74bf75f0 100644
--- a/www-servers/tomcat/tomcat-8.5.27.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.27.ebuild
@@ -52,7 +52,7 @@ src_prepare() {
# Remove bundled servlet-api
rm -rv java/javax/{el,servlet} || die
- epatch "${FILESDIR}/${P}-build.xml.patch"
+ epatch "${FILESDIR}/${PN}-8.5.27-build.xml.patch"
# For use of catalina.sh in netbeans
sed -i -e "/^# ----- Execute The Requested Command/ a\
diff --git a/www-servers/tomcat/tomcat-8.5.28.ebuild b/www-servers/tomcat/tomcat-8.5.28.ebuild
index 889da8d4f23..0fb74bf75f0 100644
--- a/www-servers/tomcat/tomcat-8.5.28.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.28.ebuild
@@ -52,7 +52,7 @@ src_prepare() {
# Remove bundled servlet-api
rm -rv java/javax/{el,servlet} || die
- epatch "${FILESDIR}/${P}-build.xml.patch"
+ epatch "${FILESDIR}/${PN}-8.5.27-build.xml.patch"
# For use of catalina.sh in netbeans
sed -i -e "/^# ----- Execute The Requested Command/ a\
diff --git a/www-servers/tomcat/tomcat-9.0.4.ebuild b/www-servers/tomcat/tomcat-9.0.4.ebuild
index 9b79ebaf947..36b0d091699 100644
--- a/www-servers/tomcat/tomcat-9.0.4.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.4.ebuild
@@ -52,7 +52,7 @@ src_prepare() {
# Remove bundled servlet-api
rm -rv java/javax/{el,servlet} || die
- epatch "${FILESDIR}/${P}-build.xml.patch"
+ epatch "${FILESDIR}/${PN}-9.0.4-build.xml.patch"
# For use of catalina.sh in netbeans
sed -i -e "/^# ----- Execute The Requested Command/ a\
diff --git a/www-servers/tomcat/tomcat-9.0.5.ebuild b/www-servers/tomcat/tomcat-9.0.5.ebuild
index 9b79ebaf947..36b0d091699 100644
--- a/www-servers/tomcat/tomcat-9.0.5.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.5.ebuild
@@ -52,7 +52,7 @@ src_prepare() {
# Remove bundled servlet-api
rm -rv java/javax/{el,servlet} || die
- epatch "${FILESDIR}/${P}-build.xml.patch"
+ epatch "${FILESDIR}/${PN}-9.0.4-build.xml.patch"
# For use of catalina.sh in netbeans
sed -i -e "/^# ----- Execute The Requested Command/ a\
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2018-04-13 14:08 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2018-04-13 14:08 UTC (permalink / raw
To: gentoo-commits
commit: 11bc522fbebc620f868a69732e8e92755be3c361
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 13 14:06:39 2018 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Apr 13 14:08:27 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11bc522f
www-servers/tomcat: removed obsolete versions
Package-Manager: Portage-2.3.28, Repoman-2.3.9
www-servers/tomcat/Manifest | 3 -
.../tomcat/files/tomcat-8.5.24-build.xml.patch | 247 ---------------------
www-servers/tomcat/tomcat-8.5.24.ebuild | 158 -------------
www-servers/tomcat/tomcat-8.5.27.ebuild | 158 -------------
www-servers/tomcat/tomcat-9.0.4.ebuild | 158 -------------
5 files changed, 724 deletions(-)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 7a92bbdc3da..4b09c651281 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -4,10 +4,7 @@ DIST apache-tomcat-7.0.85-src.tar.gz 4718223 BLAKE2B 3067709eb143feee5cc1f31cdd8
DIST apache-tomcat-8.0.48-src.tar.gz 5009969 BLAKE2B 4b1db654d74b02f5fd589590197561496ecfb9b219e445fd18f2e967c78fb95f7fc71a21a6ed9ab5f8c6cee448b74a1729eb3627bcf1a59e2d2748c9c80cc76c SHA512 c56aaa7335c4ef221b2e5de7a7d4946ae1221127f977da5f46a97b062d909abc918b0e6ceb887d98ea5f5b38a26bbe9a3de481972492be593636f6f7e6ef7841
DIST apache-tomcat-8.0.49-src.tar.gz 5017328 BLAKE2B a3494c73fc6b9ffecfe7b09380f9fb3a632e167861f876ac827848e6ae5fd41dc9d3f8a0da9d484edd87b88532de05809c8019941d3a2639e925066ff0a8cc87 SHA512 36ae75d37874430ea6b567d8415a9249f104b57afdd8689621f659f6a2c0b229f207e63cdcdfacb1eabd13af567295ff1335cb052abbefe46efdccc20f2d5a73
DIST apache-tomcat-8.0.50-src.tar.gz 5023017 BLAKE2B 862799b7f6a227217c93e1b65aacc49a765b6d11886d0f2278a860c3f4e2b89692cfb724e323d3afe074ad3af3ef8cfd780e4be1ad2f55fee381e5054fbb1941 SHA512 c46efe03cfaadbc2b89063c05c5ec9f315a4eeacdfbf6dd43691c3d23a87d75b23b6679550518d825f8ec7ed853a899ca88cc54c61da9983b025ec7042c3bfff
-DIST apache-tomcat-8.5.24-src.tar.gz 5101516 BLAKE2B c19c46cca562f0c4c4733608ec007dd423f9a8ed0595bfb835554a7d08be06b791933e4beacbb0fe472589feae82f7d1a46934c0fb68930343cb2f4589bf6530 SHA512 f4ef9a66f2cafb3207c5a38c0f88efc1189e72f02fa88ef2a1b3626a03a57d0ba505b099f6185d747d5ab858aa3f8f3446ae60789312a900ec443eac45233efc
-DIST apache-tomcat-8.5.27-src.tar.gz 5123614 BLAKE2B 0051a7b5a9d3529a012338e0b12ed5fca218fc6740a0c576d3195a9c7848a78d93d0a6151541e314d82723de1b533b28024eeb231e33b21c38a2c4f702007415 SHA512 d3cac3d618283f0c26f861df67223fcb889da750f5e42563ec2ebc17d72169a7639d05d4d42fe403f4e49052962da09bc4b312b012c31309d8a096036baec8ab
DIST apache-tomcat-8.5.28-src.tar.gz 5128929 BLAKE2B fe862a44fe57a50502b95d6f31863567b5596b183355a75fb7b75827a697299878920cc5ca5c24ffcdabae885a893266f40f174c76c32f449bec31e7a1be489b SHA512 55970e8babc1fde783e6e9f67a221012cae88e871391aa751e3c87c0fc7e58cd45662f025dc286dd529caced317dada48bb65786f87b44abbc9ce16f0d8fb0b5
DIST apache-tomcat-8.5.30-src.tar.gz 5143270 BLAKE2B 3bdcff663ca509efc3b2ee92ce140a3a22abf7fc0e32b5fa9a0ee713bdc1065ebde0b77cf624cedc2e0893194518d10e1f5df5b2f41edf76cb61157ac4d02862 SHA512 53729cfd1859872109f816df2642e3cd776a7faf8c55b1d50df0459f12958aacbf36debe6e8f10c19ab0a5bb2973fa63a2fec57f83ecaf19f4cf9d82e4a20265
-DIST apache-tomcat-9.0.4-src.tar.gz 5073991 BLAKE2B 7efffbba395d78d5ab051dd2bdb7a1491cb04159421bec17deebcb901bbca5cfec67a651f8e1fcd9a394ba3e0650fc61e7da039f0f979ae60a87f477bc4bc3b8 SHA512 bb8777f6fff861a53381b15a4196053abd9cc01e080f0511032f69eb6f57f5c6ed0eafd8a94155f19a4654bce4fad39e0fcaa2e5473cb269bceeb46a2ea43557
DIST apache-tomcat-9.0.5-src.tar.gz 5077379 BLAKE2B db345767f6c35557054c33d789fc40b1d2071501130bec57df41bb3fdf6f8be5260c0faed317b9fe6fa40474f9de1f29c6a71039eb0b7d07fee4ee0109ac16e4 SHA512 4d0b24dcf26b94f4280382f64bcdeb74f24b69b86b1410ad40d4a0284d6787809485f7c2501b66126d778a73a5c3eb155856ac6d3b3e2a477d1742d8588c1e84
DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2
diff --git a/www-servers/tomcat/files/tomcat-8.5.24-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.24-build.xml.patch
deleted file mode 100644
index 9db6d404674..00000000000
--- a/www-servers/tomcat/files/tomcat-8.5.24-build.xml.patch
+++ /dev/null
@@ -1,247 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -714,24 +714,29 @@
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
- <!-- Servlet 3.1 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- 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}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
- <!-- EL 3.0 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 -->
- <jarIt jarfile="${websocket-api.jar}"
-@@ -1005,14 +1010,14 @@
-
- <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">
-@@ -1072,7 +1077,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1106,7 +1111,7 @@
- </javac>
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- 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}"
-@@ -1121,7 +1126,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- 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}"
-@@ -1225,9 +1230,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <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
-@@ -1608,7 +1615,7 @@
-
- <target name="extras-webservices-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">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1756,6 +1763,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" >
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1820,6 +1828,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -1860,9 +1869,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path refid="tomcat.webservices.classpath"/>
- <path location="${ant.core.lib}"/>
- </classpath>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2607,7 +2618,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}"/>
-@@ -2641,7 +2652,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2698,7 +2709,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}"/>
-@@ -2724,18 +2735,18 @@ skip.installer property in build.properties" />
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2747,7 +2758,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- 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" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2777,7 +2788,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2795,7 +2806,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2805,7 +2816,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2828,7 +2839,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -2839,7 +2850,7 @@ skip.installer property in build.properties" />
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -2850,7 +2861,7 @@ skip.installer property in build.properties" />
-
- <target name="ide-eclipse"
- depends="download-compile, extras-webservices-prepare, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-8.5.24.ebuild b/www-servers/tomcat/tomcat-8.5.24.ebuild
deleted file mode 100644
index a9d17b4ed6a..00000000000
--- a/www-servers/tomcat/tomcat-8.5.24.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="8.5"
-KEYWORDS="amd64 ~x86 ~x86-fbsd ~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="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- !<dev-java/tomcat-native-1.1.24
- >=virtual/jre-1.7"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- >=virtual/jdk-1.7
- test? (
- >=dev-java/ant-junit-1.9:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_prepare() {
- default
-
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- epatch "${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}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.5.27.ebuild b/www-servers/tomcat/tomcat-8.5.27.ebuild
deleted file mode 100644
index 0fb74bf75f0..00000000000
--- a/www-servers/tomcat/tomcat-8.5.27.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="8.5"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~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="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- !<dev-java/tomcat-native-1.1.24
- >=virtual/jre-1.7"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- >=virtual/jdk-1.7
- test? (
- >=dev-java/ant-junit-1.9:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_prepare() {
- default
-
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- epatch "${FILESDIR}/${PN}-8.5.27-build.xml.patch"
-
- # For use of catalina.sh in netbeans
- sed -i -e "/^# ----- Execute The Requested Command/ a\
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
diff --git a/www-servers/tomcat/tomcat-9.0.4.ebuild b/www-servers/tomcat/tomcat-9.0.4.ebuild
deleted file mode 100644
index 36b0d091699..00000000000
--- a/www-servers/tomcat/tomcat-9.0.4.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-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${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="9"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~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"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- =dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- !<dev-java/tomcat-native-1.1.24
- >=virtual/jre-1.8"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- >=virtual/jdk-1.8
- test? (
- >=dev-java/ant-junit-1.9:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_prepare() {
- default
-
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- epatch "${FILESDIR}/${PN}-9.0.4-build.xml.patch"
-
- # For use of catalina.sh in netbeans
- sed -i -e "/^# ----- Execute The Requested Command/ a\
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2018-06-01 8:34 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2018-06-01 8:34 UTC (permalink / raw
To: gentoo-commits
commit: ced6930500287e808b5e21366223ab0b2aa595d6
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 1 08:33:48 2018 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Jun 1 08:33:48 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ced69305
www-servers/tomcat: removed obsolete ebuilds
Package-Manager: Portage-2.3.40, Repoman-2.3.9
www-servers/tomcat/Manifest | 6 -
.../tomcat/files/tomcat-7.0.82-build.xml.patch | 148 ------------
.../tomcat/files/tomcat-8.0.48-build.xml.patch | 256 ---------------------
www-servers/tomcat/tomcat-7.0.82.ebuild | 149 ------------
www-servers/tomcat/tomcat-7.0.84.ebuild | 147 ------------
www-servers/tomcat/tomcat-8.0.48.ebuild | 158 -------------
www-servers/tomcat/tomcat-8.0.49.ebuild | 158 -------------
www-servers/tomcat/tomcat-8.5.28.ebuild | 158 -------------
www-servers/tomcat/tomcat-9.0.5.ebuild | 158 -------------
9 files changed, 1338 deletions(-)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 4b09c651281..61fd077a15f 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,10 +1,4 @@
-DIST apache-tomcat-7.0.82-src.tar.gz 4697342 BLAKE2B 1106ed04dc83e64e395de29f01a7752a0578b0c88046eb59614a7cfc0d8a98e3aebb698c8eb56763eea41620d9b42482971c5093304184b1028c6bd8f9770ada SHA512 fc92388d81316de0246df4074c417ffa341eab55308c0694e9ea71c5497c863b42019cd1f38628ff640114c501a06c4e9c428cb2b6f1bc1c16fb337a286718db
-DIST apache-tomcat-7.0.84-src.tar.gz 4713409 BLAKE2B 3dc7766db1492413bbd3f878a2da7392dd4cfd1ca4c3e8a236e380cdfbc0c4ff075665d39871026e61f0bc88e0a84f372fbcef6914af9dc99e6dda05bafc6e48 SHA512 ca6b3f17f56a0b1befafd2efbfa07cbe094fb4ab022a3b5d704d249e551b44c6ef0d9691bd1b7c48ccda957efb43045209d11ca1a4aa0a7875e516e3a233cd74
DIST apache-tomcat-7.0.85-src.tar.gz 4718223 BLAKE2B 3067709eb143feee5cc1f31cdd8d41c58fb96ed1330560a4064ac3b3eeb030c76ff066c2a2f950d6f2c1576bde214f963f1a12342536a8e2ab8ac179dd166bfb SHA512 f95383b2c77670845cce577161ecf326c3e0f49d456792a53305640289d049b0de80f4b6901bcda52bc4967895f97772591eee525affee1a1d07aac2e60d2044
-DIST apache-tomcat-8.0.48-src.tar.gz 5009969 BLAKE2B 4b1db654d74b02f5fd589590197561496ecfb9b219e445fd18f2e967c78fb95f7fc71a21a6ed9ab5f8c6cee448b74a1729eb3627bcf1a59e2d2748c9c80cc76c SHA512 c56aaa7335c4ef221b2e5de7a7d4946ae1221127f977da5f46a97b062d909abc918b0e6ceb887d98ea5f5b38a26bbe9a3de481972492be593636f6f7e6ef7841
-DIST apache-tomcat-8.0.49-src.tar.gz 5017328 BLAKE2B a3494c73fc6b9ffecfe7b09380f9fb3a632e167861f876ac827848e6ae5fd41dc9d3f8a0da9d484edd87b88532de05809c8019941d3a2639e925066ff0a8cc87 SHA512 36ae75d37874430ea6b567d8415a9249f104b57afdd8689621f659f6a2c0b229f207e63cdcdfacb1eabd13af567295ff1335cb052abbefe46efdccc20f2d5a73
DIST apache-tomcat-8.0.50-src.tar.gz 5023017 BLAKE2B 862799b7f6a227217c93e1b65aacc49a765b6d11886d0f2278a860c3f4e2b89692cfb724e323d3afe074ad3af3ef8cfd780e4be1ad2f55fee381e5054fbb1941 SHA512 c46efe03cfaadbc2b89063c05c5ec9f315a4eeacdfbf6dd43691c3d23a87d75b23b6679550518d825f8ec7ed853a899ca88cc54c61da9983b025ec7042c3bfff
-DIST apache-tomcat-8.5.28-src.tar.gz 5128929 BLAKE2B fe862a44fe57a50502b95d6f31863567b5596b183355a75fb7b75827a697299878920cc5ca5c24ffcdabae885a893266f40f174c76c32f449bec31e7a1be489b SHA512 55970e8babc1fde783e6e9f67a221012cae88e871391aa751e3c87c0fc7e58cd45662f025dc286dd529caced317dada48bb65786f87b44abbc9ce16f0d8fb0b5
DIST apache-tomcat-8.5.30-src.tar.gz 5143270 BLAKE2B 3bdcff663ca509efc3b2ee92ce140a3a22abf7fc0e32b5fa9a0ee713bdc1065ebde0b77cf624cedc2e0893194518d10e1f5df5b2f41edf76cb61157ac4d02862 SHA512 53729cfd1859872109f816df2642e3cd776a7faf8c55b1d50df0459f12958aacbf36debe6e8f10c19ab0a5bb2973fa63a2fec57f83ecaf19f4cf9d82e4a20265
-DIST apache-tomcat-9.0.5-src.tar.gz 5077379 BLAKE2B db345767f6c35557054c33d789fc40b1d2071501130bec57df41bb3fdf6f8be5260c0faed317b9fe6fa40474f9de1f29c6a71039eb0b7d07fee4ee0109ac16e4 SHA512 4d0b24dcf26b94f4280382f64bcdeb74f24b69b86b1410ad40d4a0284d6787809485f7c2501b66126d778a73a5c3eb155856ac6d3b3e2a477d1742d8588c1e84
DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2
diff --git a/www-servers/tomcat/files/tomcat-7.0.82-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.82-build.xml.patch
deleted file mode 100644
index fa05cb73305..00000000000
--- a/www-servers/tomcat/files/tomcat-7.0.82-build.xml.patch
+++ /dev/null
@@ -1,148 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -660,12 +660,14 @@
- </fileset>
- </copy>
- <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
-+<!--
- <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1">
- <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
- <include name="*" />
- <exclude name="jspxml*" />
- </fileset>
- </copy>
-+-->
-
- </target>
-
-@@ -721,26 +723,32 @@
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
- <!-- Servlet 3.0 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- manifest="${tomcat.manifests}/servlet-api.jar.manifest"
- notice="${tomcat.manifests}/servlet-api.jar.notice"
- license="${tomcat.manifests}/servlet-api.jar.license" />
-+-->
-
- <!-- JSP 2.2 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${jsp-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest"
- notice="${tomcat.manifests}/jsp-api.jar.notice"
- license="${tomcat.manifests}/jsp-api.jar.license" />
-+-->
-
- <!-- JSP 2.2 EL Implementation JAR File -->
-+<!--
- <jarIt jarfile="${el-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.el-api"
- manifest="${tomcat.manifests}/el-api.jar.manifest" />
-+-->
-
- <!-- Bootstrap JAR File -->
- <jarIt jarfile="${bootstrap.jar}"
-@@ -986,12 +994,14 @@
- <target name="deploy" depends="package,build-docs,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">
-@@ -1051,14 +1061,15 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-+<!--
- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
--
-+-->
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
--
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
- failonerror="false"/>
--
-+-->
- <!-- 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}"
-@@ -1681,7 +1692,7 @@
-
- <target name="extras-webservices-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">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1886,6 +1897,7 @@
- description="Create the Tomcat javadoc" >
- <fail unless="java.7.home"
- message="The java.7.home property must be set for javadoc build"/>
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1947,6 +1959,7 @@
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -1985,9 +1998,11 @@
- <path refid="tomcat.webservices.classpath"/>
- <path location="${ant.core.lib}"/>
- </classpath>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2642,7 +2657,7 @@
- </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}"/>
-@@ -2699,7 +2714,7 @@
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2727,7 +2742,7 @@
- </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}"/>
diff --git a/www-servers/tomcat/files/tomcat-8.0.48-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.48-build.xml.patch
deleted file mode 100644
index 7cb4e1ed527..00000000000
--- a/www-servers/tomcat/files/tomcat-8.0.48-build.xml.patch
+++ /dev/null
@@ -1,256 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -715,24 +715,29 @@
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
- <!-- Servlet 3.1 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- 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}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
- <!-- EL 3.0 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 -->
- <jarIt jarfile="${websocket-api.jar}"
-@@ -1000,14 +1005,14 @@
-
- <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">
-@@ -1067,7 +1072,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1101,7 +1106,7 @@
- </javac>
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- 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}"
-@@ -1116,7 +1121,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- 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}"
-@@ -1220,9 +1225,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <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
-@@ -1613,7 +1620,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}"/>
-@@ -1752,7 +1759,7 @@
-
- <target name="extras-webservices-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">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1947,6 +1954,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" >
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -2008,6 +2016,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -2046,9 +2055,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path refid="tomcat.webservices.classpath"/>
- <path location="${ant.core.lib}"/>
- </classpath>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2781,7 +2792,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}"/>
-@@ -2815,7 +2826,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2872,7 +2883,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}"/>
-@@ -2898,18 +2909,18 @@ skip.installer property in build.properties" />
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2921,7 +2932,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2940,7 +2951,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2951,7 +2962,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2969,7 +2980,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2979,7 +2990,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3002,7 +3013,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -3013,7 +3024,7 @@ skip.installer property in build.properties" />
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -3024,7 +3035,7 @@ skip.installer property in build.properties" />
-
- <target name="ide-eclipse"
- depends="download-compile, extras-webservices-prepare, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-7.0.82.ebuild b/www-servers/tomcat/tomcat-7.0.82.ebuild
deleted file mode 100644
index 68d853eb85a..00000000000
--- a/www-servers/tomcat/tomcat-7.0.82.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="7"
-KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps websockets"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.5"
-SAPI_SLOT="3.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- dev-java/tomcat-servlet-api:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- websockets? ( >=virtual/jre-1.7 )
- !websockets? ( >=virtual/jre-1.6 )
- !<dev-java/tomcat-native-1.1.24"
-DEPEND="${COMMON_DEP}
- websockets? ( >=virtual/jdk-1.7 )
- !websockets? ( >=virtual/jdk-1.6 )
- test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_prepare() {
- default
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- java-pkg_clean
-
- eapply "${FILESDIR}/${PN}-7.0.82-build.xml.patch"
-
- # For use of catalina.sh in netbeans
- sed -i -e "/^# ----- Execute The Requested Command/ a\
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r1"
-INIT_REV="-r1"
-
-src_compile() {
- use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
diff --git a/www-servers/tomcat/tomcat-7.0.84.ebuild b/www-servers/tomcat/tomcat-7.0.84.ebuild
deleted file mode 100644
index 8ed5c13fa74..00000000000
--- a/www-servers/tomcat/tomcat-7.0.84.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="7"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps websockets"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.5"
-SAPI_SLOT="3.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- dev-java/tomcat-servlet-api:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- virtual/jre
- !<dev-java/tomcat-native-1.1.24"
-DEPEND="${COMMON_DEP}
- virtual/jdk:1.8
- test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_prepare() {
- default
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- java-pkg_clean
-
- eapply "${FILESDIR}/${PN}-7.0.84-build.xml.patch"
-
- # For use of catalina.sh in netbeans
- sed -i -e "/^# ----- Execute The Requested Command/ a\
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r1"
-INIT_REV="-r1"
-
-src_compile() {
- use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.0.48.ebuild b/www-servers/tomcat/tomcat-8.0.48.ebuild
deleted file mode 100644
index 990c2f21d48..00000000000
--- a/www-servers/tomcat/tomcat-8.0.48.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="8"
-KEYWORDS="amd64 ~x86 ~x86-fbsd ~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="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- dev-java/tomcat-servlet-api:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- !<dev-java/tomcat-native-1.1.24
- >=virtual/jre-1.7"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- >=virtual/jdk-1.7
- test? (
- >=dev-java/ant-junit-1.9:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_prepare() {
- default
-
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- eapply "${FILESDIR}/${PN}-8.0.48-build.xml.patch"
-
- # For use of catalina.sh in netbeans
- sed -i -e "/^# ----- Execute The Requested Command/ a\
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.0.49.ebuild b/www-servers/tomcat/tomcat-8.0.49.ebuild
deleted file mode 100644
index 46de488be6f..00000000000
--- a/www-servers/tomcat/tomcat-8.0.49.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="8"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~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="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- dev-java/tomcat-servlet-api:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- !<dev-java/tomcat-native-1.1.24
- >=virtual/jre-1.7"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- >=virtual/jdk-1.7
- test? (
- >=dev-java/ant-junit-1.9:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_prepare() {
- default
-
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- eapply "${FILESDIR}/${PN}-8.0.49-build.xml.patch"
-
- # For use of catalina.sh in netbeans
- sed -i -e "/^# ----- Execute The Requested Command/ a\
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.5.28.ebuild b/www-servers/tomcat/tomcat-8.5.28.ebuild
deleted file mode 100644
index 52f5424f793..00000000000
--- a/www-servers/tomcat/tomcat-8.5.28.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="8.5"
-KEYWORDS="amd64 ~x86 ~x86-fbsd ~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="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- !<dev-java/tomcat-native-1.1.24
- >=virtual/jre-1.7"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- >=virtual/jdk-1.7
- test? (
- >=dev-java/ant-junit-1.9:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_prepare() {
- default
-
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- eapply "${FILESDIR}/${PN}-8.5.27-build.xml.patch"
-
- # For use of catalina.sh in netbeans
- sed -i -e "/^# ----- Execute The Requested Command/ a\
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
diff --git a/www-servers/tomcat/tomcat-9.0.5.ebuild b/www-servers/tomcat/tomcat-9.0.5.ebuild
deleted file mode 100644
index e3c61d5f22c..00000000000
--- a/www-servers/tomcat/tomcat-9.0.5.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-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${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="9"
-KEYWORDS="amd64 ~x86 ~x86-fbsd ~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"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- =dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- !<dev-java/tomcat-native-1.1.24
- >=virtual/jre-1.8"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- >=virtual/jdk-1.8
- test? (
- >=dev-java/ant-junit-1.9:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_prepare() {
- default
-
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- eapply "${FILESDIR}/${PN}-9.0.4-build.xml.patch"
-
- # For use of catalina.sh in netbeans
- sed -i -e "/^# ----- Execute The Requested Command/ a\
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2019-01-23 12:49 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2019-01-23 12:49 UTC (permalink / raw
To: gentoo-commits
commit: 84202d9cfe48f3a68ad57a1722db4c403af586af
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 23 12:41:57 2019 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Jan 23 12:49:08 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84202d9c
www-servers/tomcat-8.5.37: bump
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
www-servers/tomcat/Manifest | 1 +
.../tomcat/files/tomcat-8.5.37-build.xml.patch | 247 +++++++++++++++++++++
www-servers/tomcat/tomcat-8.5.37.ebuild | 159 +++++++++++++
3 files changed, 407 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index f8fabd0b378..f436109e542 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -3,4 +3,5 @@ DIST apache-tomcat-7.0.92-src.tar.gz 4778943 BLAKE2B d11b01219a25c303ce791d96590
DIST apache-tomcat-8.0.52-src.tar.gz 5039683 BLAKE2B 36318d0ae50fbca3f2a97e0210d0a8da8314f1ef79d0b047971bca30a5b0cc937faf013b5090f6e6b8aec4127b6185dc54ae589f5b57143b62c71c09f8bd5e9d SHA512 6d846213db0b15f9add8d80f30f304afdaf879ab6d7f85d212183a93f4f360ebfeeb079813bdea83cbd13f507504473028bbf8279e89b800b6f150b83086fa56
DIST apache-tomcat-8.0.53-src.tar.gz 5057041 BLAKE2B 3a50d2f61baecb5244909972384e36478c69e7592dd35119d8b7b974273c57a4855082f309146ed160144dbdcced3236fd586b047970bd8558bbe7b7e002e9fd SHA512 0b56bc723277b2888896ab34ec3e49cb56bac94ddf1a9b96bd023982e2ffabd5317f63b3c0971afdc8cd7a6364197409df461d22151dbaab3a2be7daf6858b9e
DIST apache-tomcat-8.5.31-src.tar.gz 5154531 BLAKE2B cce0388e5c8c5fb5fcb3dba3b5961dc21d9f19d9a2f6177660a41410bddf241f73dda1e52c3875e28cfa13041c85a458a92c9a23c509b645f042cfa472081fde SHA512 659137ef4809af329ae4dd6f5825a603c1408ef3e48153abe7480a722e7f4bebef68a64af9cbef4a4ad9a7e8da76494f825035bbadbb983a097525f476f32f33
+DIST apache-tomcat-8.5.37-src.tar.gz 5233414 BLAKE2B 1848180c3e0a3f4559e5c232bea8bad6d05f09d9c4f2f9f903178012b7b8837d395a5ac73c8ac0504fbd3d1df3c2dc785022e1c97da4441cfdcf8b790170ff7c SHA512 29ddbf7bfef19441a8a043020b5f1149d12590dac8120012a2167b6892e3db7c644990e49ba14cc4b4c7339faed65f010a7b24d660db0fb8adde34f032099cec
DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2
diff --git a/www-servers/tomcat/files/tomcat-8.5.37-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.37-build.xml.patch
new file mode 100644
index 00000000000..4c2d8da9e91
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.5.37-build.xml.patch
@@ -0,0 +1,247 @@
+diff --git a/build.xml b/build.xml
+index 6fbb321..4fb4b42 100644
+--- a/build.xml
++++ b/build.xml
+@@ -722,24 +722,29 @@
+ manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+
+ <!-- Servlet 3.1 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+ 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}"
+ filesDir="${tomcat.classes}"
+ filesId="files.jsp-api"
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
++-->
+
+ <!-- EL 3.0 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 -->
+ <jarIt jarfile="${websocket-api.jar}"
+@@ -1025,9 +1030,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/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
++-->
+ <!-- Copy scripts -->
+ <copy todir="${tomcat.build}/bin">
+ <fileset dir="bin">
+@@ -1087,7 +1092,7 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
+- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+@@ -1123,7 +1128,7 @@
+ </javac>
+ </target>
+
+- <target name="build-tomcat-jdbc" depends="package">
++ <target name="build-tomcat-jdbc" depends="package" unless="noget">
+ <!-- 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}"
+@@ -1138,7 +1143,7 @@
+ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+ </target>
+
+- <target name="build-tomcat-jdbc-src">
++ <target name="build-tomcat-jdbc-src" unless="noget">
+ <!-- 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}"
+@@ -1242,9 +1247,11 @@
+
+ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+ <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+ <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
+@@ -1624,7 +1631,7 @@
+
+ <target name="extras-webservices-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">
+ <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -1720,6 +1727,7 @@
+
+ <target name="javadoc" depends="dist-source"
+ description="Create the Tomcat javadoc" >
++<!--
+ <javadoc packagenames="javax.servlet.*"
+ excludepackagenames="javax.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -1784,6 +1792,7 @@
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="javax.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -1824,9 +1833,11 @@
+ <path refid="tomcat.webservices.classpath"/>
+ <path location="${ant.core.lib}"/>
+ </classpath>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <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/"/>
+@@ -2550,7 +2561,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">
+
+ <!-- Download Commons Daemon -->
+ <antcall target="downloadgz-2">
+@@ -2576,7 +2587,7 @@ skip.installer property in build.properties" />
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -2654,7 +2665,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="downloadfile-2">
+ <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
+@@ -2709,13 +2720,13 @@ skip.installer property in build.properties" />
+
+ <!-- =============== Utility Targets to support downloads ================ -->
+
+- <target name="setproxy" if="${proxy.use}">
++ <target name="setproxy" if="${proxy.use}" unless="noget">
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+ proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+ </target>
+
+- <target name="testexist">
++ <target name="testexist" unless="noget">
+ <echo message="Testing for ${destfile}"/>
+ <available file="${destfile}" property="exist"/>
+ </target>
+@@ -2837,7 +2848,7 @@ skip.installer property in build.properties" />
+ </sequential>
+ </macrodef>
+
+- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
++ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2854,7 +2865,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadgz-2" unless="exist" depends="testexist">
++ <target name="downloadgz-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2879,7 +2890,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
++ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2895,7 +2906,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadzip-2" unless="exist" depends="testexist">
++ <target name="downloadzip-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2919,7 +2930,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
++ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
+ <!-- Download the file -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2934,7 +2945,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="downloadfile-2" unless="exist" depends="testexist">
++ <target name="downloadfile-2" unless="noget" depends="testexist">
+ <!-- Download the file from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2962,7 +2973,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="trydownload.check" depends="setproxy">
++ <target name="trydownload.check" depends="setproxy" unless="noget">
+ <condition property="trydownload.run">
+ <and>
+ <not>
+@@ -2973,7 +2984,7 @@ skip.installer property in build.properties" />
+ </condition>
+ </target>
+
+- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+ <!-- Downloads a file if not yet downloaded and the source URL is available -->
+ <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+ </target>
+@@ -2984,7 +2995,7 @@ skip.installer property in build.properties" />
+
+ <target name="ide-eclipse"
+ depends="download-compile, extras-webservices-prepare, download-test-compile"
+- description="Prepares the source tree to be built in Eclipse">
++ description="Prepares the source tree to be built in Eclipse" unless="noget">
+
+ <!-- Copy the sample project files into the root directory -->
+ <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-8.5.37.ebuild b/www-servers/tomcat/tomcat-8.5.37.ebuild
new file mode 100644
index 00000000000..3d8ad6af692
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.5.37.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="8.5"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~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="3.1"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+ !<dev-java/tomcat-native-1.1.24
+ >=virtual/jre-1.7"
+DEPEND="${COMMON_DEP}
+ app-admin/pwgen
+ >=dev-java/ant-core-1.9.13
+ >=virtual/jdk-1.7
+ test? (
+ >=dev-java/ant-junit-1.9:0
+ dev-java/easymock:3.2
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup tomcat 265
+ enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+src_prepare() {
+ default
+
+ find -name '*.jar' -type f -delete -print || die
+
+ # Remove bundled servlet-api
+ rm -rv java/javax/{el,servlet} || die
+
+ 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}\`" \
+ bin/catalina.sh || die
+
+ java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+ java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ # add missing docBase
+ local apps="host-manager manager"
+ for app in ${apps}; do
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+ output/build/webapps/${app}/META-INF/context.xml || die
+ done
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw="$(pwgen -s -B 15 1)"
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+ einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+ einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2019-01-23 14:54 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2019-01-23 14:54 UTC (permalink / raw
To: gentoo-commits
commit: 3f503f9d1861e0f1068008143b7c824918ddc7a3
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 23 14:50:07 2019 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Jan 23 14:54:11 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f503f9d
www-servers/tomcat-9.0.14: bump
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
www-servers/tomcat/Manifest | 3 +
.../tomcat/files/tomcat-9.0.14-build.xml.patch | 265 +++++++++++++++++++++
www-servers/tomcat/tomcat-9.0.14.ebuild | 180 ++++++++++++++
3 files changed, 448 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index f436109e542..efaea0ce320 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -4,4 +4,7 @@ DIST apache-tomcat-8.0.52-src.tar.gz 5039683 BLAKE2B 36318d0ae50fbca3f2a97e0210d
DIST apache-tomcat-8.0.53-src.tar.gz 5057041 BLAKE2B 3a50d2f61baecb5244909972384e36478c69e7592dd35119d8b7b974273c57a4855082f309146ed160144dbdcced3236fd586b047970bd8558bbe7b7e002e9fd SHA512 0b56bc723277b2888896ab34ec3e49cb56bac94ddf1a9b96bd023982e2ffabd5317f63b3c0971afdc8cd7a6364197409df461d22151dbaab3a2be7daf6858b9e
DIST apache-tomcat-8.5.31-src.tar.gz 5154531 BLAKE2B cce0388e5c8c5fb5fcb3dba3b5961dc21d9f19d9a2f6177660a41410bddf241f73dda1e52c3875e28cfa13041c85a458a92c9a23c509b645f042cfa472081fde SHA512 659137ef4809af329ae4dd6f5825a603c1408ef3e48153abe7480a722e7f4bebef68a64af9cbef4a4ad9a7e8da76494f825035bbadbb983a097525f476f32f33
DIST apache-tomcat-8.5.37-src.tar.gz 5233414 BLAKE2B 1848180c3e0a3f4559e5c232bea8bad6d05f09d9c4f2f9f903178012b7b8837d395a5ac73c8ac0504fbd3d1df3c2dc785022e1c97da4441cfdcf8b790170ff7c SHA512 29ddbf7bfef19441a8a043020b5f1149d12590dac8120012a2167b6892e3db7c644990e49ba14cc4b4c7339faed65f010a7b24d660db0fb8adde34f032099cec
+DIST apache-tomcat-9.0.14-src.tar.gz 5472704 BLAKE2B ee533afd733dacbe4a20baadb4c5dc9fa7620d695c1c57b1662894945731f978508b45ef0d8169068c13ba862804868f12d3e494873643589b9f57bc9ec0a342 SHA512 46119f6ae9003b7a178dd5158c1eae3b5116461e73c5d78cd763bff82b80f282ff08cee5175cf850d3f209af900677e93bab31c556035a6eaf6aae86a5d42fc6
DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2
+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
diff --git a/www-servers/tomcat/files/tomcat-9.0.14-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.14-build.xml.patch
new file mode 100644
index 00000000000..c3f3e71c0eb
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-9.0.14-build.xml.patch
@@ -0,0 +1,265 @@
+diff --git a/build.xml b/build.xml
+index 971f912..1e43ae0 100644
+--- a/build.xml
++++ b/build.xml
+@@ -769,6 +769,7 @@
+ addOSGi="true" />
+
+ <!-- Servlet 4.0 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+@@ -776,21 +777,23 @@
+ notice="${tomcat.manifests}/servlet-api.jar.notice"
+ license="${tomcat.manifests}/servlet-api.jar.license"
+ addOSGi="true" />
+-
++-->
+ <!-- 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"
+ addOSGi="true" />
+-
++-->
+ <!-- EL 3.0 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${el-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.el-api"
+ manifest="${tomcat.manifests}/el-api.jar.manifest"
+ addOSGi="true" />
+-
++-->
+ <!-- WebSocket 1.1 API JAR File -->
+ <jarIt jarfile="${websocket-api.jar}"
+ filesDir="${tomcat.classes}"
+@@ -1131,9 +1134,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/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
++-->
+ <!-- Copy scripts -->
+ <copy todir="${tomcat.build}/bin">
+ <fileset dir="bin">
+@@ -1193,7 +1196,7 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
+- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+@@ -1229,7 +1232,7 @@
+ </javac>
+ </target>
+
+- <target name="build-tomcat-jdbc" depends="package">
++ <target name="build-tomcat-jdbc" depends="package" unless="noget">
+ <!-- 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}"
+@@ -1244,7 +1247,7 @@
+ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+ </target>
+
+- <target name="build-tomcat-jdbc-src">
++ <target name="build-tomcat-jdbc-src" unless="noget">
+ <!-- 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}"
+@@ -1348,9 +1351,11 @@
+
+ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+ <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+ <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
+@@ -1734,7 +1739,7 @@
+
+ <target name="extras-webservices-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">
+ <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -1884,11 +1889,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.
+@@ -1898,6 +1904,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" >
++<!--
+ <javadoc packagenames="javax.servlet.*"
+ excludepackagenames="javax.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -1962,6 +1969,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="javax.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -2002,9 +2010,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path refid="tomcat.webservices.classpath"/>
+ <path location="${ant.core.lib}"/>
+ </classpath>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <link href="../websocketapi"/>
+ <link href="http://docs.oracle.com/javase/8/docs/api/"/>
+ <link href="https://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2727,7 +2737,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">
+
+ <!-- Download Commons Daemon -->
+ <antcall target="downloadgz-2">
+@@ -2763,7 +2773,7 @@ skip.installer property in build.properties" />
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -2841,7 +2851,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="downloadfile-2">
+ <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
+@@ -2896,13 +2906,13 @@ skip.installer property in build.properties" />
+
+ <!-- =============== Utility Targets to support downloads ================ -->
+
+- <target name="setproxy" if="${proxy.use}">
++ <target name="setproxy" if="${proxy.use}" unless="noget">
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+ proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+ </target>
+
+- <target name="testexist">
++ <target name="testexist" unless="noget">
+ <echo message="Testing for ${destfile}"/>
+ <available file="${destfile}" property="exist"/>
+ </target>
+@@ -3024,7 +3034,7 @@ skip.installer property in build.properties" />
+ </sequential>
+ </macrodef>
+
+- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
++ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3041,7 +3051,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadgz-2" unless="exist" depends="testexist">
++ <target name="downloadgz-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3066,7 +3076,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
++ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3082,7 +3092,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadzip-2" unless="exist" depends="testexist">
++ <target name="downloadzip-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3106,7 +3116,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
++ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
+ <!-- Download the file -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3121,7 +3131,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="downloadfile-2" unless="exist" depends="testexist">
++ <target name="downloadfile-2" unless="noget" depends="testexist">
+ <!-- Download the file from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3149,7 +3159,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="trydownload.check" depends="setproxy">
++ <target name="trydownload.check" depends="setproxy" unless="noget">
+ <condition property="trydownload.run">
+ <and>
+ <not>
+@@ -3160,7 +3170,7 @@ skip.installer property in build.properties" />
+ </condition>
+ </target>
+
+- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+ <!-- Downloads a file if not yet downloaded and the source URL is available -->
+ <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+ </target>
+@@ -3171,7 +3181,7 @@ skip.installer property in build.properties" />
+
+ <target name="ide-eclipse"
+ depends="download-compile, extras-webservices-prepare, download-test-compile"
+- description="Prepares the source tree to be built in Eclipse">
++ description="Prepares the source tree to be built in Eclipse" unless="noget">
+
+ <!-- Copy the sample project files into the root directory -->
+ <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-9.0.14.ebuild b/www-servers/tomcat/tomcat-9.0.14.ebuild
new file mode 100644
index 00000000000..94606ee3453
--- /dev/null
+++ b/www-servers/tomcat/tomcat-9.0.14.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+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="biz.aQute.bnd-${BND_VERSION}.jar"
+BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
+
+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${PV}/src/${MY_P}.tar.gz
+ https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
+ https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}"
+
+LICENSE="Apache-2.0"
+SLOT="9"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.10"
+SAPI_SLOT="4.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ dev-java/tomcat-servlet-api:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+ !<dev-java/tomcat-native-1.1.24
+ >=virtual/jre-11"
+DEPEND="${COMMON_DEP}
+ app-admin/pwgen
+ >=dev-java/ant-core-1.9.13
+ >=virtual/jdk-11
+ test? (
+ >=dev-java/ant-junit-1.9:0
+ dev-java/easymock:3.2
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+BND_HOME="${S}/tomcat-build-libs/bnd"
+BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
+BND_JAR="${BND_HOME}/${BND}"
+BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
+
+src_unpack() {
+ unpack ${MY_P}.tar.gz
+
+ mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
+ ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
+ ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
+}
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup tomcat 265
+ enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+src_prepare() {
+ default
+
+ find -name '*.jar' -type f -delete -print || die
+
+ # Remove bundled servlet-api
+ rm -rv java/javax/{el,servlet} || die
+
+ 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}\`" \
+ bin/catalina.sh || die
+
+ java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+ java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ # add missing docBase
+ local apps="host-manager manager"
+ for app in ${apps}; do
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+ output/build/webapps/${app}/META-INF/context.xml || die
+ done
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw="$(pwgen -s -B 15 1)"
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+ einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+ einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2019-04-19 14:51 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2019-04-19 14:51 UTC (permalink / raw
To: gentoo-commits
commit: 57bfe350a1c97709f203316aa1dce387cc4d6f96
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 19 14:45:16 2019 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Apr 19 14:50:57 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57bfe350
www-servers/tomcat-{7.0.92,8.5.38}: removed obsolete
Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
www-servers/tomcat/Manifest | 2 -
.../tomcat/files/tomcat-8.5.37-build.xml.patch | 247 ---------------------
www-servers/tomcat/tomcat-7.0.92.ebuild | 147 ------------
www-servers/tomcat/tomcat-8.5.38.ebuild | 159 -------------
4 files changed, 555 deletions(-)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 76d30bbf913..03598b47525 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,7 +1,5 @@
-DIST apache-tomcat-7.0.92-src.tar.gz 4778943 BLAKE2B d11b01219a25c303ce791d965908c79cd48b5c97e1f0bed81ae60e0fcae3c4b23906f652eaf1d2922db7a57e68ee9f5a09ef017b7f1b89ed6c2ab81a477a810e SHA512 8cbcaf6d8dcda5ad8bd667582a39e91c1feaa4cc7216cafc23b9f5cf005cce9af24473c1c9d573f4da26c88ea68520a113dc0a7e2a50823f3ba3bb1510ec9e0a
DIST apache-tomcat-7.0.93-src.tar.gz 4786577 BLAKE2B 8b72418c98369e0e104c5f51e9d822c287487b5d3b66a4a6d005535b33a35a6cbc50c49b48100555bfaba0c6c983ea11dcdf381d2fba80a77fc17ac0df20efaa SHA512 5f9b08827aeae58f371496c34ce1ae5692bd5403e1a9a7a91b283ece3289356dbd85d48fcb71958aaeeb42cd65bb70fcf34cbe2db3901475cfb812370766f3fc
DIST apache-tomcat-8.0.53-src.tar.gz 5057041 BLAKE2B 3a50d2f61baecb5244909972384e36478c69e7592dd35119d8b7b974273c57a4855082f309146ed160144dbdcced3236fd586b047970bd8558bbe7b7e002e9fd SHA512 0b56bc723277b2888896ab34ec3e49cb56bac94ddf1a9b96bd023982e2ffabd5317f63b3c0971afdc8cd7a6364197409df461d22151dbaab3a2be7daf6858b9e
-DIST apache-tomcat-8.5.38-src.tar.gz 5253678 BLAKE2B b2ecc732128934a3afa314ddc569b1b3d330ccb12b99b0ce4b12e1952347ac57cafb3a5637595997a0c9e77752ae41665e637c826c3b9ae9925799124e735480 SHA512 b84d96fa972a9d24957ef047cdce0fb49de3d365401b07990eaa5bad8f3c87a6b1ad1eac077c4be595ee291daef68720381fe63461815de47664275b486ceeee
DIST apache-tomcat-8.5.39-src.tar.gz 5264067 BLAKE2B 8cd672529660783d3310beae356c32a9392f550ae72f2cdbd60f23c3b532e3adb19a295737fb39e9a2990b14edeff51cedf1f936f32f844e496e751913f2a859 SHA512 ba591290be49a01cec38300c6321b634e3ca7417074b55103afc887b9af3eda942d302aee5f1648e7fa60b5231cd7d83428846e2b55a4964f5cc98c27a844f8d
DIST apache-tomcat-9.0.16-src.tar.gz 5654943 BLAKE2B a412457c2d34367301b4335a3a4bf46a647f8e60440be751874e1eaad400a0832b64fcae4c9f81585a4afbddafd75f2929bc78c12eb05b20539b11de686dfecc SHA512 60fbdefbddaa6fac4bc9d0ca4c1d9a119dd53063fd4574c474daf5f346fddc9cb7fd174f1be189e965d5ae4670710347d84fcf443c7df01faac9a1b84ecb33ce
DIST apache-tomcat-9.0.17-src.tar.gz 5670728 BLAKE2B 15f8518ec073a935dec6afdd3a8f9885e7867a0aa033024024bd72b7887011ca169c776f2a4d886d93a73a478f9dcad5f87c31b3a30a88ca913309c51e0f0ec7 SHA512 b5763dae05598c0a4d3638ba02c0627219de20406bddaab86ae3262299f2d9bbda1a5db612cad9fb8a54b2888e9ce1c4be67613d855cfd92b4cee5b85e226602
diff --git a/www-servers/tomcat/files/tomcat-8.5.37-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.37-build.xml.patch
deleted file mode 100644
index 4c2d8da9e91..00000000000
--- a/www-servers/tomcat/files/tomcat-8.5.37-build.xml.patch
+++ /dev/null
@@ -1,247 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 6fbb321..4fb4b42 100644
---- a/build.xml
-+++ b/build.xml
-@@ -722,24 +722,29 @@
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
- <!-- Servlet 3.1 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- 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}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
- <!-- EL 3.0 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 -->
- <jarIt jarfile="${websocket-api.jar}"
-@@ -1025,9 +1030,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/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
- <!-- Copy scripts -->
- <copy todir="${tomcat.build}/bin">
- <fileset dir="bin">
-@@ -1087,7 +1092,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1123,7 +1128,7 @@
- </javac>
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- 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}"
-@@ -1138,7 +1143,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- 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}"
-@@ -1242,9 +1247,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <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
-@@ -1624,7 +1631,7 @@
-
- <target name="extras-webservices-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">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1720,6 +1727,7 @@
-
- <target name="javadoc" depends="dist-source"
- description="Create the Tomcat javadoc" >
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1784,6 +1792,7 @@
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -1824,9 +1833,11 @@
- <path refid="tomcat.webservices.classpath"/>
- <path location="${ant.core.lib}"/>
- </classpath>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2550,7 +2561,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">
-
- <!-- Download Commons Daemon -->
- <antcall target="downloadgz-2">
-@@ -2576,7 +2587,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2654,7 +2665,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="downloadfile-2">
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2709,13 +2720,13 @@ skip.installer property in build.properties" />
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-@@ -2837,7 +2848,7 @@ skip.installer property in build.properties" />
- </sequential>
- </macrodef>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2854,7 +2865,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2879,7 +2890,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2895,7 +2906,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2919,7 +2930,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2934,7 +2945,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2962,7 +2973,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -2973,7 +2984,7 @@ skip.installer property in build.properties" />
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -2984,7 +2995,7 @@ skip.installer property in build.properties" />
-
- <target name="ide-eclipse"
- depends="download-compile, extras-webservices-prepare, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-7.0.92.ebuild b/www-servers/tomcat/tomcat-7.0.92.ebuild
deleted file mode 100644
index 9acd6b92a2e..00000000000
--- a/www-servers/tomcat/tomcat-7.0.92.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="7"
-KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps websockets"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.5"
-SAPI_SLOT="3.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- dev-java/tomcat-servlet-api:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- virtual/jre
- !<dev-java/tomcat-native-1.1.24"
-DEPEND="${COMMON_DEP}
- virtual/jdk:1.8
- test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_prepare() {
- default
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- java-pkg_clean
-
- eapply "${FILESDIR}/${PN}-7.0.84-build.xml.patch"
-
- # For use of catalina.sh in netbeans
- sed -i -e "/^# ----- Execute The Requested Command/ a\
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r1"
-INIT_REV="-r1"
-
-src_compile() {
- use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.5.38.ebuild b/www-servers/tomcat/tomcat-8.5.38.ebuild
deleted file mode 100644
index f4aff4478a6..00000000000
--- a/www-servers/tomcat/tomcat-8.5.38.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="8.5"
-KEYWORDS="amd64 ~x86 ~x86-fbsd ~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="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- !<dev-java/tomcat-native-1.1.24
- >=virtual/jre-1.7"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- >=dev-java/ant-core-1.9.13
- >=virtual/jdk-1.7
- test? (
- >=dev-java/ant-junit-1.9:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_prepare() {
- default
-
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- eapply "${FILESDIR}/${PN}-8.5.37-build.xml.patch"
-
- # For use of catalina.sh in netbeans
- sed -i -e "/^# ----- Execute The Requested Command/ a\
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2019-11-25 12:26 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2019-11-25 12:26 UTC (permalink / raw
To: gentoo-commits
commit: 620698485d771f41baf901f3e1a651103014cab3
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 25 12:16:52 2019 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Nov 25 12:26:22 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62069848
www-servers/tomcat-8.5.46: removed obsolete + patches
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
www-servers/tomcat/Manifest | 1 -
.../tomcat/files/tomcat-8.5.40-build.xml.patch | 259 -------------------
.../tomcat/files/tomcat-9.0.19-build.xml.patch | 278 ---------------------
www-servers/tomcat/tomcat-8.5.46.ebuild | 158 ------------
4 files changed, 696 deletions(-)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 08ee3206a9d..939f324b27c 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,5 +1,4 @@
DIST apache-tomcat-7.0.96-src.tar.gz 4983881 BLAKE2B d5b828b7a4e8a7a5ce793a15421fbd6b12b55918aa7c15bc8209b4c762d7f422a7315e4cbe9b4ae2da754b6d8493bc11ae6a5c99f11a1ac3b23473e05fa26c83 SHA512 5797e66fb9ce558340e08d3a4ccd372d912707aabd6177318781925dd35055902a0ecc3e50e677d76b0feea547cc8fc038bb83ae5de65d28680cb4c9582f60c0
-DIST apache-tomcat-8.5.46-src.tar.gz 5599021 BLAKE2B 3755f15612e63ac06cbfa097f1531dc36542ba559a6ef60230b133e45d14bb4c4c54d4dcc8b05b9996f54ac253fb1630f6a6e900ee00e4af0a9200f83455a952 SHA512 02e93cc6fb4226e81b03ae60f479e15b438b1c68c1a4104200db9cc473939b92d66eea12f0783727b06f643d11ebe3da2a81c80cbe486ed497a3280e8cdb2e62
DIST apache-tomcat-8.5.47-src.tar.gz 5607118 BLAKE2B 3c326056f674032424d298c7581243a24dd01fae39b1ce7069b60e1bcf3d825de954164f643e887618c43c87d691bc41f942e73bf86b254b4c7dca9c68ce7cce SHA512 1513fdaf7751ee263d878cdfc05329bc4ee50e2f3aeea68e1d173a5f4d555ec59a43050222f013758f704967730dd25a64337cf1ba4365ab53b8730af87b4051
DIST apache-tomcat-9.0.27-src.tar.gz 5761278 BLAKE2B 7d4a65dfa43e0956a5dbb1dad3bf1aa475e7c503d3192ac24921d7cee9bd85379cd820ce693e8c583a7cab23263b0abfa960968d04d766764e222ba8c5bd97d4 SHA512 3f63cbd49f93e6a9d44ea63b4f787cf498930b82d19eaf60603c126b8800d2894d306c27e42ab73b042f3bba9cfb75b6c939b91b8b9141e4903eb1b88c2a4ec8
DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2
diff --git a/www-servers/tomcat/files/tomcat-8.5.40-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.40-build.xml.patch
deleted file mode 100644
index e049d77141e..00000000000
--- a/www-servers/tomcat/files/tomcat-8.5.40-build.xml.patch
+++ /dev/null
@@ -1,259 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 179802b..49ac8c0 100644
---- a/build.xml
-+++ b/build.xml
-@@ -727,24 +727,29 @@
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
- <!-- Servlet 3.1 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- 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}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
- <!-- EL 3.0 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 -->
- <jarIt jarfile="${websocket-api.jar}"
-@@ -836,9 +841,9 @@
- filesId="files.jasper-el" />
-
- <!-- Re-packaged Apache Commons DBCP 2-->
-- <jarIt jarfile="${tomcat-dbcp.jar}"
-+<!-- <jarIt jarfile="${tomcat-dbcp.jar}"
- filesDir="${tomcat.classes}"
-- filesId="files.tomcat-dbcp" />
-+ filesId="files.tomcat-dbcp" /> -->
-
- <!-- i18n JARs -->
- <jar jarfile="${tomcat.build}/lib/tomcat-i18n-es.jar"
-@@ -1030,9 +1035,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/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
- <!-- Copy scripts -->
- <copy todir="${tomcat.build}/bin">
- <fileset dir="bin">
-@@ -1092,7 +1097,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1128,7 +1133,7 @@
- </javac>
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- 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}"
-@@ -1143,7 +1148,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- 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}"
-@@ -1246,9 +1251,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <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
-@@ -1629,7 +1636,7 @@
-
- <target name="extras-webservices-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">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1793,6 +1800,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" >
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1857,6 +1865,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -1897,9 +1906,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path refid="tomcat.webservices.classpath"/>
- <path location="${ant.core.lib}"/>
- </classpath>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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/"/>
-@@ -2629,7 +2640,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-compile"
-- description="Download components necessary to compile" >
-+ description="Download components necessary to compile" unless="noget" >
-
- <!-- Download Commons Daemon -->
- <antcall target="downloadgz-2">
-@@ -2655,7 +2666,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2733,7 +2744,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="downloadfile-2">
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2788,13 +2799,13 @@ skip.installer property in build.properties" />
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-@@ -2916,7 +2927,7 @@ skip.installer property in build.properties" />
- </sequential>
- </macrodef>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2933,7 +2944,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2958,7 +2969,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2974,7 +2985,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2998,7 +3009,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3013,7 +3024,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3041,7 +3052,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -3052,7 +3063,7 @@ skip.installer property in build.properties" />
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -3063,7 +3074,7 @@ skip.installer property in build.properties" />
-
- <target name="ide-eclipse"
- depends="download-compile, extras-webservices-prepare, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/files/tomcat-9.0.19-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.19-build.xml.patch
deleted file mode 100644
index a4bcbeb949b..00000000000
--- a/www-servers/tomcat/files/tomcat-9.0.19-build.xml.patch
+++ /dev/null
@@ -1,278 +0,0 @@
-diff --git a/build.xml b/build.xml
-index b3b299f..40bf4f8 100644
---- a/build.xml
-+++ b/build.xml
-@@ -752,6 +752,7 @@
- addOSGi="true" />
-
- <!-- Servlet 4.0 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
-@@ -759,21 +760,23 @@
- notice="${tomcat.manifests}/servlet-api.jar.notice"
- license="${tomcat.manifests}/servlet-api.jar.license"
- addOSGi="true" />
--
-+-->
- <!-- 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"
- addOSGi="true" />
--
-+-->
- <!-- EL 3.0 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${el-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.el-api"
- manifest="${tomcat.manifests}/el-api.jar.manifest"
- addOSGi="true" />
--
-+-->
- <!-- WebSocket 1.1 API JAR File -->
- <jarIt jarfile="${websocket-api.jar}"
- filesDir="${tomcat.classes}"
-@@ -879,10 +882,10 @@
- addOSGi="true" />
-
- <!-- Re-packaged Apache Commons DBCP 2-->
-- <jarIt jarfile="${tomcat-dbcp.jar}"
-+<!-- <jarIt jarfile="${tomcat-dbcp.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.tomcat-dbcp"
-- addOSGi="true" />
-+ addOSGi="true" /> -->
-
- <!-- i18n JARs -->
- <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
-@@ -1124,9 +1127,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/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
- <!-- Copy scripts -->
- <copy todir="${tomcat.build}/bin">
- <fileset dir="bin">
-@@ -1186,7 +1189,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1222,7 +1225,7 @@
- </javac>
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- 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}"
-@@ -1237,7 +1240,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- 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}"
-@@ -1340,9 +1343,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <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
-@@ -1849,11 +1854,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.
-@@ -1863,6 +1869,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-
- <target name="javadoc" depends="dist-source"
- description="Create the Tomcat javadoc" >
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1924,6 +1931,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -1962,9 +1970,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path refid="compile.classpath"/>
- <path location="${ant.core.lib}"/>
- </classpath>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <link href="../websocketapi"/>
- <link href="http://docs.oracle.com/javase/8/docs/api/"/>
- <link href="https://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
-@@ -2686,7 +2696,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-compile"
-- description="Download components necessary to compile" >
-+ description="Download components necessary to compile" unless="noget" >
-
- <!-- Download Commons Daemon -->
- <antcall target="downloadgz-2">
-@@ -2741,7 +2751,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2819,7 +2829,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="downloadfile-2">
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2874,13 +2884,13 @@ skip.installer property in build.properties" />
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-@@ -3002,7 +3012,7 @@ skip.installer property in build.properties" />
- </sequential>
- </macrodef>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3019,7 +3029,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3044,7 +3054,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3060,7 +3070,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3084,7 +3094,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3099,7 +3109,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3127,7 +3137,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -3138,7 +3148,7 @@ skip.installer property in build.properties" />
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -3149,7 +3159,7 @@ skip.installer property in build.properties" />
-
- <target name="ide-eclipse"
- depends="download-compile, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
-@@ -3167,7 +3177,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"
-- description="Creates project directory .idea for IntelliJ IDEA">
-+ description="Creates project directory .idea for IntelliJ IDEA" unless="noget">
-
- <copy todir="${tomcat.home}/.idea">
- <fileset dir="${tomcat.home}/res/ide-support/idea"/>
diff --git a/www-servers/tomcat/tomcat-8.5.46.ebuild b/www-servers/tomcat/tomcat-8.5.46.ebuild
deleted file mode 100644
index 0437014fa01..00000000000
--- a/www-servers/tomcat/tomcat-8.5.46.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="8.5"
-KEYWORDS="amd64 ~x86 ~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="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- >=virtual/jre-1.7"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- >=dev-java/ant-core-1.9.13
- >=virtual/jdk-1.7
- test? (
- >=dev-java/ant-junit-1.9:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_prepare() {
- default
-
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- eapply "${FILESDIR}/${PN}-8.5.40-build.xml.patch"
-
- # For use of catalina.sh in netbeans
- sed -i -e "/^# ----- Execute The Requested Command/ a\
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2020-02-09 23:34 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2020-02-09 23:34 UTC (permalink / raw
To: gentoo-commits
commit: 91e6fa30f4bcd1278c5423b370f42d0b3700df4e
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 9 23:33:46 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Feb 9 23:33:46 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91e6fa30
www-servers/tomcat: bump to 7.0.99 + eapi7
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
www-servers/tomcat/Manifest | 1 +
.../tomcat/files/tomcat-7.0.99-build.xml.patch | 163 +++++++++++++++++++++
www-servers/tomcat/tomcat-7.0.99.ebuild | 146 ++++++++++++++++++
3 files changed, 310 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 939f324b27c..07d17aa1390 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,4 +1,5 @@
DIST apache-tomcat-7.0.96-src.tar.gz 4983881 BLAKE2B d5b828b7a4e8a7a5ce793a15421fbd6b12b55918aa7c15bc8209b4c762d7f422a7315e4cbe9b4ae2da754b6d8493bc11ae6a5c99f11a1ac3b23473e05fa26c83 SHA512 5797e66fb9ce558340e08d3a4ccd372d912707aabd6177318781925dd35055902a0ecc3e50e677d76b0feea547cc8fc038bb83ae5de65d28680cb4c9582f60c0
+DIST apache-tomcat-7.0.99-src.tar.gz 5242549 BLAKE2B e24933364bae6ddd2b7aeec342f3bfe0293533e2513a34ec6e9b5b6da7ecc3c2fb1d88c1b49f470532d8db821a0b8f0821698d8ec52a6d88a7769cd86912a8bc SHA512 3148879d4a893167b9e60fd1ee6972fc9be8a5be97016ad1d86117c0cb681ac40702680bd21562a284f78aac327f0388e99af458cf1868a3b0ad5e31899b23c0
DIST apache-tomcat-8.5.47-src.tar.gz 5607118 BLAKE2B 3c326056f674032424d298c7581243a24dd01fae39b1ce7069b60e1bcf3d825de954164f643e887618c43c87d691bc41f942e73bf86b254b4c7dca9c68ce7cce SHA512 1513fdaf7751ee263d878cdfc05329bc4ee50e2f3aeea68e1d173a5f4d555ec59a43050222f013758f704967730dd25a64337cf1ba4365ab53b8730af87b4051
DIST apache-tomcat-9.0.27-src.tar.gz 5761278 BLAKE2B 7d4a65dfa43e0956a5dbb1dad3bf1aa475e7c503d3192ac24921d7cee9bd85379cd820ce693e8c583a7cab23263b0abfa960968d04d766764e222ba8c5bd97d4 SHA512 3f63cbd49f93e6a9d44ea63b4f787cf498930b82d19eaf60603c126b8800d2894d306c27e42ab73b042f3bba9cfb75b6c939b91b8b9141e4903eb1b88c2a4ec8
DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2
diff --git a/www-servers/tomcat/files/tomcat-7.0.99-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.99-build.xml.patch
new file mode 100644
index 00000000000..29cf6c2e403
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-7.0.99-build.xml.patch
@@ -0,0 +1,163 @@
+diff --git a/build.xml b/build.xml
+index dbad7cb..101bc57 100644
+--- a/build.xml
++++ b/build.xml
+@@ -715,12 +715,14 @@
+ </fileset>
+ </copy>
+ <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
++<!--
+ <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1">
+ <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
+ <include name="*" />
+ <exclude name="jspxml*" />
+ </fileset>
+ </copy>
++-->
+
+ <!-- Convert the message files from UTF-8 to ASCII. This can be removed
+ after upgrading to Java 9+ as the minimum JRE and specifying the encoding
+@@ -776,26 +778,32 @@
+ manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+
+ <!-- Servlet 3.0 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+ manifest="${tomcat.manifests}/servlet-api.jar.manifest"
+ notice="${tomcat.manifests}/servlet-api.jar.notice"
+ license="${tomcat.manifests}/servlet-api.jar.license" />
++-->
+
+ <!-- JSP 2.2 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${jsp-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.jsp-api"
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest"
+ notice="${tomcat.manifests}/jsp-api.jar.notice"
+ license="${tomcat.manifests}/jsp-api.jar.license" />
++-->
+
+ <!-- JSP 2.2 EL Implementation JAR File -->
++<!--
+ <jarIt jarfile="${el-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.el-api"
+ manifest="${tomcat.manifests}/el-api.jar.manifest" />
++-->
+
+ <!-- Bootstrap JAR File -->
+ <jarIt jarfile="${bootstrap.jar}"
+@@ -854,9 +862,9 @@
+ filesId="files.jasper-el" />
+
+ <!-- Re-packaged Apache Commons DBCP 1-->
+- <jarIt jarfile="${tomcat-dbcp.jar}"
++<!-- <jarIt jarfile="${tomcat-dbcp.jar}"
+ filesDir="${tomcat.classes}"
+- filesId="files.tomcat-dbcp" />
++ filesId="files.tomcat-dbcp" /> -->
+
+ <!-- i18n JARs -->
+ <jar jarfile="${tomcat.build}/lib/tomcat-i18n-de.jar"
+@@ -1087,9 +1095,9 @@
+
+ <target name="deploy" depends="package,build-docs,compile-webapp-examples"
+ description="Default. Builds a working Tomcat instance">
+-
++<!--
+ <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
++-->
+ <!-- Copy scripts -->
+ <copy todir="${tomcat.build}/bin">
+ <fileset dir="bin">
+@@ -1149,7 +1157,7 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
+- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+@@ -1839,7 +1847,7 @@
+
+ <target name="extras-webservices-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">
+ <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -2034,11 +2042,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.
+@@ -2070,6 +2079,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++<!--
+ <javadoc packagenames="javax.servlet.*"
+ excludepackagenames="javax.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -2137,6 +2147,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="javax.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -2181,9 +2192,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ <link href="../annotationapi"/>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <link href="../websocketapi"/>
+ <link href="https://docs.oracle.com/javase/7/docs/api/"/>
+ <link href="https://docs.oracle.com/javaee/6/api/"/>
+@@ -2889,7 +2902,7 @@ skip.installer property in build.properties" />
+ </target>
+
+ <target name="download-compile"
+- description="Download components necessary to compile" >
++ description="Download components necessary to compile" unless="noget" >
+
+ <!-- Download Commons Daemon -->
+ <antcall target="downloadgz-2">
+@@ -2925,7 +2938,7 @@ skip.installer property in build.properties" />
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -2989,7 +3002,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="downloadfile-2">
+ <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
diff --git a/www-servers/tomcat/tomcat-7.0.99.ebuild b/www-servers/tomcat/tomcat-7.0.99.ebuild
new file mode 100644
index 00000000000..7fa74915d25
--- /dev/null
+++ b/www-servers/tomcat/tomcat-7.0.99.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="7"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps websockets"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.5"
+SAPI_SLOT="3.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ dev-java/tomcat-servlet-api:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+ virtual/jre"
+DEPEND="${COMMON_DEP}
+ virtual/jdk:1.8
+ test? ( dev-java/ant-junit:0 )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup tomcat 265
+ enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+src_prepare() {
+ default
+
+ # Remove bundled servlet-api
+ rm -rv java/javax/{el,servlet} || die
+
+ java-pkg_clean
+
+ 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}\`" \
+ bin/catalina.sh || die
+
+ java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r1"
+INIT_REV="-r1"
+
+src_compile() {
+ use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+ java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+ einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+ einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2020-07-07 8:10 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2020-07-07 8:10 UTC (permalink / raw
To: gentoo-commits
commit: 46cbac0837174206854038724f9ea33ca537fcdf
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 7 08:09:47 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Jul 7 08:10:02 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46cbac08
www-servers/tomcat: bump to 8.5.57
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
www-servers/tomcat/Manifest | 1 +
.../tomcat/files/tomcat-8.5.57-build.xml.patch | 260 +++++++++++++++++++++
www-servers/tomcat/tomcat-8.5.57.ebuild | 158 +++++++++++++
3 files changed, 419 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index c7d7008579a..2deaef8fd5c 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,5 +1,6 @@
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-8.5.57-src.tar.gz 5730658 BLAKE2B f9bd2e159abc6af62c8681c38ea4eae8155f95df11f7c244e45018929189ef6b6a37a11e84119c3ddcb134a8ab58773add19cbab7506bb87c43b0039899fde60 SHA512 8bf4334b190c36900b708ee7097097e513f2d4572f119173bee732c76b5b660350fe516e58ac867250c2ef7a1371b55c116d3a1abd18323ceb92337f1dcb0f60
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
diff --git a/www-servers/tomcat/files/tomcat-8.5.57-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.57-build.xml.patch
new file mode 100644
index 00000000000..2eb3329b3ce
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.5.57-build.xml.patch
@@ -0,0 +1,260 @@
+diff --git a/build.xml b/build.xml
+index 348487c..04e40fa 100644
+--- a/build.xml
++++ b/build.xml
+@@ -762,25 +762,28 @@
+ manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+
+ <!-- Servlet 3.1 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+ manifest="${tomcat.manifests}/servlet-api.jar.manifest"
+ notice="${tomcat.manifests}/servlet-api.jar.notice"
+ license="${tomcat.manifests}/servlet-api.jar.license" />
+-
++-->
+ <!-- EL Implementation JAR File -->
++<!--
+ <jarIt jarfile="${el-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.el-api"
+ manifest="${tomcat.manifests}/el-api.jar.manifest" />
+-
++-->
+ <!-- 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}"
+ filesDir="${tomcat.classes}"
+@@ -872,9 +875,9 @@
+ meta-inf="${tomcat.manifests}/jasper.jar" />
+
+ <!-- Re-packaged Apache Commons DBCP 2-->
+- <jarIt jarfile="${tomcat-dbcp.jar}"
++<!-- <jarIt jarfile="${tomcat-dbcp.jar}"
+ filesDir="${tomcat.classes}"
+- filesId="files.tomcat-dbcp" />
++ filesId="files.tomcat-dbcp" /> -->
+
+ <!-- i18n JARs -->
+ <jar jarfile="${tomcat.build}/lib/tomcat-i18n-de.jar"
+@@ -1096,9 +1099,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/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
++-->
+ <!-- Copy scripts -->
+ <copy todir="${tomcat.build}/bin">
+ <fileset dir="bin">
+@@ -1158,7 +1161,7 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
+- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+@@ -1201,7 +1204,7 @@
+
+ </target>
+
+- <target name="build-tomcat-jdbc" depends="package">
++ <target name="build-tomcat-jdbc" depends="package" unless="noget">
+ <!-- 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}"
+@@ -1216,7 +1219,7 @@
+ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+ </target>
+
+- <target name="build-tomcat-jdbc-src">
++ <target name="build-tomcat-jdbc-src" unless="noget">
+ <!-- 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}"
+@@ -1319,9 +1322,11 @@
+
+ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+ <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+ <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
+@@ -1710,7 +1715,7 @@
+
+ <target name="extras-webservices-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">
+ <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -1874,6 +1879,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" >
++<!--
+ <javadoc packagenames="javax.annotation.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/annotationapi"
+@@ -1962,6 +1968,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="javax.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -2025,9 +2032,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ <link href="../annotationapi"/>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <link href="../websocketapi"/>
+ <link href="../jaspicapi"/>
+ <link href="https://docs.oracle.com/javase/7/docs/api/"/>
+@@ -2759,7 +2768,7 @@ skip.installer property in build.properties" />
+ </target>
+
+ <target name="download-compile"
+- description="Download components necessary to compile" >
++ description="Download components necessary to compile" unless="noget" >
+
+ <!-- Download Commons Daemon -->
+ <antcall target="downloadgz-2">
+@@ -2795,7 +2804,7 @@ skip.installer property in build.properties" />
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -2873,7 +2882,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="downloadfile-2">
+ <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
+@@ -2928,13 +2937,13 @@ skip.installer property in build.properties" />
+
+ <!-- =============== Utility Targets to support downloads ================ -->
+
+- <target name="setproxy" if="${proxy.use}">
++ <target name="setproxy" if="${proxy.use}" unless="noget">
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+ proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+ </target>
+
+- <target name="testexist">
++ <target name="testexist" unless="noget">
+ <echo message="Testing for ${destfile}"/>
+ <available file="${destfile}" property="exist"/>
+ </target>
+@@ -3056,7 +3065,7 @@ skip.installer property in build.properties" />
+ </sequential>
+ </macrodef>
+
+- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
++ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3073,7 +3082,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadgz-2" unless="exist" depends="testexist">
++ <target name="downloadgz-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3098,7 +3107,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
++ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3114,7 +3123,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadzip-2" unless="exist" depends="testexist">
++ <target name="downloadzip-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3138,7 +3147,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
++ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
+ <!-- Download the file -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3153,7 +3162,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="downloadfile-2" unless="exist" depends="testexist">
++ <target name="downloadfile-2" unless="noget" depends="testexist">
+ <!-- Download the file from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3181,7 +3190,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="trydownload.check" depends="setproxy">
++ <target name="trydownload.check" depends="setproxy" unless="noget">
+ <condition property="trydownload.run">
+ <and>
+ <not>
+@@ -3192,7 +3201,7 @@ skip.installer property in build.properties" />
+ </condition>
+ </target>
+
+- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+ <!-- Downloads a file if not yet downloaded and the source URL is available -->
+ <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+ </target>
+@@ -3203,7 +3212,7 @@ skip.installer property in build.properties" />
+
+ <target name="ide-eclipse"
+ depends="download-compile, extras-webservices-prepare, download-test-compile"
+- description="Prepares the source tree to be built in Eclipse">
++ description="Prepares the source tree to be built in Eclipse" unless="noget">
+
+ <!-- Copy the sample project files into the root directory -->
+ <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-8.5.57.ebuild b/www-servers/tomcat/tomcat-8.5.57.ebuild
new file mode 100644
index 00000000000..a1d557ed951
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.5.57.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="8.5"
+KEYWORDS="~amd64 ~x86 ~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="3.1"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+ virtual/jre"
+DEPEND="${COMMON_DEP}
+ app-admin/pwgen
+ >=dev-java/ant-core-1.9.13
+ virtual/jdk:1.8
+ test? (
+ >=dev-java/ant-junit-1.9:0
+ dev-java/easymock:3.2
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup tomcat 265
+ enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+src_prepare() {
+ default
+
+ find -name '*.jar' -type f -delete -print || die
+
+ # Remove bundled servlet-api
+ rm -rv java/javax/{el,servlet} || die
+
+ 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}\`" \
+ bin/catalina.sh || die
+
+ java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+ java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ # add missing docBase
+ local apps="host-manager manager"
+ for app in ${apps}; do
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+ output/build/webapps/${app}/META-INF/context.xml || die
+ done
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw="$(pwgen -s -B 15 1)"
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+ einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+ einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2020-07-20 8:40 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2020-07-20 8:40 UTC (permalink / raw
To: gentoo-commits
commit: 7801359547d4db9a10608c493b1d3ad00f86381c
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 20 08:39:51 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Jul 20 08:40:09 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78013595
www-servers/tomcat: removed obsolete and vulnerable
Bug: https://bugs.gentoo.org/732128
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
www-servers/tomcat/Manifest | 2 -
.../tomcat/files/tomcat-8.5.47-build.xml.patch | 259 ---------------------
www-servers/tomcat/tomcat-7.0.104.ebuild | 146 ------------
www-servers/tomcat/tomcat-8.5.56.ebuild | 158 -------------
4 files changed, 565 deletions(-)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 7601189318c..78ae5296403 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,6 +1,4 @@
-DIST apache-tomcat-7.0.104-src.tar.gz 5309794 BLAKE2B 0d4d5d668e1131bb533af1d56fe37ee1f5c252c2c4dd987e24aae67484f27805f88750b27248c6acfd0585eacd0d3f2155c723e9a25c8613652101944add2a15 SHA512 788eab3ac343815362decf4c0d5db91f3697cc669e7e051f93bf82905cc52f9b040d00b7e07f7b85bcf470e802418896a678f991e523e08a3ae5a2f212a53257
DIST apache-tomcat-7.0.105-src.tar.gz 5312024 BLAKE2B 0eaad66c6dcc3e2f6a2d8e142a7832cbd413724cab8b10f00e87d5535f4f20d5ba4712794e09444a8b3e0cf23f036da7c6923f038a6a11714682b129ed4ac5dd SHA512 249e039775e833d75b631cec26132b42e4aed25491a29f2349fa41b81737688b0a2e453072d8e3c5fc28763a9d1922f59da7529378ce8fd472eca7bbc73a6bd2
-DIST apache-tomcat-8.5.56-src.tar.gz 5724546 BLAKE2B 623dc2d1f6808f012f19fdd0d914c4bb200e8328ab6b6855666c1db1704e198d069ff74d227bf51e8376c20daf0640002e5d6907edadfde294d8c62a64d55f83 SHA512 75529e567a7be48f2c1034f3eeada571478d0babb63fb2d368061573d7e64d5fc0a937304e2e2ffa956b5d8a403936c1543a93ee78b258b532939fb9ce80ef3d
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
diff --git a/www-servers/tomcat/files/tomcat-8.5.47-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.47-build.xml.patch
deleted file mode 100644
index ffbd0701611..00000000000
--- a/www-servers/tomcat/files/tomcat-8.5.47-build.xml.patch
+++ /dev/null
@@ -1,259 +0,0 @@
-diff --git a/build.xml b/build.xml
-index c274aab..ed1c3e5 100644
---- a/build.xml
-+++ b/build.xml
-@@ -739,24 +739,29 @@
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
- <!-- Servlet 3.1 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- 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}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
- <!-- EL 3.0 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 -->
- <jarIt jarfile="${websocket-api.jar}"
-@@ -848,9 +853,9 @@
- filesId="files.jasper-el" />
-
- <!-- Re-packaged Apache Commons DBCP 2-->
-- <jarIt jarfile="${tomcat-dbcp.jar}"
-+<!-- <jarIt jarfile="${tomcat-dbcp.jar}"
- filesDir="${tomcat.classes}"
-- filesId="files.tomcat-dbcp" />
-+ filesId="files.tomcat-dbcp" /> -->
-
- <!-- i18n JARs -->
- <jar jarfile="${tomcat.build}/lib/tomcat-i18n-de.jar"
-@@ -1072,9 +1077,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/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
- <!-- Copy scripts -->
- <copy todir="${tomcat.build}/bin">
- <fileset dir="bin">
-@@ -1134,7 +1139,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1177,7 +1182,7 @@
-
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- 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 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- 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 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <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
-@@ -1681,7 +1688,7 @@
-
- <target name="extras-webservices-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">
- <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" >
-+<!--
- <javadoc packagenames="javax.annotation.*"
- 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.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <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.
- <path location="${ant.core.lib}"/>
- </classpath>
- <link href="../annotationapi"/>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <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" />
- </target>
-
- <target name="download-compile"
-- description="Download components necessary to compile" >
-+ description="Download components necessary to compile" unless="noget" >
-
- <!-- Download Commons Daemon -->
- <antcall target="downloadgz-2">
-@@ -2764,7 +2775,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2842,7 +2853,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="downloadfile-2">
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2897,13 +2908,13 @@ skip.installer property in build.properties" />
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-@@ -3025,7 +3036,7 @@ skip.installer property in build.properties" />
- </sequential>
- </macrodef>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3042,7 +3053,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- 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" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3083,7 +3094,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- 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" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3122,7 +3133,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- 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" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -3161,7 +3172,7 @@ skip.installer property in build.properties" />
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- 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" />
-
- <target name="ide-eclipse"
- depends="download-compile, extras-webservices-prepare, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-7.0.104.ebuild b/www-servers/tomcat/tomcat-7.0.104.ebuild
deleted file mode 100644
index 8fa804171b4..00000000000
--- a/www-servers/tomcat/tomcat-7.0.104.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="7"
-KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps websockets"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.5"
-SAPI_SLOT="3.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- virtual/jre"
-DEPEND="${COMMON_DEP}
- virtual/jdk:1.8
- test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_prepare() {
- default
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- java-pkg_clean
-
- eapply "${FILESDIR}/${PN}-7.0.99-build.xml.patch"
-
- # For use of catalina.sh in netbeans
- sed -i -e "/^# ----- Execute The Requested Command/ a\
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r1"
-INIT_REV="-r1"
-
-src_compile() {
- use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.5.56.ebuild b/www-servers/tomcat/tomcat-8.5.56.ebuild
deleted file mode 100644
index 688cb761576..00000000000
--- a/www-servers/tomcat/tomcat-8.5.56.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="8.5"
-KEYWORDS="amd64 ~x86 ~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="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- virtual/jre"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- >=dev-java/ant-core-1.9.13
- virtual/jdk:1.8
- test? (
- >=dev-java/ant-junit-1.9:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_prepare() {
- default
-
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- eapply "${FILESDIR}/${PN}-8.5.47-build.xml.patch"
-
- # For use of catalina.sh in netbeans
- sed -i -e "/^# ----- Execute The Requested Command/ a\
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2020-11-24 10:30 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2020-11-24 10:30 UTC (permalink / raw
To: gentoo-commits
commit: d3f46166892c50436b1de7e5b695daf27aac44fa
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 24 10:30:30 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Nov 24 10:30:41 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3f46166
www-servers/tomcat: bump to 9.0.40
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
www-servers/tomcat/Manifest | 1 +
.../tomcat/files/tomcat-9.0.40-build.xml.patch | 284 +++++++++++++++++++++
.../files/tomcat-9.0.40-insufficient-ecj.patch | 24 ++
www-servers/tomcat/tomcat-9.0.40.ebuild | 191 ++++++++++++++
4 files changed, 500 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 881b47c69e4..848ccb8b94d 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -2,5 +2,6 @@ DIST apache-tomcat-7.0.106-src.tar.gz 5302091 BLAKE2B f60975ef5570501b03e7164596
DIST apache-tomcat-8.5.59-src.tar.gz 5787634 BLAKE2B 8ca1aa8b4d12d0e73c0d7937e906530037168ac349b196e172935332e632b1e9ab15379f532cb8fb1b2f853d01567332af9c031393882c833dcea65f9e626b09 SHA512 bed80e86c4dc972fd6ad414a804ed2bffc797e22b0a5e0e6e93c8540fb87cffb2fd2f1f8d97873a3ee24397f7961a8fdeb6756c542a532e4b73468bccec6e626
DIST apache-tomcat-8.5.60-src.tar.gz 5837412 BLAKE2B 0c2200412900f7f6d318051333b15b8c6236e00f6194c21fc45bb95b565c4146e2682b879f3a293de3ab65524013f786a7f69dd7e91f1c4cc903179075253cc4 SHA512 43222e5d04b3de400429d6f1792d418172b6ff15dcc17e392cd66a5444d740a323b9c426a9f39678b3460452545fda4d784f56961d5ea56b9c0e1ca466d49040
DIST apache-tomcat-9.0.38-src.tar.gz 5948083 BLAKE2B ac076684f10a51bf0e0b5b0dbf18ee476ec900bead0089010de7b4a7d380a1e18035eaa0d0f661c863aa53491e51f719c2a5985e4791bcc9dada4c421db39fe7 SHA512 13c79abed71ead564b108ec8a046e78374611acd906f4b6e775ac0427446117192be6b25f29894e625e2dc13f79abbc97bc52b32120ce5701cbe0f5ae05bc57b
+DIST apache-tomcat-9.0.40-src.tar.gz 6017562 BLAKE2B 1c90511911363bb3b154124382f6401851c3a0e7925e06cc8f2b4f02a7b4c1c59bc75007a8b387f06742cbeca7f840b6860d84dc7c6fdb1e7774b22dbca6082f SHA512 61b8e191315cee2bc0437013dbe7d1fb3451182e0b316fb377581c7d47a59cefb7f2ff30d96a2d6326a99c86f4151b26d1ef76bda5029b30d81c8297a0b362fb
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
diff --git a/www-servers/tomcat/files/tomcat-9.0.40-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.40-build.xml.patch
new file mode 100644
index 00000000000..4b9999e283b
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-9.0.40-build.xml.patch
@@ -0,0 +1,284 @@
+diff --git a/build.xml b/build.xml
+index 56a9701..ee86df9 100644
+--- a/build.xml
++++ b/build.xml
+@@ -1014,6 +1014,7 @@
+ addOSGi="true" />
+
+ <!-- Servlet 4.0 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+@@ -1021,21 +1022,23 @@
+ notice="${tomcat.manifests}/servlet-api.jar.notice"
+ license="${tomcat.manifests}/servlet-api.jar.license"
+ addOSGi="true" />
+-
++-->
+ <!-- EL Implementation JAR File -->
++<!--
+ <jarIt jarfile="${el-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.el-api"
+ manifest="${tomcat.manifests}/el-api.jar.manifest"
+ addOSGi="true" />
+-
++-->
+ <!-- JSP Implementation JAR File -->
++<!--
+ <jarIt jarfile="${jsp-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.jsp-api"
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest"
+ addOSGi="true" />
+-
++-->
+ <!-- WebSocket API JAR File -->
+ <jarIt jarfile="${websocket-api.jar}"
+ filesDir="${tomcat.classes}"
+@@ -1148,10 +1151,10 @@
+ addOSGi="true" />
+
+ <!-- Re-packaged Apache Commons DBCP 2-->
+- <jarIt jarfile="${tomcat-dbcp.jar}"
++<!-- <jarIt jarfile="${tomcat-dbcp.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.tomcat-dbcp"
+- addOSGi="true" />
++ addOSGi="true" /> -->
+
+ <!-- i18n JARs -->
+ <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
+@@ -1374,9 +1377,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/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
++-->
+ <!-- Copy scripts -->
+ <copy todir="${tomcat.build}/bin">
+ <fileset dir="bin">
+@@ -1436,7 +1439,7 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
+- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+@@ -1479,7 +1482,7 @@
+
+ </target>
+
+- <target name="build-tomcat-jdbc" depends="package">
++ <target name="build-tomcat-jdbc" depends="package" unless="noget">
+ <!-- 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}"
+@@ -1494,7 +1497,7 @@
+ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+ </target>
+
+- <target name="build-tomcat-jdbc-src">
++ <target name="build-tomcat-jdbc-src" unless="noget">
+ <!-- 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}"
+@@ -1597,9 +1600,11 @@
+
+ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+ <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+ <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
+@@ -2171,11 +2176,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.
+@@ -2206,6 +2212,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++<!--
+ <javadoc packagenames="javax.servlet.*"
+ excludepackagenames="javax.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -2270,6 +2277,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="javax.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -2332,13 +2340,17 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path location="${osgi-annotations.jar}"/>
+ </classpath>
+ <link href="../annotationapi"/>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <link href="../websocketapi"/>
+ <link href="../jaspicapi"/>
++<!--
+ <link href="https://docs.oracle.com/javase/8/docs/api/"/>
+ <link href="https://javaee.github.io/javaee-spec/javadocs/"/>
++-->
+ <packageset dir="${tomcat.dist}/src/java/">
+ <include name="org/**"/>
+ <exclude name="org/apache/el/parser/**"/>
+@@ -3066,7 +3078,7 @@ skip.installer property in build.properties" />
+
+ <target name="download-compile"
+ description="Download components necessary to compile"
+- depends="setup-bnd">
++ depends="setup-bnd" unless="noget">
+
+ <!-- Download Commons Daemon -->
+ <antcall target="downloadgz-2">
+@@ -3121,7 +3133,7 @@ skip.installer property in build.properties" />
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -3199,7 +3211,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="downloadfile-2">
+ <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
+@@ -3254,13 +3266,13 @@ skip.installer property in build.properties" />
+
+ <!-- =============== Utility Targets to support downloads ================ -->
+
+- <target name="setproxy" if="${proxy.use}">
++ <target name="setproxy" if="${proxy.use}" unless="noget">
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+ proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+ </target>
+
+- <target name="testexist">
++ <target name="testexist" unless="noget">
+ <echo message="Testing for ${destfile}"/>
+ <available file="${destfile}" property="exist"/>
+ </target>
+@@ -3382,7 +3394,7 @@ skip.installer property in build.properties" />
+ </sequential>
+ </macrodef>
+
+- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
++ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3399,7 +3411,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadgz-2" unless="exist" depends="testexist">
++ <target name="downloadgz-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3424,7 +3436,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
++ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3440,7 +3452,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadzip-2" unless="exist" depends="testexist">
++ <target name="downloadzip-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3464,7 +3476,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
++ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
+ <!-- Download the file -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3479,7 +3491,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="downloadfile-2" unless="exist" depends="testexist">
++ <target name="downloadfile-2" unless="noget" depends="testexist">
+ <!-- Download the file from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3507,7 +3519,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="trydownload.check" depends="setproxy">
++ <target name="trydownload.check" depends="setproxy" unless="noget">
+ <condition property="trydownload.run">
+ <and>
+ <not>
+@@ -3518,7 +3530,7 @@ skip.installer property in build.properties" />
+ </condition>
+ </target>
+
+- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+ <!-- Downloads a file if not yet downloaded and the source URL is available -->
+ <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+ </target>
+@@ -3529,7 +3541,7 @@ skip.installer property in build.properties" />
+
+ <target name="ide-eclipse"
+ depends="download-compile, download-test-compile"
+- description="Prepares the source tree to be built in Eclipse">
++ description="Prepares the source tree to be built in Eclipse" unless="noget">
+
+ <!-- Copy the sample project files into the root directory -->
+ <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
+@@ -3547,7 +3559,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"
+- description="Creates project directory .idea for IntelliJ IDEA">
++ description="Creates project directory .idea for IntelliJ IDEA" unless="noget">
+
+ <copy todir="${tomcat.home}/.idea">
+ <fileset dir="${tomcat.home}/res/ide-support/idea"/>
diff --git a/www-servers/tomcat/files/tomcat-9.0.40-insufficient-ecj.patch b/www-servers/tomcat/files/tomcat-9.0.40-insufficient-ecj.patch
new file mode 100644
index 00000000000..dd002e2ca21
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-9.0.40-insufficient-ecj.patch
@@ -0,0 +1,24 @@
+diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java b/java/org/apache/jasper/compiler/JDTCompiler.java
+index 4722a4a..27ce287 100644
+--- a/java/org/apache/jasper/compiler/JDTCompiler.java
++++ b/java/org/apache/jasper/compiler/JDTCompiler.java
+@@ -307,7 +307,7 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
+ } else if(opt.equals("13")) {
+ settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_13);
+ } else if(opt.equals("14")) {
+- settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_14);
++ settings.put(CompilerOptions.OPTION_Source, "14");
+ } else if(opt.equals("15")) {
+ // Constant not available in latest ECJ version shipped with
+ // Tomcat. May be supported in a snapshot build.
+@@ -368,8 +368,8 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
+ settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_13);
+ settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_13);
+ } else if(opt.equals("14")) {
+- settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_14);
+- settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_14);
++ settings.put(CompilerOptions.OPTION_TargetPlatform, "14");
++ settings.put(CompilerOptions.OPTION_Compliance, "14");
+ } else if(opt.equals("15")) {
+ // Constant not available in latest ECJ version shipped with
+ // Tomcat. May be supported in a snapshot build.
diff --git a/www-servers/tomcat/tomcat-9.0.40.ebuild b/www-servers/tomcat/tomcat-9.0.40.ebuild
new file mode 100644
index 00000000000..41d3c02f774
--- /dev/null
+++ b/www-servers/tomcat/tomcat-9.0.40.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${PN}-${PV}-src"
+
+# Currently we bundle binary versions of bnd.jar and bndlib.jar
+# See bugs #203080 and #676116
+BND_VERSION="5.1.1"
+BND="biz.aQute.bnd-${BND_VERSION}.jar"
+BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
+
+DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
+ https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
+ https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}"
+
+LICENSE="Apache-2.0"
+SLOT="9"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.15"
+SAPI_SLOT="4.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ dev-java/glassfish-xmlrpc-api:0
+ ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
+ dev-java/wsdl4j:0"
+RDEPEND="${COMMON_DEP}
+ virtual/jre"
+DEPEND="${COMMON_DEP}
+ app-admin/pwgen
+ >=dev-java/ant-core-1.9.13
+ virtual/jdk:1.8
+ test? (
+ >=dev-java/ant-junit-1.9:0
+ dev-java/easymock:3.2
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+ "${FILESDIR}/${P}-insufficient-ecj.patch"
+)
+
+BND_HOME="${S}/tomcat-build-libs/bnd"
+BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
+BND_JAR="${BND_HOME}/${BND}"
+BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
+
+src_unpack() {
+ unpack ${MY_P}.tar.gz
+
+ mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
+ ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
+ ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
+}
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup tomcat 265
+ enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+src_prepare() {
+ default
+
+ find -name '*.jar' -type f -delete -print || die
+
+ # Remove bundled servlet-api
+ rm -rv java/javax/{el,servlet} || die
+
+ eapply "${FILESDIR}/${P}-build.xml.patch"
+
+ # For use of catalina.sh in netbeans
+ sed -i -e "/^# ----- Execute The Requested Command/ a\
+ CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+ bin/catalina.sh || die
+
+ java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT},wsdl4j"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_configure() {
+ java-ant-2_src_configure
+
+ eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
+}
+
+src_compile() {
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)"
+ java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ # add missing docBase
+ local apps="host-manager manager"
+ for app in ${apps}; do
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+ output/build/webapps/${app}/META-INF/context.xml || die
+ done
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw="$(pwgen -s -B 15 1)"
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+ einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+ einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2021-02-04 10:50 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2021-02-04 10:50 UTC (permalink / raw
To: gentoo-commits
commit: 377ab10b47d2e4b8842b36e2e2679009f35cbd6e
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 4 10:48:54 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Feb 4 10:50:23 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=377ab10b
www-servers/tomcat: introduced slot 10 with version 10.0.2
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
www-servers/tomcat/Manifest | 1 +
.../tomcat/files/tomcat-10.0.2-build.xml.patch | 284 +++++++++++++++++++++
www-servers/tomcat/tomcat-10.0.2.ebuild | 191 ++++++++++++++
3 files changed, 476 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 445c595920a..ce288762f41 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,3 +1,4 @@
+DIST apache-tomcat-10.0.2-src.tar.gz 5954905 BLAKE2B fa7ca630b287c96538955848ab0ef109beb22a381e884eae96fa5246c134164b543003669c65d716f453ffa7a0e72f119354d1f023b529a948befb11c5e375a1 SHA512 402e942b9a1006535fd0e1416a4606d880ca1af473d7c394d54aa3dff60ecfe80823a0bb14f354049e008fdf29ea67a1490d0828fbc50eaf39ea159ef36cbc53
DIST apache-tomcat-7.0.107-src.tar.gz 5312698 BLAKE2B 1f2712ddce6aa604692aaf6a6c706469d3dbcb2266a99e62346c15b8347fff573608440473be8e20b8632a431f8838dd29f24f6bf630a13d262c444be68e0d2c SHA512 820923697c487367786c595d3aeaa58981d25b56529c6739b9388ad771f3264e6995f7659805cc5b2ef9456dbd42bad92ad2cfa3c7f741920a5b7bff2cc1bb1b
DIST apache-tomcat-8.5.61-src.tar.gz 5840559 BLAKE2B 18e1505b6b7d8e1a024d9f834d33ef105a16e6fc1f9e80abd3e6e88b2326597b9973e13c2ebc030a1db4a2d4dc5572d195b9f61db6cb7bf51e97cbfaa121678a SHA512 fd6bb5926b5e7cf44f359c93dadc4edd87fa5f2e26fb0fb3a9bc0a5c89ae4d844d66872055e1b441392cf03d7690aca3429b66afd8334319784f089f821d8c22
DIST apache-tomcat-8.5.63-src.tar.gz 5853051 BLAKE2B d007d9922d54578bdebcbbaec3e7c0ffcafdce913e52fdd93d5c174c9d1304980b5eb7f126e957c5975a59dfb126857dcc87ef3ca5e479e44cd7910b6183e469 SHA512 d78a140117844675239e834a0890641c0ef0d6fc3c89eb4512536fece2c128f088edfdea15f79ba7a31e0478431f155230f8f60a57bfea0aed191298a95310c4
diff --git a/www-servers/tomcat/files/tomcat-10.0.2-build.xml.patch b/www-servers/tomcat/files/tomcat-10.0.2-build.xml.patch
new file mode 100644
index 00000000000..0ed24682291
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-10.0.2-build.xml.patch
@@ -0,0 +1,284 @@
+diff --git a/build.xml b/build.xml
+index 455edf9..457c0a9 100644
+--- a/build.xml
++++ b/build.xml
+@@ -1032,6 +1032,7 @@
+ addOSGi="true" />
+
+ <!-- Servlet Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+@@ -1039,21 +1040,23 @@
+ notice="${tomcat.manifests}/servlet-api.jar.notice"
+ license="${tomcat.manifests}/servlet-api.jar.license"
+ addOSGi="true" />
+-
++-->
+ <!-- EL Implementation JAR File -->
++<!--
+ <jarIt jarfile="${el-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.el-api"
+ manifest="${tomcat.manifests}/el-api.jar.manifest"
+ addOSGi="true" />
+-
++-->
+ <!-- JSP Implementation JAR File -->
++<!--
+ <jarIt jarfile="${jsp-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.jsp-api"
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest"
+ addOSGi="true" />
+-
++-->
+ <!-- WebSocket API JAR File -->
+ <jarIt jarfile="${websocket-api.jar}"
+ filesDir="${tomcat.classes}"
+@@ -1166,10 +1169,10 @@
+ addOSGi="true" />
+
+ <!-- Re-packaged Apache Commons DBCP 2-->
+- <jarIt jarfile="${tomcat-dbcp.jar}"
++<!-- <jarIt jarfile="${tomcat-dbcp.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.tomcat-dbcp"
+- addOSGi="true" />
++ addOSGi="true" /> -->
+
+ <!-- i18n JARs -->
+ <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
+@@ -1397,9 +1400,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/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
++-->
+ <!-- Copy scripts -->
+ <copy todir="${tomcat.build}/bin">
+ <fileset dir="bin">
+@@ -1459,7 +1462,7 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
+- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+@@ -1502,7 +1505,7 @@
+
+ </target>
+
+- <target name="build-tomcat-jdbc" depends="package">
++ <target name="build-tomcat-jdbc" depends="package" unless="noget">
+ <!-- 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}"
+@@ -1517,7 +1520,7 @@
+ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+ </target>
+
+- <target name="build-tomcat-jdbc-src">
++ <target name="build-tomcat-jdbc-src" unless="noget">
+ <!-- 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}"
+@@ -1620,9 +1623,11 @@
+
+ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+ <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+ <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
+@@ -2196,11 +2201,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.
+@@ -2231,6 +2237,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++<!--
+ <javadoc packagenames="jakarta.servlet.*"
+ excludepackagenames="jakarta.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -2295,6 +2302,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="jakarta.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -2357,13 +2365,17 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path location="${osgi-annotations.jar}"/>
+ </classpath>
+ <link href="../annotationapi"/>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <link href="../websocketapi"/>
+ <link href="../jaspicapi"/>
++<!--
+ <link href="https://docs.oracle.com/javase/8/docs/api/"/>
+ <link href="https://javaee.github.io/javaee-spec/javadocs/"/>
++-->
+ <packageset dir="${tomcat.dist}/src/java/">
+ <include name="org/**"/>
+ <exclude name="org/apache/el/parser/**"/>
+@@ -3083,7 +3095,7 @@ skip.installer property in build.properties" />
+
+ <target name="download-compile"
+ description="Download components necessary to compile"
+- depends="setup-bnd">
++ depends="setup-bnd" unless="noget">
+
+ <!-- Download Commons Daemon -->
+ <antcall target="downloadgz-2">
+@@ -3127,7 +3139,7 @@ skip.installer property in build.properties" />
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -3205,7 +3217,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="downloadfile-2">
+ <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
+@@ -3260,13 +3272,13 @@ skip.installer property in build.properties" />
+
+ <!-- =============== Utility Targets to support downloads ================ -->
+
+- <target name="setproxy" if="${proxy.use}">
++ <target name="setproxy" if="${proxy.use}" unless="noget">
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+ proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+ </target>
+
+- <target name="testexist">
++ <target name="testexist" unless="noget">
+ <echo message="Testing for ${destfile}"/>
+ <available file="${destfile}" property="exist"/>
+ </target>
+@@ -3388,7 +3400,7 @@ skip.installer property in build.properties" />
+ </sequential>
+ </macrodef>
+
+- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
++ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3405,7 +3417,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadgz-2" unless="exist" depends="testexist">
++ <target name="downloadgz-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3430,7 +3442,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
++ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3446,7 +3458,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadzip-2" unless="exist" depends="testexist">
++ <target name="downloadzip-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3470,7 +3482,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
++ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
+ <!-- Download the file -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3485,7 +3497,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="downloadfile-2" unless="exist" depends="testexist">
++ <target name="downloadfile-2" unless="noget" depends="testexist">
+ <!-- Download the file from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3513,7 +3525,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="trydownload.check" depends="setproxy">
++ <target name="trydownload.check" depends="setproxy" unless="noget">
+ <condition property="trydownload.run">
+ <and>
+ <not>
+@@ -3524,7 +3536,7 @@ skip.installer property in build.properties" />
+ </condition>
+ </target>
+
+- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+ <!-- Downloads a file if not yet downloaded and the source URL is available -->
+ <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+ </target>
+@@ -3535,7 +3547,7 @@ skip.installer property in build.properties" />
+
+ <target name="ide-eclipse"
+ depends="download-compile, download-test-compile"
+- description="Prepares the source tree to be built in Eclipse">
++ description="Prepares the source tree to be built in Eclipse" unless="noget">
+
+ <!-- Copy the sample project files into the root directory -->
+ <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
+@@ -3553,7 +3565,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"
+- description="Creates project directory .idea for IntelliJ IDEA">
++ description="Creates project directory .idea for IntelliJ IDEA" unless="noget">
+
+ <copy todir="${tomcat.home}/.idea">
+ <fileset dir="${tomcat.home}/res/ide-support/idea"/>
diff --git a/www-servers/tomcat/tomcat-10.0.2.ebuild b/www-servers/tomcat/tomcat-10.0.2.ebuild
new file mode 100644
index 00000000000..7e618f92e88
--- /dev/null
+++ b/www-servers/tomcat/tomcat-10.0.2.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix
+
+MY_P="apache-${PN}-${PV}-src"
+
+# Currently we bundle binary versions of bnd.jar and bndlib.jar
+# See bugs #203080 and #676116
+BND_VERSION="5.1.1"
+BND="biz.aQute.bnd-${BND_VERSION}.jar"
+BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
+
+DESCRIPTION="Tomcat Servlet-5.0/JSP-3.0/EL-4.0/WebSocket-2.0/JASIC-2.0 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
+ https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
+ https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}"
+
+LICENSE="Apache-2.0"
+SLOT="10"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.15"
+SAPI_SLOT="5.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ dev-java/glassfish-xmlrpc-api:0
+ ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
+ dev-java/wsdl4j:0"
+RDEPEND="${COMMON_DEP}
+ acct-group/tomcat
+ acct-user/tomcat
+ virtual/jre"
+DEPEND="${COMMON_DEP}
+ app-admin/pwgen
+ >=dev-java/ant-core-1.9.13
+ virtual/jdk:1.8
+ test? (
+ >=dev-java/ant-junit-1.9:0
+ dev-java/easymock:3.2
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+ "${FILESDIR}/${PN}-9.0.43-insufficient-ecj.patch"
+)
+
+BND_HOME="${S}/tomcat-build-libs/bnd"
+BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
+BND_JAR="${BND_HOME}/${BND}"
+BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
+
+src_unpack() {
+ unpack ${MY_P}.tar.gz
+
+ mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
+ ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
+ ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
+}
+
+src_prepare() {
+ default
+
+ find -name '*.jar' -type f -delete -print || die
+
+ # Remove bundled servlet-api
+ rm -rv java/jakarta/{el,servlet} || die
+
+ eapply "${FILESDIR}/${P}-build.xml.patch"
+
+ # For use of catalina.sh in netbeans
+ sed -i -e "/^# ----- Execute The Requested Command/ a\
+ CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+ bin/catalina.sh || die
+
+ java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT},wsdl4j"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_configure() {
+ java-ant-2_src_configure
+
+ eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
+}
+
+src_compile() {
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)"
+ java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ # add missing docBase
+ local apps="host-manager manager"
+ for app in ${apps}; do
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+ output/build/webapps/${app}/META-INF/context.xml || die
+ done
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw="$(pwgen -s -B 15 1)"
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "Please note that since version 10 the primary package for all implemented APIs"
+ ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code"
+ ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later."
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+ einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+ einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2021-03-13 12:03 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2021-03-13 12:03 UTC (permalink / raw
To: gentoo-commits
commit: 7b432f5be102c25f5e54542bc0d7eee1cabf7680
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 13 12:03:41 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Mar 13 12:03:51 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b432f5b
www-servers/tomcat: bump to 10.0.4
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
www-servers/tomcat/Manifest | 1 +
.../tomcat/files/tomcat-10.0.4-build.xml.patch | 284 +++++++++++++++++++++
www-servers/tomcat/tomcat-10.0.4.ebuild | 192 ++++++++++++++
3 files changed, 477 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 5f7acd85522..80b5fc3acf0 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,4 +1,5 @@
DIST apache-tomcat-10.0.2-src.tar.gz 5954905 BLAKE2B fa7ca630b287c96538955848ab0ef109beb22a381e884eae96fa5246c134164b543003669c65d716f453ffa7a0e72f119354d1f023b529a948befb11c5e375a1 SHA512 402e942b9a1006535fd0e1416a4606d880ca1af473d7c394d54aa3dff60ecfe80823a0bb14f354049e008fdf29ea67a1490d0828fbc50eaf39ea159ef36cbc53
+DIST apache-tomcat-10.0.4-src.tar.gz 5964416 BLAKE2B 23332b90316cedd1916b59b1b31b1c16e34c193ba61660c7c8e41e3b983a35873660eaf8e3f0777704d5663f0ede2dc39b81997a73ee726ff73d6c6392582163 SHA512 677b978afd51fe1756b486c9d5576b9fa03b5b775c462263237aef6d17f36d7e718cfb5e46a49da942b1bf6681b166a4af781138f55d89a019bf12b48eb22882
DIST apache-tomcat-7.0.107-src.tar.gz 5312698 BLAKE2B 1f2712ddce6aa604692aaf6a6c706469d3dbcb2266a99e62346c15b8347fff573608440473be8e20b8632a431f8838dd29f24f6bf630a13d262c444be68e0d2c SHA512 820923697c487367786c595d3aeaa58981d25b56529c6739b9388ad771f3264e6995f7659805cc5b2ef9456dbd42bad92ad2cfa3c7f741920a5b7bff2cc1bb1b
DIST apache-tomcat-7.0.108-src.tar.gz 5313375 BLAKE2B 200a1ccbc39a572ca7e4f7805bf3d27e0bd645156d8886b0fcbee5e64279a4d2f4e2ad847d67a70e1c65a8d88fa5bd4757a0066ceff367fe92914e22cc809aa5 SHA512 bdd957ca5b3b7dd152efa6406dbb6397ed62661ec44c83b6a8f6e9e3c33362c51ff5e0451a57d6aa3874cd745811f2afe78d08825ddaba8e29cb38ef922c48e2
DIST apache-tomcat-8.5.61-src.tar.gz 5840559 BLAKE2B 18e1505b6b7d8e1a024d9f834d33ef105a16e6fc1f9e80abd3e6e88b2326597b9973e13c2ebc030a1db4a2d4dc5572d195b9f61db6cb7bf51e97cbfaa121678a SHA512 fd6bb5926b5e7cf44f359c93dadc4edd87fa5f2e26fb0fb3a9bc0a5c89ae4d844d66872055e1b441392cf03d7690aca3429b66afd8334319784f089f821d8c22
diff --git a/www-servers/tomcat/files/tomcat-10.0.4-build.xml.patch b/www-servers/tomcat/files/tomcat-10.0.4-build.xml.patch
new file mode 100644
index 00000000000..a2c148719e2
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-10.0.4-build.xml.patch
@@ -0,0 +1,284 @@
+diff --git a/build.xml b/build.xml
+index 8338af0..db9eec8 100644
+--- a/build.xml
++++ b/build.xml
+@@ -1034,6 +1034,7 @@
+ addOSGi="true" />
+
+ <!-- Servlet Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+@@ -1041,21 +1042,23 @@
+ notice="${tomcat.manifests}/servlet-api.jar.notice"
+ license="${tomcat.manifests}/servlet-api.jar.license"
+ addOSGi="true" />
+-
++-->
+ <!-- EL Implementation JAR File -->
++<!--
+ <jarIt jarfile="${el-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.el-api"
+ manifest="${tomcat.manifests}/el-api.jar.manifest"
+ addOSGi="true" />
+-
++-->
+ <!-- JSP Implementation JAR File -->
++<!--
+ <jarIt jarfile="${jsp-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.jsp-api"
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest"
+ addOSGi="true" />
+-
++-->
+ <!-- WebSocket API JAR File -->
+ <jarIt jarfile="${websocket-api.jar}"
+ filesDir="${tomcat.classes}"
+@@ -1168,10 +1171,10 @@
+ addOSGi="true" />
+
+ <!-- Re-packaged Apache Commons DBCP 2-->
+- <jarIt jarfile="${tomcat-dbcp.jar}"
++<!-- <jarIt jarfile="${tomcat-dbcp.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.tomcat-dbcp"
+- addOSGi="true" />
++ addOSGi="true" /> -->
+
+ <!-- i18n JARs -->
+ <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
+@@ -1399,9 +1402,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/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
++-->
+ <!-- Copy scripts -->
+ <copy todir="${tomcat.build}/bin">
+ <fileset dir="bin">
+@@ -1461,7 +1464,7 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
+- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!-- <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" />
+@@ -1472,7 +1475,7 @@
+ <exclude name="${migration-lib.jar.filename}"/>
+ </fileset>
+ </delete>
+- <copy file="${migration-lib.jar}" todir="${tomcat.build}/lib"/>
++<!-- <copy file="${migration-lib.jar}" todir="${tomcat.build}/lib"/> -->
+
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+@@ -1515,7 +1518,7 @@
+
+ </target>
+
+- <target name="build-tomcat-jdbc" depends="package">
++ <target name="build-tomcat-jdbc" depends="package" unless="noget">
+ <!-- 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}"
+@@ -1530,7 +1533,7 @@
+ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+ </target>
+
+- <target name="build-tomcat-jdbc-src">
++ <target name="build-tomcat-jdbc-src" unless="noget">
+ <!-- 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}"
+@@ -1633,9 +1636,11 @@
+
+ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+ <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+ <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
+@@ -2209,11 +2214,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.
+@@ -2244,6 +2250,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++<!--
+ <javadoc packagenames="jakarta.servlet.*"
+ excludepackagenames="jakarta.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -2308,6 +2315,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="jakarta.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -2370,13 +2378,17 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path location="${osgi-annotations.jar}"/>
+ </classpath>
+ <link href="../annotationapi"/>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <link href="../websocketapi"/>
+ <link href="../jaspicapi"/>
++<!--
+ <link href="https://docs.oracle.com/javase/8/docs/api/"/>
+ <link href="https://javaee.github.io/javaee-spec/javadocs/"/>
++-->
+ <packageset dir="${tomcat.dist}/src/java/">
+ <include name="org/**"/>
+ <exclude name="org/apache/el/parser/**"/>
+@@ -3150,7 +3162,7 @@ skip.installer property in build.properties" />
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -3228,7 +3240,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">
+
+ <antcall target="downloadfile-2">
+ <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
+@@ -3283,13 +3295,13 @@ skip.installer property in build.properties" />
+
+ <!-- =============== Utility Targets to support downloads ================ -->
+
+- <target name="setproxy" if="${proxy.use}">
++ <target name="setproxy" if="${proxy.use}" unless="noget">
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+ proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+ </target>
+
+- <target name="testexist">
++ <target name="testexist" unless="noget">
+ <echo message="Testing for ${destfile}"/>
+ <available file="${destfile}" property="exist"/>
+ </target>
+@@ -3411,7 +3423,7 @@ skip.installer property in build.properties" />
+ </sequential>
+ </macrodef>
+
+- <target name="downloadgz" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++ <target name="downloadgz" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3428,7 +3440,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadgz-2" unless="exist" if="${execute.download}" depends="testexist">
++ <target name="downloadgz-2" unless="noget" if="${execute.download}" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3453,7 +3465,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadzip" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++ <target name="downloadzip" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3469,7 +3481,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadzip-2" unless="exist" if="${execute.download}" depends="testexist">
++ <target name="downloadzip-2" unless="noget" if="${execute.download}" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3493,7 +3505,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadfile" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++ <target name="downloadfile" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+ <!-- Download the file -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3508,7 +3520,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="downloadfile-2" unless="exist" if="${execute.download}" depends="testexist">
++ <target name="downloadfile-2" unless="noget" if="${execute.download}" depends="testexist">
+ <!-- Download the file from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3536,7 +3548,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="trydownload.check" depends="setproxy">
++ <target name="trydownload.check" depends="setproxy" unless="noget">
+ <condition property="trydownload.run">
+ <and>
+ <not>
+@@ -3547,7 +3559,7 @@ skip.installer property in build.properties" />
+ </condition>
+ </target>
+
+- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+ <!-- Downloads a file if not yet downloaded and the source URL is available -->
+ <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+ </target>
+@@ -3558,7 +3570,7 @@ skip.installer property in build.properties" />
+
+ <target name="ide-eclipse"
+ depends="download-compile, download-test-compile"
+- description="Prepares the source tree to be built in Eclipse">
++ description="Prepares the source tree to be built in Eclipse" unless="noget">
+
+ <!-- Copy the sample project files into the root directory -->
+ <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
+@@ -3576,7 +3588,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"
+- description="Creates project directory .idea for IntelliJ IDEA">
++ description="Creates project directory .idea for IntelliJ IDEA" unless="noget">
+
+ <copy todir="${tomcat.home}/.idea">
+ <fileset dir="${tomcat.home}/res/ide-support/idea"/>
diff --git a/www-servers/tomcat/tomcat-10.0.4.ebuild b/www-servers/tomcat/tomcat-10.0.4.ebuild
new file mode 100644
index 00000000000..a397d6e6306
--- /dev/null
+++ b/www-servers/tomcat/tomcat-10.0.4.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix
+
+MY_P="apache-${PN}-${PV}-src"
+
+# Currently we bundle binary versions of bnd.jar and bndlib.jar
+# See bugs #203080 and #676116
+BND_VERSION="5.1.1"
+BND="biz.aQute.bnd-${BND_VERSION}.jar"
+BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
+
+DESCRIPTION="Tomcat Servlet-5.0/JSP-3.0/EL-4.0/WebSocket-2.0/JASIC-2.0 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
+ https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
+ https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}"
+
+LICENSE="Apache-2.0"
+SLOT="10"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.15"
+SAPI_SLOT="5.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ dev-java/glassfish-xmlrpc-api:0
+ dev-java/jakartaee-migration:0
+ ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
+ dev-java/wsdl4j:0"
+RDEPEND="${COMMON_DEP}
+ acct-group/tomcat
+ acct-user/tomcat
+ virtual/jre"
+DEPEND="${COMMON_DEP}
+ app-admin/pwgen
+ dev-java/ant-core
+ virtual/jdk:1.8
+ test? (
+ dev-java/ant-junit:0
+ dev-java/easymock:3.2
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+ "${FILESDIR}/${PN}-9.0.43-insufficient-ecj.patch"
+)
+
+BND_HOME="${S}/tomcat-build-libs/bnd"
+BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
+BND_JAR="${BND_HOME}/${BND}"
+BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
+
+src_unpack() {
+ unpack ${MY_P}.tar.gz
+
+ mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
+ ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
+ ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
+}
+
+src_prepare() {
+ default
+
+ find -name '*.jar' -type f -delete -print || die
+
+ # Remove bundled servlet-api
+ rm -rv java/jakarta/{el,servlet} || die
+
+ eapply "${FILESDIR}/${P}-build.xml.patch"
+
+ # For use of catalina.sh in netbeans
+ sed -i -e "/^# ----- Execute The Requested Command/ a\
+ CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+ bin/catalina.sh || die
+
+ java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},jakartaee-migration,tomcat-servlet-api-${SAPI_SLOT},wsdl4j"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_configure() {
+ java-ant-2_src_configure
+
+ eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
+}
+
+src_compile() {
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)"
+ java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ # add missing docBase
+ local apps="host-manager manager"
+ for app in ${apps}; do
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+ output/build/webapps/${app}/META-INF/context.xml || die
+ done
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw="$(pwgen -s -B 15 1)"
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "Please note that since version 10 the primary package for all implemented APIs"
+ ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code"
+ ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later."
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+ einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+ einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2021-04-07 14:33 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2021-04-07 14:33 UTC (permalink / raw
To: gentoo-commits
commit: 4c7b72f7cf5c844505adf9219a9f5858927a18de
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 7 14:33:16 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Apr 7 14:33:26 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c7b72f7
www-servers/tomcat: bump to 9.0.45
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
www-servers/tomcat/Manifest | 1 +
.../tomcat/files/tomcat-9.0.45-build.xml.patch | 284 +++++++++++++++++++++
www-servers/tomcat/tomcat-9.0.45.ebuild | 187 ++++++++++++++
3 files changed, 472 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 37ea1946d23..aa167354a39 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -6,5 +6,6 @@ DIST apache-tomcat-8.5.63-src.tar.gz 5853051 BLAKE2B d007d9922d54578bdebcbbaec3e
DIST apache-tomcat-8.5.64-src.tar.gz 5863485 BLAKE2B c297c0803c74a969e96b99c379bcd050d6e08cb1036d69b5c49c64311d6f17695754631738130a76def849da6c2de70a49d4452b24ee34c5720d9474f8d4d41b SHA512 ffcc8e97b56730e7e15daa8c4ce628547afcf0bb008bb8d8142ae684c963ed6a366c1dfdbaaca9080201c3c1bcda60c759b76447dd72493f0ec922a034b75f08
DIST apache-tomcat-9.0.43-src.tar.gz 6042010 BLAKE2B 78c0e7d711dd826ba93b12db6a96929ddeeb0df189a12e907c51f02baa08d84757915b8744b5ebd027892ff2823b955d7b1c3c749ab54b588686dfd8d3157640 SHA512 8c23f8a371b3ffbc1ab4d5f24be08ecf2c9e6ba466ef36ef97e075bd0f12b1ffc93f63b9ff1def9953b3f791319c7c355a76e7a54061a21d25be37a5dc22da26
DIST apache-tomcat-9.0.44-src.tar.gz 6047722 BLAKE2B fda3081d66c9018a49e5a07bfb5d54b133fe51dff69b692480065d8d9a4877ce5b5b152e33f6d4cfaf28940ec6b556c9a2455c8fda56ea0552e4d1f83f0f9cbe SHA512 68f6a6edecc0469e21cf062cd4b5aacd2df4903fe98aea052acfc9f725268490d5a6917ac1565f26e15a513afa09814014aed267dc1b5aa92733a51ef52b305f
+DIST apache-tomcat-9.0.45-src.tar.gz 6055044 BLAKE2B 66ca4ee2c0a3bbd1f73d7257c55105e28d1619c8e533f945438cdb283cb8ccdceada163698641b034b5e43b513fcdd16e331c4c11ea300501276a5247f8ef682 SHA512 e3edfd6ab9e3ddf6a15f63a4e11f5237e03d7cacdec11805f4a901bd325c0edeca1ee0b62bee92d53e521af0a9d5a7b10ce12a8262a57fd7faa69d93ca1c066e
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
diff --git a/www-servers/tomcat/files/tomcat-9.0.45-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.45-build.xml.patch
new file mode 100644
index 00000000000..ab5e5e098a0
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-9.0.45-build.xml.patch
@@ -0,0 +1,284 @@
+diff --git a/build.xml b/build.xml
+index 2958ccd..3983182 100644
+--- a/build.xml
++++ b/build.xml
+@@ -1025,6 +1025,7 @@
+ addOSGi="true" />
+
+ <!-- Servlet 4.0 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+@@ -1032,21 +1033,23 @@
+ notice="${tomcat.manifests}/servlet-api.jar.notice"
+ license="${tomcat.manifests}/servlet-api.jar.license"
+ addOSGi="true" />
+-
++-->
+ <!-- EL Implementation JAR File -->
++<!--
+ <jarIt jarfile="${el-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.el-api"
+ manifest="${tomcat.manifests}/el-api.jar.manifest"
+ addOSGi="true" />
+-
++-->
+ <!-- JSP Implementation JAR File -->
++<!--
+ <jarIt jarfile="${jsp-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.jsp-api"
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest"
+ addOSGi="true" />
+-
++-->
+ <!-- WebSocket API JAR File -->
+ <jarIt jarfile="${websocket-api.jar}"
+ filesDir="${tomcat.classes}"
+@@ -1159,10 +1162,10 @@
+ addOSGi="true" />
+
+ <!-- Re-packaged Apache Commons DBCP 2-->
+- <jarIt jarfile="${tomcat-dbcp.jar}"
++<!-- <jarIt jarfile="${tomcat-dbcp.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.tomcat-dbcp"
+- addOSGi="true" />
++ addOSGi="true" /> -->
+
+ <!-- i18n JARs -->
+ <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
+@@ -1399,9 +1402,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/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
++-->
+ <!-- Copy scripts -->
+ <copy todir="${tomcat.build}/bin">
+ <fileset dir="bin">
+@@ -1461,7 +1464,7 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
+- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+@@ -1504,7 +1507,7 @@
+
+ </target>
+
+- <target name="build-tomcat-jdbc" depends="package">
++ <target name="build-tomcat-jdbc" depends="package" unless="noget">
+ <!-- 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}"
+@@ -1520,7 +1523,7 @@
+ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+ </target>
+
+- <target name="build-tomcat-jdbc-src">
++ <target name="build-tomcat-jdbc-src" unless="noget">
+ <!-- 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}"
+@@ -1623,9 +1626,11 @@
+
+ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+ <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+ <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
+@@ -2208,11 +2213,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.
+@@ -2243,6 +2249,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++<!--
+ <javadoc packagenames="javax.servlet.*"
+ excludepackagenames="javax.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -2307,6 +2314,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="javax.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -2369,13 +2377,17 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path location="${osgi-annotations.jar}"/>
+ </classpath>
+ <link href="../annotationapi"/>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <link href="../websocketapi"/>
+ <link href="../jaspicapi"/>
++<!--
+ <link href="https://docs.oracle.com/javase/8/docs/api/"/>
+ <link href="https://javaee.github.io/javaee-spec/javadocs/"/>
++-->
+ <packageset dir="${tomcat.dist}/src/java/">
+ <include name="org/**"/>
+ <exclude name="org/apache/el/parser/**"/>
+@@ -3148,7 +3160,7 @@ skip.installer property in build.properties" />
+
+ <target name="download-compile"
+ description="Download components necessary to compile"
+- depends="setup-bnd">
++ depends="setup-bnd" unless="noget">
+
+ <!-- Download Commons Daemon -->
+ <antcall target="downloadgz-2">
+@@ -3192,7 +3204,7 @@ skip.installer property in build.properties" />
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -3270,7 +3282,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="downloadfile-2">
+ <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
+@@ -3325,13 +3337,13 @@ skip.installer property in build.properties" />
+
+ <!-- =============== Utility Targets to support downloads ================ -->
+
+- <target name="setproxy" if="${proxy.use}">
++ <target name="setproxy" if="${proxy.use}" unless="noget">
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+ proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+ </target>
+
+- <target name="testexist">
++ <target name="testexist" unless="noget">
+ <echo message="Testing for ${destfile}"/>
+ <available file="${destfile}" property="exist"/>
+ </target>
+@@ -3453,7 +3465,7 @@ skip.installer property in build.properties" />
+ </sequential>
+ </macrodef>
+
+- <target name="downloadgz" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++ <target name="downloadgz" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3470,7 +3482,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadgz-2" unless="exist" if="${execute.download}" depends="testexist">
++ <target name="downloadgz-2" unless="noget" if="${execute.download}" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3495,7 +3507,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadzip" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++ <target name="downloadzip" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3511,7 +3523,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadzip-2" unless="exist" if="${execute.download}" depends="testexist">
++ <target name="downloadzip-2" unless="noget" if="${execute.download}" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3535,7 +3547,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadfile" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++ <target name="downloadfile" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+ <!-- Download the file -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3550,7 +3562,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="downloadfile-2" unless="exist" if="${execute.download}" depends="testexist">
++ <target name="downloadfile-2" unless="noget" if="${execute.download}" depends="testexist">
+ <!-- Download the file from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3578,7 +3590,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="trydownload.check" depends="setproxy">
++ <target name="trydownload.check" depends="setproxy" unless="noget">
+ <condition property="trydownload.run">
+ <and>
+ <not>
+@@ -3589,7 +3601,7 @@ skip.installer property in build.properties" />
+ </condition>
+ </target>
+
+- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+ <!-- Downloads a file if not yet downloaded and the source URL is available -->
+ <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+ </target>
+@@ -3600,7 +3612,7 @@ skip.installer property in build.properties" />
+
+ <target name="ide-eclipse"
+ depends="download-compile, download-test-compile"
+- description="Prepares the source tree to be built in Eclipse">
++ description="Prepares the source tree to be built in Eclipse" unless="noget">
+
+ <!-- Copy the sample project files into the root directory -->
+ <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
+@@ -3618,7 +3630,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"
+- description="Creates project directory .idea for IntelliJ IDEA">
++ description="Creates project directory .idea for IntelliJ IDEA" unless="noget">
+
+ <copy todir="${tomcat.home}/.idea">
+ <fileset dir="${tomcat.home}/res/ide-support/idea"/>
diff --git a/www-servers/tomcat/tomcat-9.0.45.ebuild b/www-servers/tomcat/tomcat-9.0.45.ebuild
new file mode 100644
index 00000000000..d7d7678e1a3
--- /dev/null
+++ b/www-servers/tomcat/tomcat-9.0.45.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix
+
+MY_P="apache-${PN}-${PV}-src"
+
+# Currently we bundle binary versions of bnd.jar and bndlib.jar
+# See bugs #203080 and #676116
+BND_VERSION="5.1.1"
+BND="biz.aQute.bnd-${BND_VERSION}.jar"
+BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
+
+DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
+ https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
+ https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}"
+
+LICENSE="Apache-2.0"
+SLOT="9"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.15"
+SAPI_SLOT="4.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ dev-java/glassfish-xmlrpc-api:0
+ ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
+ dev-java/wsdl4j:0"
+RDEPEND="${COMMON_DEP}
+ acct-group/tomcat
+ acct-user/tomcat
+ virtual/jre"
+DEPEND="${COMMON_DEP}
+ app-admin/pwgen
+ >=dev-java/ant-core-1.9.13
+ virtual/jdk:1.8
+ test? (
+ >=dev-java/ant-junit-1.9:0
+ dev-java/easymock:3.2
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+ "${FILESDIR}/${PN}-9.0.43-insufficient-ecj.patch"
+)
+
+BND_HOME="${S}/tomcat-build-libs/bnd"
+BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
+BND_JAR="${BND_HOME}/${BND}"
+BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
+
+src_unpack() {
+ unpack ${MY_P}.tar.gz
+
+ mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
+ ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
+ ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
+}
+
+src_prepare() {
+ default
+
+ find -name '*.jar' -type f -delete -print || die
+
+ # Remove bundled servlet-api
+ rm -rv java/javax/{el,servlet} || die
+
+ eapply "${FILESDIR}/${PN}-9.0.45-build.xml.patch"
+
+ # For use of catalina.sh in netbeans
+ sed -i -e "/^# ----- Execute The Requested Command/ a\
+ CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+ bin/catalina.sh || die
+
+ java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT},wsdl4j"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_configure() {
+ java-ant-2_src_configure
+
+ eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
+}
+
+src_compile() {
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)"
+ LC_ALL=C java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ # add missing docBase
+ local apps="host-manager manager"
+ for app in ${apps}; do
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+ output/build/webapps/${app}/META-INF/context.xml || die
+ done
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw="$(pwgen -s -B 15 1)"
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+ einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+ einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2021-04-07 15:03 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2021-04-07 15:03 UTC (permalink / raw
To: gentoo-commits
commit: 285762e2bc575c55a9f876f834a24eddba5a4025
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 7 15:03:38 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Apr 7 15:03:45 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=285762e2
www-servers/tomcat: bump to 8.5.65
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
www-servers/tomcat/Manifest | 1 +
.../tomcat/files/tomcat-8.5.65-build.xml.patch | 266 +++++++++++++++++++++
www-servers/tomcat/tomcat-8.5.65.ebuild | 159 ++++++++++++
3 files changed, 426 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index aa167354a39..a76d1b62e86 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -4,6 +4,7 @@ DIST apache-tomcat-10.0.5-src.tar.gz 5976090 BLAKE2B 5441bec39ddaa74a7a4b39e48ec
DIST apache-tomcat-7.0.108-src.tar.gz 5313375 BLAKE2B 200a1ccbc39a572ca7e4f7805bf3d27e0bd645156d8886b0fcbee5e64279a4d2f4e2ad847d67a70e1c65a8d88fa5bd4757a0066ceff367fe92914e22cc809aa5 SHA512 bdd957ca5b3b7dd152efa6406dbb6397ed62661ec44c83b6a8f6e9e3c33362c51ff5e0451a57d6aa3874cd745811f2afe78d08825ddaba8e29cb38ef922c48e2
DIST apache-tomcat-8.5.63-src.tar.gz 5853051 BLAKE2B d007d9922d54578bdebcbbaec3e7c0ffcafdce913e52fdd93d5c174c9d1304980b5eb7f126e957c5975a59dfb126857dcc87ef3ca5e479e44cd7910b6183e469 SHA512 d78a140117844675239e834a0890641c0ef0d6fc3c89eb4512536fece2c128f088edfdea15f79ba7a31e0478431f155230f8f60a57bfea0aed191298a95310c4
DIST apache-tomcat-8.5.64-src.tar.gz 5863485 BLAKE2B c297c0803c74a969e96b99c379bcd050d6e08cb1036d69b5c49c64311d6f17695754631738130a76def849da6c2de70a49d4452b24ee34c5720d9474f8d4d41b SHA512 ffcc8e97b56730e7e15daa8c4ce628547afcf0bb008bb8d8142ae684c963ed6a366c1dfdbaaca9080201c3c1bcda60c759b76447dd72493f0ec922a034b75f08
+DIST apache-tomcat-8.5.65-src.tar.gz 5874743 BLAKE2B 8a605b0fe5026315aa0a5463d42c01eac164c91737cc81f8df4e174075783a829ddd30a8fc9f5129cf1f83a98d85fa33cb7ec9223f365de0ad91ecffb319d187 SHA512 df6ea4e8e04fe1f787ef105cb3e453516ad25d32ad3d559c86997b44492c9a1e93e8c22c88ba2203dcfefc14404f7d1bb28a9e2e20d44ba85adf8c374a4456fa
DIST apache-tomcat-9.0.43-src.tar.gz 6042010 BLAKE2B 78c0e7d711dd826ba93b12db6a96929ddeeb0df189a12e907c51f02baa08d84757915b8744b5ebd027892ff2823b955d7b1c3c749ab54b588686dfd8d3157640 SHA512 8c23f8a371b3ffbc1ab4d5f24be08ecf2c9e6ba466ef36ef97e075bd0f12b1ffc93f63b9ff1def9953b3f791319c7c355a76e7a54061a21d25be37a5dc22da26
DIST apache-tomcat-9.0.44-src.tar.gz 6047722 BLAKE2B fda3081d66c9018a49e5a07bfb5d54b133fe51dff69b692480065d8d9a4877ce5b5b152e33f6d4cfaf28940ec6b556c9a2455c8fda56ea0552e4d1f83f0f9cbe SHA512 68f6a6edecc0469e21cf062cd4b5aacd2df4903fe98aea052acfc9f725268490d5a6917ac1565f26e15a513afa09814014aed267dc1b5aa92733a51ef52b305f
DIST apache-tomcat-9.0.45-src.tar.gz 6055044 BLAKE2B 66ca4ee2c0a3bbd1f73d7257c55105e28d1619c8e533f945438cdb283cb8ccdceada163698641b034b5e43b513fcdd16e331c4c11ea300501276a5247f8ef682 SHA512 e3edfd6ab9e3ddf6a15f63a4e11f5237e03d7cacdec11805f4a901bd325c0edeca1ee0b62bee92d53e521af0a9d5a7b10ce12a8262a57fd7faa69d93ca1c066e
diff --git a/www-servers/tomcat/files/tomcat-8.5.65-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.65-build.xml.patch
new file mode 100644
index 00000000000..66411238a3d
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.5.65-build.xml.patch
@@ -0,0 +1,266 @@
+diff --git a/build.xml b/build.xml
+index 19be6ed..c1557cd 100644
+--- a/build.xml
++++ b/build.xml
+@@ -772,25 +772,28 @@
+ manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+
+ <!-- Servlet 3.1 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+ manifest="${tomcat.manifests}/servlet-api.jar.manifest"
+ notice="${tomcat.manifests}/servlet-api.jar.notice"
+ license="${tomcat.manifests}/servlet-api.jar.license" />
+-
++-->
+ <!-- EL Implementation JAR File -->
++<!--
+ <jarIt jarfile="${el-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.el-api"
+ manifest="${tomcat.manifests}/el-api.jar.manifest" />
+-
++-->
+ <!-- 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}"
+ filesDir="${tomcat.classes}"
+@@ -882,9 +885,9 @@
+ meta-inf="${tomcat.manifests}/jasper.jar" />
+
+ <!-- Re-packaged Apache Commons DBCP 2-->
+- <jarIt jarfile="${tomcat-dbcp.jar}"
++<!-- <jarIt jarfile="${tomcat-dbcp.jar}"
+ filesDir="${tomcat.classes}"
+- filesId="files.tomcat-dbcp" />
++ filesId="files.tomcat-dbcp" /> -->
+
+ <!-- i18n JARs -->
+ <jar jarfile="${tomcat.build}/lib/tomcat-i18n-de.jar"
+@@ -1099,9 +1102,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/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
++-->
+ <!-- Copy scripts -->
+ <copy todir="${tomcat.build}/bin">
+ <fileset dir="bin">
+@@ -1161,7 +1164,7 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
+- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+@@ -1204,7 +1207,7 @@
+
+ </target>
+
+- <target name="build-tomcat-jdbc" depends="package">
++ <target name="build-tomcat-jdbc" depends="package" unless="noget">
+ <!-- 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}"
+@@ -1220,7 +1223,7 @@
+ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+ </target>
+
+- <target name="build-tomcat-jdbc-src">
++ <target name="build-tomcat-jdbc-src" unless="noget">
+ <!-- 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}"
+@@ -1323,9 +1326,11 @@
+
+ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+ <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+ <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
+@@ -1736,7 +1741,7 @@
+
+ <target name="extras-webservices-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">
+ <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -1921,6 +1926,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++<!--
+ <javadoc packagenames="javax.servlet.*"
+ excludepackagenames="javax.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -1988,6 +1994,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="javax.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -2051,13 +2058,17 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ <link href="../annotationapi"/>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <link href="../websocketapi"/>
+ <link href="../jaspicapi"/>
++<!--
+ <link href="https://docs.oracle.com/javase/7/docs/api/"/>
+ <link href="https://docs.oracle.com/javaee/7/api/"/>
++-->
+ <packageset dir="${tomcat.dist}/src/java/">
+ <include name="org/**"/>
+ <exclude name="org/apache/el/parser/**"/>
+@@ -2828,7 +2839,7 @@ skip.installer property in build.properties" />
+ </target>
+
+ <target name="download-compile"
+- description="Download components necessary to compile" >
++ description="Download components necessary to compile" unless="noget" >
+
+ <!-- Download Commons Daemon -->
+ <antcall target="downloadgz-2">
+@@ -2854,7 +2865,7 @@ skip.installer property in build.properties" />
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -2932,7 +2943,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="downloadfile-2">
+ <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
+@@ -2987,13 +2998,13 @@ skip.installer property in build.properties" />
+
+ <!-- =============== Utility Targets to support downloads ================ -->
+
+- <target name="setproxy" if="${proxy.use}">
++ <target name="setproxy" if="${proxy.use}" unless="noget">
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+ proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+ </target>
+
+- <target name="testexist">
++ <target name="testexist" unless="noget">
+ <echo message="Testing for ${destfile}"/>
+ <available file="${destfile}" property="exist"/>
+ </target>
+@@ -3115,7 +3126,7 @@ skip.installer property in build.properties" />
+ </sequential>
+ </macrodef>
+
+- <target name="downloadgz" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++ <target name="downloadgz" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3132,7 +3143,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadgz-2" unless="exist" if="${execute.download}" depends="testexist">
++ <target name="downloadgz-2" unless="noget" if="${execute.download}" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3157,7 +3168,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadzip" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++ <target name="downloadzip" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3173,7 +3184,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadzip-2" unless="exist" if="${execute.download}" depends="testexist">
++ <target name="downloadzip-2" unless="noget" if="${execute.download}" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3197,7 +3208,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadfile" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++ <target name="downloadfile" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+ <!-- Download the file -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3212,7 +3223,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="downloadfile-2" unless="exist" if="${execute.download}" depends="testexist">
++ <target name="downloadfile-2" unless="noget" if="${execute.download}" depends="testexist">
+ <!-- Download the file from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3240,7 +3251,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="trydownload.check" depends="setproxy">
++ <target name="trydownload.check" depends="setproxy" unless="noget">
+ <condition property="trydownload.run">
+ <and>
+ <not>
+@@ -3251,7 +3262,7 @@ skip.installer property in build.properties" />
+ </condition>
+ </target>
+
+- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+ <!-- Downloads a file if not yet downloaded and the source URL is available -->
+ <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+ </target>
+@@ -3262,7 +3273,7 @@ skip.installer property in build.properties" />
+
+ <target name="ide-eclipse"
+ depends="download-compile, extras-webservices-prepare, download-test-compile"
+- description="Prepares the source tree to be built in Eclipse">
++ description="Prepares the source tree to be built in Eclipse" unless="noget">
+
+ <!-- Copy the sample project files into the root directory -->
+ <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-8.5.65.ebuild b/www-servers/tomcat/tomcat-8.5.65.ebuild
new file mode 100644
index 00000000000..cd0299f18b3
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.5.65.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="8.5"
+KEYWORDS="~amd64 ~x86 ~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="3.1"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+ acct-group/tomcat
+ acct-user/tomcat
+ virtual/jre"
+DEPEND="${COMMON_DEP}
+ app-admin/pwgen
+ dev-java/ant-core
+ 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
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ default
+
+ find -name '*.jar' -type f -delete -print || die
+
+ # Remove bundled servlet-api
+ rm -rv java/javax/{el,servlet} || die
+
+ eapply "${FILESDIR}/${PN}-8.5.65-build.xml.patch"
+
+ # For use of catalina.sh in netbeans
+ sed -i -e "/^# ----- Execute The Requested Command/ a\
+ CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+ bin/catalina.sh || die
+
+ java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false"
+
+# revisions of the scripts
+IM_REV="-r2"
+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)"
+ LC_ALL=C java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ # add missing docBase
+ local apps="host-manager manager"
+ for app in ${apps}; do
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+ output/build/webapps/${app}/META-INF/context.xml || die
+ done
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw="$(pwgen -s -B 15 1)"
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+ einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+ einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2021-05-13 11:09 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2021-05-13 11:09 UTC (permalink / raw
To: gentoo-commits
commit: 67e6fd5244f345c66f7f93f0f2aa8e7becbc2dcb
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu May 13 11:08:50 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu May 13 11:08:50 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67e6fd52
www-servers/tomcat: bump to 8.5.66
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
www-servers/tomcat/Manifest | 1 +
.../tomcat/files/tomcat-8.5.66-build.xml.patch | 266 +++++++++++++++++++++
www-servers/tomcat/tomcat-8.5.66.ebuild | 159 ++++++++++++
3 files changed, 426 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index ba78b7d40d9..c946a7933a3 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -2,6 +2,7 @@ DIST apache-tomcat-10.0.5-src.tar.gz 5976090 BLAKE2B 5441bec39ddaa74a7a4b39e48ec
DIST apache-tomcat-7.0.108-src.tar.gz 5313375 BLAKE2B 200a1ccbc39a572ca7e4f7805bf3d27e0bd645156d8886b0fcbee5e64279a4d2f4e2ad847d67a70e1c65a8d88fa5bd4757a0066ceff367fe92914e22cc809aa5 SHA512 bdd957ca5b3b7dd152efa6406dbb6397ed62661ec44c83b6a8f6e9e3c33362c51ff5e0451a57d6aa3874cd745811f2afe78d08825ddaba8e29cb38ef922c48e2
DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
DIST apache-tomcat-8.5.65-src.tar.gz 5874743 BLAKE2B 8a605b0fe5026315aa0a5463d42c01eac164c91737cc81f8df4e174075783a829ddd30a8fc9f5129cf1f83a98d85fa33cb7ec9223f365de0ad91ecffb319d187 SHA512 df6ea4e8e04fe1f787ef105cb3e453516ad25d32ad3d559c86997b44492c9a1e93e8c22c88ba2203dcfefc14404f7d1bb28a9e2e20d44ba85adf8c374a4456fa
+DIST apache-tomcat-8.5.66-src.tar.gz 5879748 BLAKE2B bfef20872bd19ffa2bb34b98a1da875fdd5f232e681458f0aef093b7eecd63a95c1cd26130f54251f149249e639d0da2577770e43314d2a86b8ee9b48b675f0d SHA512 322fda683197898f873feb375791092d33c90aac08a54889fabab0f59ecbc7b27784f027b37008c6893fdbf8ca7973b73268f42673d7e8df762419b5a536593b
DIST apache-tomcat-9.0.45-src.tar.gz 6055044 BLAKE2B 66ca4ee2c0a3bbd1f73d7257c55105e28d1619c8e533f945438cdb283cb8ccdceada163698641b034b5e43b513fcdd16e331c4c11ea300501276a5247f8ef682 SHA512 e3edfd6ab9e3ddf6a15f63a4e11f5237e03d7cacdec11805f4a901bd325c0edeca1ee0b62bee92d53e521af0a9d5a7b10ce12a8262a57fd7faa69d93ca1c066e
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
diff --git a/www-servers/tomcat/files/tomcat-8.5.66-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.66-build.xml.patch
new file mode 100644
index 00000000000..3dcf6fe19e5
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.5.66-build.xml.patch
@@ -0,0 +1,266 @@
+diff --git a/build.xml b/build.xml
+index ad55d0b..0c44bb5 100644
+--- a/build.xml
++++ b/build.xml
+@@ -780,25 +780,28 @@
+ manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+
+ <!-- Servlet Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+ manifest="${tomcat.manifests}/servlet-api.jar.manifest"
+ notice="${tomcat.manifests}/servlet-api.jar.notice"
+ license="${tomcat.manifests}/servlet-api.jar.license" />
+-
++-->
+ <!-- EL Implementation JAR File -->
++<!--
+ <jarIt jarfile="${el-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.el-api"
+ manifest="${tomcat.manifests}/el-api.jar.manifest" />
+-
++-->
+ <!-- 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}"
+ filesDir="${tomcat.classes}"
+@@ -890,9 +893,9 @@
+ meta-inf="${tomcat.manifests}/jasper.jar" />
+
+ <!-- Re-packaged Apache Commons DBCP 2-->
+- <jarIt jarfile="${tomcat-dbcp.jar}"
++<!-- <jarIt jarfile="${tomcat-dbcp.jar}"
+ filesDir="${tomcat.classes}"
+- filesId="files.tomcat-dbcp" />
++ filesId="files.tomcat-dbcp" /> -->
+
+ <!-- i18n JARs -->
+ <jar jarfile="${tomcat.build}/lib/tomcat-i18n-de.jar"
+@@ -1107,9 +1110,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/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
++-->
+ <!-- Copy scripts -->
+ <copy todir="${tomcat.build}/bin">
+ <fileset dir="bin">
+@@ -1169,7 +1172,7 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
+- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+@@ -1212,7 +1215,7 @@
+
+ </target>
+
+- <target name="build-tomcat-jdbc" depends="package">
++ <target name="build-tomcat-jdbc" depends="package" unless="noget">
+ <!-- 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}"
+@@ -1228,7 +1231,7 @@
+ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+ </target>
+
+- <target name="build-tomcat-jdbc-src">
++ <target name="build-tomcat-jdbc-src" unless="noget">
+ <!-- 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}"
+@@ -1331,9 +1334,11 @@
+
+ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+ <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+ <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
+@@ -1744,7 +1749,7 @@
+
+ <target name="extras-webservices-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">
+ <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -1929,6 +1934,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++<!--
+ <javadoc packagenames="javax.servlet.*"
+ excludepackagenames="javax.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -1996,6 +2002,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="javax.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -2059,13 +2066,17 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ <link href="../annotationapi"/>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <link href="../websocketapi"/>
+ <link href="../jaspicapi"/>
++<!--
+ <link href="https://docs.oracle.com/javase/7/docs/api/"/>
+ <link href="https://docs.oracle.com/javaee/7/api/"/>
++-->
+ <packageset dir="${tomcat.dist}/src/java/">
+ <include name="org/**"/>
+ <exclude name="org/apache/el/parser/**"/>
+@@ -2836,7 +2847,7 @@ skip.installer property in build.properties" />
+ </target>
+
+ <target name="download-compile"
+- description="Download components necessary to compile" >
++ description="Download components necessary to compile" unless="noget" >
+
+ <!-- Download Commons Daemon -->
+ <antcall target="downloadgz-2">
+@@ -2862,7 +2873,7 @@ skip.installer property in build.properties" />
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -2949,7 +2960,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="downloadfile-2">
+ <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
+@@ -3004,13 +3015,13 @@ skip.installer property in build.properties" />
+
+ <!-- =============== Utility Targets to support downloads ================ -->
+
+- <target name="setproxy" if="${proxy.use}">
++ <target name="setproxy" if="${proxy.use}" unless="noget">
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+ proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+ </target>
+
+- <target name="testexist">
++ <target name="testexist" unless="noget">
+ <echo message="Testing for ${destfile}"/>
+ <available file="${destfile}" property="exist"/>
+ </target>
+@@ -3132,7 +3143,7 @@ skip.installer property in build.properties" />
+ </sequential>
+ </macrodef>
+
+- <target name="downloadgz" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++ <target name="downloadgz" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3149,7 +3160,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadgz-2" unless="exist" if="${execute.download}" depends="testexist">
++ <target name="downloadgz-2" unless="noget" if="${execute.download}" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3174,7 +3185,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadzip" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++ <target name="downloadzip" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3190,7 +3201,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadzip-2" unless="exist" if="${execute.download}" depends="testexist">
++ <target name="downloadzip-2" unless="noget" if="${execute.download}" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3214,7 +3225,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadfile" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++ <target name="downloadfile" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+ <!-- Download the file -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3229,7 +3240,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="downloadfile-2" unless="exist" if="${execute.download}" depends="testexist">
++ <target name="downloadfile-2" unless="noget" if="${execute.download}" depends="testexist">
+ <!-- Download the file from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3257,7 +3268,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="trydownload.check" depends="setproxy">
++ <target name="trydownload.check" depends="setproxy" unless="noget">
+ <condition property="trydownload.run">
+ <and>
+ <not>
+@@ -3268,7 +3279,7 @@ skip.installer property in build.properties" />
+ </condition>
+ </target>
+
+- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+ <!-- Downloads a file if not yet downloaded and the source URL is available -->
+ <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+ </target>
+@@ -3279,7 +3290,7 @@ skip.installer property in build.properties" />
+
+ <target name="ide-eclipse"
+ depends="download-compile, extras-webservices-prepare, download-test-compile"
+- description="Prepares the source tree to be built in Eclipse">
++ description="Prepares the source tree to be built in Eclipse" unless="noget">
+
+ <!-- Copy the sample project files into the root directory -->
+ <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-8.5.66.ebuild b/www-servers/tomcat/tomcat-8.5.66.ebuild
new file mode 100644
index 00000000000..ce92130bddc
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.5.66.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 prefix
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="8.5"
+KEYWORDS="~amd64 ~x86 ~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="3.1"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+ acct-group/tomcat
+ acct-user/tomcat
+ virtual/jre"
+DEPEND="${COMMON_DEP}
+ app-admin/pwgen
+ dev-java/ant-core
+ 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
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ default
+
+ find -name '*.jar' -type f -delete -print || die
+
+ # Remove bundled servlet-api
+ rm -rv java/javax/{el,servlet} || die
+
+ eapply "${FILESDIR}/${PN}-8.5.66-build.xml.patch"
+
+ # For use of catalina.sh in netbeans
+ sed -i -e "/^# ----- Execute The Requested Command/ a\
+ CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+ bin/catalina.sh || die
+
+ java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false"
+
+# revisions of the scripts
+IM_REV="-r2"
+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)"
+ LC_ALL=C java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ # add missing docBase
+ local apps="host-manager manager"
+ for app in ${apps}; do
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+ output/build/webapps/${app}/META-INF/context.xml || die
+ done
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw="$(pwgen -s -B 15 1)"
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+ einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+ einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2021-07-05 14:15 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2021-07-05 14:15 UTC (permalink / raw
To: gentoo-commits
commit: 2c38b7c30a8f0d67e0c8dd5e5d1226a8f3cba725
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 5 14:15:10 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Jul 5 14:15:18 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c38b7c3
www-servers/tomcat: bump to 9.0.50
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
www-servers/tomcat/Manifest | 1 +
.../files/tomcat-9.0.50-insufficient-ecj.patch | 40 +++++
www-servers/tomcat/tomcat-9.0.50.ebuild | 187 +++++++++++++++++++++
3 files changed, 228 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index a16ae46662a..9d9b9d3ebd5 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -5,5 +5,6 @@ DIST apache-tomcat-8.5.66-src.tar.gz 5879748 BLAKE2B bfef20872bd19ffa2bb34b98a1d
DIST apache-tomcat-8.5.68-src.tar.gz 5907026 BLAKE2B 2312edb94f98ee98b594325fbc32521776e9cadc4422a3a46f3651f1fee072a99c5f6874378ac06215396504d34ad750edd6ec3399a3931554068195a8ee15ef SHA512 579a35f944ead756995d288b66ea8a4ab30289a90c32aa01119abcea85a8524f6594ce5cb7ac9df6d352c1e3b54a18c814b5d3a6409dce6a43614e3a89284066
DIST apache-tomcat-9.0.46-src.tar.gz 6068533 BLAKE2B 400814281aedd588c008a1363199f8602e856870d4c39d536b13f8a357c2390d2db689940f4a6971ec74a84e8e400174e72610e0d64a220de41f2dff419dda3c SHA512 dc380e23aa87273c6ba32e79659e768c551b07812635c2f1c62d2c34b493b1d3d51b4548fec5014fdb36f8461fc90942aa7917874ddf3d6f5c5345d8ca02dfc1
DIST apache-tomcat-9.0.48-src.tar.gz 6080015 BLAKE2B 9b2cac8143ca8186857d7d53e8737f2f7d2ec8e0ca03d32447ad25b429cbf37c1c7b39bc6e4b93679c08bd5f4940280d00946a70e9fa82f8c2a596ea18a2a4c6 SHA512 9b762f6d1a1f6c75e10f1bc05c39a647ae2165f3b81c09ff73cc286f3c487b034b9d14c73b808c73b35f55f642848831a0329d9d611c8bbb3928559e552a3ff3
+DIST apache-tomcat-9.0.50-src.tar.gz 6086608 BLAKE2B 59b5eb1616d377193f330fd8c5abb6e98926ab0a2f75b1ea14251d249837aad733f55a0b79f2a67de57f612dd1afdeae53836be97e81701d8dc27ecb0a381d4a SHA512 1032d2d5c342fb495b76426fdc301e0e5546815e709e604061d7aa2cdab19bcd376adc957fd25dee1d574306186eafd2e9d24140dd5e725b130128592cac47a2
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
diff --git a/www-servers/tomcat/files/tomcat-9.0.50-insufficient-ecj.patch b/www-servers/tomcat/files/tomcat-9.0.50-insufficient-ecj.patch
new file mode 100644
index 00000000000..13e82c9c651
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-9.0.50-insufficient-ecj.patch
@@ -0,0 +1,40 @@
+diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java b/java/org/apache/jasper/compiler/JDTCompiler.java
+index 10d80e0..34ff7e0 100644
+--- a/java/org/apache/jasper/compiler/JDTCompiler.java
++++ b/java/org/apache/jasper/compiler/JDTCompiler.java
+@@ -306,11 +306,11 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
+ } else if(opt.equals("13")) {
+ settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_13);
+ } else if(opt.equals("14")) {
+- settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_14);
++ settings.put(CompilerOptions.OPTION_Source, "14");
+ } else if(opt.equals("15")) {
+- settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_15);
++ settings.put(CompilerOptions.OPTION_Source, "15");
+ } else if(opt.equals("16")) {
+- settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_16);
++ settings.put(CompilerOptions.OPTION_Source, "16");
+ } else if(opt.equals("17")) {
+ // Constant not available in latest ECJ version shipped with
+ // Tomcat. May be supported in a snapshot build.
+@@ -366,14 +366,14 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
+ settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_13);
+ settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_13);
+ } else if(opt.equals("14")) {
+- settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_14);
+- settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_14);
++ settings.put(CompilerOptions.OPTION_TargetPlatform, "14");
++ settings.put(CompilerOptions.OPTION_Compliance, "14");
+ } else if(opt.equals("15")) {
+- settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_15);
+- settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_15);
++ settings.put(CompilerOptions.OPTION_TargetPlatform, "15");
++ settings.put(CompilerOptions.OPTION_Compliance, "15");
+ } else if(opt.equals("16")) {
+- settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_16);
+- settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_16);
++ settings.put(CompilerOptions.OPTION_TargetPlatform, "16");
++ settings.put(CompilerOptions.OPTION_Compliance, "16");
+ } else if(opt.equals("17")) {
+ // Constant not available in latest ECJ version shipped with
+ // Tomcat. May be supported in a snapshot build.
diff --git a/www-servers/tomcat/tomcat-9.0.50.ebuild b/www-servers/tomcat/tomcat-9.0.50.ebuild
new file mode 100644
index 00000000000..8905e0fad24
--- /dev/null
+++ b/www-servers/tomcat/tomcat-9.0.50.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 prefix
+
+MY_P="apache-${PN}-${PV}-src"
+
+# Currently we bundle binary versions of bnd.jar and bndlib.jar
+# See bugs #203080 and #676116
+BND_VERSION="5.1.1"
+BND="biz.aQute.bnd-${BND_VERSION}.jar"
+BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
+
+DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
+ https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
+ https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}"
+
+LICENSE="Apache-2.0"
+SLOT="9"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.15"
+SAPI_SLOT="4.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ dev-java/glassfish-xmlrpc-api:0
+ ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
+ dev-java/wsdl4j:0"
+RDEPEND="${COMMON_DEP}
+ acct-group/tomcat
+ acct-user/tomcat
+ virtual/jre"
+DEPEND="${COMMON_DEP}
+ app-admin/pwgen
+ >=dev-java/ant-core-1.9.13
+ virtual/jdk:1.8
+ test? (
+ >=dev-java/ant-junit-1.9:0
+ dev-java/easymock:3.2
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+ "${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch"
+)
+
+BND_HOME="${S}/tomcat-build-libs/bnd"
+BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
+BND_JAR="${BND_HOME}/${BND}"
+BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
+
+src_unpack() {
+ unpack ${MY_P}.tar.gz
+
+ mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
+ ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
+ ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
+}
+
+src_prepare() {
+ default
+
+ find -name '*.jar' -type f -delete -print || die
+
+ # Remove bundled servlet-api
+ rm -rv java/javax/{el,servlet} || die
+
+ eapply "${FILESDIR}/${PN}-9.0.46-build.xml.patch"
+
+ # For use of catalina.sh in netbeans
+ sed -i -e "/^# ----- Execute The Requested Command/ a\
+ CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+ bin/catalina.sh || die
+
+ java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT},wsdl4j"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_configure() {
+ java-ant-2_src_configure
+
+ eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
+}
+
+src_compile() {
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)"
+ LC_ALL=C java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ # add missing docBase
+ local apps="host-manager manager"
+ for app in ${apps}; do
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+ output/build/webapps/${app}/META-INF/context.xml || die
+ done
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw="$(pwgen -s -B 15 1)"
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+ einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+ einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2021-08-07 14:56 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2021-08-07 14:56 UTC (permalink / raw
To: gentoo-commits
commit: 7041f64f3ee2cb5fda23612a92c2fc27a6c2b0d9
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 7 14:55:51 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Aug 7 14:55:51 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7041f64f
www-servers/tomcat: removed obsolete 10.0.7 & 9.0.48
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
www-servers/tomcat/Manifest | 2 -
.../files/tomcat-9.0.43-insufficient-ecj.patch | 32 ----
www-servers/tomcat/tomcat-10.0.7.ebuild | 192 ---------------------
www-servers/tomcat/tomcat-9.0.48.ebuild | 187 --------------------
4 files changed, 413 deletions(-)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 9dff8793f60..4a647cbe6c9 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,9 +1,7 @@
-DIST apache-tomcat-10.0.7-src.tar.gz 6001147 BLAKE2B f1aee4748d404d02188369603824dcc97765e907cfc3872f54b1859ae950a9475d72862caa2179ac39e4cbdb8c23424f89c4cbbfff8a2e079a842b0054257009 SHA512 395b0280666c6779f6378cb87e9abdb637a823e7f89452b7324329f4c0a1fe0b315275dca5df2f80a38c6f1ef98541bd1ea762df7af9cb15e4466c3b89e4e7a8
DIST apache-tomcat-10.0.8-src.tar.gz 6010420 BLAKE2B 86390f04147d3082fbc9f15704121cbd6aa8ba756b4bc03e64a49aae3dca96c6b503949da0096f8ddf143bdeb1320b7601008683ce94bdad9ef235e1f73ad948 SHA512 c264be4cb29d87c95918d2723ab20bc7e2cb5149cb366cca348c6cd311b0f38ac500ed6b4756b20245a446ead50e7208f77093d6081563ed76d6691abfcbe14c
DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
DIST apache-tomcat-8.5.68-src.tar.gz 5907026 BLAKE2B 2312edb94f98ee98b594325fbc32521776e9cadc4422a3a46f3651f1fee072a99c5f6874378ac06215396504d34ad750edd6ec3399a3931554068195a8ee15ef SHA512 579a35f944ead756995d288b66ea8a4ab30289a90c32aa01119abcea85a8524f6594ce5cb7ac9df6d352c1e3b54a18c814b5d3a6409dce6a43614e3a89284066
DIST apache-tomcat-8.5.69-src.tar.gz 5916996 BLAKE2B 4a3ef958b6bb0089149877c25baaa2c1a0bcee473c0942b419c5c1d7071dcae4f8a6e6f1805efdee1201042feedc64e213fffbcdb35cf2b7f9a67217b8dcad48 SHA512 467dd38bd77d8b5ac6fa2acf9f6ee71d04467a3182647757fa47f5d1d9576c96e5061db61ba08b04318f1db9ee4f2bcac7b45f1f9f4f81cd1807a57483dd7bbb
-DIST apache-tomcat-9.0.48-src.tar.gz 6080015 BLAKE2B 9b2cac8143ca8186857d7d53e8737f2f7d2ec8e0ca03d32447ad25b429cbf37c1c7b39bc6e4b93679c08bd5f4940280d00946a70e9fa82f8c2a596ea18a2a4c6 SHA512 9b762f6d1a1f6c75e10f1bc05c39a647ae2165f3b81c09ff73cc286f3c487b034b9d14c73b808c73b35f55f642848831a0329d9d611c8bbb3928559e552a3ff3
DIST apache-tomcat-9.0.50-src.tar.gz 6086608 BLAKE2B 59b5eb1616d377193f330fd8c5abb6e98926ab0a2f75b1ea14251d249837aad733f55a0b79f2a67de57f612dd1afdeae53836be97e81701d8dc27ecb0a381d4a SHA512 1032d2d5c342fb495b76426fdc301e0e5546815e709e604061d7aa2cdab19bcd376adc957fd25dee1d574306186eafd2e9d24140dd5e725b130128592cac47a2
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
diff --git a/www-servers/tomcat/files/tomcat-9.0.43-insufficient-ecj.patch b/www-servers/tomcat/files/tomcat-9.0.43-insufficient-ecj.patch
deleted file mode 100644
index 49276c775be..00000000000
--- a/www-servers/tomcat/files/tomcat-9.0.43-insufficient-ecj.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java b/java/org/apache/jasper/compiler/JDTCompiler.java
-index ebc00f6..df22856 100644
---- a/java/org/apache/jasper/compiler/JDTCompiler.java
-+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
-@@ -306,9 +306,9 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
- } else if(opt.equals("13")) {
- settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_13);
- } else if(opt.equals("14")) {
-- settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_14);
-+ settings.put(CompilerOptions.OPTION_Source, "14");
- } else if(opt.equals("15")) {
-- settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_15);
-+ settings.put(CompilerOptions.OPTION_Source, "15");
- } else if(opt.equals("16")) {
- // Constant not available in latest ECJ version shipped with
- // Tomcat. May be supported in a snapshot build.
-@@ -364,11 +364,11 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
- settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_13);
- settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_13);
- } else if(opt.equals("14")) {
-- settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_14);
-- settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_14);
-+ settings.put(CompilerOptions.OPTION_TargetPlatform, "14");
-+ settings.put(CompilerOptions.OPTION_Compliance, "14");
- } else if(opt.equals("15")) {
-- settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_15);
-- settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_15);
-+ settings.put(CompilerOptions.OPTION_TargetPlatform, "15");
-+ settings.put(CompilerOptions.OPTION_Compliance, "15");
- } else if(opt.equals("16")) {
- // Constant not available in latest ECJ version shipped with
- // Tomcat. May be supported in a snapshot build.
diff --git a/www-servers/tomcat/tomcat-10.0.7.ebuild b/www-servers/tomcat/tomcat-10.0.7.ebuild
deleted file mode 100644
index d66b5ff3679..00000000000
--- a/www-servers/tomcat/tomcat-10.0.7.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 prefix
-
-MY_P="apache-${PN}-${PV}-src"
-
-# Currently we bundle binary versions of bnd.jar and bndlib.jar
-# See bugs #203080 and #676116
-BND_VERSION="5.1.1"
-BND="biz.aQute.bnd-${BND_VERSION}.jar"
-BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
-
-DESCRIPTION="Tomcat Servlet-5.0/JSP-3.0/EL-4.0/WebSocket-2.0/JASIC-2.0 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}"
-
-LICENSE="Apache-2.0"
-SLOT="10"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.15"
-SAPI_SLOT="5.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- dev-java/glassfish-xmlrpc-api:0
- dev-java/jakartaee-migration:0
- ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
- dev-java/wsdl4j:0"
-RDEPEND="${COMMON_DEP}
- acct-group/tomcat
- acct-user/tomcat
- virtual/jre"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- dev-java/ant-core
- virtual/jdk:1.8
- test? (
- dev-java/ant-junit:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
- "${FILESDIR}/${PN}-9.0.43-insufficient-ecj.patch"
-)
-
-BND_HOME="${S}/tomcat-build-libs/bnd"
-BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
-BND_JAR="${BND_HOME}/${BND}"
-BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
-
-src_unpack() {
- unpack ${MY_P}.tar.gz
-
- mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
- ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
- ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
-}
-
-src_prepare() {
- default
-
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/jakarta/{el,servlet} || die
-
- eapply "${FILESDIR}/${PN}-10.0.4-build.xml.patch"
-
- # For use of catalina.sh in netbeans
- sed -i -e "/^# ----- Execute The Requested Command/ a\
- CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},jakartaee-migration,tomcat-servlet-api-${SAPI_SLOT},wsdl4j"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_configure() {
- java-ant-2_src_configure
-
- eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
-}
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)"
- LC_ALL=C java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "Please note that since version 10 the primary package for all implemented APIs"
- ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code"
- ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later."
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
diff --git a/www-servers/tomcat/tomcat-9.0.48.ebuild b/www-servers/tomcat/tomcat-9.0.48.ebuild
deleted file mode 100644
index e39b539c70d..00000000000
--- a/www-servers/tomcat/tomcat-9.0.48.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 prefix
-
-MY_P="apache-${PN}-${PV}-src"
-
-# Currently we bundle binary versions of bnd.jar and bndlib.jar
-# See bugs #203080 and #676116
-BND_VERSION="5.1.1"
-BND="biz.aQute.bnd-${BND_VERSION}.jar"
-BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
-
-DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}"
-
-LICENSE="Apache-2.0"
-SLOT="9"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.15"
-SAPI_SLOT="4.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- dev-java/glassfish-xmlrpc-api:0
- ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
- dev-java/wsdl4j:0"
-RDEPEND="${COMMON_DEP}
- acct-group/tomcat
- acct-user/tomcat
- virtual/jre"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- >=dev-java/ant-core-1.9.13
- virtual/jdk:1.8
- test? (
- >=dev-java/ant-junit-1.9:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
- "${FILESDIR}/${PN}-9.0.43-insufficient-ecj.patch"
-)
-
-BND_HOME="${S}/tomcat-build-libs/bnd"
-BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
-BND_JAR="${BND_HOME}/${BND}"
-BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
-
-src_unpack() {
- unpack ${MY_P}.tar.gz
-
- mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
- ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
- ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
-}
-
-src_prepare() {
- default
-
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- eapply "${FILESDIR}/${PN}-9.0.46-build.xml.patch"
-
- # For use of catalina.sh in netbeans
- sed -i -e "/^# ----- Execute The Requested Command/ a\
- CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT},wsdl4j"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_configure() {
- java-ant-2_src_configure
-
- eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
-}
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)"
- LC_ALL=C java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2022-01-21 10:02 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2022-01-21 10:02 UTC (permalink / raw
To: gentoo-commits
commit: 60ab67e0482342fa658b1a58a85672d515bd1b02
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 21 09:50:18 2022 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Jan 21 10:02:21 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60ab67e0
www-servers/tomcat: bump to 10.0.16
Closes: https://bugs.gentoo.org/831383
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
www-servers/tomcat/Manifest | 1 +
.../tomcat-10.0.16-build.xml-strip-html5.patch | 31 ++
.../tomcat/files/tomcat-10.0.16-build.xml.patch | 349 +++++++++++++++++++++
www-servers/tomcat/tomcat-10.0.16.ebuild | 193 ++++++++++++
4 files changed, 574 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index c1b548a49a99..8e4b7c3e894f 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,4 +1,5 @@
DIST apache-tomcat-10.0.14-src.tar.gz 6074341 BLAKE2B e6607773aebb5b5279720cbcf667e9f82d752833a323dd611d411bcb48d6b0f42a98b9120d2bf29bb53e563f7f421194e92a41c89dadff76db2f6aaa171af64b SHA512 13614a410ecb7d5d1e4e6cc0e5dab9fe21809a8a70b3f42d5b0f75a2006d098857395858cdfacbe84349f73c1ce7eecca59c1bdeac809f434df8ae3f4cff46c1
+DIST apache-tomcat-10.0.16-src.tar.gz 6088262 BLAKE2B f02a5b08e4502d4e7be2fa14f8dae8760c2844f262cdc75e2cc821038d248ed961281d11f7bb847cf55ecf012ee05c870366508fb1fe1485da2100e87aa13c55 SHA512 44a1ac752077603c5366ec92c6a5860d33ce810bf2554190a013329106ec118d1a18d1a26823b3024d046b05160a20dda65573365451d0481be8be97218445c8
DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
DIST apache-tomcat-8.5.73-src.tar.gz 5973026 BLAKE2B d3d275b7462a3bd2ce9ce03869e09e42ec0da064eb764cf8168b8d003431d075952f15c083b5486e006629ec1f9dade154b0fceb20f2584168b36599c3c5485b SHA512 6190d78e2dd5d478131443807e464821a337c5c6c24ee91953fece377ad1c758339ce1588a7a5e90443ababac239b45e4aaa0422d68cba988d7c3da5fe95d1c6
DIST apache-tomcat-9.0.56-src.tar.gz 6138381 BLAKE2B 5e49287531fcb9bcb80ba124ed83fc3acbf3406b53424c3be5c2b3fb04da86785ba9e3ef89283c3ebb88bc8aadf8211328608edf068f0d7733c2f0ec0401d7ce SHA512 43332241fda149f9da107496cc6b812e38544c9043c567e3fe11ee01b5abfbd02b6a377c3f6090902048bd9dc67746cdc65d59f03bd0de68c05e0955bfe018c5
diff --git a/www-servers/tomcat/files/tomcat-10.0.16-build.xml-strip-html5.patch b/www-servers/tomcat/files/tomcat-10.0.16-build.xml-strip-html5.patch
new file mode 100644
index 000000000000..44f629ec29b0
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-10.0.16-build.xml-strip-html5.patch
@@ -0,0 +1,31 @@
+diff --git a/build.xml b/build.xml
+index 6b2b5d5..16d55c2 100644
+--- a/build.xml
++++ b/build.xml
+@@ -2148,7 +2148,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ encoding="UTF-8"
+ docencoding="UTF-8"
+ charset="UTF-8"
+- additionalparam="-breakiterator -notimestamp -html5"
++ additionalparam="-breakiterator -notimestamp"
+ source="${compile.release}"
+ maxmemory="512m"
+ failonerror="true">
+@@ -2231,7 +2231,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ encoding="UTF-8"
+ docencoding="UTF-8"
+ charset="UTF-8"
+- additionalparam="-breakiterator -notimestamp -html5"
++ additionalparam="-breakiterator -notimestamp"
+ source="${compile.release}"
+ maxmemory="512m"
+ failonerror="true">
+@@ -2269,7 +2269,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ encoding="UTF-8"
+ docencoding="UTF-8"
+ charset="UTF-8"
+- additionalparam="-breakiterator -notimestamp -html5"
++ additionalparam="-breakiterator -notimestamp"
+ source="${compile.release}"
+ maxmemory="512m"
+ failonerror="true">
diff --git a/www-servers/tomcat/files/tomcat-10.0.16-build.xml.patch b/www-servers/tomcat/files/tomcat-10.0.16-build.xml.patch
new file mode 100644
index 000000000000..38b3a335eca6
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-10.0.16-build.xml.patch
@@ -0,0 +1,349 @@
+diff --git a/build.xml b/build.xml
+index 33a4fde..6b2b5d5 100644
+--- a/build.xml
++++ b/build.xml
+@@ -1012,6 +1012,7 @@
+ addOSGi="true" />
+
+ <!-- Servlet Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+@@ -1019,21 +1020,23 @@
+ notice="${tomcat.manifests}/servlet-api.jar.notice"
+ license="${tomcat.manifests}/servlet-api.jar.license"
+ addOSGi="true" />
+-
++-->
+ <!-- EL Implementation JAR File -->
++<!--
+ <jarIt jarfile="${el-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.el-api"
+ manifest="${tomcat.manifests}/el-api.jar.manifest"
+ addOSGi="true" />
+-
++-->
+ <!-- JSP Implementation JAR File -->
++<!--
+ <jarIt jarfile="${jsp-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.jsp-api"
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest"
+ addOSGi="true" />
+-
++-->
+ <!-- WebSocket API JAR File -->
+ <jarIt jarfile="${websocket-api.jar}"
+ filesDir="${tomcat.classes}"
+@@ -1146,10 +1149,10 @@
+ addOSGi="true" />
+
+ <!-- Re-packaged Apache Commons DBCP 2-->
+- <jarIt jarfile="${tomcat-dbcp.jar}"
++<!-- <jarIt jarfile="${tomcat-dbcp.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.tomcat-dbcp"
+- addOSGi="true" />
++ addOSGi="true" /> -->
+
+ <!-- i18n JARs -->
+ <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
+@@ -1386,9 +1389,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/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
++-->
+ <!-- Copy scripts -->
+ <copy todir="${tomcat.build}/bin">
+ <fileset dir="bin">
+@@ -1448,7 +1451,7 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
+- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!-- <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" />
+@@ -1459,7 +1462,7 @@
+ <exclude name="${migration-lib.jar.filename}"/>
+ </fileset>
+ </delete>
+- <copy file="${migration-lib.jar}" todir="${tomcat.build}/lib"/>
++<!-- <copy file="${migration-lib.jar}" todir="${tomcat.build}/lib"/> -->
+
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+@@ -1498,7 +1501,7 @@
+
+ </target>
+
+- <target name="build-tomcat-jdbc" depends="package">
++ <target name="build-tomcat-jdbc" depends="package" unless="noget">
+ <!-- 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}"
+@@ -1514,7 +1517,7 @@
+ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+ </target>
+
+- <target name="build-tomcat-jdbc-src">
++ <target name="build-tomcat-jdbc-src" unless="noget">
+ <!-- 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}"
+@@ -1617,9 +1620,11 @@
+
+ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+ <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+ <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
+@@ -2117,11 +2122,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.
+@@ -2145,13 +2151,13 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ additionalparam="-breakiterator -notimestamp -html5"
+ source="${compile.release}"
+ maxmemory="512m"
+- failonerror="true"
+- failonwarning="true">
++ failonerror="true">
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++<!--
+ <javadoc packagenames="jakarta.servlet.*"
+ excludepackagenames="jakarta.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -2167,8 +2173,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ additionalparam="-breakiterator -notimestamp -html5"
+ source="${compile.release}"
+ maxmemory="512m"
+- failonerror="true"
+- failonwarning="true">
++ failonerror="true">
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path location="${ant.core.lib}"/>
+@@ -2188,8 +2193,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ additionalparam="-breakiterator -notimestamp -html5"
+ source="${compile.release}"
+ maxmemory="512m"
+- failonerror="true"
+- failonwarning="true">
++ failonerror="true">
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path location="${ant.core.lib}"/>
+@@ -2209,13 +2213,13 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ additionalparam="-breakiterator -notimestamp -html5"
+ source="${compile.release}"
+ maxmemory="512m"
+- failonerror="true"
+- failonwarning="true">
++ failonerror="true">
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="jakarta.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -2230,8 +2234,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ additionalparam="-breakiterator -notimestamp -html5"
+ source="${compile.release}"
+ maxmemory="512m"
+- failonerror="true"
+- failonwarning="true">
++ failonerror="true">
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path location="${ant.core.lib}"/>
+@@ -2250,8 +2253,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ charset="UTF-8"
+ additionalparam="-breakiterator -notimestamp"
+ maxmemory="512m"
+- failonerror="true"
+- failonwarning="true">
++ failonerror="true">
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path location="${ant.core.lib}"/>
+@@ -2270,21 +2272,24 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ additionalparam="-breakiterator -notimestamp -html5"
+ source="${compile.release}"
+ maxmemory="512m"
+- failonerror="true"
+- failonwarning="true">
++ failonerror="true">
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path location="${ant.core.lib}"/>
+ <path location="${osgi-annotations.jar}"/>
+ </classpath>
+ <link href="../annotationapi"/>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <link href="../websocketapi"/>
+ <link href="../jaspicapi"/>
++<!--
+ <link href="https://docs.oracle.com/javase/8/docs/api/"/>
+ <link href="https://javaee.github.io/javaee-spec/javadocs/"/>
++-->
+ <packageset dir="${tomcat.dist}/src/java/">
+ <include name="org/**"/>
+ <exclude name="org/apache/el/parser/**"/>
+@@ -3103,7 +3108,7 @@ skip.installer property in build.properties" />
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -3222,7 +3227,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">
+
+ <antcall target="downloadfile-2">
+ <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
+@@ -3277,13 +3282,13 @@ skip.installer property in build.properties" />
+
+ <!-- =============== Utility Targets to support downloads ================ -->
+
+- <target name="setproxy" if="${proxy.use}">
++ <target name="setproxy" if="${proxy.use}" unless="noget">
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+ proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+ </target>
+
+- <target name="testexist">
++ <target name="testexist" unless="noget">
+ <echo message="Testing for ${destfile}"/>
+ <available file="${destfile}" property="exist"/>
+ </target>
+@@ -3405,7 +3410,7 @@ skip.installer property in build.properties" />
+ </sequential>
+ </macrodef>
+
+- <target name="downloadgz" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++ <target name="downloadgz" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3422,7 +3427,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadgz-2" unless="exist" if="${execute.download}" depends="testexist">
++ <target name="downloadgz-2" unless="noget" if="${execute.download}" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3447,7 +3452,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadzip" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++ <target name="downloadzip" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3463,7 +3468,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadzip-2" unless="exist" if="${execute.download}" depends="testexist">
++ <target name="downloadzip-2" unless="noget" if="${execute.download}" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3487,7 +3492,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadfile" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++ <target name="downloadfile" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+ <!-- Download the file -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3502,7 +3507,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="downloadfile-2" unless="exist" if="${execute.download}" depends="testexist">
++ <target name="downloadfile-2" unless="noget" if="${execute.download}" depends="testexist">
+ <!-- Download the file from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3530,7 +3535,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="trydownload.check" depends="setproxy">
++ <target name="trydownload.check" depends="setproxy" unless="noget">
+ <condition property="trydownload.run">
+ <and>
+ <not>
+@@ -3541,7 +3546,7 @@ skip.installer property in build.properties" />
+ </condition>
+ </target>
+
+- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+ <!-- Downloads a file if not yet downloaded and the source URL is available -->
+ <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+ </target>
+@@ -3552,7 +3557,7 @@ skip.installer property in build.properties" />
+
+ <target name="ide-eclipse"
+ depends="download-compile, download-test-compile"
+- description="Prepares the source tree to be built in Eclipse">
++ description="Prepares the source tree to be built in Eclipse" unless="noget">
+
+ <!-- Copy the sample project files into the root directory -->
+ <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
+@@ -3570,7 +3575,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"
+- description="Creates project directory .idea for IntelliJ IDEA">
++ description="Creates project directory .idea for IntelliJ IDEA" unless="noget">
+
+ <copy todir="${tomcat.home}/.idea">
+ <fileset dir="${tomcat.home}/res/ide-support/idea"/>
diff --git a/www-servers/tomcat/tomcat-10.0.16.ebuild b/www-servers/tomcat/tomcat-10.0.16.ebuild
new file mode 100644
index 000000000000..d629e593150b
--- /dev/null
+++ b/www-servers/tomcat/tomcat-10.0.16.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 prefix
+
+MY_P="apache-${PN}-${PV}-src"
+
+# Currently we bundle binary versions of bnd.jar and bndlib.jar
+# See bugs #203080 and #676116
+BND_VERSION="5.1.1"
+BND="biz.aQute.bnd-${BND_VERSION}.jar"
+BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
+
+DESCRIPTION="Tomcat Servlet-5.0/JSP-3.0/EL-4.0/WebSocket-2.0/JASIC-2.0 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
+ https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
+ https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}"
+
+LICENSE="Apache-2.0"
+SLOT="10"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.15"
+SAPI_SLOT="5.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ dev-java/glassfish-xmlrpc-api:0
+ dev-java/jakartaee-migration:0
+ ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
+ dev-java/wsdl4j:0"
+RDEPEND="${COMMON_DEP}
+ acct-group/tomcat
+ acct-user/tomcat
+ virtual/jre"
+DEPEND="${COMMON_DEP}
+ app-admin/pwgen
+ dev-java/ant-core
+ virtual/jdk:1.8
+ test? (
+ dev-java/ant-junit:0
+ dev-java/easymock:3.2
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+ "${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch"
+)
+
+BND_HOME="${S}/tomcat-build-libs/bnd"
+BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
+BND_JAR="${BND_HOME}/${BND}"
+BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
+
+src_unpack() {
+ unpack ${MY_P}.tar.gz
+
+ mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
+ ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
+ ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
+}
+
+src_prepare() {
+ default
+
+ find -name '*.jar' -type f -delete -print || die
+
+ # Remove bundled servlet-api
+ rm -rv java/jakarta/{el,servlet} || die
+
+ eapply "${FILESDIR}/${PN}-10.0.16-build.xml.patch"
+ java-pkg_is-vm-version-eq 1.8 && eapply "${FILESDIR}/${PN}-10.0.16-build.xml-strip-html5.patch"
+
+ # For use of catalina.sh in netbeans
+ sed -i -e "/^# ----- Execute The Requested Command/ a\
+ CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+ bin/catalina.sh || die
+
+ java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},jakartaee-migration,tomcat-servlet-api-${SAPI_SLOT},wsdl4j"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_configure() {
+ java-ant-2_src_configure
+
+ eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
+}
+
+src_compile() {
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)"
+ LC_ALL=C java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ # add missing docBase
+ local apps="host-manager manager"
+ for app in ${apps}; do
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+ output/build/webapps/${app}/META-INF/context.xml || die
+ done
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw="$(pwgen -s -B 15 1)"
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "Please note that since version 10 the primary package for all implemented APIs"
+ ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code"
+ ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later."
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+ einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+ einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2022-01-21 10:02 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2022-01-21 10:02 UTC (permalink / raw
To: gentoo-commits
commit: 6c1af53328a8c5d104409eb6fa0bb441148c0caa
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 21 09:57:03 2022 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Jan 21 10:02:21 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c1af533
www-servers/tomcat: bump to 9.0.58
Closes: https://bugs.gentoo.org/831383
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
www-servers/tomcat/Manifest | 1 +
.../tomcat/files/tomcat-9.0.58-build.xml.patch | 321 +++++++++++++++++++++
www-servers/tomcat/tomcat-9.0.58.ebuild | 187 ++++++++++++
3 files changed, 509 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 8e4b7c3e894f..edb93e7da4e3 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -3,5 +3,6 @@ DIST apache-tomcat-10.0.16-src.tar.gz 6088262 BLAKE2B f02a5b08e4502d4e7be2fa14f8
DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
DIST apache-tomcat-8.5.73-src.tar.gz 5973026 BLAKE2B d3d275b7462a3bd2ce9ce03869e09e42ec0da064eb764cf8168b8d003431d075952f15c083b5486e006629ec1f9dade154b0fceb20f2584168b36599c3c5485b SHA512 6190d78e2dd5d478131443807e464821a337c5c6c24ee91953fece377ad1c758339ce1588a7a5e90443ababac239b45e4aaa0422d68cba988d7c3da5fe95d1c6
DIST apache-tomcat-9.0.56-src.tar.gz 6138381 BLAKE2B 5e49287531fcb9bcb80ba124ed83fc3acbf3406b53424c3be5c2b3fb04da86785ba9e3ef89283c3ebb88bc8aadf8211328608edf068f0d7733c2f0ec0401d7ce SHA512 43332241fda149f9da107496cc6b812e38544c9043c567e3fe11ee01b5abfbd02b6a377c3f6090902048bd9dc67746cdc65d59f03bd0de68c05e0955bfe018c5
+DIST apache-tomcat-9.0.58-src.tar.gz 6142037 BLAKE2B 0515273882468958f5bc2ef95e3085c22975e0ec9f8153a20773266a43710645c2262da8cb10736f0f0b255716fa05a12252194e1f32851704364ef89a62e5e9 SHA512 b2b572dcad2efadf3e5e5a6ae6e108f5699af23b7751ca3c9c00e6ba896f5179745108fa602d8bd87a9611fd8bebe8817fad53c38fc75b0063835b953c67d74a
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
diff --git a/www-servers/tomcat/files/tomcat-9.0.58-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.58-build.xml.patch
new file mode 100644
index 000000000000..51f97e72e0b2
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-9.0.58-build.xml.patch
@@ -0,0 +1,321 @@
+diff --git a/build.xml b/build.xml
+index a51cbfb..43596ac 100644
+--- a/build.xml
++++ b/build.xml
+@@ -1036,6 +1036,7 @@
+ addOSGi="true" />
+
+ <!-- Servlet Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+@@ -1043,21 +1044,23 @@
+ notice="${tomcat.manifests}/servlet-api.jar.notice"
+ license="${tomcat.manifests}/servlet-api.jar.license"
+ addOSGi="true" />
+-
++-->
+ <!-- EL Implementation JAR File -->
++<!--
+ <jarIt jarfile="${el-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.el-api"
+ manifest="${tomcat.manifests}/el-api.jar.manifest"
+ addOSGi="true" />
+-
++-->
+ <!-- JSP Implementation JAR File -->
++<!--
+ <jarIt jarfile="${jsp-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.jsp-api"
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest"
+ addOSGi="true" />
+-
++-->
+ <!-- WebSocket API JAR File -->
+ <jarIt jarfile="${websocket-api.jar}"
+ filesDir="${tomcat.classes}"
+@@ -1170,10 +1173,10 @@
+ addOSGi="true" />
+
+ <!-- Re-packaged Apache Commons DBCP 2-->
+- <jarIt jarfile="${tomcat-dbcp.jar}"
++<!-- <jarIt jarfile="${tomcat-dbcp.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.tomcat-dbcp"
+- addOSGi="true" />
++ addOSGi="true" /> -->
+
+ <!-- i18n JARs -->
+ <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
+@@ -1410,9 +1413,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/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
++-->
+ <!-- Copy scripts -->
+ <copy todir="${tomcat.build}/bin">
+ <fileset dir="bin">
+@@ -1472,7 +1475,7 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
+- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+@@ -1515,7 +1518,7 @@
+
+ </target>
+
+- <target name="build-tomcat-jdbc" depends="package">
++ <target name="build-tomcat-jdbc" depends="package" unless="noget">
+ <!-- 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}"
+@@ -1531,7 +1534,7 @@
+ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+ </target>
+
+- <target name="build-tomcat-jdbc-src">
++ <target name="build-tomcat-jdbc-src" unless="noget">
+ <!-- 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}"
+@@ -1634,9 +1637,11 @@
+
+ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+ <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+ <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
+@@ -2139,11 +2144,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.
+@@ -2167,13 +2173,13 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ additionalparam="-breakiterator -notimestamp ${java9.javadoc.options}"
+ source="${compile.source}"
+ maxmemory="512m"
+- failonerror="true"
+- failonwarning="true">
++ failonerror="true">
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++<!--
+ <javadoc packagenames="javax.servlet.*"
+ excludepackagenames="javax.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -2238,6 +2244,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="javax.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -2252,8 +2259,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ additionalparam="-breakiterator -notimestamp ${java9.javadoc.options}"
+ source="${compile.source}"
+ maxmemory="512m"
+- failonerror="true"
+- failonwarning="true">
++ failonerror="true">
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path location="${ant.core.lib}"/>
+@@ -2272,8 +2278,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ charset="UTF-8"
+ additionalparam="-breakiterator -notimestamp"
+ maxmemory="512m"
+- failonerror="true"
+- failonwarning="true">
++ failonerror="true">
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path location="${ant.core.lib}"/>
+@@ -2292,21 +2297,24 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ additionalparam="-breakiterator -notimestamp ${java9.javadoc.options}"
+ source="${compile.source}"
+ maxmemory="512m"
+- failonerror="true"
+- failonwarning="true">
++ failonerror="true">
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path location="${ant.core.lib}"/>
+ <path location="${osgi-annotations.jar}"/>
+ </classpath>
+ <link href="../annotationapi"/>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <link href="../websocketapi"/>
+ <link href="../jaspicapi"/>
++<!--
+ <link href="https://docs.oracle.com/javase/8/docs/api/"/>
+ <link href="https://javaee.github.io/javaee-spec/javadocs/"/>
++-->
+ <packageset dir="${tomcat.dist}/src/java/">
+ <include name="org/**"/>
+ <exclude name="org/apache/el/parser/**"/>
+@@ -3071,7 +3079,7 @@ skip.installer property in build.properties" />
+
+ <target name="download-compile"
+ description="Download components necessary to compile"
+- depends="setup-bnd">
++ depends="setup-bnd" unless="noget">
+
+ <!-- Download Commons Daemon -->
+ <antcall target="downloadgz-2">
+@@ -3115,7 +3123,7 @@ skip.installer property in build.properties" />
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -3234,7 +3242,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="downloadfile-2">
+ <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
+@@ -3289,13 +3297,13 @@ skip.installer property in build.properties" />
+
+ <!-- =============== Utility Targets to support downloads ================ -->
+
+- <target name="setproxy" if="${proxy.use}">
++ <target name="setproxy" if="${proxy.use}" unless="noget">
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+ proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+ </target>
+
+- <target name="testexist">
++ <target name="testexist" unless="noget">
+ <echo message="Testing for ${destfile}"/>
+ <available file="${destfile}" property="exist"/>
+ </target>
+@@ -3417,7 +3425,7 @@ skip.installer property in build.properties" />
+ </sequential>
+ </macrodef>
+
+- <target name="downloadgz" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++ <target name="downloadgz" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3434,7 +3442,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadgz-2" unless="exist" if="${execute.download}" depends="testexist">
++ <target name="downloadgz-2" unless="noget" if="${execute.download}" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3459,7 +3467,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadzip" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++ <target name="downloadzip" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3475,7 +3483,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadzip-2" unless="exist" if="${execute.download}" depends="testexist">
++ <target name="downloadzip-2" unless="noget" if="${execute.download}" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3499,7 +3507,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadfile" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++ <target name="downloadfile" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+ <!-- Download the file -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3514,7 +3522,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="downloadfile-2" unless="exist" if="${execute.download}" depends="testexist">
++ <target name="downloadfile-2" unless="noget" if="${execute.download}" depends="testexist">
+ <!-- Download the file from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3542,7 +3550,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="trydownload.check" depends="setproxy">
++ <target name="trydownload.check" depends="setproxy" unless="noget">
+ <condition property="trydownload.run">
+ <and>
+ <not>
+@@ -3553,7 +3561,7 @@ skip.installer property in build.properties" />
+ </condition>
+ </target>
+
+- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+ <!-- Downloads a file if not yet downloaded and the source URL is available -->
+ <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+ </target>
+@@ -3564,7 +3572,7 @@ skip.installer property in build.properties" />
+
+ <target name="ide-eclipse"
+ depends="download-compile, download-test-compile"
+- description="Prepares the source tree to be built in Eclipse">
++ description="Prepares the source tree to be built in Eclipse" unless="noget">
+
+ <!-- Copy the sample project files into the root directory -->
+ <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
+@@ -3582,7 +3590,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"
+- description="Creates project directory .idea for IntelliJ IDEA">
++ description="Creates project directory .idea for IntelliJ IDEA" unless="noget">
+
+ <copy todir="${tomcat.home}/.idea">
+ <fileset dir="${tomcat.home}/res/ide-support/idea"/>
diff --git a/www-servers/tomcat/tomcat-9.0.58.ebuild b/www-servers/tomcat/tomcat-9.0.58.ebuild
new file mode 100644
index 000000000000..f022f3e7ea9c
--- /dev/null
+++ b/www-servers/tomcat/tomcat-9.0.58.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 prefix
+
+MY_P="apache-${PN}-${PV}-src"
+
+# Currently we bundle binary versions of bnd.jar and bndlib.jar
+# See bugs #203080 and #676116
+BND_VERSION="5.1.1"
+BND="biz.aQute.bnd-${BND_VERSION}.jar"
+BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
+
+DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
+ https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
+ https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}"
+
+LICENSE="Apache-2.0"
+SLOT="9"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.15"
+SAPI_SLOT="4.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ dev-java/glassfish-xmlrpc-api:0
+ ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
+ dev-java/wsdl4j:0"
+RDEPEND="${COMMON_DEP}
+ acct-group/tomcat
+ acct-user/tomcat
+ virtual/jre"
+DEPEND="${COMMON_DEP}
+ app-admin/pwgen
+ >=dev-java/ant-core-1.9.13
+ virtual/jdk:1.8
+ test? (
+ >=dev-java/ant-junit-1.9:0
+ dev-java/easymock:3.2
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+ "${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch"
+)
+
+BND_HOME="${S}/tomcat-build-libs/bnd"
+BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
+BND_JAR="${BND_HOME}/${BND}"
+BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
+
+src_unpack() {
+ unpack ${MY_P}.tar.gz
+
+ mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
+ ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
+ ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
+}
+
+src_prepare() {
+ default
+
+ find -name '*.jar' -type f -delete -print || die
+
+ # Remove bundled servlet-api
+ rm -rv java/javax/{el,servlet} || die
+
+ eapply "${FILESDIR}/${PN}-9.0.58-build.xml.patch"
+
+ # For use of catalina.sh in netbeans
+ sed -i -e "/^# ----- Execute The Requested Command/ a\
+ CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+ bin/catalina.sh || die
+
+ java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT},wsdl4j"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_configure() {
+ java-ant-2_src_configure
+
+ eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
+}
+
+src_compile() {
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)"
+ LC_ALL=C java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ # add missing docBase
+ local apps="host-manager manager"
+ for app in ${apps}; do
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+ output/build/webapps/${app}/META-INF/context.xml || die
+ done
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw="$(pwgen -s -B 15 1)"
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+ einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+ einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2022-02-22 9:13 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2022-02-22 9:13 UTC (permalink / raw
To: gentoo-commits
commit: 84f9eb61605aac39bc6599406604caeb6dbf9562
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 22 09:13:47 2022 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Feb 22 09:13:47 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84f9eb61
www-servers/tomcat: removed obsolete 8.5.73, 9.0.56, 10.0.14
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
www-servers/tomcat/Manifest | 3 -
.../tomcat/files/tomcat-10.0.4-build.xml.patch | 284 ---------------------
.../tomcat/files/tomcat-9.0.46-build.xml.patch | 284 ---------------------
www-servers/tomcat/tomcat-10.0.14.ebuild | 192 --------------
www-servers/tomcat/tomcat-8.5.73.ebuild | 159 ------------
www-servers/tomcat/tomcat-9.0.56.ebuild | 187 --------------
6 files changed, 1109 deletions(-)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 177f5e5465af..0afe9b0e02bb 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,9 +1,6 @@
-DIST apache-tomcat-10.0.14-src.tar.gz 6074341 BLAKE2B e6607773aebb5b5279720cbcf667e9f82d752833a323dd611d411bcb48d6b0f42a98b9120d2bf29bb53e563f7f421194e92a41c89dadff76db2f6aaa171af64b SHA512 13614a410ecb7d5d1e4e6cc0e5dab9fe21809a8a70b3f42d5b0f75a2006d098857395858cdfacbe84349f73c1ce7eecca59c1bdeac809f434df8ae3f4cff46c1
DIST apache-tomcat-10.0.16-src.tar.gz 6088262 BLAKE2B f02a5b08e4502d4e7be2fa14f8dae8760c2844f262cdc75e2cc821038d248ed961281d11f7bb847cf55ecf012ee05c870366508fb1fe1485da2100e87aa13c55 SHA512 44a1ac752077603c5366ec92c6a5860d33ce810bf2554190a013329106ec118d1a18d1a26823b3024d046b05160a20dda65573365451d0481be8be97218445c8
DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
-DIST apache-tomcat-8.5.73-src.tar.gz 5973026 BLAKE2B d3d275b7462a3bd2ce9ce03869e09e42ec0da064eb764cf8168b8d003431d075952f15c083b5486e006629ec1f9dade154b0fceb20f2584168b36599c3c5485b SHA512 6190d78e2dd5d478131443807e464821a337c5c6c24ee91953fece377ad1c758339ce1588a7a5e90443ababac239b45e4aaa0422d68cba988d7c3da5fe95d1c6
DIST apache-tomcat-8.5.75-src.tar.gz 5961981 BLAKE2B a8d3c0ef390ce6b12b09cedb71cd9c102e3a37265f7ef6db9797eb7eaf04429f75bdedf6a7dbaa7ade0b57a12cbb461498c37d9c7e234bb9dc98e3d095b66b8a SHA512 c1c2609db623eb94a5e177c0f7ccabf8753a34151961ddc0fdea47704aca86123ef63f746b7ca76e818185cae19121823f7700f9bd47ba27625b3c801ddc8bad
-DIST apache-tomcat-9.0.56-src.tar.gz 6138381 BLAKE2B 5e49287531fcb9bcb80ba124ed83fc3acbf3406b53424c3be5c2b3fb04da86785ba9e3ef89283c3ebb88bc8aadf8211328608edf068f0d7733c2f0ec0401d7ce SHA512 43332241fda149f9da107496cc6b812e38544c9043c567e3fe11ee01b5abfbd02b6a377c3f6090902048bd9dc67746cdc65d59f03bd0de68c05e0955bfe018c5
DIST apache-tomcat-9.0.58-src.tar.gz 6142037 BLAKE2B 0515273882468958f5bc2ef95e3085c22975e0ec9f8153a20773266a43710645c2262da8cb10736f0f0b255716fa05a12252194e1f32851704364ef89a62e5e9 SHA512 b2b572dcad2efadf3e5e5a6ae6e108f5699af23b7751ca3c9c00e6ba896f5179745108fa602d8bd87a9611fd8bebe8817fad53c38fc75b0063835b953c67d74a
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
diff --git a/www-servers/tomcat/files/tomcat-10.0.4-build.xml.patch b/www-servers/tomcat/files/tomcat-10.0.4-build.xml.patch
deleted file mode 100644
index a2c148719e29..000000000000
--- a/www-servers/tomcat/files/tomcat-10.0.4-build.xml.patch
+++ /dev/null
@@ -1,284 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 8338af0..db9eec8 100644
---- a/build.xml
-+++ b/build.xml
-@@ -1034,6 +1034,7 @@
- addOSGi="true" />
-
- <!-- Servlet Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
-@@ -1041,21 +1042,23 @@
- notice="${tomcat.manifests}/servlet-api.jar.notice"
- license="${tomcat.manifests}/servlet-api.jar.license"
- addOSGi="true" />
--
-+-->
- <!-- EL Implementation JAR File -->
-+<!--
- <jarIt jarfile="${el-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.el-api"
- manifest="${tomcat.manifests}/el-api.jar.manifest"
- addOSGi="true" />
--
-+-->
- <!-- JSP Implementation JAR File -->
-+<!--
- <jarIt jarfile="${jsp-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest"
- addOSGi="true" />
--
-+-->
- <!-- WebSocket API JAR File -->
- <jarIt jarfile="${websocket-api.jar}"
- filesDir="${tomcat.classes}"
-@@ -1168,10 +1171,10 @@
- addOSGi="true" />
-
- <!-- Re-packaged Apache Commons DBCP 2-->
-- <jarIt jarfile="${tomcat-dbcp.jar}"
-+<!-- <jarIt jarfile="${tomcat-dbcp.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.tomcat-dbcp"
-- addOSGi="true" />
-+ addOSGi="true" /> -->
-
- <!-- i18n JARs -->
- <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
-@@ -1399,9 +1402,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/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
- <!-- Copy scripts -->
- <copy todir="${tomcat.build}/bin">
- <fileset dir="bin">
-@@ -1461,7 +1464,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <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" />
-@@ -1472,7 +1475,7 @@
- <exclude name="${migration-lib.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${migration-lib.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${migration-lib.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1515,7 +1518,7 @@
-
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- 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}"
-@@ -1530,7 +1533,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- 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}"
-@@ -1633,9 +1636,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <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
-@@ -2209,11 +2214,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.
-@@ -2244,6 +2250,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+<!--
- <javadoc packagenames="jakarta.servlet.*"
- excludepackagenames="jakarta.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -2308,6 +2315,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="jakarta.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -2370,13 +2378,17 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${osgi-annotations.jar}"/>
- </classpath>
- <link href="../annotationapi"/>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <link href="../websocketapi"/>
- <link href="../jaspicapi"/>
-+<!--
- <link href="https://docs.oracle.com/javase/8/docs/api/"/>
- <link href="https://javaee.github.io/javaee-spec/javadocs/"/>
-+-->
- <packageset dir="${tomcat.dist}/src/java/">
- <include name="org/**"/>
- <exclude name="org/apache/el/parser/**"/>
-@@ -3150,7 +3162,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -3228,7 +3240,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">
-
- <antcall target="downloadfile-2">
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -3283,13 +3295,13 @@ skip.installer property in build.properties" />
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-@@ -3411,7 +3423,7 @@ skip.installer property in build.properties" />
- </sequential>
- </macrodef>
-
-- <target name="downloadgz" unless="exist" if="${execute.download}" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" if="${execute.download}" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3428,7 +3440,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" if="${execute.download}" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" if="${execute.download}" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3453,7 +3465,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" if="${execute.download}" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" if="${execute.download}" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3469,7 +3481,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" if="${execute.download}" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" if="${execute.download}" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3493,7 +3505,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" if="${execute.download}" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" if="${execute.download}" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3508,7 +3520,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" if="${execute.download}" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" if="${execute.download}" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3536,7 +3548,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -3547,7 +3559,7 @@ skip.installer property in build.properties" />
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -3558,7 +3570,7 @@ skip.installer property in build.properties" />
-
- <target name="ide-eclipse"
- depends="download-compile, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
-@@ -3576,7 +3588,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"
-- description="Creates project directory .idea for IntelliJ IDEA">
-+ description="Creates project directory .idea for IntelliJ IDEA" unless="noget">
-
- <copy todir="${tomcat.home}/.idea">
- <fileset dir="${tomcat.home}/res/ide-support/idea"/>
diff --git a/www-servers/tomcat/files/tomcat-9.0.46-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.46-build.xml.patch
deleted file mode 100644
index 3fa9cf825465..000000000000
--- a/www-servers/tomcat/files/tomcat-9.0.46-build.xml.patch
+++ /dev/null
@@ -1,284 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 89feb96..c4f1d25 100644
---- a/build.xml
-+++ b/build.xml
-@@ -1033,6 +1033,7 @@
- addOSGi="true" />
-
- <!-- Servlet Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
-@@ -1040,21 +1041,23 @@
- notice="${tomcat.manifests}/servlet-api.jar.notice"
- license="${tomcat.manifests}/servlet-api.jar.license"
- addOSGi="true" />
--
-+-->
- <!-- EL Implementation JAR File -->
-+<!--
- <jarIt jarfile="${el-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.el-api"
- manifest="${tomcat.manifests}/el-api.jar.manifest"
- addOSGi="true" />
--
-+-->
- <!-- JSP Implementation JAR File -->
-+<!--
- <jarIt jarfile="${jsp-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest"
- addOSGi="true" />
--
-+-->
- <!-- WebSocket API JAR File -->
- <jarIt jarfile="${websocket-api.jar}"
- filesDir="${tomcat.classes}"
-@@ -1167,10 +1170,10 @@
- addOSGi="true" />
-
- <!-- Re-packaged Apache Commons DBCP 2-->
-- <jarIt jarfile="${tomcat-dbcp.jar}"
-+<!-- <jarIt jarfile="${tomcat-dbcp.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.tomcat-dbcp"
-- addOSGi="true" />
-+ addOSGi="true" /> -->
-
- <!-- i18n JARs -->
- <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
-@@ -1407,9 +1410,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/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
- <!-- Copy scripts -->
- <copy todir="${tomcat.build}/bin">
- <fileset dir="bin">
-@@ -1469,7 +1472,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1512,7 +1515,7 @@
-
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- 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}"
-@@ -1528,7 +1531,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- 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}"
-@@ -1631,9 +1634,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <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
-@@ -2216,11 +2221,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.
-@@ -2251,6 +2257,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -2315,6 +2322,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -2377,13 +2385,17 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${osgi-annotations.jar}"/>
- </classpath>
- <link href="../annotationapi"/>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <link href="../websocketapi"/>
- <link href="../jaspicapi"/>
-+<!--
- <link href="https://docs.oracle.com/javase/8/docs/api/"/>
- <link href="https://javaee.github.io/javaee-spec/javadocs/"/>
-+-->
- <packageset dir="${tomcat.dist}/src/java/">
- <include name="org/**"/>
- <exclude name="org/apache/el/parser/**"/>
-@@ -3156,7 +3168,7 @@ skip.installer property in build.properties" />
-
- <target name="download-compile"
- description="Download components necessary to compile"
-- depends="setup-bnd">
-+ depends="setup-bnd" unless="noget">
-
- <!-- Download Commons Daemon -->
- <antcall target="downloadgz-2">
-@@ -3200,7 +3212,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -3287,7 +3299,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="downloadfile-2">
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -3342,13 +3354,13 @@ skip.installer property in build.properties" />
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-@@ -3470,7 +3482,7 @@ skip.installer property in build.properties" />
- </sequential>
- </macrodef>
-
-- <target name="downloadgz" unless="exist" if="${execute.download}" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" if="${execute.download}" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3487,7 +3499,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" if="${execute.download}" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" if="${execute.download}" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3512,7 +3524,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" if="${execute.download}" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" if="${execute.download}" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3528,7 +3540,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" if="${execute.download}" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" if="${execute.download}" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3552,7 +3564,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" if="${execute.download}" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" if="${execute.download}" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3567,7 +3579,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" if="${execute.download}" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" if="${execute.download}" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3595,7 +3607,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -3606,7 +3618,7 @@ skip.installer property in build.properties" />
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -3617,7 +3629,7 @@ skip.installer property in build.properties" />
-
- <target name="ide-eclipse"
- depends="download-compile, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
-@@ -3635,7 +3647,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"
-- description="Creates project directory .idea for IntelliJ IDEA">
-+ description="Creates project directory .idea for IntelliJ IDEA" unless="noget">
-
- <copy todir="${tomcat.home}/.idea">
- <fileset dir="${tomcat.home}/res/ide-support/idea"/>
diff --git a/www-servers/tomcat/tomcat-10.0.14.ebuild b/www-servers/tomcat/tomcat-10.0.14.ebuild
deleted file mode 100644
index 83885719c779..000000000000
--- a/www-servers/tomcat/tomcat-10.0.14.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 prefix
-
-MY_P="apache-${PN}-${PV}-src"
-
-# Currently we bundle binary versions of bnd.jar and bndlib.jar
-# See bugs #203080 and #676116
-BND_VERSION="5.1.1"
-BND="biz.aQute.bnd-${BND_VERSION}.jar"
-BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
-
-DESCRIPTION="Tomcat Servlet-5.0/JSP-3.0/EL-4.0/WebSocket-2.0/JASIC-2.0 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}"
-
-LICENSE="Apache-2.0"
-SLOT="10"
-KEYWORDS="amd64 ~amd64-linux"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.15"
-SAPI_SLOT="5.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- dev-java/glassfish-xmlrpc-api:0
- dev-java/jakartaee-migration:0
- ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
- dev-java/wsdl4j:0"
-RDEPEND="${COMMON_DEP}
- acct-group/tomcat
- acct-user/tomcat
- virtual/jre"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- dev-java/ant-core
- virtual/jdk:1.8
- test? (
- dev-java/ant-junit:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
- "${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch"
-)
-
-BND_HOME="${S}/tomcat-build-libs/bnd"
-BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
-BND_JAR="${BND_HOME}/${BND}"
-BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
-
-src_unpack() {
- unpack ${MY_P}.tar.gz
-
- mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
- ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
- ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
-}
-
-src_prepare() {
- default
-
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/jakarta/{el,servlet} || die
-
- eapply "${FILESDIR}/${PN}-10.0.4-build.xml.patch"
-
- # For use of catalina.sh in netbeans
- sed -i -e "/^# ----- Execute The Requested Command/ a\
- CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},jakartaee-migration,tomcat-servlet-api-${SAPI_SLOT},wsdl4j"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_configure() {
- java-ant-2_src_configure
-
- eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
-}
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)"
- LC_ALL=C java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "Please note that since version 10 the primary package for all implemented APIs"
- ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code"
- ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later."
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.5.73.ebuild b/www-servers/tomcat/tomcat-8.5.73.ebuild
deleted file mode 100644
index 0d566b00a7b8..000000000000
--- a/www-servers/tomcat/tomcat-8.5.73.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 prefix
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="8.5"
-KEYWORDS="amd64 ~x86 ~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="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- acct-group/tomcat
- acct-user/tomcat
- virtual/jre"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- dev-java/ant-core
- 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
- )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- default
-
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- eapply "${FILESDIR}/${PN}-8.5.66-build.xml.patch"
-
- # For use of catalina.sh in netbeans
- sed -i -e "/^# ----- Execute The Requested Command/ a\
- CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-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)"
- LC_ALL=C java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
diff --git a/www-servers/tomcat/tomcat-9.0.56.ebuild b/www-servers/tomcat/tomcat-9.0.56.ebuild
deleted file mode 100644
index 527e8af5c661..000000000000
--- a/www-servers/tomcat/tomcat-9.0.56.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 prefix
-
-MY_P="apache-${PN}-${PV}-src"
-
-# Currently we bundle binary versions of bnd.jar and bndlib.jar
-# See bugs #203080 and #676116
-BND_VERSION="5.1.1"
-BND="biz.aQute.bnd-${BND_VERSION}.jar"
-BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
-
-DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}"
-
-LICENSE="Apache-2.0"
-SLOT="9"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.15"
-SAPI_SLOT="4.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- dev-java/glassfish-xmlrpc-api:0
- ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
- dev-java/wsdl4j:0"
-RDEPEND="${COMMON_DEP}
- acct-group/tomcat
- acct-user/tomcat
- virtual/jre"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- >=dev-java/ant-core-1.9.13
- virtual/jdk:1.8
- test? (
- >=dev-java/ant-junit-1.9:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
- "${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch"
-)
-
-BND_HOME="${S}/tomcat-build-libs/bnd"
-BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
-BND_JAR="${BND_HOME}/${BND}"
-BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
-
-src_unpack() {
- unpack ${MY_P}.tar.gz
-
- mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
- ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
- ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
-}
-
-src_prepare() {
- default
-
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- eapply "${FILESDIR}/${PN}-9.0.46-build.xml.patch"
-
- # For use of catalina.sh in netbeans
- sed -i -e "/^# ----- Execute The Requested Command/ a\
- CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT},wsdl4j"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_configure() {
- java-ant-2_src_configure
-
- eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
-}
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)"
- LC_ALL=C java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2022-04-01 9:50 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2022-04-01 9:50 UTC (permalink / raw
To: gentoo-commits
commit: 703ed8717f7a1e04f3d4925cc37e6ed6d640ecf4
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 1 09:50:03 2022 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Apr 1 09:50:07 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=703ed871
www-servers/tomcat: bump to 10.0.20
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
www-servers/tomcat/Manifest | 1 +
.../tomcat/files/tomcat-10.0.20-build.xml.patch | 347 +++++++++++++++++++++
www-servers/tomcat/tomcat-10.0.20.ebuild | 198 ++++++++++++
3 files changed, 546 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index d97cc865aa80..3f615beef674 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,6 +1,7 @@
DIST apache-tomcat-10.0.16-src.tar.gz 6088262 BLAKE2B f02a5b08e4502d4e7be2fa14f8dae8760c2844f262cdc75e2cc821038d248ed961281d11f7bb847cf55ecf012ee05c870366508fb1fe1485da2100e87aa13c55 SHA512 44a1ac752077603c5366ec92c6a5860d33ce810bf2554190a013329106ec118d1a18d1a26823b3024d046b05160a20dda65573365451d0481be8be97218445c8
DIST apache-tomcat-10.0.17-src.tar.gz 6086996 BLAKE2B ff3584e58ec6f22f493cf7f32435423d68b941d9eec22441ee54ba69af03b50b687b23012129108485c9db147c8e7364ded037cf9ed2add174e6c928b927382a SHA512 1cc0f8e2187934c6dac3e31739f8c53a0a152527a98210deab8ce027c1347cbbd1cef3bdf0294bee3c4dbed20ba57b2291bcd887f353837fd505ea2d17e7ba3d
DIST apache-tomcat-10.0.18-src.tar.gz 6088118 BLAKE2B 7d3fdb5a682dd44d358a619a18ca3df3bde27c9fc963436c9bce86baf07a42e87ba80724afdc6ce72b493d2fb35dda644eba29df7d4434f8c815ada4cb5d2ca3 SHA512 001205f382f44163f08dba1d306472b7ef3256e31a522c3f1f7595bca4fd084776a0c1f69b241302fa5d0d2f143ac063cb34d4fcf79a51ec9722f2f2ce3f1dab
+DIST apache-tomcat-10.0.20-src.tar.gz 6097471 BLAKE2B 77df97d73ff87a5ad55dfc3a0df02e3a306e619a5ae4bd2df0a0e3d42d236ccf2c6a6c46f60f56311f9be1bd561be9096d810d932f136b5856ff275fb3ae8368 SHA512 1e75b0bad54a9fac6ddc650156fac88bc91933ff0bf4e9a62948f5e116454b6def10d7ad632968e709e8aac72b15c567e4497cdb9b594352cd12d7518fdaf18f
DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
DIST apache-tomcat-8.5.75-src.tar.gz 5961981 BLAKE2B a8d3c0ef390ce6b12b09cedb71cd9c102e3a37265f7ef6db9797eb7eaf04429f75bdedf6a7dbaa7ade0b57a12cbb461498c37d9c7e234bb9dc98e3d095b66b8a SHA512 c1c2609db623eb94a5e177c0f7ccabf8753a34151961ddc0fdea47704aca86123ef63f746b7ca76e818185cae19121823f7700f9bd47ba27625b3c801ddc8bad
DIST apache-tomcat-8.5.76-src.tar.gz 5961741 BLAKE2B 4c661c2f753edac48c28fdec3caa06c487e1546feb91f2d69003a4d9f71fb023eb2314520bb156f3087656d655acdfdbdff3f68cd3f81d0d9dfbb2c9577898ee SHA512 b1c1b8c870c77e46969fe64acc71194d37605e5ccda87d105186d8070ec2dd0b7b9c64cf2f9b276db140fd3927832405123018f6fe8f46c0ebda50af6404d8b9
diff --git a/www-servers/tomcat/files/tomcat-10.0.20-build.xml.patch b/www-servers/tomcat/files/tomcat-10.0.20-build.xml.patch
new file mode 100644
index 000000000000..7332c570160a
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-10.0.20-build.xml.patch
@@ -0,0 +1,347 @@
+diff --git a/build.xml b/build.xml
+index 72e49ad..8ff8ecc 100644
+--- a/build.xml
++++ b/build.xml
+@@ -1030,6 +1030,7 @@
+ addOSGi="true" />
+
+ <!-- Servlet Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+@@ -1037,21 +1038,23 @@
+ notice="${tomcat.manifests}/servlet-api.jar.notice"
+ license="${tomcat.manifests}/servlet-api.jar.license"
+ addOSGi="true" />
+-
++-->
+ <!-- EL Implementation JAR File -->
++<!--
+ <jarIt jarfile="${el-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.el-api"
+ manifest="${tomcat.manifests}/el-api.jar.manifest"
+ addOSGi="true" />
+-
++-->
+ <!-- JSP Implementation JAR File -->
++<!--
+ <jarIt jarfile="${jsp-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.jsp-api"
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest"
+ addOSGi="true" />
+-
++-->
+ <!-- WebSocket API JAR File -->
+ <jarIt jarfile="${websocket-api.jar}"
+ filesDir="${tomcat.classes}"
+@@ -1164,10 +1167,10 @@
+ addOSGi="true" />
+
+ <!-- Re-packaged Apache Commons DBCP 2-->
+- <jarIt jarfile="${tomcat-dbcp.jar}"
++<!-- <jarIt jarfile="${tomcat-dbcp.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.tomcat-dbcp"
+- addOSGi="true" />
++ addOSGi="true" /> -->
+
+ <!-- i18n JARs -->
+ <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
+@@ -1404,9 +1407,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/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
++-->
+ <!-- Copy scripts -->
+ <copy todir="${tomcat.build}/bin">
+ <fileset dir="bin">
+@@ -1466,7 +1469,7 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
+- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!-- <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" />
+@@ -1477,7 +1480,7 @@
+ <exclude name="${migration-lib.jar.filename}"/>
+ </fileset>
+ </delete>
+- <copy file="${migration-lib.jar}" todir="${tomcat.build}/lib"/>
++<!-- <copy file="${migration-lib.jar}" todir="${tomcat.build}/lib"/> -->
+
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+@@ -1506,7 +1509,7 @@
+
+ </target>
+
+- <target name="build-tomcat-jdbc" depends="package">
++ <target name="build-tomcat-jdbc" depends="package" unless="noget">
+ <!-- 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}"
+@@ -1522,7 +1525,7 @@
+ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+ </target>
+
+- <target name="build-tomcat-jdbc-src">
++ <target name="build-tomcat-jdbc-src" unless="noget">
+ <!-- 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}"
+@@ -1625,9 +1628,11 @@
+
+ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+ <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+ <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
+@@ -2131,11 +2136,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.
+@@ -2159,13 +2165,13 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ additionalparam="-breakiterator -notimestamp -html5"
+ source="${compile.release}"
+ maxmemory="512m"
+- failonerror="true"
+- failonwarning="true">
++ failonerror="true">
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++<!--
+ <javadoc packagenames="jakarta.servlet.*"
+ excludepackagenames="jakarta.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -2181,8 +2187,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ additionalparam="-breakiterator -notimestamp -html5"
+ source="${compile.release}"
+ maxmemory="512m"
+- failonerror="true"
+- failonwarning="true">
++ failonerror="true">
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path location="${ant.core.lib}"/>
+@@ -2202,8 +2207,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ additionalparam="-breakiterator -notimestamp -html5"
+ source="${compile.release}"
+ maxmemory="512m"
+- failonerror="true"
+- failonwarning="true">
++ failonerror="true">
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path location="${ant.core.lib}"/>
+@@ -2223,13 +2227,13 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ additionalparam="-breakiterator -notimestamp -html5"
+ source="${compile.release}"
+ maxmemory="512m"
+- failonerror="true"
+- failonwarning="true">
++ failonerror="true">
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="jakarta.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -2244,8 +2248,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ additionalparam="-breakiterator -notimestamp -html5"
+ source="${compile.release}"
+ maxmemory="512m"
+- failonerror="true"
+- failonwarning="true">
++ failonerror="true">
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path location="${ant.core.lib}"/>
+@@ -2264,8 +2267,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ charset="UTF-8"
+ additionalparam="-breakiterator -notimestamp -html5"
+ maxmemory="512m"
+- failonerror="true"
+- failonwarning="true">
++ failonerror="true">
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path location="${ant.core.lib}"/>
+@@ -2284,20 +2286,23 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ additionalparam="-breakiterator -notimestamp -html5"
+ source="${compile.release}"
+ maxmemory="512m"
+- failonerror="true"
+ failonwarning="true">
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ <link href="../annotationapi"/>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <link href="../websocketapi"/>
+ <link href="../jaspicapi"/>
++<!--
+ <link href="https://docs.oracle.com/javase/8/docs/api/"/>
+ <link href="https://javaee.github.io/javaee-spec/javadocs/"/>
++-->
+ <packageset dir="${tomcat.dist}/src/java/">
+ <include name="org/**"/>
+ <exclude name="org/apache/el/parser/**"/>
+@@ -3134,7 +3139,7 @@ skip.installer property in build.properties" />
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -3262,7 +3267,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">
+
+ <antcall target="downloadfile-2">
+ <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
+@@ -3317,13 +3322,13 @@ skip.installer property in build.properties" />
+
+ <!-- =============== Utility Targets to support downloads ================ -->
+
+- <target name="setproxy" if="${proxy.use}">
++ <target name="setproxy" if="${proxy.use}" unless="noget">
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+ proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+ </target>
+
+- <target name="testexist">
++ <target name="testexist" unless="noget">
+ <echo message="Testing for ${destfile}"/>
+ <available file="${destfile}" property="exist"/>
+ </target>
+@@ -3445,7 +3450,7 @@ skip.installer property in build.properties" />
+ </sequential>
+ </macrodef>
+
+- <target name="downloadgz" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++ <target name="downloadgz" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3462,7 +3467,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadgz-2" unless="exist" if="${execute.download}" depends="testexist">
++ <target name="downloadgz-2" unless="noget" if="${execute.download}" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3487,7 +3492,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadzip" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++ <target name="downloadzip" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3503,7 +3508,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadzip-2" unless="exist" if="${execute.download}" depends="testexist">
++ <target name="downloadzip-2" unless="noget" if="${execute.download}" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3527,7 +3532,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadfile" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++ <target name="downloadfile" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+ <!-- Download the file -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3542,7 +3547,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="downloadfile-2" unless="exist" if="${execute.download}" depends="testexist">
++ <target name="downloadfile-2" unless="noget" if="${execute.download}" depends="testexist">
+ <!-- Download the file from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3570,7 +3575,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="trydownload.check" depends="setproxy">
++ <target name="trydownload.check" depends="setproxy" unless="noget">
+ <condition property="trydownload.run">
+ <and>
+ <not>
+@@ -3581,7 +3586,7 @@ skip.installer property in build.properties" />
+ </condition>
+ </target>
+
+- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+ <!-- Downloads a file if not yet downloaded and the source URL is available -->
+ <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+ </target>
+@@ -3592,7 +3597,7 @@ skip.installer property in build.properties" />
+
+ <target name="ide-eclipse"
+ depends="download-compile, download-test-compile"
+- description="Prepares the source tree to be built in Eclipse">
++ description="Prepares the source tree to be built in Eclipse" unless="noget">
+
+ <!-- Copy the sample project files into the root directory -->
+ <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
+@@ -3610,7 +3615,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"
+- description="Creates project directory .idea for IntelliJ IDEA">
++ description="Creates project directory .idea for IntelliJ IDEA" unless="noget">
+
+ <copy todir="${tomcat.home}/.idea">
+ <fileset dir="${tomcat.home}/res/ide-support/idea"/>
diff --git a/www-servers/tomcat/tomcat-10.0.20.ebuild b/www-servers/tomcat/tomcat-10.0.20.ebuild
new file mode 100644
index 000000000000..685d4e4d5ae4
--- /dev/null
+++ b/www-servers/tomcat/tomcat-10.0.20.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 prefix
+
+MY_P="apache-${PN}-${PV}-src"
+
+# Currently we bundle binary versions of bnd.jar and bndlib.jar
+# See bugs #203080 and #676116
+BND_VERSION="6.2.0"
+BND="biz.aQute.bnd-${BND_VERSION}.jar"
+BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
+
+DESCRIPTION="Tomcat Servlet-5.0/JSP-3.0/EL-4.0/WebSocket-2.0/JASIC-2.0 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
+ https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
+ https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}"
+
+LICENSE="Apache-2.0"
+SLOT="10"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+# though it could work with 4.22 and upstream uses 4.20,
+# we still use 4.15 because 4.20+ is currently built with java 11
+# and it would force Tomcat to use at least java 11 too
+ECJ_SLOT="4.15"
+SAPI_SLOT="5.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ dev-java/glassfish-xmlrpc-api:0
+ dev-java/jakartaee-migration:0
+ ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
+ dev-java/wsdl4j:0"
+RDEPEND="${COMMON_DEP}
+ acct-group/tomcat
+ acct-user/tomcat
+ virtual/jre"
+DEPEND="${COMMON_DEP}
+ app-admin/pwgen
+ dev-java/ant-core
+ >=virtual/jdk-1.8:*
+ test? (
+ dev-java/ant-junit:0
+ dev-java/easymock:3.2
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+ "${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch"
+)
+
+BND_HOME="${S}/tomcat-build-libs/bnd"
+BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
+BND_JAR="${BND_HOME}/${BND}"
+BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
+
+src_unpack() {
+ unpack ${MY_P}.tar.gz
+
+ mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
+ ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
+ ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
+}
+
+src_prepare() {
+ default
+
+ find -name '*.jar' -type f -delete -print || die
+
+ # Remove bundled servlet-api
+ rm -rv java/jakarta/{el,servlet} || die
+
+ eapply "${FILESDIR}/${PN}-10.0.20-build.xml.patch"
+
+ local vm_version="$(java-config -g PROVIDES_VERSION)"
+ [[ "${vm_version}" == "1.8" ]] && eapply "${FILESDIR}/${PN}-10.0.16-build.xml-strip-html5.patch"
+
+ # For use of catalina.sh in netbeans
+ sed -i -e "/^# ----- Execute The Requested Command/ a\
+ CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+ bin/catalina.sh || die
+
+ java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},jakartaee-migration,tomcat-servlet-api-${SAPI_SLOT},wsdl4j"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_configure() {
+ java-ant-2_src_configure
+
+ eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
+}
+
+src_compile() {
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)"
+ LC_ALL=C java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ # add missing docBase
+ local apps="host-manager manager"
+ for app in ${apps}; do
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+ output/build/webapps/${app}/META-INF/context.xml || die
+ done
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw="$(pwgen -s -B 15 1)"
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "Please note that since version 10 the primary package for all implemented APIs"
+ ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code"
+ ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later."
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+ einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+ einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2022-04-01 10:04 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2022-04-01 10:04 UTC (permalink / raw
To: gentoo-commits
commit: 60374ea6269933139877c648824f938a8afa8925
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 1 10:04:08 2022 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Apr 1 10:04:11 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60374ea6
www-servers/tomcat: bump to 9.0.62
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
www-servers/tomcat/Manifest | 1 +
.../tomcat/files/tomcat-9.0.62-build.xml.patch | 319 +++++++++++++++++++++
www-servers/tomcat/tomcat-9.0.62.ebuild | 190 ++++++++++++
3 files changed, 510 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 3f615beef674..01d590f0b07f 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -9,6 +9,7 @@ DIST apache-tomcat-8.5.77-src.tar.gz 5963037 BLAKE2B 63192409b148cf0691e6ad22180
DIST apache-tomcat-9.0.58-src.tar.gz 6142037 BLAKE2B 0515273882468958f5bc2ef95e3085c22975e0ec9f8153a20773266a43710645c2262da8cb10736f0f0b255716fa05a12252194e1f32851704364ef89a62e5e9 SHA512 b2b572dcad2efadf3e5e5a6ae6e108f5699af23b7751ca3c9c00e6ba896f5179745108fa602d8bd87a9611fd8bebe8817fad53c38fc75b0063835b953c67d74a
DIST apache-tomcat-9.0.59-src.tar.gz 6142359 BLAKE2B 26dee501a374e54280237dbe392924ac89e3e4b331a11b30c2e0923ac38fa16bb52c02dfc8a9f3597fb0ee169ae2835ac254eab745d1e2ab1e64cfed6395d0c3 SHA512 cea0125ca9b90b247ed114fa7b2e9c63da38b1ef97b3a373a43ed0d775764178534a4014b254219c8c5a26575eaf0ddc25ebc1e276b2ad5086ef3406627f1c80
DIST apache-tomcat-9.0.60-src.tar.gz 6143845 BLAKE2B af7061854659de06afa6a7cf6380c4be4375e18bec896049bf468ddb9139794170271454af4712ade5099b8d46ed7c8d642e9c5f37ea168f0e31394a5128beeb SHA512 e5cb12fb134ff0a59e01a30fbcabc350ddbef6959494176848c2858c3c68444bc520153e00fdcdecb0eefbe7f69876c2965fedbffeeb0aeda7931dc1c11b0de5
+DIST apache-tomcat-9.0.62-src.tar.gz 6156545 BLAKE2B 414f4f7193a8db2bb3d0abcbd2d8c30ede5783e83ba01229ffb322e9bf6b08d2fb10d83ce4742d9e6a4ebc50c9b047679ae798fbd3db8ae165f76d2782034d71 SHA512 7e9cad2703473d9f096009c464b28d54d3765259fab1923ef8c9b1cbfa231fa51cedadfe771a3a95abffd258759a71023e036bda78b949440a5e826fbd4e9e09
DIST biz.aQute.bnd-5.1.1.jar 16088761 BLAKE2B 59906cc39ea27ef20cbf82de1ba78096f34dc417da6dc5c28e21f6e92c0625efecf14cec6c5faf0ab17551c31a6c87a24614c2ac75ac902cfea30199ecc0d39f SHA512 8092b083e7b86e75bf27233964763b88bee74d8ae141c85e387c1cc8bd0cbf3a54be27afea29931fb3ae950700a515fd4a28cfe8e7f26cbaaec506aa06357a37
DIST biz.aQute.bnd-6.2.0.jar 16669843 BLAKE2B 290aec26cb4e2248488038e6cb0919728ca0cc802b16de3f390d549d135bc1177053b75e500b9f74e47c996d20b231404d57965a3f412662730cc4c938d90a4f SHA512 ad51dc9a04fc117cd01b604559989dd7c7db776761ef6000eccdcfdab825dedc615297af60c778044e46867972a74840d90eebea9b0ff826bdbd10f4d2ec5d6f
DIST biz.aQute.bndlib-5.1.1.jar 3652944 BLAKE2B dad9f9835fb407a36e0eae4b65fa2fda147e06ab3f3211a2ed2f1631aeccd6d14d198c325793cb1ce9a57b719a836db230d0452715744ba5a4a6c2983c17916b SHA512 d7da056ba541ae0862159bf5e38e1a5351b2ab5388c88733b46601c2d7dab8970f16af00df186a6cb67fbe81ef53f2c8402db9d28a8c6819dadf60a1df40879b
diff --git a/www-servers/tomcat/files/tomcat-9.0.62-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.62-build.xml.patch
new file mode 100644
index 000000000000..fdf66cf7b63a
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-9.0.62-build.xml.patch
@@ -0,0 +1,319 @@
+diff --git a/build.xml b/build.xml
+index 5a0be1b..87bfb33 100644
+--- a/build.xml
++++ b/build.xml
+@@ -1023,6 +1023,7 @@
+ addOSGi="true" />
+
+ <!-- Servlet Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+@@ -1030,21 +1031,23 @@
+ notice="${tomcat.manifests}/servlet-api.jar.notice"
+ license="${tomcat.manifests}/servlet-api.jar.license"
+ addOSGi="true" />
+-
++-->
+ <!-- EL Implementation JAR File -->
++<!--
+ <jarIt jarfile="${el-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.el-api"
+ manifest="${tomcat.manifests}/el-api.jar.manifest"
+ addOSGi="true" />
+-
++-->
+ <!-- JSP Implementation JAR File -->
++<!--
+ <jarIt jarfile="${jsp-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.jsp-api"
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest"
+ addOSGi="true" />
+-
++-->
+ <!-- WebSocket API JAR File -->
+ <jarIt jarfile="${websocket-api.jar}"
+ filesDir="${tomcat.classes}"
+@@ -1157,10 +1160,10 @@
+ addOSGi="true" />
+
+ <!-- Re-packaged Apache Commons DBCP 2-->
+- <jarIt jarfile="${tomcat-dbcp.jar}"
++<!-- <jarIt jarfile="${tomcat-dbcp.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.tomcat-dbcp"
+- addOSGi="true" />
++ addOSGi="true" /> -->
+
+ <!-- i18n JARs -->
+ <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
+@@ -1397,9 +1400,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/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
++-->
+ <!-- Copy scripts -->
+ <copy todir="${tomcat.build}/bin">
+ <fileset dir="bin">
+@@ -1459,7 +1462,7 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
+- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+@@ -1488,7 +1491,7 @@
+
+ </target>
+
+- <target name="build-tomcat-jdbc" depends="package">
++ <target name="build-tomcat-jdbc" depends="package" unless="noget">
+ <!-- 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}"
+@@ -1504,7 +1507,7 @@
+ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+ </target>
+
+- <target name="build-tomcat-jdbc-src">
++ <target name="build-tomcat-jdbc-src" unless="noget">
+ <!-- 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}"
+@@ -1607,9 +1610,11 @@
+
+ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+ <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+ <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
+@@ -2113,11 +2118,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.
+@@ -2141,13 +2147,13 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ additionalparam="-breakiterator -notimestamp -html5"
+ source="${compile.release}"
+ maxmemory="512m"
+- failonerror="true"
+- failonwarning="true">
++ failonerror="true">
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++<!--
+ <javadoc packagenames="javax.servlet.*"
+ excludepackagenames="javax.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -2212,6 +2218,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="javax.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -2226,8 +2233,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ additionalparam="-breakiterator -notimestamp -html5"
+ source="${compile.release}"
+ maxmemory="512m"
+- failonerror="true"
+- failonwarning="true">
++ failonerror="true">
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path location="${ant.core.lib}"/>
+@@ -2246,8 +2252,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ charset="UTF-8"
+ additionalparam="-breakiterator -notimestamp -html5"
+ maxmemory="512m"
+- failonerror="true"
+- failonwarning="true">
++ failonerror="true">
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path location="${ant.core.lib}"/>
+@@ -2266,20 +2271,23 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ additionalparam="-breakiterator -notimestamp -html5"
+ source="${compile.release}"
+ maxmemory="512m"
+- failonerror="true"
+ failonwarning="true">
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ <link href="../annotationapi"/>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <link href="../websocketapi"/>
+ <link href="../jaspicapi"/>
++<!--
+ <link href="https://docs.oracle.com/javase/8/docs/api/"/>
+ <link href="https://javaee.github.io/javaee-spec/javadocs/"/>
++-->
+ <packageset dir="${tomcat.dist}/src/java/">
+ <include name="org/**"/>
+ <exclude name="org/apache/el/parser/**"/>
+@@ -3062,7 +3070,7 @@ skip.installer property in build.properties" />
+
+ <target name="download-compile"
+ description="Download components necessary to compile"
+- depends="setup-bnd">
++ depends="setup-bnd" unless="noget">
+
+ <!-- Download Commons Daemon -->
+ <antcall target="downloadgz-2">
+@@ -3106,7 +3114,7 @@ skip.installer property in build.properties" />
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -3234,7 +3242,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="downloadfile-2">
+ <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
+@@ -3289,13 +3297,13 @@ skip.installer property in build.properties" />
+
+ <!-- =============== Utility Targets to support downloads ================ -->
+
+- <target name="setproxy" if="${proxy.use}">
++ <target name="setproxy" if="${proxy.use}" unless="noget">
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+ proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+ </target>
+
+- <target name="testexist">
++ <target name="testexist" unless="noget">
+ <echo message="Testing for ${destfile}"/>
+ <available file="${destfile}" property="exist"/>
+ </target>
+@@ -3417,7 +3425,7 @@ skip.installer property in build.properties" />
+ </sequential>
+ </macrodef>
+
+- <target name="downloadgz" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++ <target name="downloadgz" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3434,7 +3442,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadgz-2" unless="exist" if="${execute.download}" depends="testexist">
++ <target name="downloadgz-2" unless="noget" if="${execute.download}" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3459,7 +3467,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadzip" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++ <target name="downloadzip" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3475,7 +3483,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadzip-2" unless="exist" if="${execute.download}" depends="testexist">
++ <target name="downloadzip-2" unless="noget" if="${execute.download}" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3499,7 +3507,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadfile" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++ <target name="downloadfile" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+ <!-- Download the file -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3514,7 +3522,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="downloadfile-2" unless="exist" if="${execute.download}" depends="testexist">
++ <target name="downloadfile-2" unless="noget" if="${execute.download}" depends="testexist">
+ <!-- Download the file from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3542,7 +3550,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="trydownload.check" depends="setproxy">
++ <target name="trydownload.check" depends="setproxy" unless="noget">
+ <condition property="trydownload.run">
+ <and>
+ <not>
+@@ -3553,7 +3561,7 @@ skip.installer property in build.properties" />
+ </condition>
+ </target>
+
+- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+ <!-- Downloads a file if not yet downloaded and the source URL is available -->
+ <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+ </target>
+@@ -3564,7 +3572,7 @@ skip.installer property in build.properties" />
+
+ <target name="ide-eclipse"
+ depends="download-compile, download-test-compile"
+- description="Prepares the source tree to be built in Eclipse">
++ description="Prepares the source tree to be built in Eclipse" unless="noget">
+
+ <!-- Copy the sample project files into the root directory -->
+ <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
+@@ -3582,7 +3590,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"
+- description="Creates project directory .idea for IntelliJ IDEA">
++ description="Creates project directory .idea for IntelliJ IDEA" unless="noget">
+
+ <copy todir="${tomcat.home}/.idea">
+ <fileset dir="${tomcat.home}/res/ide-support/idea"/>
diff --git a/www-servers/tomcat/tomcat-9.0.62.ebuild b/www-servers/tomcat/tomcat-9.0.62.ebuild
new file mode 100644
index 000000000000..e151500fc704
--- /dev/null
+++ b/www-servers/tomcat/tomcat-9.0.62.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 prefix
+
+MY_P="apache-${PN}-${PV}-src"
+
+# Currently we bundle binary versions of bnd.jar and bndlib.jar
+# See bugs #203080 and #676116
+BND_VERSION="6.2.0"
+BND="biz.aQute.bnd-${BND_VERSION}.jar"
+BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
+
+DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
+ https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
+ https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}"
+
+LICENSE="Apache-2.0"
+SLOT="9"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+# though it could work with 4.22 and upstream uses 4.20,
+# we still use 4.15 because 4.20+ is currently built with java 11
+# and it would force Tomcat to use at least java 11 too
+ECJ_SLOT="4.15"
+SAPI_SLOT="4.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ dev-java/glassfish-xmlrpc-api:0
+ ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
+ dev-java/wsdl4j:0"
+RDEPEND="${COMMON_DEP}
+ acct-group/tomcat
+ acct-user/tomcat
+ >=virtual/jre-1.8:*"
+DEPEND="${COMMON_DEP}
+ app-admin/pwgen
+ >=dev-java/ant-core-1.9.13
+ >=virtual/jdk-1.8:*
+ test? (
+ >=dev-java/ant-junit-1.9:0
+ dev-java/easymock:3.2
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+ "${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch"
+)
+
+BND_HOME="${S}/tomcat-build-libs/bnd"
+BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
+BND_JAR="${BND_HOME}/${BND}"
+BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
+
+src_unpack() {
+ unpack ${MY_P}.tar.gz
+
+ mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
+ ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
+ ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
+}
+
+src_prepare() {
+ default
+
+ find -name '*.jar' -type f -delete -print || die
+
+ # Remove bundled servlet-api
+ rm -rv java/javax/{el,servlet} || die
+
+ eapply "${FILESDIR}/${PN}-9.0.62-build.xml.patch"
+
+ # For use of catalina.sh in netbeans
+ sed -i -e "/^# ----- Execute The Requested Command/ a\
+ CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+ bin/catalina.sh || die
+
+ java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT},wsdl4j"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_configure() {
+ java-ant-2_src_configure
+
+ eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
+}
+
+src_compile() {
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)"
+ LC_ALL=C java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ # add missing docBase
+ local apps="host-manager manager"
+ for app in ${apps}; do
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+ output/build/webapps/${app}/META-INF/context.xml || die
+ done
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw="$(pwgen -s -B 15 1)"
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+ einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+ einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2022-09-18 11:20 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2022-09-18 11:20 UTC (permalink / raw
To: gentoo-commits
commit: a5516ff908ff4c7080cfedfebc48dd016a035565
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 18 11:20:28 2022 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Sep 18 11:20:39 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5516ff9
www-servers/tomcat: dropped tomcat 7 (eol in mid 2021)
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
www-servers/tomcat/Manifest | 1 -
.../tomcat/files/tomcat-7.0.99-build.xml.patch | 163 --------------
.../tomcat/files/tomcat-instance-manager-r1.bash | 240 ---------------------
www-servers/tomcat/metadata.xml | 1 -
www-servers/tomcat/tomcat-7.0.109-r1.ebuild | 142 ------------
5 files changed, 547 deletions(-)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 3cce1c29b8c0..70949c970e3c 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,5 +1,4 @@
DIST apache-tomcat-10.0.23-src.tar.gz 6136614 BLAKE2B 4eaf963187b9a754ed459d7f85e6f7d329927b949bb4a390a602cdc6651aa037aeec559c511ddb9880b6ec4d7cd97b96d82da341509370e412e1b21b799d8c2e SHA512 19ec026bae75318e9ffbe2e619ad2e12ec116382ea88a1064696275afb3fd13e6f08efe497dde79689bfc828f76e27d114ad3a9284b79c8d956a6a85bdac6360
-DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
DIST apache-tomcat-8.5.82-src.tar.gz 6011553 BLAKE2B ea34c0485877ace8c84144f0e75f370c0ac461b5b725d97a07e27014b7a14b1ab88fad4230d4fae60190d7bff3836f691615b57b9f085797477acc69560a57ce SHA512 3e0a0a808fb78493930ce8832731eba4ab3cc440387c3b5226ff6e4ac2faf5fd70eff1560d840d34f14a8acfd7e60fc8b7f638f3dbe0c0ed4569dc4271a9c3f2
DIST apache-tomcat-9.0.65-src.tar.gz 6195265 BLAKE2B 13ca956b58e9f1831700f67d1fa8883f6471ab6b700b2af169bf284552658a4e9ad4130451b36976af4dd366cc987e228e0b0f98e688cccf577c626dfc78aae7 SHA512 3ff344370cc36f5bed389ed198054783a4f5bc86476a751cda280618457a06bae38c1e764b0c110c2f68efe2d34243a4e24596e8b90e8fbd171bf584a22fd3bc
DIST biz.aQute.bnd-6.2.0.jar 16669843 BLAKE2B 290aec26cb4e2248488038e6cb0919728ca0cc802b16de3f390d549d135bc1177053b75e500b9f74e47c996d20b231404d57965a3f412662730cc4c938d90a4f SHA512 ad51dc9a04fc117cd01b604559989dd7c7db776761ef6000eccdcfdab825dedc615297af60c778044e46867972a74840d90eebea9b0ff826bdbd10f4d2ec5d6f
diff --git a/www-servers/tomcat/files/tomcat-7.0.99-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.99-build.xml.patch
deleted file mode 100644
index 29cf6c2e403c..000000000000
--- a/www-servers/tomcat/files/tomcat-7.0.99-build.xml.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-diff --git a/build.xml b/build.xml
-index dbad7cb..101bc57 100644
---- a/build.xml
-+++ b/build.xml
-@@ -715,12 +715,14 @@
- </fileset>
- </copy>
- <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
-+<!--
- <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1">
- <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
- <include name="*" />
- <exclude name="jspxml*" />
- </fileset>
- </copy>
-+-->
-
- <!-- Convert the message files from UTF-8 to ASCII. This can be removed
- after upgrading to Java 9+ as the minimum JRE and specifying the encoding
-@@ -776,26 +778,32 @@
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
- <!-- Servlet 3.0 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- manifest="${tomcat.manifests}/servlet-api.jar.manifest"
- notice="${tomcat.manifests}/servlet-api.jar.notice"
- license="${tomcat.manifests}/servlet-api.jar.license" />
-+-->
-
- <!-- JSP 2.2 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${jsp-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest"
- notice="${tomcat.manifests}/jsp-api.jar.notice"
- license="${tomcat.manifests}/jsp-api.jar.license" />
-+-->
-
- <!-- JSP 2.2 EL Implementation JAR File -->
-+<!--
- <jarIt jarfile="${el-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.el-api"
- manifest="${tomcat.manifests}/el-api.jar.manifest" />
-+-->
-
- <!-- Bootstrap JAR File -->
- <jarIt jarfile="${bootstrap.jar}"
-@@ -854,9 +862,9 @@
- filesId="files.jasper-el" />
-
- <!-- Re-packaged Apache Commons DBCP 1-->
-- <jarIt jarfile="${tomcat-dbcp.jar}"
-+<!-- <jarIt jarfile="${tomcat-dbcp.jar}"
- filesDir="${tomcat.classes}"
-- filesId="files.tomcat-dbcp" />
-+ filesId="files.tomcat-dbcp" /> -->
-
- <!-- i18n JARs -->
- <jar jarfile="${tomcat.build}/lib/tomcat-i18n-de.jar"
-@@ -1087,9 +1095,9 @@
-
- <target name="deploy" depends="package,build-docs,compile-webapp-examples"
- description="Default. Builds a working Tomcat instance">
--
-+<!--
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
- <!-- Copy scripts -->
- <copy todir="${tomcat.build}/bin">
- <fileset dir="bin">
-@@ -1149,7 +1157,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1839,7 +1847,7 @@
-
- <target name="extras-webservices-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">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -2034,11 +2042,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.
-@@ -2070,6 +2079,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -2137,6 +2147,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -2181,9 +2192,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- <link href="../annotationapi"/>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <link href="../websocketapi"/>
- <link href="https://docs.oracle.com/javase/7/docs/api/"/>
- <link href="https://docs.oracle.com/javaee/6/api/"/>
-@@ -2889,7 +2902,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-compile"
-- description="Download components necessary to compile" >
-+ description="Download components necessary to compile" unless="noget" >
-
- <!-- Download Commons Daemon -->
- <antcall target="downloadgz-2">
-@@ -2925,7 +2938,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2989,7 +3002,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="downloadfile-2">
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
diff --git a/www-servers/tomcat/files/tomcat-instance-manager-r1.bash b/www-servers/tomcat/files/tomcat-instance-manager-r1.bash
deleted file mode 100644
index de5152198b3e..000000000000
--- a/www-servers/tomcat/files/tomcat-instance-manager-r1.bash
+++ /dev/null
@@ -1,240 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Author: Ralph Sennhauser <sera@gentoo.org>
-
-die() {
- echo "${@}"
- exit 1
-}
-
-usage() {
- cat <<EOL
-Usage: ${BASH_SOURCE} <--create|--remove|--help> [--suffix s][--user u][--group g]
-
- Options:
- --help:
- show this text.
- --create:
- create a new instance
- --remove:
- remove an existing instance.
- --suffix SUFFIX:
- a suffix for this instance. the suffix may not collide with an already
- existing instance, defaults to empty.
- --user USER:
- the user for which to configure this instance for. The user needs to
- exist already. defaults to tomcat.
- --group GROUP:
- the group for which to configure this instance for. The group needs to
- exist already. defaults to tomcat.
-
- Examples:
- ${BASH_SOURCE} --create --suffix testing --user tacmot --group tacmot
- ${BASH_SOURCE} --remove --suffix testing
-EOL
-}
-
-parse_argv() {
- action="not specified"
- instance_name="tomcat-@SLOT@"
- instance_user="tomcat"
- instance_group="tomcat"
-
- while [[ -n $1 ]]; do
- case $1 in
- --help)
- usage
- exit 0;;
- --suffix)
- instance_name+="-$2"
- shift; shift;;
- --user)
- instance_user="$2"
- shift; shift;;
- --group)
- instance_group="$2"
- shift; shift;;
- --create)
- action=create
- shift;;
- --remove)
- action=remove
- shift;;
- --backup)
- action=backup
- shift;;
- --restore)
- action=restore
- shift;;
- --update)
- action=update
- shift;;
- *)
- echo "Invalid option '$1'"
- usage
- exit 2;;
- esac
- done
-
- tomcat_home="/@GENTOO_PORTAGE_EPREFIX@usr/share/tomcat-@SLOT@"
- instance_base="/@GENTOO_PORTAGE_EPREFIX@var/lib/${instance_name}"
- instance_conf="/@GENTOO_PORTAGE_EPREFIX@etc/${instance_name}"
- instance_logs="/@GENTOO_PORTAGE_EPREFIX@var/log/${instance_name}"
- instance_temp="/@GENTOO_PORTAGE_EPREFIX@var/tmp/${instance_name}"
-
- all_targets=(
- "${instance_base}"
- "${instance_logs}"
- "${instance_temp}"
- "/@GENTOO_PORTAGE_EPREFIX@etc/${instance_name}"
- "/@GENTOO_PORTAGE_EPREFIX@etc/init.d/${instance_name}"
- "/@GENTOO_PORTAGE_EPREFIX@etc/conf.d/${instance_name}"
- )
-}
-
-test_can_deploy() {
- local no_deploy target
- for target in "${all_targets[@]}"; do
- if [[ -e "${target}" ]]; then
- echo "Error: '${target}' already exists."
- no_deploy=yes
- fi
- done
- if [[ -n "${no_deploy}" ]]; then
- cat <<-EOL
-
- To protect an existing installation no new instance was deployed. You can use
- '${BASH_SOURCE} --remove'
- to remove an existing instance first or run
- '${BASH_SOURCE} --create --sufix <instance_suffix>'
- to deploy an instance under a different name
-
- EOL
- usage
- exit 1
- fi
-
- if ! getent passwd | cut -d: -f1 | grep -Fx "${instance_user}" > /dev/null; then
- echo "Error: user '${instance_user}' doesn't exist."
- exit 1
- fi
-
- if ! getent group | cut -d: -f1 | grep -Fx "${instance_group}" > /dev/null; then
- echo "Error: group '${instance_group}' doesn't exist."
- exit 1
- fi
-}
-
-deploy_instance() {
- test_can_deploy
-
- mkdir -p "${instance_base}"/{work,webapps} || die
- mkdir -p "${instance_logs}" || die
- mkdir -p "${instance_temp}" || die
-
- cp -r "${tomcat_home}"/webapps/ROOT "${instance_base}"/webapps || die
-
- chown -R "${instance_user}":"${instance_group}" \
- "${instance_base}" "${instance_logs}" "${instance_temp}" || die
-
- find "${instance_base}"/webapps -type d -exec chmod 750 {} + || die
- find "${instance_base}"/webapps -type f -exec chmod 640 {} + || die
-
- # initial config #
-
- cp -r "${tomcat_home}"/conf "${instance_conf}" || die
-
- sed -i -e "s|\${catalina.base}/logs|${instance_logs}|" \
- "${instance_conf}"/logging.properties || die
- sed -i -e "s|directory=\"logs\"|directory=\"${instance_logs}\"|" \
- "${instance_conf}"/server.xml || die
-
- mkdir -p "${instance_conf}"/Catalina/localhost || die
- cat > "${instance_conf}"/Catalina/localhost/host-manager.xml <<-'EOF'
- <?xml version="1.0" encoding="UTF-8"?>
- <Context docBase="${catalina.home}/webapps/host-manager"
- antiResourceLocking="false" privileged="true" />
- EOF
-
- cat > "${instance_conf}"/Catalina/localhost/manager.xml <<-'EOF'
- <?xml version="1.0" encoding="UTF-8"?>
- <Context docBase="${catalina.home}/webapps/manager"
- antiResourceLocking="false" privileged="true" />
- EOF
-
- if [[ -d "${tomcat_home}"/webapps/docs ]]; then
- cat > "${instance_conf}"/Catalina/localhost/docs.xml <<-'EOF'
- <?xml version="1.0" encoding="UTF-8"?>
- <Context docBase="${catalina.home}/webapps/docs" />
- EOF
- fi
-
- if [[ -d "${tomcat_home}"/webapps/examples ]]; then
- cat > "${instance_conf}"/Catalina/localhost/examples.xml <<-'EOF'
- <?xml version="1.0" encoding="UTF-8"?>
- <Context docBase="${catalina.home}/webapps/examples" />
- EOF
- fi
-
- chown -R "${instance_user}":"${instance_group}" "${instance_conf}" || die
- find "${instance_conf}" -type d -exec chmod 750 {} + || die
- find "${instance_conf}" -type f -exec chmod 640 {} + || die
-
- # rc script #
-
- cp "${tomcat_home}"/gentoo/tomcat.init \
- "/@GENTOO_PORTAGE_EPREFIX@etc/init.d/${instance_name}" || die
-
- sed -e "s|@INSTANCE_NAME@|${instance_name}|g" \
- -e "s|@INSTANCE_USER@|${instance_user}|g" \
- -e "s|@INSTANCE_GROUP@|${instance_group}|g" \
- "${tomcat_home}"/gentoo/tomcat.conf \
- > "/@GENTOO_PORTAGE_EPREFIX@etc/conf.d/${instance_name}" || die
-
- # some symlinks for tomcat and netbeans #
-
- ln -s "${instance_conf}" "${instance_base}"/conf || die
- ln -s "${instance_temp}" "${instance_base}"/temp || die
-
- # a note to update the default configuration #
-
- cat <<-EOL
- Successfully created instance '${instance_name}'
- It's strongly recommended for production systems to go carefully through the
- configuration files at '${instance_conf}'.
- The generated initial configuration is close to upstreams default which
- favours the demo aspect over hardening.
- EOL
-}
-
-remove_instance() {
- echo "The following files will be removed permanently:"
- local target; for target in "${all_targets[@]}"; do
- find ${target}
- done
-
- echo "Type 'yes' to continue"
- read
- if [[ ${REPLY} == yes ]]; then
- rm -rv "${all_targets[@]}"
- else
- echo "Aborting as requested ..."
- fi
-}
-
-parse_argv "$@"
-
-if [[ ${action} == create ]]; then
- deploy_instance
-elif [[ ${action} == remove ]]; then
- remove_instance
-elif [[ ${action} == "not specified" ]]; then
- echo "No action specified!"
- usage
- exit 1
-else
- echo "${action} not yet implemented!"
- usage
- exit 1
-fi
diff --git a/www-servers/tomcat/metadata.xml b/www-servers/tomcat/metadata.xml
index 8fb0d0abaeee..aaecdcb10391 100644
--- a/www-servers/tomcat/metadata.xml
+++ b/www-servers/tomcat/metadata.xml
@@ -13,6 +13,5 @@
</longdescription>
<use>
<flag name="extra-webapps">Build also the docs and examples webapp</flag>
- <flag name="websockets">Builds websockets api and implementation (requires java 7)</flag>
</use>
</pkgmetadata>
diff --git a/www-servers/tomcat/tomcat-7.0.109-r1.ebuild b/www-servers/tomcat/tomcat-7.0.109-r1.ebuild
deleted file mode 100644
index b7489d78220d..000000000000
--- a/www-servers/tomcat/tomcat-7.0.109-r1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 prefix
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="https://archive.apache.org/dist/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="7"
-KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="extra-webapps websockets"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.15"
-SAPI_SLOT="3.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- acct-group/tomcat
- acct-user/tomcat
- virtual/jre"
-DEPEND="${COMMON_DEP}
- virtual/jdk:1.8
- test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- default
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- java-pkg_clean
-
- eapply "${FILESDIR}/${PN}-7.0.99-build.xml.patch"
-
- # For use of catalina.sh in netbeans
- sed -i -e "/^# ----- Execute The Requested Command/ a\
- CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r1"
-INIT_REV="-r1"
-
-src_compile() {
- use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2022-09-27 5:17 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2022-09-27 5:17 UTC (permalink / raw
To: gentoo-commits
commit: 798b1e3b8a40e3691514188a5a8270dadb352eed
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 27 05:17:21 2022 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 05:17:21 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=798b1e3b
www-servers/tomcat: bump to 10.1.0
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
www-servers/tomcat/Manifest | 3 +
.../tomcat/files/tomcat-10.1.0-build.xml.patch | 347 +++++++++++++++++++++
www-servers/tomcat/tomcat-10.1.0.ebuild | 190 +++++++++++
3 files changed, 540 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 919c1c26cbc3..7c69381c5902 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,6 +1,9 @@
DIST apache-tomcat-10.0.23-src.tar.gz 6136614 BLAKE2B 4eaf963187b9a754ed459d7f85e6f7d329927b949bb4a390a602cdc6651aa037aeec559c511ddb9880b6ec4d7cd97b96d82da341509370e412e1b21b799d8c2e SHA512 19ec026bae75318e9ffbe2e619ad2e12ec116382ea88a1064696275afb3fd13e6f08efe497dde79689bfc828f76e27d114ad3a9284b79c8d956a6a85bdac6360
+DIST apache-tomcat-10.1.0-src.tar.gz 6060833 BLAKE2B 49f36131c1e809b298ac915e671b9f4df55b55c2ba34d21ee3fdeb8759ddaf53a6780b177e8049446079d91186c52669969f30762ddf776d9f8615e527d5a975 SHA512 08323eec0403473fa97f419d7911980c3dfe7b1607a64741bbe972a737dfa70ea04ea80ca9ab28bf72bdde9d24cf8f7161eeb8b194204c777d1628d00c78611c
DIST apache-tomcat-8.5.82-src.tar.gz 6011553 BLAKE2B ea34c0485877ace8c84144f0e75f370c0ac461b5b725d97a07e27014b7a14b1ab88fad4230d4fae60190d7bff3836f691615b57b9f085797477acc69560a57ce SHA512 3e0a0a808fb78493930ce8832731eba4ab3cc440387c3b5226ff6e4ac2faf5fd70eff1560d840d34f14a8acfd7e60fc8b7f638f3dbe0c0ed4569dc4271a9c3f2
DIST apache-tomcat-9.0.65-src.tar.gz 6195265 BLAKE2B 13ca956b58e9f1831700f67d1fa8883f6471ab6b700b2af169bf284552658a4e9ad4130451b36976af4dd366cc987e228e0b0f98e688cccf577c626dfc78aae7 SHA512 3ff344370cc36f5bed389ed198054783a4f5bc86476a751cda280618457a06bae38c1e764b0c110c2f68efe2d34243a4e24596e8b90e8fbd171bf584a22fd3bc
DIST apache-tomcat-9.0.67-src.tar.gz 6211392 BLAKE2B 273b921ce580be6fb76d8567e5b0aec01b936518875f8470c1cee4b159519f723e606680d9986f61fbbab79cea2d027195f3debe9af59dfac786b0d0566d7c02 SHA512 33319d70c50fde71d163f66dc388ed2d5855aa4f087f7e2259adc27cc7ed30ace079d81e52def43a904c88ac670bb0c71667938b931a214470d77679108914cc
DIST biz.aQute.bnd-6.2.0.jar 16669843 BLAKE2B 290aec26cb4e2248488038e6cb0919728ca0cc802b16de3f390d549d135bc1177053b75e500b9f74e47c996d20b231404d57965a3f412662730cc4c938d90a4f SHA512 ad51dc9a04fc117cd01b604559989dd7c7db776761ef6000eccdcfdab825dedc615297af60c778044e46867972a74840d90eebea9b0ff826bdbd10f4d2ec5d6f
+DIST biz.aQute.bnd-6.3.1.jar 16703723 BLAKE2B 97cc171a926be326abe95695e795ccb575bc6ca770b4c4df7764bdedbd6dfcf5643673484f50cc34f845f27d03ddf8a971c1c502b3b63db2541266c2b35e8e23 SHA512 59d3a50575ea8fcfc5f5c2178f7d40248c987c77ae8afeb0a8c9ec397ce9e4ceae277ba3b26dafc245bd2185bbafeaef219dd1af0988921631b6a8fe0cbd0abf
DIST biz.aQute.bndlib-6.2.0.jar 3156015 BLAKE2B 922b9bc78e47968bad73a26f4df475d84d8a2bca3773473b1f8c147737e652728df4e90a49d09a20943f418a91fd5acfe18e51137e85850796d95b7415bcf684 SHA512 7b7b366467b71c6dd67b3d7a7bc63d476c4aca479153bbc1506435168b0b4c792152fb5b44e2b1f916cd67f482d15956d2c38182fdfaf9679dff65b1b109a16a
+DIST biz.aQute.bndlib-6.3.1.jar 3183076 BLAKE2B 73bef88e8f3c8015d259ac36b953672ed9cb0aa5d9dfca3361033a7f37646bb65bbea8be4ef1fb425518e85ec8a9cc63032815671ece5f956b754ecf555dc174 SHA512 7c3f7bc0280beb1b15182c558ef23f431719c046da8473545efe9aeec935776ebf6682cabbb7e7f53dcf2ccca168d8df35859be77121dab04340a5ec7e993608
diff --git a/www-servers/tomcat/files/tomcat-10.1.0-build.xml.patch b/www-servers/tomcat/files/tomcat-10.1.0-build.xml.patch
new file mode 100644
index 000000000000..da51f82d9bd7
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-10.1.0-build.xml.patch
@@ -0,0 +1,347 @@
+diff --git a/build.xml b/build.xml
+index bdd0801..28319a5 100644
+--- a/build.xml
++++ b/build.xml
+@@ -1046,6 +1046,7 @@
+ addOSGi="true" />
+
+ <!-- Servlet Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+@@ -1053,21 +1054,23 @@
+ notice="${tomcat.manifests}/servlet-api.jar.notice"
+ license="${tomcat.manifests}/servlet-api.jar.license"
+ addOSGi="true" />
+-
++-->
+ <!-- EL Implementation JAR File -->
++<!--
+ <jarIt jarfile="${el-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.el-api"
+ manifest="${tomcat.manifests}/el-api.jar.manifest"
+ addOSGi="true" />
+-
++-->
+ <!-- JSP Implementation JAR File -->
++<!--
+ <jarIt jarfile="${jsp-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.jsp-api"
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest"
+ addOSGi="true" />
+-
++-->
+ <!-- WebSocket API JAR File -->
+ <jarIt jarfile="${websocket-api.jar}"
+ filesDir="${tomcat.classes}"
+@@ -1187,10 +1190,10 @@
+ addOSGi="true" />
+
+ <!-- Re-packaged Apache Commons DBCP 2-->
+- <jarIt jarfile="${tomcat-dbcp.jar}"
++<!-- <jarIt jarfile="${tomcat-dbcp.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.tomcat-dbcp"
+- addOSGi="true" />
++ addOSGi="true" /> -->
+
+ <!-- i18n JARs -->
+ <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
+@@ -1427,9 +1430,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/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
++-->
+ <!-- Copy scripts -->
+ <copy todir="${tomcat.build}/bin">
+ <fileset dir="bin">
+@@ -1489,7 +1492,7 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
+- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!-- <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" />
+@@ -1500,7 +1503,7 @@
+ <exclude name="${migration-lib.jar.filename}"/>
+ </fileset>
+ </delete>
+- <copy file="${migration-lib.jar}" todir="${tomcat.build}/lib"/>
++<!-- <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
+@@ -1542,7 +1545,7 @@
+
+ </target>
+
+- <target name="build-tomcat-jdbc" depends="package">
++ <target name="build-tomcat-jdbc" depends="package" unless="noget">
+ <!-- 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}"
+@@ -1559,7 +1562,7 @@
+ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+ </target>
+
+- <target name="build-tomcat-jdbc-src">
++ <target name="build-tomcat-jdbc-src" unless="noget">
+ <!-- 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}"
+@@ -1662,9 +1665,11 @@
+
+ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+ <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+ <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
+@@ -2182,11 +2187,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.
+@@ -2210,13 +2216,13 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ additionalparam="-breakiterator -notimestamp -html5"
+ source="${compile.release}"
+ maxmemory="512m"
+- failonerror="true"
+- failonwarning="true">
++ failonerror="true">
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++<!--
+ <javadoc packagenames="jakarta.servlet.*"
+ excludepackagenames="jakarta.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -2232,8 +2238,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ additionalparam="-breakiterator -notimestamp -html5"
+ source="${compile.release}"
+ maxmemory="512m"
+- failonerror="true"
+- failonwarning="true">
++ failonerror="true">
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path location="${ant.core.lib}"/>
+@@ -2253,8 +2258,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ additionalparam="-breakiterator -notimestamp -html5"
+ source="${compile.release}"
+ maxmemory="512m"
+- failonerror="true"
+- failonwarning="true">
++ failonerror="true">
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path location="${ant.core.lib}"/>
+@@ -2274,13 +2278,13 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ additionalparam="-breakiterator -notimestamp -html5"
+ source="${compile.release}"
+ maxmemory="512m"
+- failonerror="true"
+- failonwarning="true">
++ failonerror="true">
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="jakarta.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -2295,8 +2299,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ additionalparam="-breakiterator -notimestamp -html5"
+ source="${compile.release}"
+ maxmemory="512m"
+- failonerror="true"
+- failonwarning="true">
++ failonerror="true">
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path location="${ant.core.lib}"/>
+@@ -2315,8 +2318,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ charset="UTF-8"
+ additionalparam="-breakiterator -notimestamp -html5"
+ maxmemory="512m"
+- failonerror="true"
+- failonwarning="true">
++ failonerror="true">
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path location="${ant.core.lib}"/>
+@@ -2335,20 +2337,23 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ additionalparam="-breakiterator -notimestamp -html5"
+ source="${compile.release}"
+ maxmemory="512m"
+- failonerror="true"
+ failonwarning="true">
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ <link href="../annotationapi"/>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <link href="../websocketapi"/>
+ <link href="../jaspicapi"/>
++<!--
+ <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/**"/>
+@@ -3320,7 +3325,7 @@ asf.ldap.username=${release.asfusername}
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -3448,7 +3453,7 @@ asf.ldap.username=${release.asfusername}
+ </target>
+
+ <target name="download-dist"
+- description="Download additional components for a distribution" >
++ description="Download additional components for a distribution">
+
+ <antcall target="downloadfile-2">
+ <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
+@@ -3503,13 +3508,13 @@ asf.ldap.username=${release.asfusername}
+
+ <!-- =============== Utility Targets to support downloads ================ -->
+
+- <target name="setproxy" if="${proxy.use}">
++ <target name="setproxy" if="${proxy.use}" unless="noget">
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+ proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+ </target>
+
+- <target name="testexist">
++ <target name="testexist" unless="noget">
+ <echo message="Testing for ${destfile}"/>
+ <available file="${destfile}" property="exist"/>
+ </target>
+@@ -3631,7 +3636,7 @@ asf.ldap.username=${release.asfusername}
+ </sequential>
+ </macrodef>
+
+- <target name="downloadgz" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++ <target name="downloadgz" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3648,7 +3653,7 @@ asf.ldap.username=${release.asfusername}
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadgz-2" unless="exist" if="${execute.download}" depends="testexist">
++ <target name="downloadgz-2" unless="noget" if="${execute.download}" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3673,7 +3678,7 @@ asf.ldap.username=${release.asfusername}
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadzip" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++ <target name="downloadzip" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3689,7 +3694,7 @@ asf.ldap.username=${release.asfusername}
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadzip-2" unless="exist" if="${execute.download}" depends="testexist">
++ <target name="downloadzip-2" unless="noget" if="${execute.download}" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3713,7 +3718,7 @@ asf.ldap.username=${release.asfusername}
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadfile" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++ <target name="downloadfile" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+ <!-- Download the file -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3728,7 +3733,7 @@ asf.ldap.username=${release.asfusername}
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="downloadfile-2" unless="exist" if="${execute.download}" depends="testexist">
++ <target name="downloadfile-2" unless="noget" if="${execute.download}" depends="testexist">
+ <!-- Download the file from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3756,7 +3761,7 @@ asf.ldap.username=${release.asfusername}
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="trydownload.check" depends="setproxy">
++ <target name="trydownload.check" depends="setproxy" unless="noget">
+ <condition property="trydownload.run">
+ <and>
+ <not>
+@@ -3767,7 +3772,7 @@ asf.ldap.username=${release.asfusername}
+ </condition>
+ </target>
+
+- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+ <!-- Downloads a file if not yet downloaded and the source URL is available -->
+ <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+ </target>
+@@ -3778,7 +3783,7 @@ asf.ldap.username=${release.asfusername}
+
+ <target name="ide-eclipse"
+ depends="download-compile, download-test-compile"
+- description="Prepares the source tree to be built in Eclipse">
++ description="Prepares the source tree to be built in Eclipse" unless="noget">
+
+ <!-- Copy the sample project files into the root directory -->
+ <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
+@@ -3796,7 +3801,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"
+- description="Creates project directory .idea for IntelliJ IDEA">
++ description="Creates project directory .idea for IntelliJ IDEA" unless="noget">
+
+ <copy todir="${tomcat.home}/.idea">
+ <fileset dir="${tomcat.home}/res/ide-support/idea"/>
diff --git a/www-servers/tomcat/tomcat-10.1.0.ebuild b/www-servers/tomcat/tomcat-10.1.0.ebuild
new file mode 100644
index 000000000000..a1647adfb4d0
--- /dev/null
+++ b/www-servers/tomcat/tomcat-10.1.0.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 prefix
+
+MY_P="apache-${PN}-${PV}-src"
+
+# Currently we bundle binary versions of bnd.jar and bndlib.jar
+# See bugs #203080 and #676116
+BND_VERSION="6.3.1"
+BND="biz.aQute.bnd-${BND_VERSION}.jar"
+BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
+
+DESCRIPTION="Tomcat Servlet-6.0/JSP-3.1/EL-5.0/WebSocket-2.1/JASPIC-3.0 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-10/v${PV}/src/${MY_P}.tar.gz
+ https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
+ https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}"
+
+LICENSE="Apache-2.0"
+SLOT="10.1"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.22"
+SAPI_SLOT="6.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ dev-java/glassfish-xmlrpc-api:0
+ dev-java/jakartaee-migration:0
+ ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
+ dev-java/wsdl4j:0"
+RDEPEND="${COMMON_DEP}
+ acct-group/tomcat
+ acct-user/tomcat
+ >=virtual/jre-11:*"
+DEPEND="${COMMON_DEP}
+ app-admin/pwgen
+ dev-java/ant-core
+ >=virtual/jdk-11:*
+ test? (
+ dev-java/ant-junit:0
+ dev-java/easymock:3.2
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+BND_HOME="${S}/tomcat-build-libs/bnd"
+BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
+BND_JAR="${BND_HOME}/${BND}"
+BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
+
+src_unpack() {
+ unpack ${MY_P}.tar.gz
+
+ mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
+ ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
+ ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
+}
+
+src_prepare() {
+ default
+
+ find -name '*.jar' -type f -delete -print || die
+
+ # Remove bundled servlet-api
+ rm -rv java/jakarta/{el,servlet} || die
+
+ eapply "${FILESDIR}/${PN}-10.1.0-build.xml.patch"
+
+ local vm_version="$(java-config -g PROVIDES_VERSION)"
+
+ # For use of catalina.sh in netbeans
+ sed -i -e "/^# ----- Execute The Requested Command/ a\
+ CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+ bin/catalina.sh || die
+
+ java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},jakartaee-migration,tomcat-servlet-api-${SAPI_SLOT},wsdl4j"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_configure() {
+ java-ant-2_src_configure
+
+ eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
+}
+
+src_compile() {
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)"
+ LC_ALL=C java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ # add missing docBase
+ local apps="host-manager manager"
+ for app in ${apps}; do
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+ output/build/webapps/${app}/META-INF/context.xml || die
+ done
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw="$(pwgen -s -B 15 1)"
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "Please note that since version 10 the primary package for all implemented APIs"
+ ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code"
+ ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later."
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+ einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+ einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2023-01-04 8:05 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2023-01-04 8:05 UTC (permalink / raw
To: gentoo-commits
commit: 2451ac41755ade568c777ea96ed6714fdbce8061
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 4 08:05:21 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Jan 4 08:05:21 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2451ac41
www-servers/tomcat: dropped eol'd tomcat 10
https://tomcat.apache.org/tomcat-10.0-eol.html
Bug: https://bugs.gentoo.org/889596
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
www-servers/tomcat/Manifest | 1 -
.../tomcat-10.0.16-build.xml-strip-html5.patch | 31 --
.../tomcat/files/tomcat-10.0.26-build.xml.patch | 347 ---------------------
www-servers/tomcat/tomcat-10.0.27.ebuild | 202 ------------
4 files changed, 581 deletions(-)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index d542bc977d1e..a42846b9af2e 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,4 +1,3 @@
-DIST apache-tomcat-10.0.27-src.tar.gz 6154411 BLAKE2B 87a66acacf5443189620af3c8f306e1ae7d8572f9d6ba657379f8a9691c01530e2f1cb17bb1daef5504459480395f4eabdbb626b6da3a879c5a11910029e002b SHA512 ab7c2ae4134ec9652dc0d19343be7d3bf298b1c7a367b51bcceb88f1aaf70ecb45b3a7b9682e2deac70a1e9b00aca974b77110d3363bc5d1c88dc3ae95015e15
DIST apache-tomcat-10.1.2-src.tar.gz 6063352 BLAKE2B 960feb80afd12249301414786d7e502c5f87f78f609dd1335fee4cd8767b7600062ebdd34e6e09735e6c28e1c3eb99d49098917ea720a92bac5f67901f509026 SHA512 446acee71c4a0588cf0d004a35ff107dcbcd7f2e2675cf59bd487aad16768e7e06a41ee56fe58448dde7f518bd9d44cfc70136d1b25dba2fcee6e60b3b191655
DIST apache-tomcat-10.1.2-src.tar.gz.asc 849 BLAKE2B bb90cb53af6c5725f2bacbdd1e9a35c859803ccba5dc9355d61b02b6b2b4c41593b43f95fff878f295ec8dcd652b36d9245e710b6976ac3157a2fa02cbebef05 SHA512 d1dbd81d2df81430c4fbdfb57e2c1b37295004d89a77542d7cde51eaa3149835941859573d523e9803be7e6aa3a1bb4c008bfdeed45429a76d1b19d6700cbc10
DIST apache-tomcat-10.1.4-src.tar.gz 6065442 BLAKE2B 92e8a2dbe686ce2faa7b766f523f3e2f49d70e6a34cf1d25628842ea22ea94400b6415c676ac52712ebee2950451ff220d8db3fc415ccddf4f1e74a953ba0c82 SHA512 36f2272b017536af140771875e956441a7ee714c533d679d153cb2143ff2eae9e3277acc48541bbe29bfebdf79619f7742f2d719fbd8c330e070dc54d08d40a2
diff --git a/www-servers/tomcat/files/tomcat-10.0.16-build.xml-strip-html5.patch b/www-servers/tomcat/files/tomcat-10.0.16-build.xml-strip-html5.patch
deleted file mode 100644
index 44f629ec29b0..000000000000
--- a/www-servers/tomcat/files/tomcat-10.0.16-build.xml-strip-html5.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 6b2b5d5..16d55c2 100644
---- a/build.xml
-+++ b/build.xml
-@@ -2148,7 +2148,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- encoding="UTF-8"
- docencoding="UTF-8"
- charset="UTF-8"
-- additionalparam="-breakiterator -notimestamp -html5"
-+ additionalparam="-breakiterator -notimestamp"
- source="${compile.release}"
- maxmemory="512m"
- failonerror="true">
-@@ -2231,7 +2231,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- encoding="UTF-8"
- docencoding="UTF-8"
- charset="UTF-8"
-- additionalparam="-breakiterator -notimestamp -html5"
-+ additionalparam="-breakiterator -notimestamp"
- source="${compile.release}"
- maxmemory="512m"
- failonerror="true">
-@@ -2269,7 +2269,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- encoding="UTF-8"
- docencoding="UTF-8"
- charset="UTF-8"
-- additionalparam="-breakiterator -notimestamp -html5"
-+ additionalparam="-breakiterator -notimestamp"
- source="${compile.release}"
- maxmemory="512m"
- failonerror="true">
diff --git a/www-servers/tomcat/files/tomcat-10.0.26-build.xml.patch b/www-servers/tomcat/files/tomcat-10.0.26-build.xml.patch
deleted file mode 100644
index aff5333f0833..000000000000
--- a/www-servers/tomcat/files/tomcat-10.0.26-build.xml.patch
+++ /dev/null
@@ -1,347 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 774e25e..2684b10 100644
---- a/build.xml
-+++ b/build.xml
-@@ -1041,6 +1041,7 @@
- addOSGi="true" />
-
- <!-- Servlet Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
-@@ -1048,21 +1049,23 @@
- notice="${tomcat.manifests}/servlet-api.jar.notice"
- license="${tomcat.manifests}/servlet-api.jar.license"
- addOSGi="true" />
--
-+-->
- <!-- EL Implementation JAR File -->
-+<!--
- <jarIt jarfile="${el-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.el-api"
- manifest="${tomcat.manifests}/el-api.jar.manifest"
- addOSGi="true" />
--
-+-->
- <!-- JSP Implementation JAR File -->
-+<!--
- <jarIt jarfile="${jsp-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest"
- addOSGi="true" />
--
-+-->
- <!-- WebSocket API JAR File -->
- <jarIt jarfile="${websocket-api.jar}"
- filesDir="${tomcat.classes}"
-@@ -1175,10 +1178,10 @@
- addOSGi="true" />
-
- <!-- Re-packaged Apache Commons DBCP 2-->
-- <jarIt jarfile="${tomcat-dbcp.jar}"
-+<!-- <jarIt jarfile="${tomcat-dbcp.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.tomcat-dbcp"
-- addOSGi="true" />
-+ addOSGi="true" /> -->
-
- <!-- i18n JARs -->
- <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
-@@ -1415,9 +1418,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/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
- <!-- Copy scripts -->
- <copy todir="${tomcat.build}/bin">
- <fileset dir="bin">
-@@ -1477,7 +1480,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <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" />
-@@ -1488,7 +1491,7 @@
- <exclude name="${migration-lib.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${migration-lib.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${migration-lib.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1517,7 +1520,7 @@
-
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- 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}"
-@@ -1534,7 +1537,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- 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}"
-@@ -1637,9 +1640,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <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
-@@ -2144,11 +2149,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.
-@@ -2172,13 +2178,13 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- additionalparam="-breakiterator -notimestamp -html5"
- source="${compile.release}"
- maxmemory="512m"
-- failonerror="true"
-- failonwarning="true">
-+ failonerror="true">
- <classpath>
- <path refid="compile.classpath"/>
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+<!--
- <javadoc packagenames="jakarta.servlet.*"
- excludepackagenames="jakarta.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -2194,8 +2200,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- additionalparam="-breakiterator -notimestamp -html5"
- source="${compile.release}"
- maxmemory="512m"
-- failonerror="true"
-- failonwarning="true">
-+ failonerror="true">
- <classpath>
- <path refid="compile.classpath"/>
- <path location="${ant.core.lib}"/>
-@@ -2215,8 +2220,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- additionalparam="-breakiterator -notimestamp -html5"
- source="${compile.release}"
- maxmemory="512m"
-- failonerror="true"
-- failonwarning="true">
-+ failonerror="true">
- <classpath>
- <path refid="compile.classpath"/>
- <path location="${ant.core.lib}"/>
-@@ -2236,13 +2240,13 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- additionalparam="-breakiterator -notimestamp -html5"
- source="${compile.release}"
- maxmemory="512m"
-- failonerror="true"
-- failonwarning="true">
-+ failonerror="true">
- <classpath>
- <path refid="compile.classpath"/>
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="jakarta.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -2257,8 +2261,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- additionalparam="-breakiterator -notimestamp -html5"
- source="${compile.release}"
- maxmemory="512m"
-- failonerror="true"
-- failonwarning="true">
-+ failonerror="true">
- <classpath>
- <path refid="compile.classpath"/>
- <path location="${ant.core.lib}"/>
-@@ -2277,8 +2280,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- charset="UTF-8"
- additionalparam="-breakiterator -notimestamp -html5"
- maxmemory="512m"
-- failonerror="true"
-- failonwarning="true">
-+ failonerror="true">
- <classpath>
- <path refid="compile.classpath"/>
- <path location="${ant.core.lib}"/>
-@@ -2297,20 +2299,23 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- additionalparam="-breakiterator -notimestamp -html5"
- source="${compile.release}"
- maxmemory="512m"
-- failonerror="true"
- failonwarning="true">
- <classpath>
- <path refid="compile.classpath"/>
- <path location="${ant.core.lib}"/>
- </classpath>
- <link href="../annotationapi"/>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <link href="../websocketapi"/>
- <link href="../jaspicapi"/>
-+<!--
- <link href="https://docs.oracle.com/javase/8/docs/api/"/>
- <link href="https://jakarta.ee/specifications/platform/9/apidocs/"/>
-+-->
- <packageset dir="${tomcat.dist}/src/java/">
- <include name="org/**"/>
- <exclude name="org/apache/el/parser/**"/>
-@@ -3275,7 +3280,7 @@ asf.ldap.username=${release.asfusername}
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -3403,7 +3408,7 @@ asf.ldap.username=${release.asfusername}
- </target>
-
- <target name="download-dist"
-- description="Download additional components for a distribution" >
-+ description="Download additional components for a distribution">
-
- <antcall target="downloadfile-2">
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -3458,13 +3463,13 @@ asf.ldap.username=${release.asfusername}
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-@@ -3586,7 +3591,7 @@ asf.ldap.username=${release.asfusername}
- </sequential>
- </macrodef>
-
-- <target name="downloadgz" unless="exist" if="${execute.download}" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" if="${execute.download}" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3603,7 +3608,7 @@ asf.ldap.username=${release.asfusername}
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" if="${execute.download}" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" if="${execute.download}" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3628,7 +3633,7 @@ asf.ldap.username=${release.asfusername}
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" if="${execute.download}" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" if="${execute.download}" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3644,7 +3649,7 @@ asf.ldap.username=${release.asfusername}
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" if="${execute.download}" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" if="${execute.download}" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3668,7 +3673,7 @@ asf.ldap.username=${release.asfusername}
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" if="${execute.download}" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" if="${execute.download}" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3683,7 +3688,7 @@ asf.ldap.username=${release.asfusername}
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" if="${execute.download}" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" if="${execute.download}" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3711,7 +3716,7 @@ asf.ldap.username=${release.asfusername}
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -3722,7 +3727,7 @@ asf.ldap.username=${release.asfusername}
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -3733,7 +3738,7 @@ asf.ldap.username=${release.asfusername}
-
- <target name="ide-eclipse"
- depends="download-compile, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
-@@ -3751,7 +3756,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"
-- description="Creates project directory .idea for IntelliJ IDEA">
-+ description="Creates project directory .idea for IntelliJ IDEA" unless="noget">
-
- <copy todir="${tomcat.home}/.idea">
- <fileset dir="${tomcat.home}/res/ide-support/idea"/>
diff --git a/www-servers/tomcat/tomcat-10.0.27.ebuild b/www-servers/tomcat/tomcat-10.0.27.ebuild
deleted file mode 100644
index a54403b4f0d2..000000000000
--- a/www-servers/tomcat/tomcat-10.0.27.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 prefix
-
-MY_P="apache-${PN}-${PV}-src"
-
-# Currently we bundle binary versions of bnd.jar and bndlib.jar
-# See bugs #203080 and #676116
-BND_VERSION="6.3.1"
-BND="biz.aQute.bnd-${BND_VERSION}.jar"
-BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
-
-DESCRIPTION="Tomcat Servlet-5.0/JSP-3.0/EL-4.0/WebSocket-2.0/JASIC-2.0 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-10/v${PV}/src/${MY_P}.tar.gz
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}"
-
-LICENSE="Apache-2.0"
-SLOT="10"
-KEYWORDS="amd64 ~amd64-linux"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-# though it could work with 4.22 and upstream uses 4.20,
-# we still use 4.15 because 4.20+ is currently built with java 11
-# and it would force Tomcat to use at least java 11 too
-ECJ_SLOT="4.15"
-SERVLET_API_SLOT="5.0"
-JSP_API_SLOT="3.0"
-EL_API_SLOT="4.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- dev-java/glassfish-xmlrpc-api:0
- dev-java/jakartaee-migration:0
- ~dev-java/tomcat-el-api-${PV}:${EL_API_SLOT}
- ~dev-java/tomcat-jsp-api-${PV}:${JSP_API_SLOT}
- ~dev-java/tomcat-servlet-api-${PV}:${SERVLET_API_SLOT}
- dev-java/wsdl4j:0"
-RDEPEND="${COMMON_DEP}
- acct-group/tomcat
- acct-user/tomcat
- virtual/jre"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- dev-java/ant-core
- >=virtual/jdk-1.8:*
- test? (
- dev-java/ant-junit:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
- "${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch"
-)
-
-BND_HOME="${S}/tomcat-build-libs/bnd"
-BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
-BND_JAR="${BND_HOME}/${BND}"
-BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
-
-src_unpack() {
- unpack ${MY_P}.tar.gz
-
- mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
- ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
- ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
-}
-
-src_prepare() {
- default
-
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/jakarta/{el,servlet} || die
-
- eapply "${FILESDIR}/${PN}-10.0.26-build.xml.patch"
-
- local vm_version="$(java-config -g PROVIDES_VERSION)"
- [[ "${vm_version}" == "1.8" ]] && eapply "${FILESDIR}/${PN}-10.0.16-build.xml-strip-html5.patch"
-
- # For use of catalina.sh in netbeans
- sed -i -e "/^# ----- Execute The Requested Command/ a\
- CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},jakartaee-migration,tomcat-servlet-api-${SERVLET_API_SLOT},tomcat-jsp-api-${JSP_API_SLOT},tomcat-el-api-${EL_API_SLOT},wsdl4j"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_configure() {
- java-ant-2_src_configure
-
- eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
-}
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)"
- LC_ALL=C java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "Please note that since version 10 the primary package for all implemented APIs"
- ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code"
- ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later."
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2023-11-08 9:02 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2023-11-08 9:02 UTC (permalink / raw
To: gentoo-commits
commit: 5e554b5f850115f621d25cc56261aacab235f3ef
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Fri Nov 3 07:31:12 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Nov 8 08:59:53 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e554b5f
www-servers/tomcat: min java 1.8 (slot 8.5)
Closes: https://bugs.gentoo.org/916705
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/33643
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../tomcat/files/tomcat-8.5.95-min.java.patch | 37 ++++++++++++++++++++++
www-servers/tomcat/tomcat-8.5.95.ebuild | 5 ++-
2 files changed, 41 insertions(+), 1 deletion(-)
diff --git a/www-servers/tomcat/files/tomcat-8.5.95-min.java.patch b/www-servers/tomcat/files/tomcat-8.5.95-min.java.patch
new file mode 100644
index 000000000000..9198ff3a1911
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.5.95-min.java.patch
@@ -0,0 +1,37 @@
+diff --git a/build.xml b/build.xml
+index 723be26..3cf7bb7 100644
+--- a/build.xml
++++ b/build.xml
+@@ -112,8 +112,8 @@
+
+ <!-- Java EE 7 platform requires Java 7+ -->
+ <!-- Keep in sync with webapps/docs/tomcat-docs.xsl -->
+- <property name="compile.release" value="7"/>
+- <property name="min.java.version" value="7"/>
++ <property name="compile.release" value="8"/>
++ <property name="min.java.version" value="8"/>
+ <property name="build.java.version" value="11"/>
+
+ <!-- Locations to create the JAR artifacts -->
+--- a/webapps/docs/tomcat-docs.xsl
++++ b/webapps/docs/tomcat-docs.xsl
+@@ -39,7 +39,7 @@
+ <xsl:param name="version" select="'8.5.x'"/>
+ <xsl:param name="majorversion" select="'8'"/>
+ <xsl:param name="majorminorversion" select="'8.5'"/>
+- <xsl:param name="minjavaversion" select="'7'"/>
++ <xsl:param name="minjavaversion" select="'8'"/>
+ <xsl:param name="buildjavaversion" select="'11'"/>
+ <xsl:param name="antversionrequired" select="'1.9.10'"/>
+ <xsl:param name="build-date" select="'MMM d yyyy'"/>
+--- a/modules/jdbc-pool/build.properties.default
++++ b/modules/jdbc-pool/build.properties.default
+@@ -40,7 +40,7 @@ version.suffix=
+ # contexts by the various build scripts.
+ base.path=${basedir}/includes
+
+-compile.release=7
++compile.release=8
+ compile.debug=true
+
+ # Do not pass -deprecation (-Xlint:deprecation) flag to javac
diff --git a/www-servers/tomcat/tomcat-8.5.95.ebuild b/www-servers/tomcat/tomcat-8.5.95.ebuild
index d4b11f790044..7c3cee7e4014 100644
--- a/www-servers/tomcat/tomcat-8.5.95.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.95.ebuild
@@ -47,7 +47,10 @@ DEPEND="${COMMON_DEP}
BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
-PATCHES=( "${FILESDIR}/${PN}-8.5.86-build.xml.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-8.5.86-build.xml.patch"
+ "${FILESDIR}/${PN}-8.5.95-min.java.patch"
+)
S=${WORKDIR}/${MY_P}
^ permalink raw reply related [flat|nested] 73+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
@ 2024-04-04 7:51 Miroslav Šulc
0 siblings, 0 replies; 73+ messages in thread
From: Miroslav Šulc @ 2024-04-04 7:51 UTC (permalink / raw
To: gentoo-commits
commit: 8921750856abf7b98ec4e6162fa0d2ffcc570b55
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Mar 19 19:52:28 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Apr 4 07:48:10 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89217508
www-servers/tomcat: add 10.1.20 unbundling bnd
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/35320
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
www-servers/tomcat/Manifest | 2 +
.../tomcat/files/tomcat-10.1.20-do-not-copy.patch | 29 ++++
.../tomcat/files/tomcat-10.1.20-offline.patch | 12 ++
www-servers/tomcat/tomcat-10.1.20.ebuild | 176 +++++++++++++++++++++
4 files changed, 219 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 4115fa5057ab..a46c1246776f 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -2,6 +2,8 @@ DIST apache-tomcat-10.1.19-src.tar.gz 6175254 BLAKE2B 8ec0f461de2fed4642fcb20e38
DIST apache-tomcat-10.1.19-src.tar.gz.asc 833 BLAKE2B 12b92d5f42219b0fccbc3eeb004fe38c762090790da93d51423ffec07c34f3203fbbb45c670f1cf8bf992ab061d0ed8f52f622eb51163511d29567bc241f6e26 SHA512 edbeea8873b8d1b48b8a298e57ef9715dd6b912d9edf6447bfcf85945ab79db08a21b0d134926d814676f2df823e1b78184792118926220fe4ea070919a5e71c
DIST apache-tomcat-8.5.100-src.tar.gz 6172727 BLAKE2B c56a0c02fcac8b70186edfcf9132370bdc4d57d6997821717c8c480dbee2ebdef05d87eb2fd0d25ea2a86001aae1ddf47b2bed7d2f15bd331c6aadea298e2556 SHA512 ae03d6b99ba4d7b7718c0c9040db7cdd5db3e047efa3dc8ff145b3005733285b134462e0d47ef10730aba6d5ef9f7aa9d4fbd46f1dafe0ac622ac8fc2201aea2
DIST apache-tomcat-8.5.100-src.tar.gz.asc 833 BLAKE2B 1c763b792d0259fad7d26aef6ee70ceb840fd9491e2d0492d9db5edcc20ea08b0ad38f878ccf49d662a6891f0e3a6cfd772dd6e5b9073a142093a4eab9e97ece SHA512 39d9a361e03574ea1a6f28df7148e4db8dae33a8978ee3f883169b789e37c8d91b41cbe159a26dc03013f53b5914915d5c2adafd9225f8d085c083eca1e47c1d
+DIST apache-tomcat-10.1.20-src.tar.gz 6187831 BLAKE2B bc664346e93270c2f89ef36ed21968698aaf99be7aafce64a19b8666d663bab17ff8a9c401fd115e20686012c268ef29f259df8d5f95e57076dfdab6047376af SHA512 b3d00a8b46e75329477aab0c710fc3ad219a13347f23ff287a034228bee9fda8f0faefe6a7cc3f58462f9d00b275cb82101d3576b4225fe768a504576a44032a
+DIST apache-tomcat-10.1.20-src.tar.gz.asc 833 BLAKE2B 4084c5100da15cc1103202318ccc485304a262c4ac3f9b0f2823c6119c5c741a51936903c04078870e5fa524d2d284bb0df8001639eafda86a8eccf5e9ae62c7 SHA512 89946ad7a36e1cb77dff6309b99dbd2cfa8f2a7ff54183adeae7d052edb4fa649a5e04e98a86fe42d5813ef1bf026e8120948b6f4b13dc072de0d6992d8dea2e
DIST apache-tomcat-8.5.99-src.tar.gz 6162573 BLAKE2B 4443dc4865a16e60e9b9224fcd9947b36f316c4d2a81207fbb1204a1b12952275e995028eb5280a962d3488c1c43fc81bace6bb0fdf252cfb1e9025ef85da8b0 SHA512 a8aabf6d12ef89d2b908f0739392e595b3d481ceca124580323e3f3d3c26f4a39c960dcc3686efb5219bf10a7b5b55fc8c9f742a87eb975e04ed40415cab2e51
DIST apache-tomcat-8.5.99-src.tar.gz.asc 833 BLAKE2B 55d39f5b9e821baab51a617b1c9df0e7f7192ace642eaa637c9e870b0ffdbe1ba5d58b132111eaf3417d26572d3e6650f316def53a6b2489bc820880464fddfc SHA512 b93eeaf4ae2f08d7f1cb5de09fcffa561202d852422f2464ffa61b98afd867237a0a0239caa176975b77c550d69b21bb41b681c1d655372c8b63930db7bbe483
DIST apache-tomcat-9.0.86-src.tar.gz 6324982 BLAKE2B 2f7d1251ec3db1012f8f90691b6c7aa18ee2be9204ee27209af4d3a9d6505e1ce172a4babbffd42f56fd784aabddff41998980f578337372df6c721089e9d67d SHA512 02b5100f18233b4b20e6f03e455daf67b842ec2f894ff6f6971383f1a8f8c8ebbb098cb7f16be73f69e3f8cd1f3a2ce1ca78948aa7cc788fc316e0e8f68f4cde
diff --git a/www-servers/tomcat/files/tomcat-10.1.20-do-not-copy.patch b/www-servers/tomcat/files/tomcat-10.1.20-do-not-copy.patch
new file mode 100644
index 000000000000..ade8527d11f1
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-10.1.20-do-not-copy.patch
@@ -0,0 +1,29 @@
+--- a/build.xml
++++ b/build.xml
+#<!-- we provide tomcat native as another package and we don't need commons-daemon
+@@ -1469,7 +1469,6 @@
+ <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/commons-daemon.jar" file="${commons-daemon.jar}" />
+
+ <!-- Copy scripts -->
+ <copy todir="${tomcat.build}/bin">
+#<!-- we provide jdt jar externally
+@@ -1530,7 +1529,6 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
+- <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" />
+#<!-- we provide migration tool externally
+@@ -1541,7 +1539,6 @@
+ <exclude name="${migration-lib.jar.filename}"/>
+ </fileset>
+ </delete>
+- <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
diff --git a/www-servers/tomcat/files/tomcat-10.1.20-offline.patch b/www-servers/tomcat/files/tomcat-10.1.20-offline.patch
new file mode 100644
index 000000000000..94edd1c8b7e9
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-10.1.20-offline.patch
@@ -0,0 +1,12 @@
+--- a/build.xml
++++ b/build.xml
+# javadoc would fail without network access
+@@ -2413,8 +2410,6 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <link href="../elapi"/>
+ <link href="../websocketapi"/>
+ <link href="../jaspicapi"/>
+- <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/**"/>
diff --git a/www-servers/tomcat/tomcat-10.1.20.ebuild b/www-servers/tomcat/tomcat-10.1.20.ebuild
new file mode 100644
index 000000000000..e3d7f6a4aa61
--- /dev/null
+++ b/www-servers/tomcat/tomcat-10.1.20.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 prefix verify-sig
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-6.0/JSP-3.1/EL-5.0/WebSocket-2.1/JASPIC-3.0 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-10/v${PV}/src/${MY_P}.tar.gz
+ verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/${MY_P}.tar.gz.asc )"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="10.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~amd64-linux"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.27"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ dev-java/jax-rpc-api:0
+ >=dev-java/jakartaee-migration-1.0.7-r2:0
+ dev-java/wsdl4j:0"
+RDEPEND="${COMMON_DEP}
+ acct-group/tomcat
+ acct-user/tomcat
+ >=virtual/jre-11:*"
+DEPEND="${COMMON_DEP}
+ app-admin/pwgen
+ >=dev-java/ant-1.10.14-r3:0
+ dev-java/bnd-annotation:0
+ dev-java/bnd-ant:0
+ dev-java/bnd-util:0
+ dev-java/bndlib:0
+ dev-java/libg:0
+ dev-java/osgi-cmpn:8
+ dev-java/osgi-core:0
+ dev-java/slf4j-api:0
+ >=virtual/jdk-17:*
+ test? (
+ >=dev-java/ant-1.10.14-r3:0[junit]
+ dev-java/easymock:3.2
+ )"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+PATCHES=(
+ "${FILESDIR}/tomcat-10.1.20-do-not-copy.patch"
+ "${FILESDIR}/tomcat-10.1.20-offline.patch"
+ "${FILESDIR}/tomcat-9.0.87-gentoo-bnd.patch"
+)
+
+src_prepare() {
+ default #780585
+ java-pkg-2_src_prepare
+ find -name '*.jar' -type f -delete -print || die
+
+ cat > build.properties <<-EOF || die
+ execute.download=false
+ exist=true # skip target="downloadfile-2"
+ ant.jar=$(java-pkg_getjar --build-only ant ant.jar)
+ bnd-annotation.jar=$(java-pkg_getjars --build-only bnd-annotation)
+ bnd-ant.jar=$(java-pkg_getjars --build-only bnd-ant)
+ bnd-util.jar=$(java-pkg_getjars --build-only bnd-util)
+ bnd.jar=$(java-pkg_getjars --build-only bnd)
+ bndlib.jar=$(java-pkg_getjars --build-only bndlib)
+ jaxrpc-lib.jar=$(java-pkg_getjars --build-only jax-rpc-api)
+ jdt.jar=$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT})
+ libg.jar=$(java-pkg_getjars --build-only libg)
+ migration-lib.jar=$(java-pkg_getjars jakartaee-migration)
+ osgi-cmpn.jar=$(java-pkg_getjars --build-only osgi-cmpn-8)
+ osgi-core.jar=$(java-pkg_getjars --build-only osgi-core)
+ slf4j-api.jar=$(java-pkg_getjars --build-only slf4j-api)
+ wsdl4j-lib.jar=$(java-pkg_getjars wsdl4j)
+ EOF
+
+ # For use of catalina.sh in netbeans
+ sed -i -e "/^# ----- Execute The Requested Command/ a\
+ CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+ bin/catalina.sh || die
+}
+
+EANT_BUILD_TARGET="deploy"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+ LC_ALL=C java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ # add missing docBase
+ local apps="host-manager manager"
+ for app in ${apps}; do
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+ output/build/webapps/${app}/META-INF/context.xml || die
+ done
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw="$(pwgen -s -B 15 1)"
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:"
+ einfo " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "Please note that since version 10 the primary package for all implemented APIs"
+ ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code"
+ ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later."
+
+ einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+ einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
^ permalink raw reply related [flat|nested] 73+ messages in thread
end of thread, other threads:[~2024-04-04 7:51 UTC | newest]
Thread overview: 73+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-08 20:15 [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/ James Le Cuirot
-- strict thread matches above, loose matches on Subject: below --
2024-04-04 7:51 Miroslav Šulc
2023-11-08 9:02 Miroslav Šulc
2023-01-04 8:05 Miroslav Šulc
2022-09-27 5:17 Miroslav Šulc
2022-09-18 11:20 Miroslav Šulc
2022-04-01 10:04 Miroslav Šulc
2022-04-01 9:50 Miroslav Šulc
2022-02-22 9:13 Miroslav Šulc
2022-01-21 10:02 Miroslav Šulc
2022-01-21 10:02 Miroslav Šulc
2021-08-07 14:56 Miroslav Šulc
2021-07-05 14:15 Miroslav Šulc
2021-05-13 11:09 Miroslav Šulc
2021-04-07 15:03 Miroslav Šulc
2021-04-07 14:33 Miroslav Šulc
2021-03-13 12:03 Miroslav Šulc
2021-02-04 10:50 Miroslav Šulc
2020-11-24 10:30 Miroslav Šulc
2020-07-20 8:40 Miroslav Šulc
2020-07-07 8:10 Miroslav Šulc
2020-02-09 23:34 Miroslav Šulc
2019-11-25 12:26 Miroslav Šulc
2019-04-19 14:51 Miroslav Šulc
2019-01-23 14:54 Miroslav Šulc
2019-01-23 12:49 Miroslav Šulc
2018-06-01 8:34 Miroslav Šulc
2018-04-13 14:08 Miroslav Šulc
2018-02-15 17:00 Miroslav Šulc
2018-01-23 15:30 Miroslav Šulc
2017-12-15 18:03 Miroslav Šulc
2017-12-04 15:07 Miroslav Šulc
2017-11-16 8:54 Miroslav Šulc
2017-10-19 7:41 Miroslav Šulc
2017-10-11 14:27 Miroslav Šulc
2017-08-10 10:35 Miroslav Šulc
2017-08-10 10:35 Miroslav Šulc
2017-07-15 7:50 Miroslav Šulc
2017-07-15 7:50 Miroslav Šulc
2017-07-15 7:50 Miroslav Šulc
2017-05-15 17:36 Miroslav Šulc
2017-05-09 13:27 Miroslav Šulc
2017-04-25 10:12 Miroslav Šulc
2017-04-09 14:56 Miroslav Šulc
2017-04-09 14:28 Miroslav Šulc
2017-03-31 17:40 Miroslav Šulc
2017-03-31 17:40 Miroslav Šulc
2017-03-31 17:40 Miroslav Šulc
2017-03-14 15:15 Miroslav Šulc
2017-02-10 10:11 Miroslav Šulc
2017-01-25 15:56 Miroslav Šulc
2016-12-13 12:22 Miroslav Šulc
2016-12-13 8:34 Miroslav Šulc
2016-11-10 16:03 Miroslav Šulc
2016-10-13 17:10 Miroslav Šulc
2016-09-06 17:23 Miroslav Šulc
2016-07-13 21:39 Miroslav Šulc
2016-07-13 21:39 Miroslav Šulc
2016-06-14 12:34 Miroslav Šulc
2016-06-14 12:18 Miroslav Šulc
2016-05-25 20:10 Miroslav Šulc
2016-02-18 9:13 Miroslav Šulc
2016-02-12 18:28 Miroslav Šulc
2016-02-10 14:40 Miroslav Šulc
2016-01-18 15:18 Miroslav Šulc
2015-12-11 9:50 Miroslav Šulc
2015-12-04 18:11 Miroslav Šulc
2015-11-25 19:49 Miroslav Šulc
2015-10-15 11:07 Miroslav Šulc
2015-10-02 9:08 Miroslav Šulc
2015-09-03 16:50 Miroslav Šulc
2015-08-25 23:22 James Le Cuirot
2015-08-16 14:22 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox