www-servers/tomcat: removed obsolete ebuilds

(Portage version: 2.1.11.33/cvs/Linux x86_64, unsigned Manifest commit)

24 files changed, 14 insertions, 3432 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index e856ffaa7378..1911d9eb12e7 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.309 2012/12/06 00:54:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.310 2012/12/06 11:07:55 fordfrog Exp $
+
+  06 Dec 2012; Miroslav Šulc <fordfrog@gentoo.org>
+  -files/tomcat-6.0.35-build.xml.patch, -files/6/catalina.policy,
+  -files/6/tomcat.init.2, -files/6/tomcat.init.4, -files/7/tomcat.conf,
+  -tomcat-6.0.35.ebuild, -tomcat-7.0.23-r3.ebuild, -tomcat-7.0.27.ebuild,
+  -files/tomcat-7.0.29-build.xml.patch, -files/6/tomcat.conf,
+  -files/6/tomcat.init.3, -files/7/7.0.23-build-xml.patch,
+  -files/7/7.0.26-build-xml.patch, -files/7/7.0.27-build-xml.patch,
+  -files/7/7.0.28-build-xml.patch, -files/7/7.0.29-build-xml.patch,
+  -files/7/tomcat.init, -tomcat-6.0.35-r1.ebuild, -tomcat-7.0.26.ebuild,
+  -tomcat-7.0.28.ebuild, -tomcat-7.0.29.ebuild, -tomcat-7.0.29-r1.ebuild,
+  -tomcat-7.0.30.ebuild:
+  removed obsolete ebuilds
 
   06 Dec 2012; <ago@gentoo.org> tomcat-7.0.32.ebuild:
   Stable for ppc64, wrt bug #446146
diff --git a/www-servers/tomcat/files/6/catalina.policy b/www-servers/tomcat/files/6/catalina.policy
deleted file mode 100644
index 57bf1b133a0a..000000000000
--- a/www-servers/tomcat/files/6/catalina.policy
+++ /dev/null
@@ -1,163 +0,0 @@
-// ============================================================================
-// catalina.corepolicy - Security Policy Permissions for Tomcat 6
-//
-// This file contains a default set of security policies to be enforced (by the
-// JVM) when Catalina is executed with the "-security" option.  In addition
-// to the permissions granted here, the following additional permissions are
-// granted to the codebase specific to each web application:
-//
-// * Read access to the document root directory
-//
-// $Id: catalina.policy,v 1.1 2007/05/15 04:37:21 wltjr Exp $
-// ============================================================================
-
-
-// ========== SYSTEM CODE PERMISSIONS =========================================
-
-
-// These permissions apply to javac
-grant codeBase "file:${java.home}/lib/-" {
-        permission java.security.AllPermission;
-};
-
-// These permissions apply to all shared system extensions
-grant codeBase "file:${java.home}/jre/lib/ext/-" {
-        permission java.security.AllPermission;
-};
-
-// These permissions apply to javac when ${java.home] points at $JAVA_HOME/jre
-grant codeBase "file:${java.home}/../lib/-" {
-        permission java.security.AllPermission;
-};
-
-// These permissions apply to all shared system extensions when
-// ${java.home} points at $JAVA_HOME/jre
-grant codeBase "file:${java.home}/lib/ext/-" {
-        permission java.security.AllPermission;
-};
-
-
-// ========== CATALINA CODE PERMISSIONS =======================================
-
-
-// These permissions apply to the daemon code
-grant codeBase "file:${catalina.home}/bin/commons-daemon.jar" {
-        permission java.security.AllPermission;
-};
-
-// These permissions apply to the logging API
-grant codeBase "file:${catalina.home}/bin/tomcat-juli.jar" {
-        permission java.security.AllPermission;
-};
-
-// These permissions apply to the server startup code
-grant codeBase "file:${catalina.home}/bin/bootstrap.jar" {
-        permission java.security.AllPermission;
-};
-
-// These permissions apply to the servlet API classes
-// and those that are shared across all class loaders
-// located in the "lib" directory
-grant codeBase "file:${catalina.home}/lib/-" {
-        permission java.security.AllPermission;
-};
-grant codeBase "file:${catalina.home}/common/lib/jsp-api.jar" {
-        permission java.security.AllPermission;
-};
-grant codeBase "file:${catalina.home}/common/lib/servlet-api.jar" {
-        permission java.security.AllPermission;
-};
-
-
-// ========== WEB APPLICATION PERMISSIONS =====================================
-
-
-grant codeBase "file:${catalina.home}/webapps/host-manager/-" {
-        permission java.security.AllPermission;
-};
-grant codeBase "file:${catalina.home}/webapps/manager/-" {
-        permission java.security.AllPermission;
-};
-grant codeBase "file:${catalina.base}/webapps/ROOT/-" {
-        permission java.security.AllPermission;
-};
-
-// These permissions are granted by default to all web applications
-// In addition, a web application will be given a read FilePermission
-// and JndiPermission for all files and directories in its document root.
-grant { 
-    // Required for JNDI lookup of named JDBC DataSource's and
-    // javamail named MimePart DataSource used to send mail
-    permission java.util.PropertyPermission "java.home", "read";
-    permission java.util.PropertyPermission "java.naming.*", "read";
-    permission java.util.PropertyPermission "javax.sql.*", "read";
-
-    // OS Specific properties to allow read access
-    permission java.util.PropertyPermission "os.name", "read";
-    permission java.util.PropertyPermission "os.version", "read";
-    permission java.util.PropertyPermission "os.arch", "read";
-    permission java.util.PropertyPermission "file.separator", "read";
-    permission java.util.PropertyPermission "path.separator", "read";
-    permission java.util.PropertyPermission "line.separator", "read";
-
-    // JVM properties to allow read access
-    permission java.util.PropertyPermission "java.version", "read";
-    permission java.util.PropertyPermission "java.vendor", "read";
-    permission java.util.PropertyPermission "java.vendor.url", "read";
-    permission java.util.PropertyPermission "java.class.version", "read";
-	permission java.util.PropertyPermission "java.specification.version", "read";
-	permission java.util.PropertyPermission "java.specification.vendor", "read";
-	permission java.util.PropertyPermission "java.specification.name", "read";
-
-	permission java.util.PropertyPermission "java.vm.specification.version", "read";
-	permission java.util.PropertyPermission "java.vm.specification.vendor", "read";
-	permission java.util.PropertyPermission "java.vm.specification.name", "read";
-	permission java.util.PropertyPermission "java.vm.version", "read";
-	permission java.util.PropertyPermission "java.vm.vendor", "read";
-	permission java.util.PropertyPermission "java.vm.name", "read";
-
-    // Required for OpenJMX
-    permission java.lang.RuntimePermission "getAttribute";
-
-	// Allow read of JAXP compliant XML parser debug
-	permission java.util.PropertyPermission "jaxp.debug", "read";
-
-    // Precompiled JSPs need access to this package.
-    permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime";
-    permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime.*";
-    
-};
-
-
-// You can assign additional permissions to particular web applications by
-// adding additional "grant" entries here, based on the code base for that
-// application, /WEB-INF/classes/, or /WEB-INF/lib/ jar files.
-//
-// Different permissions can be granted to JSP pages, classes loaded from
-// the /WEB-INF/classes/ directory, all jar files in the /WEB-INF/lib/
-// directory, or even to individual jar files in the /WEB-INF/lib/ directory.
-//
-// For instance, assume that the standard "examples" application
-// included a JDBC driver that needed to establish a network connection to the
-// corresponding database and used the scrape taglib to get the weather from
-// the NOAA web server.  You might create a "grant" entries like this:
-//
-// The permissions granted to the context root directory apply to JSP pages.
-// grant codeBase "file:${catalina.home}/webapps/examples/-" {
-//      permission java.net.SocketPermission "dbhost.mycompany.com:5432", "connect";
-//      permission java.net.SocketPermission "*.noaa.gov:80", "connect";
-// };
-//
-// The permissions granted to the context WEB-INF/classes directory
-// grant codeBase "file:${catalina.home}/webapps/examples/WEB-INF/classes/-" {
-// };
-//
-// The permission granted to your JDBC driver
-// grant codeBase "jar:file:${catalina.home}/webapps/examples/WEB-INF/lib/driver.jar!/-" {
-//      permission java.net.SocketPermission "dbhost.mycompany.com:5432", "connect";
-// };
-// The permission granted to the scrape taglib
-// grant codeBase "jar:file:${catalina.home}/webapps/examples/WEB-INF/lib/scrape.jar!/-" {
-//      permission java.net.SocketPermission "*.noaa.gov:80", "connect";
-// };
-
diff --git a/www-servers/tomcat/files/6/tomcat.conf b/www-servers/tomcat/files/6/tomcat.conf
deleted file mode 100644
index 5fc22e3a921e..000000000000
--- a/www-servers/tomcat/files/6/tomcat.conf
+++ /dev/null
@@ -1,79 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.conf,v 1.5 2008/12/19 20:48:47 ali_bush Exp $
-
-# JVM Runtime
-# Using the default setting, it will determine your JVM from the system-vm
-# set using java-config.
-# See java-config(1) manual page for assistance in determining this value.
-#
-# You can override this value with whatever path you wish.  
-# Example: export GENTOO_VM="sun-jdk-1.6"
-
-#export GENTOO_VM="sun-jdk-1.6"
-
-# (Optional) Java runtime options used when the "start", "stop", or "run"
-# commands are executed.
-# Example to set library path for tomcat-native
-# JAVA_OPTS="-Djava.library.path=/usr/lib"
-# JAVA_OPTS=""
-
-# Where your web applications are located
-CATALINA_HOME=/usr/share/tomcat-6/
-CATALINA_BASE=/var/lib/tomcat-6/
-
-# Tomcat's User/Group
-# Change these at your own risk!!! These are not supported so if it 
-# breaks something, you are on your own.
-CATALINA_USER=tomcat
-CATALINA_GROUP=tomcat
-
-# Location of the Tomcat JARs and classes
-CATALINA_LIBDIR=/usr/share/tomcat-6/lib/
-
-# The CLASSPATH for Tomcat to use, plus any others you need.
-CLASSPATH=${CATALINA_LIBDIR}
-
-# (Optional) Directory path location of temporary directory the JVM should 
-# use (java.io.tmpdir).  Defaults to $CATALINA_BASE/temp.
-# Note: This directory must exist and be read/writable by tomcat.  
-# See #246362 as an example where /var/tmp was deleted on shutdown.
-CATALINA_TMPDIR="/var/tmp/tomcat-6/"
-
-# TOMCAT STARTUP/SHUTDOWN
-# 	debug             Start Catalina in a debugger
-# 	-security debug   Debug Catalina with a security manager
-# 	jpda start        Start Catalina under JPDA debugger
-# 	start             Start Catalina in a separate window
-# 	-security start   Start in a separate window with security manager
-# 	stop              Stop Catalina"
-#
-# NOTE: -security requires JSSE (see below)
-# NOTE: jpda requires JPDA (see below)
-TOMCAT_START="start"
-TOMCAT_STOP="stop"
-
-# (Optional) Java runtime options used when the "start", "stop", or "run" 
-# commands are executed.
-# CATALINA_OPTS=""
-
-# Java Platform Debugger Architecture (JPDA)
-# http://java.sun.com/products/jpda/
-# Included with Java SDK 1.3 and later.  No need to specify location.
-#
-#   JPDA_TRANSPORT  (Optional) JPDA transport used when the "jpda start"
-#                   command is executed. The default is "dt_socket".
-#
-#   JPDA_ADDRESS    (Optional) Java runtime options used when the "jpda start"
-#                   command is executed. The default is 8000.
-#
-# JPDA_TRANSPORT="dt_socket"
-# JPDA_ADDRESS="8000"
-
-# Java Secure Socket Extension (JSSE)
-# http://java.sun.com/products/jsse/
-# Included with Java SDK 1.4 and later.
-#
-#   JSSE_HOME       (Optional) May point at your Java Secure Sockets Extension
-#                   (JSSE) installation, whose JAR files will be added to the
-#                   system class path used to start Tomcat.
-#
-# JSSE_HOME="/opt/sun-jdk-1.5.0.09/jre/lib/"
diff --git a/www-servers/tomcat/files/6/tomcat.init.2 b/www-servers/tomcat/files/6/tomcat.init.2
deleted file mode 100644
index 9e08e07014ef..000000000000
--- a/www-servers/tomcat/files/6/tomcat.init.2
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.init.2,v 1.3 2011/04/08 11:25:06 elvanor Exp $
-
-opts="${opts} forcestop"
-
-init_env_vars() {
-	# Populate JAVA_HOME
-	JAVA_HOME=`java-config --jre-home`
-
-	# Set some sane defaults
-	if [ -z "${CATALINA_TMPDIR}" ] ; then
-		CATALINA_TMPDIR="${CATALINA_BASE}"/temp
-	fi
-	JPDA_TRANSPORT=${JPDA_TRANSPORT:="dt_socket"}
-	JPDA_ADDRESS=${JPDA_ADDRESS:="8000"}
-	JPDA_OPTS=${JPDA_OPTS="-Xdebug -Xrunjdwp:transport=${JPDA_TRANSPORT},address=${JPDA_ADDRESS},server=y,suspend=n"}
-
-	# Activate Logging
-	if [ -r "${CATALINA_HOME}"/bin/tomcat-juli.jar ]; then
-		JAVA_OPTS="${JAVA_OPTS} -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager \
-			-Djava.util.logging.config.file=${CATALINA_BASE}/conf/logging.properties"
-	fi
-
-	# Populate the classpath
-	unset CLASSPATH
-	CLASSPATH="${CATALINA_HOME}/lib:${JAVA_HOME}/lib/tools.jar"
-	if [ -n "${JSSE_HOME}" ]; then
-		CLASSPATH="${CLASSPATH}:${JSSE_HOME}/lib/jcert.jar:${JSSE_HOME}/lib/jnet.jar:${JSSE_HOME}/lib/jsse.jar"
-	fi
-	CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar:${CATALINA_HOME}/bin/tomcat-juli.jar"
-
-	OPTS_CP="${JAVA_OPTS} ${CATALINA_OPTS} -classpath ${CLASSPATH}"
-
-	CATALINA_ARGS="-Dcatalina.base=${CATALINA_BASE} \
-			-Dcatalina.home=${CATALINA_HOME} \
-			-Djava.io.tmpdir=${CATALINA_TMPDIR} \
-			org.apache.catalina.startup.Bootstrap "
-
-	if [ ! -f "${CATALINA_BASE}logs/catalina.out" ]; then
-		touch "${CATALINA_BASE}logs/catalina.out"
-		chown "${CATALINA_USER}:${CATALINA_GROUP}" "${CATALINA_BASE}logs/catalina.out"
-	fi
-}
-
-ssd() {
-	local exec=${1}
-	shift
-	local args="--start --quiet \
-		--chdir "${CATALINA_TMPDIR}" \
-		--chuid ${CATALINA_USER}:${CATALINA_GROUP} \
-		--make-pidfile --pidfile /var/run/tomcat-6.pid"
-
-	# bug #243348
-	if [ -e /etc/init.d/sysfs ] ; then
-		args="${args} --background \
-			 --stdout ${CATALINA_BASE}/logs/catalina.out \
-			 --stderr ${CATALINA_BASE}/logs/catalina.out"
-		start-stop-daemon ${args} --exec ${exec} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${TOMCAT_START}
-	else
-		start-stop-daemon ${args} --exec ${exec} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${TOMCAT_START} >> \
-			"${CATALINA_BASE}/logs/catalina.out" 2>&1 &
-	fi
-	return $?
-}
-
-depend() {
-	use dns logger net
-}
-
-start()	{
-	ebegin "Starting Tomcat"
-	init_env_vars
-
-	if [ ! -e "${CATALINA_TMPDIR}" ]; then
-		eerror "CATALINA_TMPDIR does not exist. Unable to start tomcat."
-		eerror "Please see /etc/conf.d/tomcat-6 for more information."
-		eend 1
-	fi
-
-	# Figure out what args to pass start_helper based on TOMCAT_START
-	if [ "${TOMCAT_START}" = "debug" ] ; then
-		ssd ${JAVA_HOME}/bin/jdb \
-			-sourcepath ${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share
-	elif [ "${TOMCAT_START}" = "-security debug" ] ; then
-		ssd ${JAVA_HOME}/bin/jdb \
-			-sourcepath ${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share \
-			-Djava.security.manager \
-			-Djava.security.policy=${CATALINA_BASE}/conf/catalina.policy
-	elif [ "${TOMCAT_START}" = "jpda start" ] ; then
-		ssd ${JAVA_HOME}/bin/java ${JPDA_OPTS}
-	elif [ "${TOMCAT_START}" = "start" ] ; then
-		ssd ${JAVA_HOME}/bin/java
-	elif [ "${TOMCAT_START}" = "-security start" ] ; then
-		ssd ${JAVA_HOME}/bin/java \
-			-Djava.security.manager \
-			-Djava.security.policy=${CATALINA_BASE}/conf/catalina.policy
-	else
-		eerror "Invalid TOMCAT_START variable value, or one is not set"
-		eerror "Please see /etc/conf.d/tomcat-6 for more information"
-		eend 1
-	fi
-	eend $?
-}
-
-stop()	{
-	ebegin "Stopping Tomcat"
-	init_env_vars
-	start-stop-daemon --stop --quiet --retry=60 \
-	       	--pidfile /var/run/tomcat-6.pid \
-		--exec ${JAVA_HOME}/bin/java -- ${OPTS_CP} ${CATALINA_args} stop ${STD_OUT}
-	eend $?
-}
-forcestop()	{
-	ebegin "Forcing Tomcat to Stop"
-	start-stop-daemon --stop --quiet --retry=60 \
-		--pidfile /var/run/tomcat-6.pid --signal=9
-	if service_started "${SVCNAME}"; then
-		mark_service_stopped "${SVCNAME}"
-	fi
-	eend $?
-}
\ No newline at end of file
diff --git a/www-servers/tomcat/files/6/tomcat.init.3 b/www-servers/tomcat/files/6/tomcat.init.3
deleted file mode 100644
index dd5c2667bf01..000000000000
--- a/www-servers/tomcat/files/6/tomcat.init.3
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.init.3,v 1.3 2011/04/08 11:25:06 elvanor Exp $
-
-opts="${opts} forcestop"
-
-init_env_vars() {
-	# Populate JAVA_HOME
-	JAVA_HOME=`java-config --jre-home`
-
-	# Set some sane defaults
-	if [ -z "${CATALINA_TMPDIR}" ] ; then
-		CATALINA_TMPDIR="${CATALINA_BASE}"/temp
-	fi
-	JPDA_TRANSPORT=${JPDA_TRANSPORT:="dt_socket"}
-	JPDA_ADDRESS=${JPDA_ADDRESS:="8000"}
-	JPDA_OPTS=${JPDA_OPTS="-Xdebug -Xrunjdwp:transport=${JPDA_TRANSPORT},address=${JPDA_ADDRESS},server=y,suspend=n"}
-
-	# Activate Logging
-	if [ -r "${CATALINA_HOME}"/bin/tomcat-juli.jar ]; then
-		JAVA_OPTS="${JAVA_OPTS} -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager \
-			-Djava.util.logging.config.file=${CATALINA_BASE}/conf/logging.properties"
-	fi
-
-	# Populate the classpath
-	unset CLASSPATH
-	CLASSPATH="${CATALINA_HOME}/lib:${JAVA_HOME}/lib/tools.jar"
-	if [ -n "${JSSE_HOME}" ]; then
-		CLASSPATH="${CLASSPATH}:${JSSE_HOME}/lib/jcert.jar:${JSSE_HOME}/lib/jnet.jar:${JSSE_HOME}/lib/jsse.jar"
-	fi
-	CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar:${CATALINA_HOME}/bin/tomcat-juli.jar"
-
-	OPTS_CP="${JAVA_OPTS} ${CATALINA_OPTS} -classpath ${CLASSPATH}"
-
-	CATALINA_ARGS="-Dcatalina.base=${CATALINA_BASE} \
-			-Dcatalina.home=${CATALINA_HOME} \
-			-Djava.io.tmpdir=${CATALINA_TMPDIR} \
-			org.apache.catalina.startup.Bootstrap "
-
-	if [ ! -f "${CATALINA_BASE}logs/catalina.out" ]; then
-		touch "${CATALINA_BASE}logs/catalina.out"
-		chown "${CATALINA_USER}:${CATALINA_GROUP}" "${CATALINA_BASE}logs/catalina.out"
-	fi
-}
-
-ssd() {
-	local exec=${1}
-	shift
-	local args="--start --quiet \
-		--chdir "${CATALINA_TMPDIR}" \
-		--chuid ${CATALINA_USER}:${CATALINA_GROUP} \
-		--make-pidfile --pidfile /var/run/tomcat-6.pid"
-
-	# bug #243348
-	if [ -e /etc/init.d/sysfs ] ; then
-		args="${args} --background \
-			 --stdout ${CATALINA_BASE}/logs/catalina.out \
-			 --stderr ${CATALINA_BASE}/logs/catalina.out"
-		start-stop-daemon ${args} --exec ${exec} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${TOMCAT_START}
-	else
-		start-stop-daemon ${args} --name ${exec} --exec ${exec} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${TOMCAT_START} >> \
-			"${CATALINA_BASE}/logs/catalina.out" 2>&1 &
-	fi
-	return $?
-}
-
-depend() {
-	use dns logger net
-}
-
-start()	{
-	ebegin "Starting Tomcat"
-	init_env_vars
-
-	if [ ! -e "${CATALINA_TMPDIR}" ]; then
-		eerror "CATALINA_TMPDIR does not exist. Unable to start tomcat."
-		eerror "Please see /etc/conf.d/tomcat-6 for more information."
-		eend 1
-	fi
-
-	# Figure out what args to pass start_helper based on TOMCAT_START
-	if [ "${TOMCAT_START}" = "debug" ] ; then
-		ssd ${JAVA_HOME}/bin/jdb \
-			-sourcepath ${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share
-	elif [ "${TOMCAT_START}" = "-security debug" ] ; then
-		ssd ${JAVA_HOME}/bin/jdb \
-			-sourcepath ${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share \
-			-Djava.security.manager \
-			-Djava.security.policy=${CATALINA_BASE}/conf/catalina.policy
-	elif [ "${TOMCAT_START}" = "jpda start" ] ; then
-		ssd ${JAVA_HOME}/bin/java ${JPDA_OPTS}
-	elif [ "${TOMCAT_START}" = "start" ] ; then
-		ssd ${JAVA_HOME}/bin/java
-	elif [ "${TOMCAT_START}" = "-security start" ] ; then
-		ssd ${JAVA_HOME}/bin/java \
-			-Djava.security.manager \
-			-Djava.security.policy=${CATALINA_BASE}/conf/catalina.policy
-	else
-		eerror "Invalid TOMCAT_START variable value, or one is not set"
-		eerror "Please see /etc/conf.d/tomcat-6 for more information"
-		eend 1
-	fi
-	eend $?
-}
-
-stop()	{
-	ebegin "Stopping Tomcat"
-	init_env_vars
-	start-stop-daemon --stop --quiet --retry=60 \
-	       	--pidfile /var/run/tomcat-6.pid \
-		--exec ${JAVA_HOME}/bin/java -- ${OPTS_CP} ${CATALINA_args} stop ${STD_OUT}
-	eend $?
-}
-forcestop()	{
-	ebegin "Forcing Tomcat to Stop"
-	start-stop-daemon --stop --quiet --retry=60 \
-		--pidfile /var/run/tomcat-6.pid --signal=9
-	if service_started "${SVCNAME}"; then
-		mark_service_stopped "${SVCNAME}"
-	fi
-	eend $?
-}
diff --git a/www-servers/tomcat/files/6/tomcat.init.4 b/www-servers/tomcat/files/6/tomcat.init.4
deleted file mode 100644
index 424f77d12bf5..000000000000
--- a/www-servers/tomcat/files/6/tomcat.init.4
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.init.4,v 1.1 2011/12/24 19:43:50 fordfrog Exp $
-
-extra_commands="forcestop"
-
-init_env_vars() {
-	# Populate JAVA_HOME
-	JAVA_HOME=`java-config --jre-home`
-
-	# Set some sane defaults
-	if [ -z "${CATALINA_TMPDIR}" ] ; then
-		CATALINA_TMPDIR="${CATALINA_BASE}"/temp
-	fi
-	JPDA_TRANSPORT=${JPDA_TRANSPORT:="dt_socket"}
-	JPDA_ADDRESS=${JPDA_ADDRESS:="8000"}
-	JPDA_OPTS=${JPDA_OPTS="-Xdebug -Xrunjdwp:transport=${JPDA_TRANSPORT},address=${JPDA_ADDRESS},server=y,suspend=n"}
-
-	# Activate Logging
-	if [ -r "${CATALINA_HOME}"/bin/tomcat-juli.jar ]; then
-		JAVA_OPTS="${JAVA_OPTS} -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager \
-			-Djava.util.logging.config.file=${CATALINA_BASE}/conf/logging.properties"
-	fi
-
-	# Populate the classpath
-	unset CLASSPATH
-	CLASSPATH="${CATALINA_HOME}/lib:${JAVA_HOME}/lib/tools.jar"
-	if [ -n "${JSSE_HOME}" ]; then
-		CLASSPATH="${CLASSPATH}:${JSSE_HOME}/lib/jcert.jar:${JSSE_HOME}/lib/jnet.jar:${JSSE_HOME}/lib/jsse.jar"
-	fi
-	CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar:${CATALINA_HOME}/bin/tomcat-juli.jar"
-
-	OPTS_CP="${JAVA_OPTS} ${CATALINA_OPTS} -classpath ${CLASSPATH}"
-
-	CATALINA_ARGS="-Dcatalina.base=${CATALINA_BASE} \
-			-Dcatalina.home=${CATALINA_HOME} \
-			-Djava.io.tmpdir=${CATALINA_TMPDIR} \
-			org.apache.catalina.startup.Bootstrap "
-
-	if [ ! -f "${CATALINA_BASE}logs/catalina.out" ]; then
-		touch "${CATALINA_BASE}logs/catalina.out"
-		chown "${CATALINA_USER}:${CATALINA_GROUP}" "${CATALINA_BASE}logs/catalina.out"
-	fi
-}
-
-ssd() {
-	local exec=${1}
-	shift
-	local args="--start --quiet \
-		--chdir "${CATALINA_TMPDIR}" \
-		--user ${CATALINA_USER}:${CATALINA_GROUP} \
-		--make-pidfile --pidfile /var/run/tomcat-6.pid"
-
-	# bug #243348
-	if [ -e /etc/init.d/sysfs ] ; then
-		args="${args} --background \
-			 --stdout ${CATALINA_BASE}/logs/catalina.out \
-			 --stderr ${CATALINA_BASE}/logs/catalina.out"
-		start-stop-daemon ${args} --exec ${exec} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${TOMCAT_START}
-	else
-		start-stop-daemon ${args} --name ${exec} --exec ${exec} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${TOMCAT_START} >> \
-			"${CATALINA_BASE}/logs/catalina.out" 2>&1 &
-	fi
-	return $?
-}
-
-depend() {
-	use dns logger net
-}
-
-start()	{
-	ebegin "Starting Tomcat"
-	init_env_vars
-
-	if [ ! -e "${CATALINA_TMPDIR}" ]; then
-		eerror "CATALINA_TMPDIR does not exist. Unable to start tomcat."
-		eerror "Please see /etc/conf.d/tomcat-6 for more information."
-		eend 1
-	fi
-
-	# Figure out what args to pass start_helper based on TOMCAT_START
-	if [ "${TOMCAT_START}" = "debug" ] ; then
-		ssd ${JAVA_HOME}/bin/jdb \
-			-sourcepath ${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share
-	elif [ "${TOMCAT_START}" = "-security debug" ] ; then
-		ssd ${JAVA_HOME}/bin/jdb \
-			-sourcepath ${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share \
-			-Djava.security.manager \
-			-Djava.security.policy=${CATALINA_BASE}/conf/catalina.policy
-	elif [ "${TOMCAT_START}" = "jpda start" ] ; then
-		ssd ${JAVA_HOME}/bin/java ${JPDA_OPTS}
-	elif [ "${TOMCAT_START}" = "start" ] ; then
-		ssd ${JAVA_HOME}/bin/java
-	elif [ "${TOMCAT_START}" = "-security start" ] ; then
-		ssd ${JAVA_HOME}/bin/java \
-			-Djava.security.manager \
-			-Djava.security.policy=${CATALINA_BASE}/conf/catalina.policy
-	else
-		eerror "Invalid TOMCAT_START variable value, or one is not set"
-		eerror "Please see /etc/conf.d/tomcat-6 for more information"
-		eend 1
-	fi
-	eend $?
-}
-
-stop()	{
-	ebegin "Stopping Tomcat"
-	init_env_vars
-	start-stop-daemon --stop --quiet --retry=60 \
-	       	--pidfile /var/run/tomcat-6.pid \
-		--exec ${JAVA_HOME}/bin/java -- ${OPTS_CP} ${CATALINA_args} stop ${STD_OUT}
-	eend $?
-}
-forcestop()	{
-	ebegin "Forcing Tomcat to Stop"
-	start-stop-daemon --stop --quiet --retry=60 \
-		--pidfile /var/run/tomcat-6.pid --signal=9
-	if service_started "${SVCNAME}"; then
-		mark_service_stopped "${SVCNAME}"
-	fi
-	eend $?
-}
diff --git a/www-servers/tomcat/files/7/7.0.23-build-xml.patch b/www-servers/tomcat/files/7/7.0.23-build-xml.patch
deleted file mode 100644
index e5978bbc6c9c..000000000000
--- a/www-servers/tomcat/files/7/7.0.23-build-xml.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff --git a/apache-tomcat-7.0.23-src/build.xml b/apache-tomcat-7.0.23-src/build.xml
-index 1601cc6..a3a66a8 100644
---- a/apache-tomcat-7.0.23-src/build.xml
-+++ b/apache-tomcat-7.0.23-src/build.xml
-@@ -156,6 +156,7 @@
-   
-   <!-- Classpaths -->
-   <path id="compile.classpath">
-+    <pathelement location="${ant.jar}"/>
-     <pathelement location="${jdt.jar}"/>
-   </path>
- 
-@@ -301,6 +302,7 @@
-     <exclude name="org/apache/catalina/mbeans/JmxRemote*" />
-     <exclude name="org/apache/catalina/tribes/**" />
-     <exclude name="org/apache/naming/factory/webservices/**" />
-+    <exclude name="javax/servlet/**" />
-   </patternset>
- 
-   <patternset id="files.catalina-tribes">
-@@ -430,7 +432,7 @@
-     
-   </target>
- 
--  <target name="validate" depends="download-validate" if="${execute.validate}">
-+  <target name="validate" if="${execute.validate}">
-     <!-- Required so we can cache checkstyle results -->
-     <mkdir dir="${tomcat.output}/res/checkstyle"/>
- 
-@@ -482,7 +484,7 @@
-     </copy>
-   </target>
- 
--  <target name="compile" depends="build-prepare,download-compile,compile-prepare,validate">
-+  <target name="compile" depends="build-prepare,compile-prepare,validate">
-     <!-- Compile internal server components -->
-     <javac srcdir="java" destdir="${tomcat.classes}"
-            debug="${compile.debug}"
-@@ -544,7 +546,7 @@
-       filesId="files.annotations-api"
-       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
- 
--    <!-- Servlet 3.0 Implementation JAR File -->
-+<!-- Servlet 3.0 Implementation JAR File
-     <jarIt jarfile="${servlet-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.servlet-api"
-@@ -552,7 +554,7 @@
-       notice="${tomcat.manifests}/servlet-api.jar.notice"
-       license="${tomcat.manifests}/servlet-api.jar.license" />
- 
--    <!-- JSP 2.2 Implementation JAR File -->
-+    JSP 2.2 Implementation JAR File
-     <jarIt jarfile="${jsp-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.jsp-api"
-@@ -560,12 +562,12 @@
-       notice="${tomcat.manifests}/jsp-api.jar.notice"
-       license="${tomcat.manifests}/jsp-api.jar.license" />
- 
--    <!-- JSP 2.2 EL Implementation JAR File -->
-+    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}"
-       filesDir="${tomcat.classes}"
-@@ -656,7 +658,7 @@
- 
-   </target>
- 
--  <target name="build-docs" description="Builds all documentation from XML sources">
-+  <target name="build-docs" unless="nobuild.docs" description="Builds all documentation from XML sources">
- 
-     <copy todir="${tomcat.build}/webapps">
-       <fileset dir="webapps">
-@@ -770,14 +772,14 @@
- 
-   <target name="deploy" depends="package,build-docs"
-           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">
-@@ -834,7 +836,7 @@
-              source="${compile.source}"
-              target="${compile.target}"
-              optimize="${compile.optimize}"
--             classpath="${tomcat.classes}"
-+             classpath="${tomcat.classes}:${jsp-api.jar}"
-              excludes="**/CVS/**,**/.svn/**"
-              encoding="ISO-8859-1"
-              includeantruntime="false">
-@@ -846,7 +848,7 @@
-              source="${compile.source}"
-              target="${compile.target}"
-              optimize="${compile.optimize}"
--             classpath="$tomcat.lcasses}"
-+             classpath="${tomcat.classes}:${jsp-api.jar}"
-              excludes="**/CVS/**,**/.svn/**"
-              encoding="ISO-8859-1"
-              includeantruntime="false">
-@@ -854,11 +856,11 @@
- 
-     <!-- Add sources for examples -->
-     <antcall target="examples-sources" />
--
-+<!--
-     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
-       failonerror="false"/>
-     <copy file="${jdt.jar}" todir="${tomcat.build}/lib" />
--
-+-->
-     <!-- 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}" inheritall="false" target="build">
-@@ -1042,7 +1044,7 @@
- 
-   </target>
- 
--  <target name="test-compile" depends="compile,download-test-compile" >
-+  <target name="test-compile" depends="compile" >
-     <mkdir dir="${test.classes}"/>
-     <!-- Compile -->
-     <javac srcdir="test" destdir="${test.classes}"
diff --git a/www-servers/tomcat/files/7/7.0.26-build-xml.patch b/www-servers/tomcat/files/7/7.0.26-build-xml.patch
deleted file mode 100644
index 50c21e21ef44..000000000000
--- a/www-servers/tomcat/files/7/7.0.26-build-xml.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff --git a/apache-tomcat-7.0.25-src/build.xml b/apache-tomcat-7.0.25-src/build.xml
-index c7d4669..d8dc2c5 100644
---- a/apache-tomcat-7.0.25-src/build.xml
-+++ b/apache-tomcat-7.0.25-src/build.xml
-@@ -163,6 +163,7 @@
- 
-   <!-- Classpaths -->
-   <path id="compile.classpath">
-+    <pathelement location="${ant.jar}"/>
-     <pathelement location="${jdt.jar}"/>
-   </path>
- 
-@@ -309,6 +310,7 @@
-     <exclude name="org/apache/catalina/mbeans/JmxRemote*" />
-     <exclude name="org/apache/catalina/tribes/**" />
-     <exclude name="org/apache/naming/factory/webservices/**" />
-+    <exclude name="javax/servlet/**" />
-   </patternset>
- 
-   <patternset id="files.catalina-tribes">
-@@ -438,7 +440,7 @@
-     
-   </target>
- 
--  <target name="validate" depends="download-validate" if="${execute.validate}">
-+  <target name="validate" if="${execute.validate}">
-     <!-- Required so we can cache checkstyle results -->
-     <mkdir dir="${tomcat.output}/res/checkstyle"/>
- 
-@@ -497,7 +499,7 @@
-     </copy>
-   </target>
- 
--  <target name="compile" depends="build-prepare,download-compile,compile-prepare,validate">
-+  <target name="compile" depends="build-prepare,compile-prepare,validate">
-     <!-- Compile internal server components -->
-     <javac srcdir="java" destdir="${tomcat.classes}"
-            debug="${compile.debug}"
-@@ -559,7 +561,7 @@
-       filesId="files.annotations-api"
-       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
- 
--    <!-- Servlet 3.0 Implementation JAR File -->
-+<!-- Servlet 3.0 Implementation JAR File
-     <jarIt jarfile="${servlet-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.servlet-api"
-@@ -567,7 +569,7 @@
-       notice="${tomcat.manifests}/servlet-api.jar.notice"
-       license="${tomcat.manifests}/servlet-api.jar.license" />
- 
--    <!-- JSP 2.2 Implementation JAR File -->
-+    JSP 2.2 Implementation JAR File
-     <jarIt jarfile="${jsp-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.jsp-api"
-@@ -575,12 +577,12 @@
-       notice="${tomcat.manifests}/jsp-api.jar.notice"
-       license="${tomcat.manifests}/jsp-api.jar.license" />
- 
--    <!-- JSP 2.2 EL Implementation JAR File -->
-+    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}"
-       filesDir="${tomcat.classes}"
-@@ -671,7 +673,7 @@
- 
-   </target>
- 
--  <target name="build-docs" depends="compile-prepare" description="Builds all documentation from XML sources">
-+  <target name="build-docs" depends="compile-prepare" unless="nobuild.docs" description="Builds all documentation from XML sources">
- 
-     <copy todir="${tomcat.build}/webapps">
-       <fileset dir="webapps">
-@@ -779,14 +781,14 @@
- 
-   <target name="deploy" depends="package,build-docs"
-           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">
-@@ -843,7 +845,7 @@
-              source="${compile.source}"
-              target="${compile.target}"
-              optimize="${compile.optimize}"
--             classpath="${tomcat.classes}"
-+             classpath="${tomcat.classes}:${jsp-api.jar}"
-              excludes="**/CVS/**,**/.svn/**"
-              encoding="ISO-8859-1"
-              includeantruntime="false">
-@@ -855,7 +857,7 @@
-              source="${compile.source}"
-              target="${compile.target}"
-              optimize="${compile.optimize}"
--             classpath="$tomcat.lcasses}"
-+             classpath="${tomcat.classes}:${jsp-api.jar}"
-              excludes="**/CVS/**,**/.svn/**"
-              encoding="ISO-8859-1"
-              includeantruntime="false">
-@@ -863,11 +865,11 @@
- 
-     <!-- Add sources for examples -->
-     <antcall target="examples-sources" />
--
-+<!--
-     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
-       failonerror="false"/>
-     <copy file="${jdt.jar}" todir="${tomcat.build}/lib" />
--
-+-->
-     <!-- 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}" inheritall="false" target="build">
-@@ -1051,7 +1053,7 @@
- 
-   </target>
- 
--  <target name="test-compile" depends="compile,download-test-compile" >
-+  <target name="test-compile" depends="compile" >
-     <mkdir dir="${test.classes}"/>
-     <!-- Compile -->
-     <javac srcdir="test" destdir="${test.classes}"
diff --git a/www-servers/tomcat/files/7/7.0.27-build-xml.patch b/www-servers/tomcat/files/7/7.0.27-build-xml.patch
deleted file mode 100644
index 50c21e21ef44..000000000000
--- a/www-servers/tomcat/files/7/7.0.27-build-xml.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff --git a/apache-tomcat-7.0.25-src/build.xml b/apache-tomcat-7.0.25-src/build.xml
-index c7d4669..d8dc2c5 100644
---- a/apache-tomcat-7.0.25-src/build.xml
-+++ b/apache-tomcat-7.0.25-src/build.xml
-@@ -163,6 +163,7 @@
- 
-   <!-- Classpaths -->
-   <path id="compile.classpath">
-+    <pathelement location="${ant.jar}"/>
-     <pathelement location="${jdt.jar}"/>
-   </path>
- 
-@@ -309,6 +310,7 @@
-     <exclude name="org/apache/catalina/mbeans/JmxRemote*" />
-     <exclude name="org/apache/catalina/tribes/**" />
-     <exclude name="org/apache/naming/factory/webservices/**" />
-+    <exclude name="javax/servlet/**" />
-   </patternset>
- 
-   <patternset id="files.catalina-tribes">
-@@ -438,7 +440,7 @@
-     
-   </target>
- 
--  <target name="validate" depends="download-validate" if="${execute.validate}">
-+  <target name="validate" if="${execute.validate}">
-     <!-- Required so we can cache checkstyle results -->
-     <mkdir dir="${tomcat.output}/res/checkstyle"/>
- 
-@@ -497,7 +499,7 @@
-     </copy>
-   </target>
- 
--  <target name="compile" depends="build-prepare,download-compile,compile-prepare,validate">
-+  <target name="compile" depends="build-prepare,compile-prepare,validate">
-     <!-- Compile internal server components -->
-     <javac srcdir="java" destdir="${tomcat.classes}"
-            debug="${compile.debug}"
-@@ -559,7 +561,7 @@
-       filesId="files.annotations-api"
-       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
- 
--    <!-- Servlet 3.0 Implementation JAR File -->
-+<!-- Servlet 3.0 Implementation JAR File
-     <jarIt jarfile="${servlet-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.servlet-api"
-@@ -567,7 +569,7 @@
-       notice="${tomcat.manifests}/servlet-api.jar.notice"
-       license="${tomcat.manifests}/servlet-api.jar.license" />
- 
--    <!-- JSP 2.2 Implementation JAR File -->
-+    JSP 2.2 Implementation JAR File
-     <jarIt jarfile="${jsp-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.jsp-api"
-@@ -575,12 +577,12 @@
-       notice="${tomcat.manifests}/jsp-api.jar.notice"
-       license="${tomcat.manifests}/jsp-api.jar.license" />
- 
--    <!-- JSP 2.2 EL Implementation JAR File -->
-+    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}"
-       filesDir="${tomcat.classes}"
-@@ -671,7 +673,7 @@
- 
-   </target>
- 
--  <target name="build-docs" depends="compile-prepare" description="Builds all documentation from XML sources">
-+  <target name="build-docs" depends="compile-prepare" unless="nobuild.docs" description="Builds all documentation from XML sources">
- 
-     <copy todir="${tomcat.build}/webapps">
-       <fileset dir="webapps">
-@@ -779,14 +781,14 @@
- 
-   <target name="deploy" depends="package,build-docs"
-           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">
-@@ -843,7 +845,7 @@
-              source="${compile.source}"
-              target="${compile.target}"
-              optimize="${compile.optimize}"
--             classpath="${tomcat.classes}"
-+             classpath="${tomcat.classes}:${jsp-api.jar}"
-              excludes="**/CVS/**,**/.svn/**"
-              encoding="ISO-8859-1"
-              includeantruntime="false">
-@@ -855,7 +857,7 @@
-              source="${compile.source}"
-              target="${compile.target}"
-              optimize="${compile.optimize}"
--             classpath="$tomcat.lcasses}"
-+             classpath="${tomcat.classes}:${jsp-api.jar}"
-              excludes="**/CVS/**,**/.svn/**"
-              encoding="ISO-8859-1"
-              includeantruntime="false">
-@@ -863,11 +865,11 @@
- 
-     <!-- Add sources for examples -->
-     <antcall target="examples-sources" />
--
-+<!--
-     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
-       failonerror="false"/>
-     <copy file="${jdt.jar}" todir="${tomcat.build}/lib" />
--
-+-->
-     <!-- 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}" inheritall="false" target="build">
-@@ -1051,7 +1053,7 @@
- 
-   </target>
- 
--  <target name="test-compile" depends="compile,download-test-compile" >
-+  <target name="test-compile" depends="compile" >
-     <mkdir dir="${test.classes}"/>
-     <!-- Compile -->
-     <javac srcdir="test" destdir="${test.classes}"
diff --git a/www-servers/tomcat/files/7/7.0.28-build-xml.patch b/www-servers/tomcat/files/7/7.0.28-build-xml.patch
deleted file mode 100644
index e4d30ea2a661..000000000000
--- a/www-servers/tomcat/files/7/7.0.28-build-xml.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff --git a/apache-tomcat-7.0.28-src/build.xml b/apache-tomcat-7.0.28-src/build.xml
-index 3ff8f81..fb50560 100644
---- a/apache-tomcat-7.0.28-src/build.xml
-+++ b/apache-tomcat-7.0.28-src/build.xml
-@@ -163,6 +163,7 @@
- 
-   <!-- Classpaths -->
-   <path id="compile.classpath">
-+    <pathelement location="${ant.jar}"/>
-     <pathelement location="${jdt.jar}"/>
-   </path>
- 
-@@ -309,6 +310,7 @@
-     <exclude name="org/apache/catalina/mbeans/JmxRemote*" />
-     <exclude name="org/apache/catalina/tribes/**" />
-     <exclude name="org/apache/naming/factory/webservices/**" />
-+    <exclude name="javax/servlet/**" />
-   </patternset>
- 
-   <patternset id="files.catalina-tribes">
-@@ -439,7 +441,7 @@
-   </target>
- 
-   <target name="validate" if="${execute.validate}"
--    depends="build-prepare,compile-prepare,download-validate"
-+    depends="build-prepare,compile-prepare"
-     description="Uses Checkstyle tool to perform style check for the source code">
-     <!-- Required so we can cache checkstyle results -->
-     <mkdir dir="${tomcat.output}/res/checkstyle"/>
-@@ -551,7 +553,7 @@
-     </copy>
-   </target>
- 
--  <target name="compile" depends="build-prepare,download-compile,compile-prepare,validate">
-+  <target name="compile" depends="build-prepare,compile-prepare,validate">
-     <!-- Compile internal server components -->
-     <javac srcdir="java" destdir="${tomcat.classes}"
-            debug="${compile.debug}"
-@@ -613,7 +615,7 @@
-       filesId="files.annotations-api"
-       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
- 
--    <!-- Servlet 3.0 Implementation JAR File -->
-+<!-- Servlet 3.0 Implementation JAR File
-     <jarIt jarfile="${servlet-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.servlet-api"
-@@ -621,7 +623,7 @@
-       notice="${tomcat.manifests}/servlet-api.jar.notice"
-       license="${tomcat.manifests}/servlet-api.jar.license" />
- 
--    <!-- JSP 2.2 Implementation JAR File -->
-+    JSP 2.2 Implementation JAR File
-     <jarIt jarfile="${jsp-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.jsp-api"
-@@ -629,12 +631,12 @@
-       notice="${tomcat.manifests}/jsp-api.jar.notice"
-       license="${tomcat.manifests}/jsp-api.jar.license" />
- 
--    <!-- JSP 2.2 EL Implementation JAR File -->
-+    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}"
-       filesDir="${tomcat.classes}"
-@@ -725,7 +727,7 @@
- 
-   </target>
- 
--  <target name="build-docs" depends="compile-prepare" description="Builds all documentation from XML sources">
-+  <target name="build-docs" depends="compile-prepare" unless="nobuild.docs" description="Builds all documentation from XML sources">
- 
-     <copy todir="${tomcat.build}/webapps">
-       <fileset dir="webapps">
-@@ -833,14 +835,14 @@
- 
-   <target name="deploy" depends="package,build-docs"
-           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">
-@@ -897,7 +899,7 @@
-              source="${compile.source}"
-              target="${compile.target}"
-              optimize="${compile.optimize}"
--             classpath="${tomcat.classes}"
-+             classpath="${tomcat.classes}:${jsp-api.jar}"
-              excludes="**/CVS/**,**/.svn/**"
-              encoding="ISO-8859-1"
-              includeantruntime="false">
-@@ -909,7 +911,7 @@
-              source="${compile.source}"
-              target="${compile.target}"
-              optimize="${compile.optimize}"
--             classpath="$tomcat.lcasses}"
-+             classpath="${tomcat.classes}:${jsp-api.jar}"
-              excludes="**/CVS/**,**/.svn/**"
-              encoding="ISO-8859-1"
-              includeantruntime="false">
-@@ -917,11 +919,11 @@
- 
-     <!-- Add sources for examples -->
-     <antcall target="examples-sources" />
--
-+<!--
-     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
-       failonerror="false"/>
-     <copy file="${jdt.jar}" todir="${tomcat.build}/lib" />
--
-+-->
-     <!-- 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}" inheritall="false" target="build">
-@@ -1105,7 +1107,7 @@
- 
-   </target>
- 
--  <target name="test-compile" depends="compile,download-test-compile" >
-+  <target name="test-compile" depends="compile" >
-     <mkdir dir="${test.classes}"/>
-     <!-- Compile -->
-     <javac srcdir="test" destdir="${test.classes}"
diff --git a/www-servers/tomcat/files/7/7.0.29-build-xml.patch b/www-servers/tomcat/files/7/7.0.29-build-xml.patch
deleted file mode 100644
index e4d30ea2a661..000000000000
--- a/www-servers/tomcat/files/7/7.0.29-build-xml.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff --git a/apache-tomcat-7.0.28-src/build.xml b/apache-tomcat-7.0.28-src/build.xml
-index 3ff8f81..fb50560 100644
---- a/apache-tomcat-7.0.28-src/build.xml
-+++ b/apache-tomcat-7.0.28-src/build.xml
-@@ -163,6 +163,7 @@
- 
-   <!-- Classpaths -->
-   <path id="compile.classpath">
-+    <pathelement location="${ant.jar}"/>
-     <pathelement location="${jdt.jar}"/>
-   </path>
- 
-@@ -309,6 +310,7 @@
-     <exclude name="org/apache/catalina/mbeans/JmxRemote*" />
-     <exclude name="org/apache/catalina/tribes/**" />
-     <exclude name="org/apache/naming/factory/webservices/**" />
-+    <exclude name="javax/servlet/**" />
-   </patternset>
- 
-   <patternset id="files.catalina-tribes">
-@@ -439,7 +441,7 @@
-   </target>
- 
-   <target name="validate" if="${execute.validate}"
--    depends="build-prepare,compile-prepare,download-validate"
-+    depends="build-prepare,compile-prepare"
-     description="Uses Checkstyle tool to perform style check for the source code">
-     <!-- Required so we can cache checkstyle results -->
-     <mkdir dir="${tomcat.output}/res/checkstyle"/>
-@@ -551,7 +553,7 @@
-     </copy>
-   </target>
- 
--  <target name="compile" depends="build-prepare,download-compile,compile-prepare,validate">
-+  <target name="compile" depends="build-prepare,compile-prepare,validate">
-     <!-- Compile internal server components -->
-     <javac srcdir="java" destdir="${tomcat.classes}"
-            debug="${compile.debug}"
-@@ -613,7 +615,7 @@
-       filesId="files.annotations-api"
-       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
- 
--    <!-- Servlet 3.0 Implementation JAR File -->
-+<!-- Servlet 3.0 Implementation JAR File
-     <jarIt jarfile="${servlet-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.servlet-api"
-@@ -621,7 +623,7 @@
-       notice="${tomcat.manifests}/servlet-api.jar.notice"
-       license="${tomcat.manifests}/servlet-api.jar.license" />
- 
--    <!-- JSP 2.2 Implementation JAR File -->
-+    JSP 2.2 Implementation JAR File
-     <jarIt jarfile="${jsp-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.jsp-api"
-@@ -629,12 +631,12 @@
-       notice="${tomcat.manifests}/jsp-api.jar.notice"
-       license="${tomcat.manifests}/jsp-api.jar.license" />
- 
--    <!-- JSP 2.2 EL Implementation JAR File -->
-+    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}"
-       filesDir="${tomcat.classes}"
-@@ -725,7 +727,7 @@
- 
-   </target>
- 
--  <target name="build-docs" depends="compile-prepare" description="Builds all documentation from XML sources">
-+  <target name="build-docs" depends="compile-prepare" unless="nobuild.docs" description="Builds all documentation from XML sources">
- 
-     <copy todir="${tomcat.build}/webapps">
-       <fileset dir="webapps">
-@@ -833,14 +835,14 @@
- 
-   <target name="deploy" depends="package,build-docs"
-           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">
-@@ -897,7 +899,7 @@
-              source="${compile.source}"
-              target="${compile.target}"
-              optimize="${compile.optimize}"
--             classpath="${tomcat.classes}"
-+             classpath="${tomcat.classes}:${jsp-api.jar}"
-              excludes="**/CVS/**,**/.svn/**"
-              encoding="ISO-8859-1"
-              includeantruntime="false">
-@@ -909,7 +911,7 @@
-              source="${compile.source}"
-              target="${compile.target}"
-              optimize="${compile.optimize}"
--             classpath="$tomcat.lcasses}"
-+             classpath="${tomcat.classes}:${jsp-api.jar}"
-              excludes="**/CVS/**,**/.svn/**"
-              encoding="ISO-8859-1"
-              includeantruntime="false">
-@@ -917,11 +919,11 @@
- 
-     <!-- Add sources for examples -->
-     <antcall target="examples-sources" />
--
-+<!--
-     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
-       failonerror="false"/>
-     <copy file="${jdt.jar}" todir="${tomcat.build}/lib" />
--
-+-->
-     <!-- 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}" inheritall="false" target="build">
-@@ -1105,7 +1107,7 @@
- 
-   </target>
- 
--  <target name="test-compile" depends="compile,download-test-compile" >
-+  <target name="test-compile" depends="compile" >
-     <mkdir dir="${test.classes}"/>
-     <!-- Compile -->
-     <javac srcdir="test" destdir="${test.classes}"
diff --git a/www-servers/tomcat/files/7/tomcat.conf b/www-servers/tomcat/files/7/tomcat.conf
deleted file mode 100644
index ad45eae1e3c5..000000000000
--- a/www-servers/tomcat/files/7/tomcat.conf
+++ /dev/null
@@ -1,79 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/7/tomcat.conf,v 1.1 2010/12/21 09:13:39 ali_bush Exp $
-
-# JVM Runtime
-# Using the default setting, it will determine your JVM from the system-vm
-# set using java-config.
-# See java-config(1) manual page for assistance in determining this value.
-#
-# You can override this value with whatever path you wish.  
-# Example: export GENTOO_VM="sun-jdk-1.6"
-
-#export GENTOO_VM="sun-jdk-1.6"
-
-# (Optional) Java runtime options used when the "start", "stop", or "run"
-# commands are executed.
-# Example to set library path for tomcat-native
-# JAVA_OPTS="-Djava.library.path=/usr/lib"
-# JAVA_OPTS=""
-
-# Where your web applications are located
-CATALINA_HOME=/usr/share/tomcat-7/
-CATALINA_BASE=/var/lib/tomcat-7/
-
-# Tomcat's User/Group
-# Change these at your own risk!!! These are not supported so if it 
-# breaks something, you are on your own.
-CATALINA_USER=tomcat
-CATALINA_GROUP=tomcat
-
-# Location of the Tomcat JARs and classes
-CATALINA_LIBDIR=/usr/share/tomcat-7/lib/
-
-# The CLASSPATH for Tomcat to use, plus any others you need.
-CLASSPATH=${CATALINA_LIBDIR}
-
-# (Optional) Directory path location of temporary directory the JVM should 
-# use (java.io.tmpdir).  Defaults to $CATALINA_BASE/temp.
-# Note: This directory must exist and be read/writable by tomcat.  
-# See #246362 as an example where /var/tmp was deleted on shutdown.
-CATALINA_TMPDIR="/var/tmp/tomcat-7/"
-
-# TOMCAT STARTUP/SHUTDOWN
-# 	debug             Start Catalina in a debugger
-# 	-security debug   Debug Catalina with a security manager
-# 	jpda start        Start Catalina under JPDA debugger
-# 	start             Start Catalina in a separate window
-# 	-security start   Start in a separate window with security manager
-# 	stop              Stop Catalina"
-#
-# NOTE: -security requires JSSE (see below)
-# NOTE: jpda requires JPDA (see below)
-TOMCAT_START="start"
-TOMCAT_STOP="stop"
-
-# (Optional) Java runtime options used when the "start", "stop", or "run" 
-# commands are executed.
-# CATALINA_OPTS=""
-
-# Java Platform Debugger Architecture (JPDA)
-# http://java.sun.com/products/jpda/
-# Included with Java SDK 1.3 and later.  No need to specify location.
-#
-#   JPDA_TRANSPORT  (Optional) JPDA transport used when the "jpda start"
-#                   command is executed. The default is "dt_socket".
-#
-#   JPDA_ADDRESS    (Optional) Java runtime options used when the "jpda start"
-#                   command is executed. The default is 8000.
-#
-# JPDA_TRANSPORT="dt_socket"
-# JPDA_ADDRESS="8000"
-
-# Java Secure Socket Extension (JSSE)
-# http://java.sun.com/products/jsse/
-# Included with Java SDK 1.4 and later.
-#
-#   JSSE_HOME       (Optional) May point at your Java Secure Sockets Extension
-#                   (JSSE) installation, whose JAR files will be added to the
-#                   system class path used to start Tomcat.
-#
-# JSSE_HOME="/opt/sun-jdk-1.5.0.09/jre/lib/"
diff --git a/www-servers/tomcat/files/7/tomcat.init b/www-servers/tomcat/files/7/tomcat.init
deleted file mode 100644
index 9e623a9dfc1b..000000000000
--- a/www-servers/tomcat/files/7/tomcat.init
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/7/tomcat.init,v 1.2 2011/10/18 22:27:52 fordfrog Exp $
-
-extra_commands="forcestop"
-
-init_env_vars() {
-	# Populate JAVA_HOME
-	JAVA_HOME=`java-config --jre-home`
-
-	# Set some sane defaults
-	if [ -z "${CATALINA_TMPDIR}" ] ; then
-		CATALINA_TMPDIR="${CATALINA_BASE}"/temp
-	fi
-	JPDA_TRANSPORT=${JPDA_TRANSPORT:="dt_socket"}
-	JPDA_ADDRESS=${JPDA_ADDRESS:="8000"}
-	JPDA_OPTS=${JPDA_OPTS="-Xdebug -Xrunjdwp:transport=${JPDA_TRANSPORT},address=${JPDA_ADDRESS},server=y,suspend=n"}
-
-	# Activate Logging
-	if [ -r "${CATALINA_HOME}"/bin/tomcat-juli.jar ]; then
-		JAVA_OPTS="${JAVA_OPTS} -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager \
-			-Djava.util.logging.config.file=${CATALINA_BASE}/conf/logging.properties"
-	fi
-
-	# Populate the classpath
-	unset CLASSPATH
-	CLASSPATH="${CATALINA_HOME}/lib:${JAVA_HOME}/lib/tools.jar"
-	if [ -n "${JSSE_HOME}" ]; then
-		CLASSPATH="${CLASSPATH}:${JSSE_HOME}/lib/jcert.jar:${JSSE_HOME}/lib/jnet.jar:${JSSE_HOME}/lib/jsse.jar"
-	fi
-	CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar:${CATALINA_HOME}/bin/tomcat-juli.jar"
-
-	OPTS_CP="${JAVA_OPTS} ${CATALINA_OPTS} -classpath ${CLASSPATH}"
-
-	CATALINA_ARGS="-Dcatalina.base=${CATALINA_BASE} \
-			-Dcatalina.home=${CATALINA_HOME} \
-			-Djava.io.tmpdir=${CATALINA_TMPDIR} \
-			org.apache.catalina.startup.Bootstrap "
-}
-
-ssd() {
-	local exec=${1}
-	shift
-	start-stop-daemon --start --quiet --background \
-		--chdir "${CATALINA_TMPDIR}" \
-		--user ${CATALINA_USER}:${CATALINA_GROUP} \
-		--make-pidfile --pidfile /var/run/tomcat-7.pid \
-		--exec ${exec} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${TOMCAT_START}
-	return $?
-}
-
-depend() {
-	use dns logger net
-}
-
-start()	{
-	ebegin "Starting Tomcat"
-	init_env_vars
-
-	if [ ! -e "${CATALINA_TMPDIR}" ]; then
-		eerror "CATALINA_TMPDIR does not exist. Unable to start tomcat."
-		eerror "Please see /etc/conf.d/tomcat-7 for more information."
-		eend 1
-	fi
-
-	# Figure out what args to pass start_helper based on TOMCAT_START
-	if [ "${TOMCAT_START}" = "debug" ] ; then
-		ssd ${JAVA_HOME}/bin/jdb \
-			-sourcepath ${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share
-	elif [ "${TOMCAT_START}" = "-security debug" ] ; then
-		ssd ${JAVA_HOME}/bin/jdb \
-			-sourcepath ${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share \
-			-Djava.security.manager \
-			-Djava.security.policy=${CATALINA_BASE}/conf/catalina.policy
-	elif [ "${TOMCAT_START}" = "jpda start" ] ; then
-		ssd ${JAVA_HOME}/bin/java ${JPDA_OPTS}
-	elif [ "${TOMCAT_START}" = "start" ] ; then
-		ssd ${JAVA_HOME}/bin/java
-	elif [ "${TOMCAT_START}" = "-security start" ] ; then
-		ssd ${JAVA_HOME}/bin/java \
-			-Djava.security.manager \
-			-Djava.security.policy=${CATALINA_BASE}/conf/catalina.policy
-	else
-		eerror "Invalid TOMCAT_START variable value, or one is not set"
-		eerror "Please see /etc/conf.d/tomcat-7 for more information"
-		eend 1
-	fi
-	eend $?
-}
-
-stop()	{
-	ebegin "Stopping Tomcat"
-	init_env_vars
-	start-stop-daemon --stop --quiet --retry=60 \
-	       	--pidfile /var/run/tomcat-7.pid \
-		--exec ${JAVA_HOME}/bin/java -- ${OPTS_CP} ${CATALINA_args} stop ${STD_OUT}
-	eend $?
-}
-forcestop()	{
-	ebegin "Forcing Tomcat to Stop"
-	start-stop-daemon --stop --quiet --retry=60 \
-		--pidfile /var/run/tomcat-7.pid --signal=9
-	if service_started "${SVCNAME}"; then
-		mark_service_stopped "${SVCNAME}"
-	fi
-	eend $?
-}
diff --git a/www-servers/tomcat/files/tomcat-6.0.35-build.xml.patch b/www-servers/tomcat/files/tomcat-6.0.35-build.xml.patch
deleted file mode 100644
index 6517dee4d196..000000000000
--- a/www-servers/tomcat/files/tomcat-6.0.35-build.xml.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- 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 @@
- 
-   <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">
---- 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 @@
-       </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-7.0.29-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.29-build.xml.patch
deleted file mode 100644
index 9b07137451aa..000000000000
--- a/www-servers/tomcat/files/tomcat-7.0.29-build.xml.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 3ff8f81..83357a4 100644
---- a/build.xml
-+++ b/build.xml
-@@ -613,7 +614,8 @@
-       filesId="files.annotations-api"
-       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
- 
--    <!-- Servlet 3.0 Implementation JAR File -->
-+<!--
-+    Servlet 3.0 Implementation JAR File
-     <jarIt jarfile="${servlet-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.servlet-api"
-@@ -621,7 +623,7 @@
-       notice="${tomcat.manifests}/servlet-api.jar.notice"
-       license="${tomcat.manifests}/servlet-api.jar.license" />
- 
--    <!-- JSP 2.2 Implementation JAR File -->
-+    JSP 2.2 Implementation JAR File
-     <jarIt jarfile="${jsp-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.jsp-api"
-@@ -629,11 +631,12 @@
-       notice="${tomcat.manifests}/jsp-api.jar.notice"
-       license="${tomcat.manifests}/jsp-api.jar.license" />
- 
--    <!-- JSP 2.2 EL Implementation JAR File -->
-+    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}"
-@@ -834,13 +837,14 @@
-   <target name="deploy" depends="package,build-docs"
-           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">
-@@ -918,9 +922,11 @@
-     <!-- Add sources for examples -->
-     <antcall target="examples-sources" />
- 
-+<!--
-     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
-       failonerror="false"/>
-     <copy file="${jdt.jar}" todir="${tomcat.build}/lib" />
-+-->
- 
-     <!-- build the jdbc-pool jar and source jar-->
-     <echo message="Building Tomcat JDBC pool libraries"/>
-@@ -1355,7 +1361,8 @@
- 
-   <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}"/>
-@@ -2278,7 +2285,8 @@ 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">
- 
-     <antcall target="downloadfile-2">
-       <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2335,7 +2343,8 @@ 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="downloadzip">
-       <param name="sourcefile" value="${junit.loc}"/>
-@@ -2346,7 +2355,8 @@ 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="downloadzip-2">
-       <param name="sourcefile.1" value="${tomcat-native.win.1}"/>
diff --git a/www-servers/tomcat/tomcat-6.0.35-r1.ebuild b/www-servers/tomcat/tomcat-6.0.35-r1.ebuild
deleted file mode 100644
index c0a340e6685b..000000000000
--- a/www-servers/tomcat/tomcat-6.0.35-r1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.35-r1.ebuild,v 1.2 2012/07/21 01:48:02 mr_bones_ Exp $
-
-EAPI=4
-
-JAVA_PKG_IUSE="source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix
-
-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"
-
-RESTRICT="test"
-
-ECJ_SLOT="3.7"
-SAPI_SLOT="2.5"
-
-COMMON_DEP="
-	dev-java/eclipse-ecj:${ECJ_SLOT}
-	~dev-java/tomcat-servlet-api-${PV}
-	extra-webapps? ( dev-java/jakarta-jstl:0 )"
-RDEPEND="${COMMON_DEP}
-	!<dev-java/tomcat-native-1.1.20
-	>=virtual/jre-1.5"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.5
-	>=dev-java/ant-core-1.8.1:0
-	test? (
-		dev-java/ant-junit:0
-		dev-java/junit:4
-	)"
-
-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' -exec rm -v {} + || 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_DOC_TARGET=""
-EANT_GENTOO_CLASSPATH="tomcat-servlet-api-${SAPI_SLOT},eclipse-ecj-${ECJ_SLOT}"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-src_compile() {
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
-	java-pkg-2_src_compile
-}
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-
-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
-
-	# so we don't have to call java-config with --with-dependencies, which might
-	# bring in more jars then actually desired.
-	java-pkg_addcp "$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT})"
-
-	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 ###
-
-	# 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
-
-	insinto "${dest}"
-	doins -r output/build/conf
-
-	### rc ###
-
-	cp "${FILESDIR}"/tomcat{.conf,.init,-instance-manager.bash} "${T}" || die
-	eprefixify "${T}"/tomcat{.conf,.init,-instance-manager.bash}
-	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,.init,-instance-manager.bash} || die
-
-	insinto "${dest}"/gentoo
-	doins "${T}"/tomcat.conf
-	exeinto "${dest}"/gentoo
-	doexe "${T}"/tomcat{.init,-instance-manager.bash}
-}
-
-pkg_postinst() {
-	elog "For how to deploy a server instance 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-6.0.35.ebuild b/www-servers/tomcat/tomcat-6.0.35.ebuild
deleted file mode 100644
index 754e37867a47..000000000000
--- a/www-servers/tomcat/tomcat-6.0.35.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.35.ebuild,v 1.5 2012/03/12 15:19:01 ranger Exp $
-
-EAPI=2
-JAVA_PKG_IUSE="doc examples source test"
-WANT_ANT_TASKS="ant-trax"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Tomcat Servlet-2.5/JSP-2.1 Container"
-
-MY_P="apache-${P}-src"
-SLOT="6"
-SRC_URI="mirror://apache/${PN}/${PN}-6/v${PV/_/-}/src/${MY_P}.tar.gz"
-HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-LICENSE="Apache-2.0"
-
-IUSE=""
-
-COMMON_DEPEND="dev-java/eclipse-ecj:3.3
-	dev-java/ant-eclipse-ecj:3.3
-	>=dev-java/commons-dbcp-1.2.1
-	>=dev-java/commons-logging-1.1
-	>=dev-java/commons-pool-1.2
-	~dev-java/tomcat-servlet-api-${PV}
-	examples? ( dev-java/jakarta-jstl )"
-
-RDEPEND="
-	!<dev-java/tomcat-native-1.1.20
-	>=virtual/jre-1.5
-	>=dev-java/commons-daemon-1.0.1
-	dev-java/ant-core
-	${COMMON_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.5
-	${COMMON_DEPEND}
-	test? ( =dev-java/junit-3.8* )"
-
-S=${WORKDIR}/${MY_P}
-
-TOMCAT_NAME="${PN}-${SLOT}"
-TOMCAT_HOME="/usr/share/${TOMCAT_NAME}"
-WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps"
-
-# TODO: Fails to find PrettyPrint in with python 2.6 and xml-rewriter-3
-# Find out why so
-JAVA_ANT_CELEMENT_REWRITER="true"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_NEEDS_TOOLS="true"
-EANT_GENTOO_CLASSPATH="tomcat-servlet-api-2.5,eclipse-ecj-3.3"
-
-EANT_BUILD_TARGET="build-only"
-EANT_DOC_TARGET="build-docs"
-
-EANT_EXTRA_ARGS="-Dbase.path=${T} -Dversion=${PV} -Dversion.number=${PV}
--Dcompile.debug=false -Djsp-api.jar=jsp-api.jar -Dservlet-api.jar=servlet-api.jar
--Dant.jar=ant.jar"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	enewgroup tomcat 265
-	enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
-	rm -v webapps/examples/WEB-INF/lib/*.jar || die
-
-	# bug # 178980 and #312293
-	if use amd64; then
-		java-pkg_force-compiler ecj-3.3
-	fi
-
-	if ! use doc; then
-		EANT_EXTRA_ARGS+=" -Dnobuild.docs=true"
-	fi
-
-	EANT_EXTRA_ARGS+=" -Djdt.jar=$(java-pkg_getjar eclipse-ecj-3.3 ecj.jar)"
-	java-pkg_jarfrom --build-only ant-core ant.jar
-}
-
-src_install() {
-	cd "${S}/bin"
-	rm -f *.bat
-	chmod 755 *.sh
-
-	# register jars per bug #171496
-	cd "${S}/output/build/lib/"
-	for jar in *.jar; do
-		java-pkg_dojar ${jar}
-	done
-
-	local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/
-
-	# init.d, conf.d
-	newinitd "${FILESDIR}"/${SLOT}/tomcat.init.4 ${TOMCAT_NAME}
-	newconfd "${FILESDIR}"/${SLOT}/tomcat.conf ${TOMCAT_NAME}
-
-	# create dir structure
-	dodir /usr/share/${TOMCAT_NAME}
-
-	diropts -m750 -o tomcat -g tomcat
-	dodir   /etc/${TOMCAT_NAME}
-	keepdir ${WEBAPPS_DIR}
-
-	diropts -m755 -o tomcat -g tomcat
-	dodir   ${CATALINA_BASE}
-
-	diropts -m775 -o tomcat -g tomcat
-	dodir   /etc/${TOMCAT_NAME}/Catalina/localhost
-	keepdir /var/log/${TOMCAT_NAME}/
-	keepdir /var/run/${TOMCAT_NAME}/
-	keepdir /var/tmp/${TOMCAT_NAME}/
-
-	cd "${S}"
-	# fix context's so webapps will be deployed
-	sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/host-manager"  a:' "${S}"/webapps/host-manager/META-INF/context.xml
-	sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/manager"  a:' "${S}"/webapps/manager/META-INF/context.xml
-
-	# replace the default pw with a random one, see #92281
-	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
-	sed -e s:SHUTDOWN:${randpw}: -i conf/server.xml
-
-	# copy over the directories
-	chown -R tomcat:tomcat webapps/* conf/*
-	cp -pR conf/* "${D}"/etc/${TOMCAT_NAME} || die "failed to copy conf"
-	cp -pPR output/build/bin "${D}"/usr/share/${TOMCAT_NAME} \
-		|| die "failed to copy"
-	# webapps get stored in /usr/share/${TOMCAT_NAME}/webapps
-	cd "${S}"/webapps || die
-	ebegin "Installing webapps to /usr/share/${TOMCAT_NAME}"
-
-	dodir /usr/share/${TOMCAT_NAME}/webapps
-	cp -pR ROOT "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
-	cp -pR host-manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
-	cp -pR manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
-	if use doc; then
-		cp -pR "${S}"/output/build/webapps/docs "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
-	fi
-	if use examples; then
-		cd "${S}"/webapps/examples/WEB-INF/lib
-		java-pkg_jar-from jakarta-jstl jstl.jar
-		java-pkg_jar-from jakarta-jstl standard.jar
-		cd "${S}"/webapps
-		cp -pR examples "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
-	fi
-
-	# replace catalina.policy with gentoo specific one bug #176701
-#	cp ${FILESDIR}/${SLOT}/catalina.policy "${D}"/etc/${TOMCAT_NAME} \
-#		|| die "failed to replace catalina.policy"
-
-#	cp "${T}"/tomcat6-deps/jdt/jasper-jdt.jar "${D}"/usr/share/${TOMCAT_NAME}/lib \
-#		|| die "failed to copy"
-
-	cd "${D}/usr/share/${TOMCAT_NAME}/lib" || die
-	java-pkg_jar-from tomcat-servlet-api-2.5
-	java-pkg_jar-from eclipse-ecj-3.3
-
-	# symlink the directories to make CATALINA_BASE possible
-	dosym /etc/${TOMCAT_NAME} ${CATALINA_BASE}/conf
-	dosym /var/log/${TOMCAT_NAME} ${CATALINA_BASE}/logs
-	dosym /var/tmp/${TOMCAT_NAME} ${CATALINA_BASE}/temp
-	dosym /var/run/${TOMCAT_NAME} ${CATALINA_BASE}/work
-
-	dodoc  "${S}"/{RELEASE-NOTES,RUNNING.txt}
-	fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
-
-	#install *.sh scripts bug #278059
-	exeinto /usr/share/${TOMCAT_NAME}/bin
-	doexe "${S}"/bin/*.sh
-}
-
-pkg_postinst() {
-	ewarn "Changing ownership recursively on /etc/${TOMCAT_NAME}"
-	# temp fix for bug #176097
-	chown -fR tomcat:tomcat /etc/${TOMCAT_NAME}
-	ewarn "Owner ship changed to tomcat:tomcat. Temp hack/fix."
-
-	# bug #180519
-	if [[ -e "${ROOT}var/lib/${TOMCAT_NAME}/webapps/manager" ]] ; then
-		elog "The latest webapp has NOT been installed into"
-		elog "${ROOT}var/lib/${TOMCAT_NAME}/webapps/ because directory already exists"
-		elog "and we do not want to overwrite any files you have put there."
-		elog
-		elog "Installing latest webapp into"
-		elog "${ROOT}usr/share/${TOMCAT_NAME}/webapps instead"
-		elog
-		elog "Manager Symbolic Links NOT created."
-	else
-		einfo "Installing latest webroot to ${ROOT}/${WEBAPPS_DIR}"
-		cp -pR "${ROOT}"/usr/share/${TOMCAT_NAME}/webapps/* \
-			"${ROOT}""${WEBAPPS_DIR}"
-		# link the manager's context to the right position
-		dosym ${TOMCAT_HOME}/webapps/host-manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/host-manager.xml
-		dosym ${TOMCAT_HOME}/webapps/manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/manager.xml
-	fi
-
-	elog
-	elog " This ebuild implements a FHS compliant layout for tomcat"
-	elog " Please read http://www.gentoo.org/proj/en/java/tomcat6-guide.xml"
-	elog " for more information."
-	elog
-	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
-	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-	elog
-
-	ewarn "The manager webapps have known exploits, please refer to"
-	ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2450"
-
-	if use examples ; then
-		ewarn
-		ewarn "The examples webapp has a known exploit, please refer to"
-		ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2449"
-		ewarn
-	fi
-
-	elog
-	elog " Please report any bugs to http://bugs.gentoo.org/"
-	elog
-}
diff --git a/www-servers/tomcat/tomcat-7.0.23-r3.ebuild b/www-servers/tomcat/tomcat-7.0.23-r3.ebuild
deleted file mode 100644
index d6c88b7f6aa4..000000000000
--- a/www-servers/tomcat/tomcat-7.0.23-r3.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.23-r3.ebuild,v 1.4 2012/03/12 15:16:15 ranger Exp $
-
-EAPI=2
-JAVA_PKG_IUSE="doc examples source test"
-WANT_ANT_TASKS="ant-trax"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
-
-MY_P="apache-${P}-src"
-SLOT="7"
-SRC_URI="mirror://apache/${PN}/${PN}-${SLOT}/v${PV}/src/${MY_P}.tar.gz"
-HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="amd64 ppc ppc64 ~x86 ~x86-fbsd"
-LICENSE="Apache-2.0"
-
-IUSE=""
-
-ECJV="3.7"
-
-# servlet-api slot
-SAPIS="3.0"
-
-COMMON_DEPEND="dev-java/eclipse-ecj:${ECJV}
-	dev-java/ant-eclipse-ecj:${ECJV}
-	>=dev-java/commons-dbcp-1.4
-	>=dev-java/commons-logging-1.1
-	>=dev-java/commons-pool-1.5.5
-	~dev-java/tomcat-servlet-api-${PV}
-	examples? ( dev-java/jakarta-jstl )"
-
-RDEPEND="
-	!<dev-java/tomcat-native-1.1.20
-	>=virtual/jre-1.6
-	>=dev-java/commons-daemon-1.0.3
-	dev-java/ant-core
-	${COMMON_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-	${COMMON_DEPEND}
-	test? ( =dev-java/junit-3.8* )"
-
-S=${WORKDIR}/${MY_P}
-
-TOMCAT_NAME="${PN}-${SLOT}"
-TOMCAT_HOME="/usr/share/${TOMCAT_NAME}"
-WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps"
-
-# TODO: Fails to find PrettyPrint in with python 2.6 and xml-rewriter-3
-# Find out why so
-JAVA_ANT_CELEMENT_REWRITER="true"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_NEEDS_TOOLS="true"
-EANT_GENTOO_CLASSPATH="tomcat-servlet-api-${SAPIS},eclipse-ecj-${ECJV}"
-
-EANT_BUILD_TARGET="package"
-EANT_DOC_TARGET="build-docs"
-
-EANT_EXTRA_ARGS="-Dbase.path=${T} -Dversion=${PV}-gentoo -Dversion.number=${PV}
--Dcompile.debug=false -Del-api.jar=el-api.jar -Djsp-api.jar=jsp-api.jar -Dservlet-api.jar=servlet-api.jar
--Dant.jar=ant.jar"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	enewgroup tomcat 265
-	enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
-	epatch "${FILESDIR}/${SLOT}/${PV}-build-xml.patch"
-
-	rm -v webapps/examples/WEB-INF/lib/*.jar \
-		test/webapp-3.0-fragments/WEB-INF/lib/*.jar || die
-
-	# bug # 178980 and #312293
-	use amd64 && java-pkg_force-compiler eclipse-ecj-${ECJV}
-
-	if ! use doc; then
-		EANT_EXTRA_ARGS+=" -Dnobuild.docs=true"
-	fi
-
-	EANT_EXTRA_ARGS+=" -Djdt.jar=$(java-pkg_getjar eclipse-ecj-${ECJV} ecj.jar)"
-	java-pkg_jarfrom --build-only ant-core ant.jar
-}
-
-src_install() {
-	cd "${S}/bin"
-	rm -f *.bat
-	chmod 755 *.sh
-
-	# register jars per bug #171496
-	cd "${S}/output/build/lib/"
-	for jar in *.jar; do
-		java-pkg_dojar ${jar}
-	done
-
-	local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/
-
-	# init.d, conf.d
-	newinitd "${FILESDIR}"/${SLOT}/tomcat.init ${TOMCAT_NAME}
-	newconfd "${FILESDIR}"/${SLOT}/tomcat.conf ${TOMCAT_NAME}
-
-	# create dir structure
-	dodir /usr/share/${TOMCAT_NAME}
-
-	diropts -m750 -o tomcat -g tomcat
-	dodir   /etc/${TOMCAT_NAME}
-	keepdir ${WEBAPPS_DIR}
-
-	diropts -m755 -o tomcat -g tomcat
-	dodir   ${CATALINA_BASE}
-
-	diropts -m775 -o tomcat -g tomcat
-	dodir   /etc/${TOMCAT_NAME}/Catalina/localhost
-	keepdir /var/log/${TOMCAT_NAME}/
-	keepdir /var/run/${TOMCAT_NAME}/
-	keepdir /var/tmp/${TOMCAT_NAME}/
-
-	cd "${S}"
-	# fix context's so webapps will be deployed
-	sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/host-manager"  a:' "${S}"/webapps/host-manager/META-INF/context.xml
-	sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/manager"  a:' "${S}"/webapps/manager/META-INF/context.xml
-
-	# replace the default pw with a random one, see #92281
-	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
-	sed -e s:SHUTDOWN:${randpw}: -i conf/server.xml
-
-	# copy over the directories
-	chown -R tomcat:tomcat webapps/* conf/*
-	cp -pR conf/* "${D}"/etc/${TOMCAT_NAME} || die "failed to copy conf"
-	cp -pPR output/build/bin "${D}"/usr/share/${TOMCAT_NAME} \
-		|| die "failed to copy"
-	# webapps get stored in /usr/share/${TOMCAT_NAME}/webapps
-	cd "${S}"/webapps || die
-	ebegin "Installing webapps to /usr/share/${TOMCAT_NAME}"
-
-	dodir /usr/share/${TOMCAT_NAME}/webapps
-	cp -pR ROOT "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
-	cp -pR host-manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
-	cp -pR manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
-	if use doc; then
-		cp -pR "${S}"/output/build/webapps/docs "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
-	fi
-	if use examples; then
-		cd "${S}"/webapps/examples/WEB-INF/lib
-		java-pkg_jar-from jakarta-jstl jstl.jar
-		java-pkg_jar-from jakarta-jstl standard.jar
-		cd "${S}"/webapps
-		cp -pR examples "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
-	fi
-
-	# replace catalina.policy with gentoo specific one bug #176701
-#	cp ${FILESDIR}/${SLOT}/catalina.policy "${D}"/etc/${TOMCAT_NAME} \
-#		|| die "failed to replace catalina.policy"
-
-	cd "${D}/usr/share/${TOMCAT_NAME}/lib" || die
-	java-pkg_jar-from eclipse-ecj-${ECJV}
-	java-pkg_jar-from tomcat-servlet-api-${SAPIS}
-
-	# symlink the directories to make CATALINA_BASE possible
-	dosym /etc/${TOMCAT_NAME} ${CATALINA_BASE}/conf
-	dosym /var/log/${TOMCAT_NAME} ${CATALINA_BASE}/logs
-	dosym /var/tmp/${TOMCAT_NAME} ${CATALINA_BASE}/temp
-	# we cannot symlink work directory because that breaks saving session data
-	# because session file cannot be saved to symlinked location by default
-	#dosym /var/run/${TOMCAT_NAME} ${CATALINA_BASE}/work
-
-	dodoc  "${S}"/{RELEASE-NOTES,RUNNING.txt}
-	fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
-
-	#install *.sh scripts bug #278059
-	exeinto /usr/share/${TOMCAT_NAME}/bin
-	doexe "${S}"/bin/*.sh
-}
-
-pkg_postinst() {
-	ewarn "Changing ownership recursively on /etc/${TOMCAT_NAME}"
-	# temp fix for bug #176097
-	chown -fR tomcat:tomcat /etc/${TOMCAT_NAME}
-	ewarn "Owner ship changed to tomcat:tomcat. Temp hack/fix."
-
-	# bug #180519
-	if [[ -e "${ROOT}var/lib/${TOMCAT_NAME}/webapps/manager" ]] ; then
-		elog
-		elog "The latest webapp has NOT been installed into"
-		elog "${ROOT}var/lib/${TOMCAT_NAME}/webapps/ because directory already exists"
-		elog "and we do not want to overwrite any files you have put there."
-		elog
-		elog "Installing latest webapp into"
-		elog "${ROOT}usr/share/${TOMCAT_NAME}/webapps instead"
-		elog
-		elog "Manager Symbolic Links NOT created."
-	else
-		einfo "Installing latest webroot to ${ROOT}/${WEBAPPS_DIR}"
-		cp -pR "${ROOT}"/usr/share/${TOMCAT_NAME}/webapps/* \
-			"${ROOT}""${WEBAPPS_DIR}"
-		# link the manager's context to the right position
-		dosym ${TOMCAT_HOME}/webapps/host-manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/host-manager.xml
-		dosym ${TOMCAT_HOME}/webapps/manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/manager.xml
-	fi
-
-	# bug with storing SESSIONS.ser file to path with symlink
-	if [[ -L "${ROOT}var/lib/${TOMCAT_NAME}/work" ]] ; then
-		elog
-		ewarn "${ROOT}var/lib/${TOMCAT_NAME}/work is symbolic link which breaks"
-		ewarn "storing of SESSIONS.ser files in work directory when allowLinking"
-		ewarn "is disabled (the default). Remove the symbolic link (while Tomcat is"
-		ewarn "not running) to fix the issue."
-	fi
-
-	elog
-	elog " This ebuild implements a FHS compliant layout for tomcat"
-	elog " Please read http://www.gentoo.org/proj/en/java/tomcat6-guide.xml"
-	elog " for more information."
-	elog
-	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
-	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-	elog
-
-	ewarn "The manager webapps have known exploits, please refer to"
-	ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2450"
-
-	if use examples ; then
-		ewarn
-		ewarn "The examples webapp has a known exploit, please refer to"
-		ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2449"
-		ewarn
-	fi
-
-	elog
-	elog " Please report any bugs to http://bugs.gentoo.org/"
-	elog
-}
diff --git a/www-servers/tomcat/tomcat-7.0.26.ebuild b/www-servers/tomcat/tomcat-7.0.26.ebuild
deleted file mode 100644
index 74c53fb073f2..000000000000
--- a/www-servers/tomcat/tomcat-7.0.26.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.26.ebuild,v 1.2 2012/03/25 16:58:40 ago Exp $
-
-EAPI=2
-JAVA_PKG_IUSE="doc examples source test"
-WANT_ANT_TASKS="ant-trax"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
-
-MY_P="apache-${P}-src"
-SLOT="7"
-SRC_URI="mirror://apache/${PN}/${PN}-${SLOT}/v${PV}/src/${MY_P}.tar.gz"
-HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-LICENSE="Apache-2.0"
-
-IUSE=""
-
-ECJV="3.7"
-
-# servlet-api slot
-SAPIS="3.0"
-
-COMMON_DEPEND="dev-java/eclipse-ecj:${ECJV}
-	dev-java/ant-eclipse-ecj:${ECJV}
-	>=dev-java/commons-dbcp-1.4
-	>=dev-java/commons-logging-1.1
-	>=dev-java/commons-pool-1.5.5
-	~dev-java/tomcat-servlet-api-${PV}
-	examples? ( dev-java/jakarta-jstl )"
-
-RDEPEND="
-	!<dev-java/tomcat-native-1.1.20
-	>=virtual/jre-1.6
-	>=dev-java/commons-daemon-1.0.9
-	dev-java/ant-core
-	${COMMON_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-	${COMMON_DEPEND}
-	test? ( =dev-java/junit-3.8* )"
-
-S=${WORKDIR}/${MY_P}
-
-TOMCAT_NAME="${PN}-${SLOT}"
-TOMCAT_HOME="/usr/share/${TOMCAT_NAME}"
-WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps"
-
-# TODO: Fails to find PrettyPrint in with python 2.6 and xml-rewriter-3
-# Find out why so
-JAVA_ANT_CELEMENT_REWRITER="true"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_NEEDS_TOOLS="true"
-EANT_GENTOO_CLASSPATH="tomcat-servlet-api-${SAPIS},eclipse-ecj-${ECJV}"
-
-EANT_BUILD_TARGET="package"
-EANT_DOC_TARGET="build-docs"
-
-EANT_EXTRA_ARGS="-Dbase.path=${T} -Dversion=${PV}-gentoo -Dversion.number=${PV}
--Dcompile.debug=false -Del-api.jar=el-api.jar -Djsp-api.jar=jsp-api.jar -Dservlet-api.jar=servlet-api.jar
--Dant.jar=ant.jar"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	enewgroup tomcat 265
-	enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
-	epatch "${FILESDIR}/${SLOT}/${PV}-build-xml.patch"
-
-	rm -v webapps/examples/WEB-INF/lib/*.jar \
-		test/webapp-3.0-fragments/WEB-INF/lib/*.jar || die
-
-	# bug # 178980 and #312293
-	use amd64 && java-pkg_force-compiler eclipse-ecj-${ECJV}
-
-	if ! use doc; then
-		EANT_EXTRA_ARGS+=" -Dnobuild.docs=true"
-	fi
-
-	EANT_EXTRA_ARGS+=" -Djdt.jar=$(java-pkg_getjar eclipse-ecj-${ECJV} ecj.jar)"
-	java-pkg_jarfrom --build-only ant-core ant.jar
-}
-
-src_install() {
-	cd "${S}/bin"
-	rm -f *.bat
-	chmod 755 *.sh
-
-	# register jars per bug #171496
-	cd "${S}/output/build/lib/"
-	for jar in *.jar; do
-		java-pkg_dojar ${jar}
-	done
-
-	local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/
-
-	# init.d, conf.d
-	newinitd "${FILESDIR}"/${SLOT}/tomcat.init ${TOMCAT_NAME}
-	newconfd "${FILESDIR}"/${SLOT}/tomcat.conf ${TOMCAT_NAME}
-
-	# create dir structure
-	dodir /usr/share/${TOMCAT_NAME}
-
-	diropts -m750 -o tomcat -g tomcat
-	dodir   /etc/${TOMCAT_NAME}
-	keepdir ${WEBAPPS_DIR}
-
-	diropts -m755 -o tomcat -g tomcat
-	dodir   ${CATALINA_BASE}
-
-	diropts -m775 -o tomcat -g tomcat
-	dodir   /etc/${TOMCAT_NAME}/Catalina/localhost
-	keepdir /var/log/${TOMCAT_NAME}/
-	keepdir /var/run/${TOMCAT_NAME}/
-	keepdir /var/tmp/${TOMCAT_NAME}/
-
-	cd "${S}"
-	# fix context's so webapps will be deployed
-	sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/host-manager"  a:' "${S}"/webapps/host-manager/META-INF/context.xml
-	sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/manager"  a:' "${S}"/webapps/manager/META-INF/context.xml
-
-	# replace the default pw with a random one, see #92281
-	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
-	sed -e s:SHUTDOWN:${randpw}: -i conf/server.xml
-
-	# copy over the directories
-	chown -R tomcat:tomcat webapps/* conf/*
-	cp -pR conf/* "${D}"/etc/${TOMCAT_NAME} || die "failed to copy conf"
-	cp -pPR output/build/bin "${D}"/usr/share/${TOMCAT_NAME} \
-		|| die "failed to copy"
-	# webapps get stored in /usr/share/${TOMCAT_NAME}/webapps
-	cd "${S}"/webapps || die
-	ebegin "Installing webapps to /usr/share/${TOMCAT_NAME}"
-
-	dodir /usr/share/${TOMCAT_NAME}/webapps
-	cp -pR ROOT "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
-	cp -pR host-manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
-	cp -pR manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
-	if use doc; then
-		cp -pR "${S}"/output/build/webapps/docs "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
-	fi
-	if use examples; then
-		cd "${S}"/webapps/examples/WEB-INF/lib
-		java-pkg_jar-from jakarta-jstl jstl.jar
-		java-pkg_jar-from jakarta-jstl standard.jar
-		cd "${S}"/webapps
-		cp -pR examples "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
-	fi
-
-	# replace catalina.policy with gentoo specific one bug #176701
-#	cp ${FILESDIR}/${SLOT}/catalina.policy "${D}"/etc/${TOMCAT_NAME} \
-#		|| die "failed to replace catalina.policy"
-
-	cd "${D}/usr/share/${TOMCAT_NAME}/lib" || die
-	java-pkg_jar-from eclipse-ecj-${ECJV}
-	java-pkg_jar-from tomcat-servlet-api-${SAPIS}
-
-	# symlink the directories to make CATALINA_BASE possible
-	dosym /etc/${TOMCAT_NAME} ${CATALINA_BASE}/conf
-	dosym /var/log/${TOMCAT_NAME} ${CATALINA_BASE}/logs
-	dosym /var/tmp/${TOMCAT_NAME} ${CATALINA_BASE}/temp
-	# we cannot symlink work directory because that breaks saving session data
-	# because session file cannot be saved to symlinked location by default
-	#dosym /var/run/${TOMCAT_NAME} ${CATALINA_BASE}/work
-
-	dodoc  "${S}"/{RELEASE-NOTES,RUNNING.txt}
-	fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
-
-	#install *.sh scripts bug #278059
-	exeinto /usr/share/${TOMCAT_NAME}/bin
-	doexe "${S}"/bin/*.sh
-}
-
-pkg_postinst() {
-	ewarn "Changing ownership recursively on /etc/${TOMCAT_NAME}"
-	# temp fix for bug #176097
-	chown -fR tomcat:tomcat /etc/${TOMCAT_NAME}
-	ewarn "Owner ship changed to tomcat:tomcat. Temp hack/fix."
-
-	# bug #180519
-	if [[ -e "${ROOT}var/lib/${TOMCAT_NAME}/webapps/manager" ]] ; then
-		elog
-		elog "The latest webapp has NOT been installed into"
-		elog "${ROOT}var/lib/${TOMCAT_NAME}/webapps/ because directory already exists"
-		elog "and we do not want to overwrite any files you have put there."
-		elog
-		elog "Installing latest webapp into"
-		elog "${ROOT}usr/share/${TOMCAT_NAME}/webapps instead"
-		elog
-		elog "Manager Symbolic Links NOT created."
-	else
-		einfo "Installing latest webroot to ${ROOT}/${WEBAPPS_DIR}"
-		cp -pR "${ROOT}"/usr/share/${TOMCAT_NAME}/webapps/* \
-			"${ROOT}""${WEBAPPS_DIR}"
-		# link the manager's context to the right position
-		dosym ${TOMCAT_HOME}/webapps/host-manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/host-manager.xml
-		dosym ${TOMCAT_HOME}/webapps/manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/manager.xml
-	fi
-
-	# bug with storing SESSIONS.ser file to path with symlink
-	if [[ -L "${ROOT}var/lib/${TOMCAT_NAME}/work" ]] ; then
-		elog
-		ewarn "${ROOT}var/lib/${TOMCAT_NAME}/work is symbolic link which breaks"
-		ewarn "storing of SESSIONS.ser files in work directory when allowLinking"
-		ewarn "is disabled (the default). Remove the symbolic link (while Tomcat is"
-		ewarn "not running) to fix the issue."
-	fi
-
-	elog
-	elog " This ebuild implements a FHS compliant layout for tomcat"
-	elog " Please read http://www.gentoo.org/proj/en/java/tomcat6-guide.xml"
-	elog " for more information."
-	elog
-	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
-	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-	elog
-
-	ewarn "The manager webapps have known exploits, please refer to"
-	ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2450"
-
-	if use examples ; then
-		ewarn
-		ewarn "The examples webapp has a known exploit, please refer to"
-		ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2449"
-		ewarn
-	fi
-
-	elog
-	elog " Please report any bugs to http://bugs.gentoo.org/"
-	elog
-}
diff --git a/www-servers/tomcat/tomcat-7.0.27.ebuild b/www-servers/tomcat/tomcat-7.0.27.ebuild
deleted file mode 100644
index ca0ceeec7ae0..000000000000
--- a/www-servers/tomcat/tomcat-7.0.27.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.27.ebuild,v 1.4 2012/08/24 13:37:03 xmw Exp $
-
-EAPI=2
-JAVA_PKG_IUSE="doc examples source test"
-WANT_ANT_TASKS="ant-trax"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
-
-MY_P="apache-${P}-src"
-SLOT="7"
-SRC_URI="mirror://apache/${PN}/${PN}-${SLOT}/v${PV}/src/${MY_P}.tar.gz"
-HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd"
-LICENSE="Apache-2.0"
-
-IUSE=""
-
-ECJV="3.7"
-
-# servlet-api slot
-SAPIS="3.0"
-
-COMMON_DEPEND="dev-java/eclipse-ecj:${ECJV}
-	dev-java/ant-eclipse-ecj:${ECJV}
-	>=dev-java/commons-dbcp-1.4
-	>=dev-java/commons-logging-1.1
-	>=dev-java/commons-pool-1.5.5
-	~dev-java/tomcat-servlet-api-${PV}
-	examples? ( dev-java/jakarta-jstl )"
-
-RDEPEND="
-	!<dev-java/tomcat-native-1.1.20
-	>=virtual/jre-1.6
-	>=dev-java/commons-daemon-1.0.9
-	dev-java/ant-core
-	${COMMON_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-	${COMMON_DEPEND}
-	test? ( =dev-java/junit-3.8* )"
-
-S=${WORKDIR}/${MY_P}
-
-TOMCAT_NAME="${PN}-${SLOT}"
-TOMCAT_HOME="/usr/share/${TOMCAT_NAME}"
-WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps"
-
-# TODO: Fails to find PrettyPrint in with python 2.6 and xml-rewriter-3
-# Find out why so
-JAVA_ANT_CELEMENT_REWRITER="true"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_NEEDS_TOOLS="true"
-EANT_GENTOO_CLASSPATH="tomcat-servlet-api-${SAPIS},eclipse-ecj-${ECJV}"
-
-EANT_BUILD_TARGET="package"
-EANT_DOC_TARGET="build-docs"
-
-EANT_EXTRA_ARGS="-Dbase.path=${T} -Dversion=${PV}-gentoo -Dversion.number=${PV}
--Dcompile.debug=false -Del-api.jar=el-api.jar -Djsp-api.jar=jsp-api.jar -Dservlet-api.jar=servlet-api.jar
--Dant.jar=ant.jar"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	enewgroup tomcat 265
-	enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
-	epatch "${FILESDIR}/${SLOT}/${PV}-build-xml.patch"
-
-	rm -v webapps/examples/WEB-INF/lib/*.jar \
-		test/webapp-3.0-fragments/WEB-INF/lib/*.jar || die
-
-	# bug # 178980 and #312293
-	use amd64 && java-pkg_force-compiler eclipse-ecj-${ECJV}
-
-	if ! use doc; then
-		EANT_EXTRA_ARGS+=" -Dnobuild.docs=true"
-	fi
-
-	EANT_EXTRA_ARGS+=" -Djdt.jar=$(java-pkg_getjar eclipse-ecj-${ECJV} ecj.jar)"
-	java-pkg_jarfrom --build-only ant-core ant.jar
-}
-
-src_install() {
-	cd "${S}/bin"
-	rm -f *.bat
-	chmod 755 *.sh
-
-	# register jars per bug #171496
-	cd "${S}/output/build/lib/"
-	for jar in *.jar; do
-		java-pkg_dojar ${jar}
-	done
-
-	local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/
-
-	# init.d, conf.d
-	newinitd "${FILESDIR}"/${SLOT}/tomcat.init ${TOMCAT_NAME}
-	newconfd "${FILESDIR}"/${SLOT}/tomcat.conf ${TOMCAT_NAME}
-
-	# create dir structure
-	dodir /usr/share/${TOMCAT_NAME}
-
-	diropts -m750 -o tomcat -g tomcat
-	dodir   /etc/${TOMCAT_NAME}
-	keepdir ${WEBAPPS_DIR}
-
-	diropts -m755 -o tomcat -g tomcat
-	dodir   ${CATALINA_BASE}
-
-	diropts -m775 -o tomcat -g tomcat
-	dodir   /etc/${TOMCAT_NAME}/Catalina/localhost
-	keepdir /var/log/${TOMCAT_NAME}/
-	keepdir /var/run/${TOMCAT_NAME}/
-	keepdir /var/tmp/${TOMCAT_NAME}/
-
-	cd "${S}"
-	# fix context's so webapps will be deployed
-	sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/host-manager"  a:' "${S}"/webapps/host-manager/META-INF/context.xml
-	sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/manager"  a:' "${S}"/webapps/manager/META-INF/context.xml
-
-	# replace the default pw with a random one, see #92281
-	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
-	sed -e s:SHUTDOWN:${randpw}: -i conf/server.xml
-
-	# copy over the directories
-	chown -R tomcat:tomcat webapps/* conf/*
-	cp -pR conf/* "${D}"/etc/${TOMCAT_NAME} || die "failed to copy conf"
-	cp -pPR output/build/bin "${D}"/usr/share/${TOMCAT_NAME} \
-		|| die "failed to copy"
-	# webapps get stored in /usr/share/${TOMCAT_NAME}/webapps
-	cd "${S}"/webapps || die
-	ebegin "Installing webapps to /usr/share/${TOMCAT_NAME}"
-
-	dodir /usr/share/${TOMCAT_NAME}/webapps
-	cp -pR ROOT "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
-	cp -pR host-manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
-	cp -pR manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
-	if use doc; then
-		cp -pR "${S}"/output/build/webapps/docs "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
-	fi
-	if use examples; then
-		cd "${S}"/webapps/examples/WEB-INF/lib
-		java-pkg_jar-from jakarta-jstl jstl.jar
-		java-pkg_jar-from jakarta-jstl standard.jar
-		cd "${S}"/webapps
-		cp -pR examples "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
-	fi
-
-	# replace catalina.policy with gentoo specific one bug #176701
-#	cp ${FILESDIR}/${SLOT}/catalina.policy "${D}"/etc/${TOMCAT_NAME} \
-#		|| die "failed to replace catalina.policy"
-
-	cd "${D}/usr/share/${TOMCAT_NAME}/lib" || die
-	java-pkg_jar-from eclipse-ecj-${ECJV}
-	java-pkg_jar-from tomcat-servlet-api-${SAPIS}
-
-	# symlink the directories to make CATALINA_BASE possible
-	dosym /etc/${TOMCAT_NAME} ${CATALINA_BASE}/conf
-	dosym /var/log/${TOMCAT_NAME} ${CATALINA_BASE}/logs
-	dosym /var/tmp/${TOMCAT_NAME} ${CATALINA_BASE}/temp
-	# we cannot symlink work directory because that breaks saving session data
-	# because session file cannot be saved to symlinked location by default
-	#dosym /var/run/${TOMCAT_NAME} ${CATALINA_BASE}/work
-
-	dodoc  "${S}"/{RELEASE-NOTES,RUNNING.txt}
-	fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
-
-	#install *.sh scripts bug #278059
-	exeinto /usr/share/${TOMCAT_NAME}/bin
-	doexe "${S}"/bin/*.sh
-}
-
-pkg_postinst() {
-	ewarn "Changing ownership recursively on /etc/${TOMCAT_NAME}"
-	# temp fix for bug #176097
-	chown -fR tomcat:tomcat /etc/${TOMCAT_NAME}
-	ewarn "Owner ship changed to tomcat:tomcat. Temp hack/fix."
-
-	# bug #180519
-	if [[ -e "${ROOT}var/lib/${TOMCAT_NAME}/webapps/manager" ]] ; then
-		elog
-		elog "The latest webapp has NOT been installed into"
-		elog "${ROOT}var/lib/${TOMCAT_NAME}/webapps/ because directory already exists"
-		elog "and we do not want to overwrite any files you have put there."
-		elog
-		elog "Installing latest webapp into"
-		elog "${ROOT}usr/share/${TOMCAT_NAME}/webapps instead"
-		elog
-		elog "Manager Symbolic Links NOT created."
-	else
-		einfo "Installing latest webroot to ${ROOT}/${WEBAPPS_DIR}"
-		cp -pR "${ROOT}"/usr/share/${TOMCAT_NAME}/webapps/* \
-			"${ROOT}""${WEBAPPS_DIR}"
-		# link the manager's context to the right position
-		dosym ${TOMCAT_HOME}/webapps/host-manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/host-manager.xml
-		dosym ${TOMCAT_HOME}/webapps/manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/manager.xml
-	fi
-
-	# bug with storing SESSIONS.ser file to path with symlink
-	if [[ -L "${ROOT}var/lib/${TOMCAT_NAME}/work" ]] ; then
-		elog
-		ewarn "${ROOT}var/lib/${TOMCAT_NAME}/work is symbolic link which breaks"
-		ewarn "storing of SESSIONS.ser files in work directory when allowLinking"
-		ewarn "is disabled (the default). Remove the symbolic link (while Tomcat is"
-		ewarn "not running) to fix the issue."
-	fi
-
-	elog
-	elog " This ebuild implements a FHS compliant layout for tomcat"
-	elog " Please read http://www.gentoo.org/proj/en/java/tomcat6-guide.xml"
-	elog " for more information."
-	elog
-	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
-	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-	elog
-
-	ewarn "The manager webapps have known exploits, please refer to"
-	ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2450"
-
-	if use examples ; then
-		ewarn
-		ewarn "The examples webapp has a known exploit, please refer to"
-		ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2449"
-		ewarn
-	fi
-
-	elog
-	elog " Please report any bugs to http://bugs.gentoo.org/"
-	elog
-}
diff --git a/www-servers/tomcat/tomcat-7.0.28.ebuild b/www-servers/tomcat/tomcat-7.0.28.ebuild
deleted file mode 100644
index 40a0513fdf3e..000000000000
--- a/www-servers/tomcat/tomcat-7.0.28.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.28.ebuild,v 1.1 2012/06/19 14:36:26 fordfrog Exp $
-
-EAPI=2
-JAVA_PKG_IUSE="doc examples source test"
-WANT_ANT_TASKS="ant-trax"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
-
-MY_P="apache-${P}-src"
-SLOT="7"
-SRC_URI="mirror://apache/${PN}/${PN}-${SLOT}/v${PV}/src/${MY_P}.tar.gz"
-HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-LICENSE="Apache-2.0"
-
-IUSE=""
-
-ECJV="3.7"
-
-# servlet-api slot
-SAPIS="3.0"
-
-COMMON_DEPEND="dev-java/eclipse-ecj:${ECJV}
-	dev-java/ant-eclipse-ecj:${ECJV}
-	>=dev-java/commons-dbcp-1.4
-	>=dev-java/commons-logging-1.1
-	>=dev-java/commons-pool-1.5.5
-	~dev-java/tomcat-servlet-api-${PV}
-	examples? ( dev-java/jakarta-jstl )"
-
-RDEPEND="
-	!<dev-java/tomcat-native-1.1.20
-	>=virtual/jre-1.6
-	>=dev-java/commons-daemon-1.0.9
-	dev-java/ant-core
-	${COMMON_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-	${COMMON_DEPEND}
-	test? ( =dev-java/junit-3.8* )"
-
-S=${WORKDIR}/${MY_P}
-
-TOMCAT_NAME="${PN}-${SLOT}"
-TOMCAT_HOME="/usr/share/${TOMCAT_NAME}"
-WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps"
-
-# TODO: Fails to find PrettyPrint in with python 2.6 and xml-rewriter-3
-# Find out why so
-JAVA_ANT_CELEMENT_REWRITER="true"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_NEEDS_TOOLS="true"
-EANT_GENTOO_CLASSPATH="tomcat-servlet-api-${SAPIS},eclipse-ecj-${ECJV}"
-
-EANT_BUILD_TARGET="package"
-EANT_DOC_TARGET="build-docs"
-
-EANT_EXTRA_ARGS="-Dbase.path=${T} -Dversion=${PV}-gentoo -Dversion.number=${PV}
--Dcompile.debug=false -Del-api.jar=el-api.jar -Djsp-api.jar=jsp-api.jar -Dservlet-api.jar=servlet-api.jar
--Dant.jar=ant.jar"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	enewgroup tomcat 265
-	enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
-	epatch "${FILESDIR}/${SLOT}/${PV}-build-xml.patch"
-
-	rm -v webapps/examples/WEB-INF/lib/*.jar \
-		test/webapp-3.0-fragments/WEB-INF/lib/*.jar || die
-
-	# bug # 178980 and #312293
-	use amd64 && java-pkg_force-compiler eclipse-ecj-${ECJV}
-
-	if ! use doc; then
-		EANT_EXTRA_ARGS+=" -Dnobuild.docs=true"
-	fi
-
-	EANT_EXTRA_ARGS+=" -Djdt.jar=$(java-pkg_getjar eclipse-ecj-${ECJV} ecj.jar)"
-	java-pkg_jarfrom --build-only ant-core ant.jar
-}
-
-src_install() {
-	cd "${S}/bin"
-	rm -f *.bat
-	chmod 755 *.sh
-
-	# register jars per bug #171496
-	cd "${S}/output/build/lib/"
-	for jar in *.jar; do
-		java-pkg_dojar ${jar}
-	done
-
-	local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/
-
-	# init.d, conf.d
-	newinitd "${FILESDIR}"/${SLOT}/tomcat.init ${TOMCAT_NAME}
-	newconfd "${FILESDIR}"/${SLOT}/tomcat.conf ${TOMCAT_NAME}
-
-	# create dir structure
-	dodir /usr/share/${TOMCAT_NAME}
-
-	diropts -m750 -o tomcat -g tomcat
-	dodir   /etc/${TOMCAT_NAME}
-	keepdir ${WEBAPPS_DIR}
-
-	diropts -m755 -o tomcat -g tomcat
-	dodir   ${CATALINA_BASE}
-
-	diropts -m775 -o tomcat -g tomcat
-	dodir   /etc/${TOMCAT_NAME}/Catalina/localhost
-	keepdir /var/log/${TOMCAT_NAME}/
-	keepdir /var/run/${TOMCAT_NAME}/
-	keepdir /var/tmp/${TOMCAT_NAME}/
-
-	cd "${S}"
-	# fix context's so webapps will be deployed
-	sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/host-manager"  a:' "${S}"/webapps/host-manager/META-INF/context.xml
-	sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/manager"  a:' "${S}"/webapps/manager/META-INF/context.xml
-
-	# replace the default pw with a random one, see #92281
-	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
-	sed -e s:SHUTDOWN:${randpw}: -i conf/server.xml
-
-	# copy over the directories
-	chown -R tomcat:tomcat webapps/* conf/*
-	cp -pR conf/* "${D}"/etc/${TOMCAT_NAME} || die "failed to copy conf"
-	cp -pPR output/build/bin "${D}"/usr/share/${TOMCAT_NAME} \
-		|| die "failed to copy"
-	# webapps get stored in /usr/share/${TOMCAT_NAME}/webapps
-	cd "${S}"/webapps || die
-	ebegin "Installing webapps to /usr/share/${TOMCAT_NAME}"
-
-	dodir /usr/share/${TOMCAT_NAME}/webapps
-	cp -pR ROOT "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
-	cp -pR host-manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
-	cp -pR manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
-	if use doc; then
-		cp -pR "${S}"/output/build/webapps/docs "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
-	fi
-	if use examples; then
-		cd "${S}"/webapps/examples/WEB-INF/lib
-		java-pkg_jar-from jakarta-jstl jstl.jar
-		java-pkg_jar-from jakarta-jstl standard.jar
-		cd "${S}"/webapps
-		cp -pR examples "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
-	fi
-
-	# replace catalina.policy with gentoo specific one bug #176701
-#	cp ${FILESDIR}/${SLOT}/catalina.policy "${D}"/etc/${TOMCAT_NAME} \
-#		|| die "failed to replace catalina.policy"
-
-	cd "${D}/usr/share/${TOMCAT_NAME}/lib" || die
-	java-pkg_jar-from eclipse-ecj-${ECJV}
-	java-pkg_jar-from tomcat-servlet-api-${SAPIS}
-
-	# symlink the directories to make CATALINA_BASE possible
-	dosym /etc/${TOMCAT_NAME} ${CATALINA_BASE}/conf
-	dosym /var/log/${TOMCAT_NAME} ${CATALINA_BASE}/logs
-	dosym /var/tmp/${TOMCAT_NAME} ${CATALINA_BASE}/temp
-	# we cannot symlink work directory because that breaks saving session data
-	# because session file cannot be saved to symlinked location by default
-	#dosym /var/run/${TOMCAT_NAME} ${CATALINA_BASE}/work
-
-	dodoc  "${S}"/{RELEASE-NOTES,RUNNING.txt}
-	fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
-
-	#install *.sh scripts bug #278059
-	exeinto /usr/share/${TOMCAT_NAME}/bin
-	doexe "${S}"/bin/*.sh
-}
-
-pkg_postinst() {
-	ewarn "Changing ownership recursively on /etc/${TOMCAT_NAME}"
-	# temp fix for bug #176097
-	chown -fR tomcat:tomcat /etc/${TOMCAT_NAME}
-	ewarn "Owner ship changed to tomcat:tomcat. Temp hack/fix."
-
-	# bug #180519
-	if [[ -e "${ROOT}var/lib/${TOMCAT_NAME}/webapps/manager" ]] ; then
-		elog
-		elog "The latest webapp has NOT been installed into"
-		elog "${ROOT}var/lib/${TOMCAT_NAME}/webapps/ because directory already exists"
-		elog "and we do not want to overwrite any files you have put there."
-		elog
-		elog "Installing latest webapp into"
-		elog "${ROOT}usr/share/${TOMCAT_NAME}/webapps instead"
-		elog
-		elog "Manager Symbolic Links NOT created."
-	else
-		einfo "Installing latest webroot to ${ROOT}/${WEBAPPS_DIR}"
-		cp -pR "${ROOT}"/usr/share/${TOMCAT_NAME}/webapps/* \
-			"${ROOT}""${WEBAPPS_DIR}"
-		# link the manager's context to the right position
-		dosym ${TOMCAT_HOME}/webapps/host-manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/host-manager.xml
-		dosym ${TOMCAT_HOME}/webapps/manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/manager.xml
-	fi
-
-	# bug with storing SESSIONS.ser file to path with symlink
-	if [[ -L "${ROOT}var/lib/${TOMCAT_NAME}/work" ]] ; then
-		elog
-		ewarn "${ROOT}var/lib/${TOMCAT_NAME}/work is symbolic link which breaks"
-		ewarn "storing of SESSIONS.ser files in work directory when allowLinking"
-		ewarn "is disabled (the default). Remove the symbolic link (while Tomcat is"
-		ewarn "not running) to fix the issue."
-	fi
-
-	elog
-	elog " This ebuild implements a FHS compliant layout for tomcat"
-	elog " Please read http://www.gentoo.org/proj/en/java/tomcat6-guide.xml"
-	elog " for more information."
-	elog
-	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
-	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-	elog
-
-	ewarn "The manager webapps have known exploits, please refer to"
-	ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2450"
-
-	if use examples ; then
-		ewarn
-		ewarn "The examples webapp has a known exploit, please refer to"
-		ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2449"
-		ewarn
-	fi
-
-	elog
-	elog " Please report any bugs to http://bugs.gentoo.org/"
-	elog
-}
diff --git a/www-servers/tomcat/tomcat-7.0.29-r1.ebuild b/www-servers/tomcat/tomcat-7.0.29-r1.ebuild
deleted file mode 100644
index b3b866a0a4e1..000000000000
--- a/www-servers/tomcat/tomcat-7.0.29-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.29-r1.ebuild,v 1.2 2012/07/21 01:48:02 mr_bones_ Exp $
-
-EAPI=4
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix
-
-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-fbsd"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="3.7"
-SAPI_SLOT="3.0"
-
-COMMON_DEP="
-	dev-java/eclipse-ecj:${ECJ_SLOT}
-	~dev-java/tomcat-servlet-api-${PV}
-	extra-webapps? ( dev-java/jakarta-jstl:0 )"
-RDEPEND="${COMMON_DEP}
-	!<dev-java/tomcat-native-1.1.20
-	>=virtual/jre-1.6"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.6
-	>=dev-java/ant-core-1.8.1:0
-	test? (
-		dev-java/ant-junit:0
-		dev-java/junit:4
-	)"
-
-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' -exec rm -v {} + || 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="tomcat-servlet-api-${SAPI_SLOT},eclipse-ecj-${ECJ_SLOT}"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-src_compile() {
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
-	java-pkg-2_src_compile
-}
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-
-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
-
-	# so we don't have to call java-config with --with-dependencies, which might
-	# bring in more jars then actually desired.
-	java-pkg_addcp "$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT})"
-
-	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 ###
-
-	# 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
-
-	insinto "${dest}"
-	doins -r output/build/conf
-
-	### rc ###
-
-	cp "${FILESDIR}"/tomcat{.conf,.init,-instance-manager.bash} "${T}" || die
-	eprefixify "${T}"/tomcat{.conf,.init,-instance-manager.bash}
-	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,.init,-instance-manager.bash} || die
-
-	insinto "${dest}"/gentoo
-	doins "${T}"/tomcat.conf
-	exeinto "${dest}"/gentoo
-	doexe "${T}"/tomcat{.init,-instance-manager.bash}
-}
-
-pkg_postinst() {
-	elog "For how to deploy a server instance 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.29.ebuild b/www-servers/tomcat/tomcat-7.0.29.ebuild
deleted file mode 100644
index 55d721374eaf..000000000000
--- a/www-servers/tomcat/tomcat-7.0.29.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.29.ebuild,v 1.1 2012/07/08 21:35:54 fordfrog Exp $
-
-EAPI=2
-JAVA_PKG_IUSE="doc examples source test"
-WANT_ANT_TASKS="ant-trax"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
-
-MY_P="apache-${P}-src"
-SLOT="7"
-SRC_URI="mirror://apache/${PN}/${PN}-${SLOT}/v${PV}/src/${MY_P}.tar.gz"
-HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-LICENSE="Apache-2.0"
-
-IUSE=""
-
-ECJV="3.7"
-
-# servlet-api slot
-SAPIS="3.0"
-
-COMMON_DEPEND="dev-java/eclipse-ecj:${ECJV}
-	dev-java/ant-eclipse-ecj:${ECJV}
-	>=dev-java/commons-dbcp-1.4
-	>=dev-java/commons-logging-1.1
-	>=dev-java/commons-pool-1.5.5
-	~dev-java/tomcat-servlet-api-${PV}
-	examples? ( dev-java/jakarta-jstl )"
-
-RDEPEND="
-	!<dev-java/tomcat-native-1.1.20
-	>=virtual/jre-1.6
-	>=dev-java/commons-daemon-1.0.9
-	dev-java/ant-core
-	${COMMON_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-	${COMMON_DEPEND}
-	test? ( =dev-java/junit-3.8* )"
-
-S=${WORKDIR}/${MY_P}
-
-TOMCAT_NAME="${PN}-${SLOT}"
-TOMCAT_HOME="/usr/share/${TOMCAT_NAME}"
-WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps"
-
-# TODO: Fails to find PrettyPrint in with python 2.6 and xml-rewriter-3
-# Find out why so
-JAVA_ANT_CELEMENT_REWRITER="true"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_NEEDS_TOOLS="true"
-EANT_GENTOO_CLASSPATH="tomcat-servlet-api-${SAPIS},eclipse-ecj-${ECJV}"
-
-EANT_BUILD_TARGET="package"
-EANT_DOC_TARGET="build-docs"
-
-EANT_EXTRA_ARGS="-Dbase.path=${T} -Dversion=${PV}-gentoo -Dversion.number=${PV}
--Dcompile.debug=false -Del-api.jar=el-api.jar -Djsp-api.jar=jsp-api.jar -Dservlet-api.jar=servlet-api.jar
--Dant.jar=ant.jar"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	enewgroup tomcat 265
-	enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
-	epatch "${FILESDIR}/${SLOT}/${PV}-build-xml.patch"
-
-	rm -v webapps/examples/WEB-INF/lib/*.jar \
-		test/webapp-3.0-fragments/WEB-INF/lib/*.jar || die
-
-	# bug # 178980 and #312293
-	use amd64 && java-pkg_force-compiler eclipse-ecj-${ECJV}
-
-	if ! use doc; then
-		EANT_EXTRA_ARGS+=" -Dnobuild.docs=true"
-	fi
-
-	EANT_EXTRA_ARGS+=" -Djdt.jar=$(java-pkg_getjar eclipse-ecj-${ECJV} ecj.jar)"
-	java-pkg_jarfrom --build-only ant-core ant.jar
-}
-
-src_install() {
-	cd "${S}/bin"
-	rm -f *.bat
-	chmod 755 *.sh
-
-	# register jars per bug #171496
-	cd "${S}/output/build/lib/"
-	for jar in *.jar; do
-		java-pkg_dojar ${jar}
-	done
-
-	local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/
-
-	# init.d, conf.d
-	newinitd "${FILESDIR}"/${SLOT}/tomcat.init ${TOMCAT_NAME}
-	newconfd "${FILESDIR}"/${SLOT}/tomcat.conf ${TOMCAT_NAME}
-
-	# create dir structure
-	dodir /usr/share/${TOMCAT_NAME}
-
-	diropts -m750 -o tomcat -g tomcat
-	dodir   /etc/${TOMCAT_NAME}
-	keepdir ${WEBAPPS_DIR}
-
-	diropts -m755 -o tomcat -g tomcat
-	dodir   ${CATALINA_BASE}
-
-	diropts -m775 -o tomcat -g tomcat
-	dodir   /etc/${TOMCAT_NAME}/Catalina/localhost
-	keepdir /var/log/${TOMCAT_NAME}/
-	keepdir /var/run/${TOMCAT_NAME}/
-	keepdir /var/tmp/${TOMCAT_NAME}/
-
-	cd "${S}"
-	# fix context's so webapps will be deployed
-	sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/host-manager"  a:' "${S}"/webapps/host-manager/META-INF/context.xml
-	sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/manager"  a:' "${S}"/webapps/manager/META-INF/context.xml
-
-	# replace the default pw with a random one, see #92281
-	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
-	sed -e s:SHUTDOWN:${randpw}: -i conf/server.xml
-
-	# copy over the directories
-	chown -R tomcat:tomcat webapps/* conf/*
-	cp -pR conf/* "${D}"/etc/${TOMCAT_NAME} || die "failed to copy conf"
-	cp -pPR output/build/bin "${D}"/usr/share/${TOMCAT_NAME} \
-		|| die "failed to copy"
-	# webapps get stored in /usr/share/${TOMCAT_NAME}/webapps
-	cd "${S}"/webapps || die
-	ebegin "Installing webapps to /usr/share/${TOMCAT_NAME}"
-
-	dodir /usr/share/${TOMCAT_NAME}/webapps
-	cp -pR ROOT "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
-	cp -pR host-manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
-	cp -pR manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
-	if use doc; then
-		cp -pR "${S}"/output/build/webapps/docs "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
-	fi
-	if use examples; then
-		cd "${S}"/webapps/examples/WEB-INF/lib
-		java-pkg_jar-from jakarta-jstl jstl.jar
-		java-pkg_jar-from jakarta-jstl standard.jar
-		cd "${S}"/webapps
-		cp -pR examples "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
-	fi
-
-	# replace catalina.policy with gentoo specific one bug #176701
-#	cp ${FILESDIR}/${SLOT}/catalina.policy "${D}"/etc/${TOMCAT_NAME} \
-#		|| die "failed to replace catalina.policy"
-
-	cd "${D}/usr/share/${TOMCAT_NAME}/lib" || die
-	java-pkg_jar-from eclipse-ecj-${ECJV}
-	java-pkg_jar-from tomcat-servlet-api-${SAPIS}
-
-	# symlink the directories to make CATALINA_BASE possible
-	dosym /etc/${TOMCAT_NAME} ${CATALINA_BASE}/conf
-	dosym /var/log/${TOMCAT_NAME} ${CATALINA_BASE}/logs
-	dosym /var/tmp/${TOMCAT_NAME} ${CATALINA_BASE}/temp
-	# we cannot symlink work directory because that breaks saving session data
-	# because session file cannot be saved to symlinked location by default
-	#dosym /var/run/${TOMCAT_NAME} ${CATALINA_BASE}/work
-
-	dodoc  "${S}"/{RELEASE-NOTES,RUNNING.txt}
-	fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
-
-	#install *.sh scripts bug #278059
-	exeinto /usr/share/${TOMCAT_NAME}/bin
-	doexe "${S}"/bin/*.sh
-}
-
-pkg_postinst() {
-	ewarn "Changing ownership recursively on /etc/${TOMCAT_NAME}"
-	# temp fix for bug #176097
-	chown -fR tomcat:tomcat /etc/${TOMCAT_NAME}
-	ewarn "Owner ship changed to tomcat:tomcat. Temp hack/fix."
-
-	# bug #180519
-	if [[ -e "${ROOT}var/lib/${TOMCAT_NAME}/webapps/manager" ]] ; then
-		elog
-		elog "The latest webapp has NOT been installed into"
-		elog "${ROOT}var/lib/${TOMCAT_NAME}/webapps/ because directory already exists"
-		elog "and we do not want to overwrite any files you have put there."
-		elog
-		elog "Installing latest webapp into"
-		elog "${ROOT}usr/share/${TOMCAT_NAME}/webapps instead"
-		elog
-		elog "Manager Symbolic Links NOT created."
-	else
-		einfo "Installing latest webroot to ${ROOT}/${WEBAPPS_DIR}"
-		cp -pR "${ROOT}"/usr/share/${TOMCAT_NAME}/webapps/* \
-			"${ROOT}""${WEBAPPS_DIR}"
-		# link the manager's context to the right position
-		dosym ${TOMCAT_HOME}/webapps/host-manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/host-manager.xml
-		dosym ${TOMCAT_HOME}/webapps/manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/manager.xml
-	fi
-
-	# bug with storing SESSIONS.ser file to path with symlink
-	if [[ -L "${ROOT}var/lib/${TOMCAT_NAME}/work" ]] ; then
-		elog
-		ewarn "${ROOT}var/lib/${TOMCAT_NAME}/work is symbolic link which breaks"
-		ewarn "storing of SESSIONS.ser files in work directory when allowLinking"
-		ewarn "is disabled (the default). Remove the symbolic link (while Tomcat is"
-		ewarn "not running) to fix the issue."
-	fi
-
-	elog
-	elog " This ebuild implements a FHS compliant layout for tomcat"
-	elog " Please read http://www.gentoo.org/proj/en/java/tomcat6-guide.xml"
-	elog " for more information."
-	elog
-	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
-	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-	elog
-
-	ewarn "The manager webapps have known exploits, please refer to"
-	ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2450"
-
-	if use examples ; then
-		ewarn
-		ewarn "The examples webapp has a known exploit, please refer to"
-		ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2449"
-		ewarn
-	fi
-
-	elog
-	elog " Please report any bugs to http://bugs.gentoo.org/"
-	elog
-}
diff --git a/www-servers/tomcat/tomcat-7.0.30.ebuild b/www-servers/tomcat/tomcat-7.0.30.ebuild
deleted file mode 100644
index 0817dbb6928b..000000000000
--- a/www-servers/tomcat/tomcat-7.0.30.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.30.ebuild,v 1.1 2012/09/06 14:51:05 fordfrog Exp $
-
-EAPI=4
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix
-
-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-fbsd"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="3.7"
-SAPI_SLOT="3.0"
-
-COMMON_DEP="
-	dev-java/eclipse-ecj:${ECJ_SLOT}
-	~dev-java/tomcat-servlet-api-${PV}
-	extra-webapps? ( dev-java/jakarta-jstl:0 )"
-RDEPEND="${COMMON_DEP}
-	!<dev-java/tomcat-native-1.1.20
-	>=virtual/jre-1.6"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.6
-	>=dev-java/ant-core-1.8.1:0
-	test? (
-		dev-java/ant-junit:0
-		dev-java/junit:4
-	)"
-
-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' -exec rm -v {} + || 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="tomcat-servlet-api-${SAPI_SLOT},eclipse-ecj-${ECJ_SLOT}"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-src_compile() {
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
-	java-pkg-2_src_compile
-}
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-
-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
-
-	# so we don't have to call java-config with --with-dependencies, which might
-	# bring in more jars then actually desired.
-	java-pkg_addcp "$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT})"
-
-	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 ###
-
-	# 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
-
-	insinto "${dest}"
-	doins -r output/build/conf
-
-	### rc ###
-
-	cp "${FILESDIR}"/tomcat{.conf,.init,-instance-manager.bash} "${T}" || die
-	eprefixify "${T}"/tomcat{.conf,.init,-instance-manager.bash}
-	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,.init,-instance-manager.bash} || die
-
-	insinto "${dest}"/gentoo
-	doins "${T}"/tomcat.conf
-	exeinto "${dest}"/gentoo
-	doexe "${T}"/tomcat{.init,-instance-manager.bash}
-}
-
-pkg_postinst() {
-	elog "For how to deploy a server instance 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."
-}