Removed old versions of package

(Portage version: 2.1.2-r4)

10 files changed, 8 insertions, 598 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 4796cd357aa5..d0c0ffe62038 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.115 2007/02/03 15:52:57 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.116 2007/02/03 16:23:28 wltjr Exp $
+
+  03 Feb 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  -files/5.0.27/gentoo.diff, -files/5.0.27/tomcat.conf,
+  -files/5.0.27/jikes.diff, -files/5.0.27/tomcat.env,
+  -files/5.0.27/tomcat.init, -tomcat-5.0.27-r6.ebuild,
+  -tomcat-5.5.20-r7.ebuild:
+  Removed old versions of package
 
   03 Feb 2007; Steve Dibb <beandog@gentoo.org> tomcat-5.5.20-r8.ebuild:
   amd64 stable, bug 163982
diff --git a/www-servers/tomcat/files/5.0.27/gentoo.diff b/www-servers/tomcat/files/5.0.27/gentoo.diff
deleted file mode 100644
index 0bfcb4523fec..000000000000
--- a/www-servers/tomcat/files/5.0.27/gentoo.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- bin/catalina.sh	2004-05-19 02:25:07.000000000 -0400
-+++ bin/catalina.sh	2004-05-19 02:23:20.128089696 -0400
-@@ -38,6 +38,10 @@
- # $Id: gentoo.diff,v 1.1 2004/08/08 18:39:49 stuart Exp $
- # -----------------------------------------------------------------------------
- 
-+# source the appropriate files right away
-+source /etc/profile
-+source /etc/conf.d/tomcat5
-+
- # OS specific support.  $var _must_ be set to either true or false.
- cygwin=false
- os400=false
diff --git a/www-servers/tomcat/files/5.0.27/jikes.diff b/www-servers/tomcat/files/5.0.27/jikes.diff
deleted file mode 100644
index a91210d56c99..000000000000
--- a/www-servers/tomcat/files/5.0.27/jikes.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- conf/web.xml	2004-06-18 03:10:14.000000000 +0200
-+++ conf/web.xml	2004-07-28 18:51:39.192165664 +0200
-@@ -186,6 +186,10 @@
-     <servlet>
-         <servlet-name>jsp</servlet-name>
-         <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
-+        <init-param>
-+            <param-name>compiler</param-name>
-+            <param-value>jikes</param-value>
-+        </init-param>
-         <init-param>
-             <param-name>fork</param-name>
-             <param-value>false</param-value>
diff --git a/www-servers/tomcat/files/5.0.27/tomcat.conf b/www-servers/tomcat/files/5.0.27/tomcat.conf
deleted file mode 100644
index 2da3a6924d1e..000000000000
--- a/www-servers/tomcat/files/5.0.27/tomcat.conf
+++ /dev/null
@@ -1,76 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.0.27/tomcat.conf,v 1.1 2004/08/08 18:39:49 stuart 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: JAVA_HOME=/opt/sun-jdk-1.4.2.05
-
-#JAVA_HOME=`java-config -O`
-
-# (Optional) Java runtime options used when the "start", "stop", or "run"
-# commands are executed.
-# JAVA_OPTS=""
-
-# Where your web applications are located
-CATALINA_HOME=/opt/tomcat5
-#CATALINA_BASE=${CATALINA_HOME}
-
-# Tomcat's User
-CATALINA_USER=tomcat
-
-# Tomcat Console Log Location
-CATALINA_OUT=/var/log/tomcat5/catalina.log
-
-# Location of the Tomcat JARs and classes
-#CATALINA_LIBDIR=/usr/share/tomcat5/lib
-
-# The CLASSPATH for Tomcat to use, plus any others you need.
-#CLASSPATH=${CLASSPATH}:${CATALINA_LIBDIR}
-
-# (Optional) Directory path location of temporary directory the JVM should 
-# use (java.io.tmpdir).  Defaults to $CATALINA_BASE/temp.
-# CATALINA_TMPDIR="/your/path/here"
-
-# TOMCAT STARTUP/SHUTDOWN
-# 	debug             Start Catalina in a debugger
-# 	debug -security   Debug Catalina with a security manager
-# 	embedded          Start Catalina in embedded mode
-# 	jpda start        Start Catalina under JPDA debugger
-# 	start             Start Catalina in a separate window
-# 	start -security   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.4.1.02/jre/lib/"
diff --git a/www-servers/tomcat/files/5.0.27/tomcat.env b/www-servers/tomcat/files/5.0.27/tomcat.env
deleted file mode 100644
index 7570b733c38c..000000000000
--- a/www-servers/tomcat/files/5.0.27/tomcat.env
+++ /dev/null
@@ -1 +0,0 @@
-CATALINA_HOME=/opt/tomcat5
diff --git a/www-servers/tomcat/files/5.0.27/tomcat.init b/www-servers/tomcat/files/5.0.27/tomcat.init
deleted file mode 100644
index c9db528be0e5..000000000000
--- a/www-servers/tomcat/files/5.0.27/tomcat.init
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.0.27/tomcat.init,v 1.3 2004/10/08 13:38:08 axxo Exp $
-
-depend() {
-	use dns logger mysql postgresql net
-}
-
-start()	{
-	ebegin "Starting Tomcat"
-	start-stop-daemon --start --quiet --chuid tomcat:tomcat --exec ${CATALINA_HOME}/bin/catalina.sh -- ${TOMCAT_START}
-	sleep 5
-	eend $?
-}
-
-stop()	{
-	ebegin "Stopping Tomcat"
-	start-stop-daemon --start --quiet --chuid tomcat:tomcat --exec ${CATALINA_HOME}/bin/catalina.sh -- ${TOMCAT_STOP}
-	sleep 5
-	eend $?
-}
diff --git a/www-servers/tomcat/files/digest-tomcat-5.0.27-r6 b/www-servers/tomcat/files/digest-tomcat-5.0.27-r6
deleted file mode 100644
index 4e9c4065820d..000000000000
--- a/www-servers/tomcat/files/digest-tomcat-5.0.27-r6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b802ee042677e284bcf65738c7bdc3b6 jakarta-tomcat-5.0.27.tar.gz 10298374
-RMD160 a333fcb531bb98af20db6e0a10d3e8b2c72ee1fa jakarta-tomcat-5.0.27.tar.gz 10298374
-SHA256 873fc94b4316235091e69bca926bd66a0fb9fab542016e582a03323ed6777d78 jakarta-tomcat-5.0.27.tar.gz 10298374
diff --git a/www-servers/tomcat/files/digest-tomcat-5.5.20-r7 b/www-servers/tomcat/files/digest-tomcat-5.5.20-r7
deleted file mode 100644
index 25cb711a112c..000000000000
--- a/www-servers/tomcat/files/digest-tomcat-5.5.20-r7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5775bae8fac16a0e3a2c913c4768bb37 apache-tomcat-5.5.20-src.tar.gz 4796377
-RMD160 587590d2e272d1ede73501b62933f544cd969822 apache-tomcat-5.5.20-src.tar.gz 4796377
-SHA256 19f24717fb3e2db902c33e21650dfa88bbf98428c15b1ed68ecaf7a9150e4a77 apache-tomcat-5.5.20-src.tar.gz 4796377
diff --git a/www-servers/tomcat/tomcat-5.0.27-r6.ebuild b/www-servers/tomcat/tomcat-5.0.27-r6.ebuild
deleted file mode 100644
index b7af74d5c0a4..000000000000
--- a/www-servers/tomcat/tomcat-5.0.27-r6.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.0.27-r6.ebuild,v 1.10 2007/01/09 16:49:14 wltjr Exp $
-
-inherit eutils
-
-DESCRIPTION="Apache Servlet-2.4/JSP-2.0 Container"
-
-JT_P="jakarta-${P}.tar.gz"
-S=${WORKDIR}/jakarta-${P}
-SLOT="${PV/.*/}"
-SRC_URI="http://archive.apache.org/dist/tomcat/tomcat-${SLOT}/archive/v${PV}/bin/${JT_P}"
-HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="ppc ~ppc64"
-LICENSE="Apache-2.0"
-DEPEND="sys-apps/sed"
-RDEPEND=">=virtual/jdk-1.3
-		jikes? ( dev-java/jikes )"
-IUSE="doc jikes"
-
-TOMCAT_HOME="/opt/${PN}${SLOT}"
-TOMCAT_NAME="${PN}${SLOT}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}/gentoo.diff
-	use jikes && epatch ${FILESDIR}/${PV}/jikes.diff
-}
-
-src_install() {
-	dodoc RELEASE* RUNNING.txt LICENSE
-
-	# init.d, conf.d , env.d
-	insinto /etc/init.d
-	insopts -m0750
-	newins ${FILESDIR}/${PV}/${PN}.init ${TOMCAT_NAME}
-
-	newenvd ${FILESDIR}/${PV}/${PN}.env 21${PN}
-
-	insinto /etc/conf.d
-	insopts -m0644
-	newins ${FILESDIR}/${PV}/${PN}.conf ${TOMCAT_NAME}
-	use jikes && sed -e "\cCATALINA_OPTScaCATALINA_OPTS=\"-Dbuild.compiler.emacs=true\"" -i ${D}/etc/conf.d/${TOMCAT_NAME}
-
-	diropts -m750
-	dodir ${TOMCAT_HOME} /var/log/${TOMCAT_NAME} /etc/${TOMCAT_NAME}
-	keepdir /var/log/${TOMCAT_NAME}
-
-	# we don't want DOS related things
-	rm -f bin/*.{bat,exe}
-
-	# 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,server-minimal}.xml
-
-	mv conf/* ${D}/etc/${TOMCAT_NAME}
-	mv bin common server shared temp work ${D}${TOMCAT_HOME}
-	keepdir ${TOMCAT_HOME}/{work,temp}
-
-	if ! use doc; then
-		rm -rf webapps/{tomcat-docs,jsp-examples,servlets-examples}
-	fi
-	mv webapps ${D}${TOMCAT_HOME}
-
-	dosym /etc/${TOMCAT_NAME} ${TOMCAT_HOME}/conf
-	dosym /var/log/${TOMCAT_NAME} ${TOMCAT_HOME}/logs
-
-	fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
-}
-
-
-pkg_preinst() {
-	enewgroup tomcat
-	enewuser tomcat -1 -1 /dev/null tomcat
-
-	chown -R tomcat:tomcat ${D}/opt/${TOMCAT_NAME}
-	chown -R tomcat:tomcat ${D}/etc/${TOMCAT_NAME}
-	chown -R tomcat:tomcat ${D}/var/log/${TOMCAT_NAME}
-}
-
-pkg_postinst() {
-	#due to previous ebuild bloopers, make sure everything is correct
-	chown -R root:root /usr/share/doc/${PF}
-	chown root:root /etc/init.d/${TOMCAT_NAME}
-	chown root:root /etc/conf.d/${TOMCAT_NAME}
-
-	chown -R tomcat:tomcat /opt/${TOMCAT_NAME}
-	chown -R tomcat:tomcat /etc/${TOMCAT_NAME}
-	chown -R tomcat:tomcat /var/log/${TOMCAT_NAME}
-
-	chmod 750 /etc/${TOMCAT_NAME}
-
-	elog
-	elog " NOTICE!"
-	elog " FILE LOCATIONS:"
-	elog " 1.  Tomcat home directory: ${TOMCAT_HOME}"
-	elog "     Contains application data, configuration files."
-	elog " 2.  Runtime settings: /etc/conf.d/${TOMCAT_NAME}"
-	elog "     Contains CLASSPATH and JAVA_HOME settings."
-	elog " 3.  Configuration:  /etc/${TOMCAT_NAME}"
-	elog " 4.  Logs:  /var/log/${TOMCAT_NAME}/"
-	elog
-	elog
-	elog " STARTING AND STOPPING TOMCAT:"
-	elog "   /etc/init.d/${TOMCAT_NAME} start"
-	elog "   /etc/init.d/${TOMCAT_NAME} stop"
-	elog "   /etc/init.d/${TOMCAT_NAME} restart"
-	elog
-	elog
-	ewarn " If you are upgrading from older ebuild do NOT use"
-	ewarn " /etc/init.d/tomcat and /etc/conf.d/tomcat you probably"
-	ewarn " want to remove these."
-	ewarn " A version number has been appended so that tomcat 3, 4 and 5"
-	ewarn " can be installed side by side"
-	elog
-	elog " NETWORK CONFIGURATION:"
-	elog " By default, Tomcat runs on port 8080.  You can change this"
-	elog " value by editing /etc/${TOMCAT_NAME}/server.xml."
-	elog
-	elog " To test Tomcat while it's running, point your web browser to:"
-	elog " http://localhost:8080/"
-	elog
-	elog
-	elog " BUGS:"
-	elog " Please file any bugs at http://bugs.gentoo.org/ or else it"
-	elog " may not get seen.  Thank you."
-	elog
-}
diff --git a/www-servers/tomcat/tomcat-5.5.20-r7.ebuild b/www-servers/tomcat/tomcat-5.5.20-r7.ebuild
deleted file mode 100644
index 616e5356f540..000000000000
--- a/www-servers/tomcat/tomcat-5.5.20-r7.ebuild
+++ /dev/null
@@ -1,337 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.20-r7.ebuild,v 1.3 2007/01/26 02:07:51 caster Exp $
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Apache Servlet-2.4/JSP-2.0 Container"
-
-MY_P="apache-${P}-src"
-SLOT="5.5"
-SRC_URI="mirror://apache/${PN}/${PN}-5/v${PV}/src/${MY_P}.tar.gz"
-HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="amd64 x86 -ppc -ppc64"
-LICENSE="Apache-2.0"
-
-IUSE="admin java5 doc examples source test"
-
-RDEPEND="=dev-java/eclipse-ecj-3.1*
-	=dev-java/commons-beanutils-1.7*
-	>=dev-java/commons-collections-3.1
-	>=dev-java/commons-daemon-1.0.1
-	>=dev-java/commons-dbcp-1.2.1
-	>=dev-java/commons-digester-1.7
-	>=dev-java/commons-fileupload-1.1
-	>=dev-java/commons-io-1.1
-	>=dev-java/commons-el-1.0
-	>=dev-java/commons-launcher-0.9
-	>=dev-java/commons-logging-1.0.4
-	>=dev-java/commons-modeler-1.1
-	>=dev-java/commons-pool-1.2
-	>=dev-java/log4j-1.2.9
-	~dev-java/servletapi-2.4
-	admin? ( =dev-java/struts-1.2* )
-	dev-java/sun-javamail
-	java5? ( >=virtual/jre-1.5 )
-	!java5? (
-		=virtual/jre-1.4*
-		=dev-java/commons-httpclient-2.0*
-		dev-java/sun-jaf
-		>=dev-java/junit-3.8.1
-		=dev-java/mx4j-3*
-		>=dev-java/saxpath-1.0
-		>=dev-java/xerces-2.7.1
-	   	=dev-java/xml-commons-external-1.3*
-	   )"
-DEPEND="java5? ( >=virtual/jdk-1.5 )
-	!java5? ( =virtual/jdk-1.4* )
-	${RDEPEND}
-	dev-java/ant"
-
-if ! use java5; then
-	JAVA_PKG_NV_DEPEND="=virtual/jdk-1.4*"
-else
-	JAVA_PKG_NV_DEPEND="=virtual/jdk-1.5"
-fi
-
-S=${WORKDIR}/${MY_P}
-
-TOMCAT_NAME="${PN}-${SLOT}"
-WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps"
-
-pkg_setup() {
-	# new user for tomcat
-	enewgroup tomcat
-	enewuser tomcat -1 -1 /dev/null tomcat
-
-	java-pkg_filter-compiler ecj-3.1  ecj-3.2
-
-	if use java5; then
-		JAVA_PKG_WANT_SOURCE="1.5"
-		JAVA_PKG_WANT_TARGET="1.5"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	local PATCHES="
-		mainbuild-xml.patch
-		tomcatbuild-xml.patch
-		catalinabuild-xml.patch
-		jasperbuild-xml.patch
-	"
-	for patch in ${PATCHES}; do
-		epatch "${FILESDIR}/${PV}/${patch}"
-	done
-	if ! use examples; then
-		epatch "${FILESDIR}/${PV}/jsr152build-xml-examples.patch"
-		epatch "${FILESDIR}/${PV}/jsr154build-xml-examples.patch"
-	fi
-
-	# avoid packed jars :-)
-	mkdir -p ${S}/build/build/common
-	cd ${S}/build/build
-
-	mkdir ./bin && cd ./bin
-	java-pkg_jar-from commons-logging commons-logging-api.jar
-	java-pkg_jar-from commons-daemon
-	if ! use java5; then
-		java-pkg_jar-from mx4j-3.0 mx4j.jar jmx.jar
-		java-pkg_jar-from mx4j-3.0 mx4j-rjmx.jar jmx-remote.jar
-	fi
-
-	if ! use java5; then
-		mkdir ${S}/build/build/common/endorsed && cd ${S}/build/build/common/endorsed
-		java-pkg_jar-from xml-commons-external-1.3 xml-apis.jar
-		java-pkg_jar-from xerces-2 xercesImpl.jar
-	fi
-
-	mkdir ${S}/build/build/common/lib && cd ${S}/build/build/common/lib
-	java-pkg_jar-from ant-core
-	java-pkg_jar-from commons-collections
-	java-pkg_jar-from commons-dbcp
-	java-pkg_jar-from commons-el
-	java-pkg_jar-from commons-pool
-	java-pkg_jar-from servletapi-2.4
-
-	mkdir -p ${S}/build/build/server/lib && cd ${S}/build/build/server/lib
-	java-pkg_jar-from commons-beanutils-1.7 commons-beanutils.jar
-	java-pkg_jar-from commons-digester
-	java-pkg_jar-from commons-modeler
-
-}
-
-src_compile(){
-	local antflags="-Dbase.path=${T}"
-
-	antflags="${antflags} -Dcommons-collections.jar=$(java-config -p commons-collections)"
-	antflags="${antflags} -Dcommons-daemon.jar=$(java-config -p commons-daemon)"
-	antflags="${antflags} -Dcommons-digester.jar=$(java-config -p commons-digester)"
-	antflags="${antflags} -Dcommons-dbcp.jar=$(java-config -p commons-dbcp)"
-	antflags="${antflags} -Dcommons-el.jar=$(java-config -p commons-el)"
-	antflags="${antflags} -Dcommons-pool.jar=$(java-config -p commons-pool)"
-	antflags="${antflags} -Dcommons-fileupload.jar=$(java-config -p commons-fileupload)"
-	antflags="${antflags} -Dcommons-launcher.jar=$(java-config -p commons-launcher)"
-	antflags="${antflags} -Dcommons-modeler.jar=$(java-config -p commons-modeler)"
-	antflags="${antflags} -Djunit.jar=$(java-config -p junit)"
-	antflags="${antflags} -Djdt.jar=$(java-pkg_getjar eclipse-ecj-3.1 ecj.jar)"
-	antflags="${antflags} -Dlog4j.jar=$(java-config -p log4j)"
-	antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.7 commons-beanutils.jar)"
-	antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)"
-	antflags="${antflags} -Dcommons-logging-api.jar=$(java-pkg_getjar commons-logging commons-logging-api.jar)"
-	antflags="${antflags} -Dmail.jar=$(java-pkg_getjar sun-javamail mail.jar)"
-	if use admin; then
-		antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts-1.2 struts.jar)"
-		antflags="${antflags} -Dstruts.home=/usr/share/struts"
-	else
-		antflags="${antflags} -Dadmin.build.notrequired=true"
-		antflags="${antflags} -Dadmin.precompile.notrequired=true"
-	fi
-	if ! use examples; then
-		antflags="${antflags} -Dexamples.precompile.notrequired=true"
-	fi
-	antflags="${antflags} -Djasper.home=${S}/jasper"
-	if ! use java5; then
-		antflags="${antflags} -Dcommons-httpclient.jar=$(java-config -p commons-httpclient)"
-		antflags="${antflags} -Dactivation.jar=$(java-config -p sun-jaf)"
-		antflags="${antflags} -Djmx.jar=$(java-pkg_getjar mx4j-3.0 mx4j.jar)"
-		antflags="${antflags} -Djmx-remote.jar=$(java-pkg_getjar mx4j-3.0 mx4j-rjmx.jar)"
-		antflags="${antflags} -Dsaxpath.jar=$(java-pkg_getjar saxpath saxpath.jar)"
-		antflags="${antflags} -DxercesImpl.jar=$(java-pkg_getjar xerces-2 xercesImpl.jar)"
-		antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xml-commons-external-1.3 xml-apis.jar)"
-	fi
-
-	# prevent classpath bloat with ant-1.7.0 which makes admin app fail
-	ANT_TASKS="ant-trax" eant ${antflags}
-}
-
-src_install() {
-	cd ${S}/build/build
-
-	# init.d, conf.d
-	newinitd ${FILESDIR}/${PV}/tomcat.init ${TOMCAT_NAME}
-	newconfd ${FILESDIR}/${PV}/tomcat.conf ${TOMCAT_NAME}
-
-	# create dir structure
-	diropts -m755 -o tomcat -g tomcat
-	dodir /usr/share/${TOMCAT_NAME}
-	keepdir /var/log/${TOMCAT_NAME}/
-	keepdir /var/tmp/${TOMCAT_NAME}/
-	keepdir /var/run/${TOMCAT_NAME}/
-
-	local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/
-	dodir   ${CATALINA_BASE}
-	keepdir ${CATALINA_BASE}/shared/lib
-	keepdir ${CATALINA_BASE}/shared/classes
-
-	keepdir /usr/share/${TOMCAT_NAME}/common/lib
-
-	dodir   /etc/${TOMCAT_NAME}
-	fperms  750 /etc/${TOMCAT_NAME}
-
-	diropts -m0755
-
-	# we don't need dos scripts
-	rm -f bin/*.bat
-
-	# copy the manager and admin context's to the right position
-	mkdir -p conf/Catalina/localhost
-	if use admin; then
-		cp ${S}/container/webapps/admin/admin.xml \
-			conf/Catalina/localhost
-	fi
-	cp ${S}/container/webapps/manager/manager.xml \
-		conf/Catalina/localhost
-
-	# make the jars available via java-config -p and jar-from, etc
-	base=$(pwd)
-	libdirs="common/lib server/lib"
-	for dir in ${libdirs}
-	do
-		cd ${dir}
-
-		for jar in *.jar;
-		do
-			# replace the file with a symlink
-			if [ ! -L ${jar} ]; then
-				java-pkg_dojar ${jar}
-				rm -f ${jar}
-				ln -s ${DESTTREE}/share/${TOMCAT_NAME}/lib/${jar} ${jar}
-			fi
-		done
-
-		cd ${base}
-	done
-
-	# replace a packed struts.jar
-	if use admin; then
-		cd server/webapps/admin/WEB-INF/lib
-		rm -f struts.jar
-		java-pkg_jar-from struts-1.2 struts.jar
-		cd ${base}
-	else
-		rm -fR server/webapps/admin
-	fi
-
-	cd server/webapps/manager/WEB-INF/lib
-	java-pkg_jar-from commons-fileupload
-	java-pkg_jar-from commons-io-1
-	cd ${base}
-
-	# 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,server-minimal}.xml
-
-	# copy over the directories
-	chown -R tomcat:tomcat webapps/* conf/*
-	cp -pR conf/* ${D}/etc/${TOMCAT_NAME} || die "failed to copy conf"
-	cp -HR bin common server ${D}/usr/share/${TOMCAT_NAME} || die "failed to copy"
-
-	keepdir               ${WEBAPPS_DIR}
-	set_webapps_perms     ${D}/${WEBAPPS_DIR}
-
-	# Copy over webapps, some controlled by use flags
-	cp -p ../RELEASE-NOTES webapps/ROOT/RELEASE-NOTES.txt
-	cp -pr webapps/ROOT ${D}${CATALINA_BASE}/webapps
-	if use doc; then
-		cp -pr webapps/tomcat-docs ${D}${CATALINA_BASE}/webapps
-	fi
-	if use examples; then
-		cp -pr webapps/{jsp-examples,servlets-examples,webdav} \
-			${D}${CATALINA_BASE}/webapps
-	fi
-
-	# 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}/build/{RELEASE-NOTES,RUNNING.txt}
-	fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
-}
-
-pkg_postinst() {
-	#due to previous ebuild bloopers, make sure everything is correct
-	chown root:root /etc/init.d/${TOMCAT_NAME}
-	chown root:root /etc/conf.d/${TOMCAT_NAME}
-
-	ewarn
-	ewarn " This ebuild implements a new filesystem layout for tomcat"
-	ewarn " please read http://www.gentoo.org/proj/en/java/tomcat-guide.xml"
-	ewarn " for more information!."
-	elog
-	elog " Please file any bugs at http://bugs.gentoo.org/ or else it"
-	elog " may not get seen.  Thank you."
-	elog
-
-#	elog "Run emerge --config =${PF}"
-#	elog "to configure Tomcat if you need to for example"
-#	elog "change the home directory of the Tomcat user."
-}
-
-#helpers
-set_webapps_perms() {
-	chown  tomcat:tomcat ${1} || die "Failed to change owner off ${1}."
-	chmod  750           ${1} || die "Failed to change permissions off ${1}."
-}
-
-pkg_config() {
-	# Better suggestions are welcome
-	local currentdir="$(getent passwd tomcat | gawk -F':' '{ print $6 }')"
-
-	elog "The default home directory for Tomcat is /dev/null."
-	elog "You need to change it if your applications needs it to"
-	elog "be an actual directory. Current home directory:"
-	elog "${currentdir}"
-	elog ""
-	elog "Do you want to change it [yes/no]?"
-
-	local answer
-	read answer
-
-	if [[ "${answer}" == "yes" ]]; then
-		elog ""
-		elog "Suggestions:"
-		elog "${WEBAPPS_DIR}"
-		elog ""
-		elog "If you want to suggest a directory, file a bug to"
-		elog "http://bugs.gentoo.org"
-		elog ""
-		elog "Enter home directory:"
-
-		local homedir
-		read homedir
-
-		elog ""
-		elog "Setting home directory to: ${homedir}"
-
-		/usr/sbin/usermod -d"${homedir}" tomcat
-
-		elog "You can run emerge --config =${PF}"
-		elog "again to change to homedir"
-		elog "at any time."
-	fi
-}