www-servers/tomcat: Remove masked version 6

Upstream EOL is December 2016. We would rather focus on other things
than support it until then.

Package-Manager: portage-2.2.28

4 files changed, 0 insertions, 356 deletions

diff --git a/www-servers/tomcat/files/tomcat-6-sysprop.patch b/www-servers/tomcat/files/tomcat-6-sysprop.patch
deleted file mode 100644
index 033bbc89d157..000000000000
--- a/www-servers/tomcat/files/tomcat-6-sysprop.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-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
deleted file mode 100644
index 743065130f07..000000000000
--- a/www-servers/tomcat/files/tomcat-6.0.44-build.xml.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-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/files/tomcat-6.0.45-build.xml.patch b/www-servers/tomcat/files/tomcat-6.0.45-build.xml.patch
deleted file mode 100644
index 743065130f07..000000000000
--- a/www-servers/tomcat/files/tomcat-6.0.45-build.xml.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-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/files/tomcat.init b/www-servers/tomcat/files/tomcat.init
deleted file mode 100644
index 1f806810ce22..000000000000
--- a/www-servers/tomcat/files/tomcat.init
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/@GENTOO_PORTAGE_EPREFIX@sbin/runscript
-# Copyright 1999-2012 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`
-
-CLASSPATH=`java-config --classpath tomcat-@SLOT@${TOMCAT_EXTRA_JARS:+,${TOMCAT_EXTRA_JARS}}`
-export CLASSPATH="${CLASSPATH}${TOMCAT_EXTRA_CLASSPATH:+:${TOMCAT_EXTRA_CLASSPATH}}"
-
-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
-
-	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}" \
-			-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 $?
-}