Version bump + now builds from source, Thanks too Mark Wolfe <mwolfe@netspace.net.au> for his work on this. #18352

10 files changed, 401 insertions, 5 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index d30cda333b78..da513b22e85d 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.8 2004/10/08 13:38:08 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.9 2004/10/09 09:59:14 axxo Exp $
+
+*tomcat-5.0.28 (09 Oct 2004)
+
+  09 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  +files/5.0.28/build.xml-01.patch, +files/5.0.28/build.xml-02.patch,
+  +files/5.0.28/gentoo.diff, +files/5.0.28/jikes.diff,
+  +files/5.0.28/tomcat.conf, +files/5.0.28/tomcat.init,
+  +tomcat-5.0.28.ebuild:
+  Version bump + now builds from source, Thanks too Mark Wolfe
+  <mwolfe@netspace.net.au> for his work on this. #18352
 
   08 Oct 2004; Thomas Matthijs <axxo@gentoo.org> files/3.3.2/tomcat.init,
   files/4.1.30/tomcat.init, files/5.0.27/tomcat.init:
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 168ce830e21c..1e5fd15995a8 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -2,12 +2,14 @@
 Hash: SHA1
 
 MD5 9c44e79d216fa2be078f524e2058849c tomcat-5.0.27-r4.ebuild 3642
+MD5 47f6fb782d6c3ec8fedce23ae8cc2c3f tomcat-5.0.28.ebuild 6944
 MD5 ff159c6e5e2e2aa736a45b8649e387a5 tomcat-4.1.30-r5.ebuild 3614
 MD5 9f43fb32ba8bd0c3316be682bc796c48 tomcat-3.3.2-r2.ebuild 3212
-MD5 2787d6e43d6302beec8836b6d822a7ac ChangeLog 11941
+MD5 2eaa5e15b69461b7dea0523efef675a2 ChangeLog 12346
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 MD5 71d59fd713a960e63c1b894ca5893a1b files/digest-tomcat-4.1.30-r5 74
 MD5 d5a48abc8db5543a73abbbf151d0630e files/digest-tomcat-5.0.27-r4 75
+MD5 af26ca4772989a2090085a6e24b71628 files/digest-tomcat-5.0.28 78
 MD5 6940eb780efc66ecb6ecf11b6b7adb05 files/digest-tomcat-3.3.2-r2 73
 MD5 eb7830519ae94bb563d39f1f51ab590a files/3.3.2/gentoo.diff 368
 MD5 04d838f36e57a63e574b2aea1c70dc47 files/3.3.2/tomcat.conf 904
@@ -20,10 +22,16 @@ MD5 cbb635ed31e3b7ddabe1db851a8b471e files/5.0.27/gentoo.diff 463
 MD5 bf74c2bd8c21359ada1793cddfa95f37 files/5.0.27/tomcat.conf 2660
 MD5 d6b2ebda71fd769327f49bcb51f92db2 files/5.0.27/tomcat.init 636
 MD5 c19b85e130d0e0a565eebc406d699965 files/5.0.27/jikes.diff 510
+MD5 c51b5f0fe2e164a8ec2712dca47d5e14 files/5.0.28/gentoo.diff 535
+MD5 6eaf54e60fd0b74ae37ec1dbd8540598 files/5.0.28/build.xml-01.patch 623
+MD5 b86e1b48fdd506ecbff14c2e811578ac files/5.0.28/tomcat.conf 2658
+MD5 851c137a8916df40729fcd9c01f17906 files/5.0.28/tomcat.init 636
+MD5 b4e47e52a6f3b3c69baad3ccfbd2fd14 files/5.0.28/build.xml-02.patch 1065
+MD5 c19b85e130d0e0a565eebc406d699965 files/5.0.28/jikes.diff 510
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBZphV/rLF9B432nYRAkZkAKCxttMibzY4wyKRSzLNZpaCmO4gCgCfTzo8
-KHXGk1eaf2pEunUml/W6iJk=
-=orwC
+iD8DBQFBZ7bV/rLF9B432nYRAvj2AKCyiN96WCnJ9je69QV2iOQogfciIACeKF7b
+5ua0GqomHR6bV6F7B1BwFyo=
+=FKf4
 -----END PGP SIGNATURE-----
diff --git a/www-servers/tomcat/files/5.0.28/build.xml-01.patch b/www-servers/tomcat/files/5.0.28/build.xml-01.patch
new file mode 100644
index 000000000000..1caa16c04181
--- /dev/null
+++ b/www-servers/tomcat/files/5.0.28/build.xml-01.patch
@@ -0,0 +1,19 @@
+--- build.xml	2004-10-05 22:19:36.837810480 +1000
++++ build.xml	2004-10-05 22:19:51.448589304 +1000
+@@ -77,14 +77,14 @@
+ 
+   <target name="checkout.depends"
+           description="Update or checkout dependent sources from CVS">
+-
++<!--
+     <cvs cvsroot="${cvsroot}" quiet="true"
+          command="checkout -P jakarta-commons/LICENSE" 
+          dest="${basedir}" compression="true" />
+     <cvs cvsroot="${cvsroot}" quiet="true"
+          command="checkout -P ${commons-daemon.project}" 
+          dest="${basedir}" compression="true" />
+-
++-->
+   </target>
+ 
+   <!-- *************** UTILITY TARGETS *************** -->
diff --git a/www-servers/tomcat/files/5.0.28/build.xml-02.patch b/www-servers/tomcat/files/5.0.28/build.xml-02.patch
new file mode 100644
index 000000000000..6eaf757fbff9
--- /dev/null
+++ b/www-servers/tomcat/files/5.0.28/build.xml-02.patch
@@ -0,0 +1,29 @@
+--- jakarta-tomcat-5/build.xml	2004-10-05 23:21:44.091181840 +1000
++++ jakarta-tomcat-5/build.xml	2004-10-05 23:22:26.574723360 +1000
+@@ -1545,8 +1545,7 @@
+     <!-- That is ugly XXX needs a review -->
+     <copy file="LICENSE" tofile="../LICENSE"/>
+     <copy file="LICENSE" tofile="${base.path}/LICENSE"/>
+-
+-    <!-- Downdown any sub package or tools needed. -->
++<!-- 
+     <antcall target="downloadgz">
+       <param name="sourcefile" value="${commons-beanutils.loc}"/>
+       <param name="destfile" value="${commons-beanutils.jar}"/>
+@@ -1593,7 +1592,6 @@
+     </antcall>
+ 
+     <antcall target="downloadgz">
+-      <!-- xerces2 brings 2 files, test for one of them -->
+       <param name="sourcefile" value="${xerces.loc}"/>
+       <param name="destfile" value="${xml-apis.jar}"/>
+     </antcall>
+@@ -1655,7 +1653,7 @@
+       <param name="sourcefile" value="${saxpath.loc}"/>
+       <param name="destfile" value="${saxpath.jar}"/>
+     </antcall>
+-
++-->
+     <!-- Build the dependencies that are not yet released -->
+     <antcall target="build-depends"/>
+ 
diff --git a/www-servers/tomcat/files/5.0.28/gentoo.diff b/www-servers/tomcat/files/5.0.28/gentoo.diff
new file mode 100644
index 000000000000..78e61fe7035c
--- /dev/null
+++ b/www-servers/tomcat/files/5.0.28/gentoo.diff
@@ -0,0 +1,13 @@
+--- jakarta-tomcat-catalina/catalina/src/bin/catalina.sh	2004-05-19 02:25:07.000000000 -0400
++++ jakarta-tomcat-catalina/catalina/src/bin/catalina.sh	2004-05-19 02:23:20.128089696 -0400
+@@ -38,6 +38,10 @@
+ # $Id: gentoo.diff,v 1.1 2004/10/09 09:59:14 axxo 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.28/jikes.diff b/www-servers/tomcat/files/5.0.28/jikes.diff
new file mode 100644
index 000000000000..a91210d56c99
--- /dev/null
+++ b/www-servers/tomcat/files/5.0.28/jikes.diff
@@ -0,0 +1,13 @@
+--- 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.28/tomcat.conf b/www-servers/tomcat/files/5.0.28/tomcat.conf
new file mode 100644
index 000000000000..aa0cbb329a6a
--- /dev/null
+++ b/www-servers/tomcat/files/5.0.28/tomcat.conf
@@ -0,0 +1,76 @@
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.0.28/tomcat.conf,v 1.1 2004/10/09 09:59:14 axxo 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.28/tomcat.init b/www-servers/tomcat/files/5.0.28/tomcat.init
new file mode 100644
index 000000000000..fc99eecb80f8
--- /dev/null
+++ b/www-servers/tomcat/files/5.0.28/tomcat.init
@@ -0,0 +1,22 @@
+#!/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.28/tomcat.init,v 1.1 2004/10/09 09:59:14 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.28 b/www-servers/tomcat/files/digest-tomcat-5.0.28
new file mode 100644
index 000000000000..38ec5031aa8e
--- /dev/null
+++ b/www-servers/tomcat/files/digest-tomcat-5.0.28
@@ -0,0 +1 @@
+MD5 8115f86558aef8a17543397e7f9d9469 jakarta-tomcat-5.0.28-src.tar.gz 3565766
diff --git a/www-servers/tomcat/tomcat-5.0.28.ebuild b/www-servers/tomcat/tomcat-5.0.28.ebuild
new file mode 100644
index 000000000000..569089c26680
--- /dev/null
+++ b/www-servers/tomcat/tomcat-5.0.28.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.0.28.ebuild,v 1.1 2004/10/09 09:59:14 axxo Exp $
+
+inherit eutils java-pkg
+
+DESCRIPTION="Apache Servlet-2.4/JSP-2.0 Container"
+
+SRC_URI="mirror://apache/tomcat-${SLOT}/v${PV}/bin/jakarta-${P}-src.tar.gz"
+HOMEPAGE="http://jakarta.apache.org/tomcat"
+KEYWORDS="~x86"
+LICENSE="Apache-2.0"
+SLOT="${PV/.*}"
+DEPEND="sys-apps/sed
+	   >=virtual/jdk-1.4
+	   >=dev-java/commons-beanutils-1.7.0
+	   >=dev-java/commons-collections-3.1
+	   >=dev-java/commons-daemon-1.0
+	   >=dev-java/commons-digester-1.5
+	   >=dev-java/commons-logging-1.0.4
+	   >=dev-java/commons-el-1.0
+	   >=dev-java/regexp-1.3
+	   >=dev-java/xerces-2.6.2-r1
+	   >=dev-java/log4j-1.2.8
+	   >=dev-java/commons-dbcp-1.2.1
+	   >=dev-java/commons-httpclient-2.0
+	   >=dev-java/commons-pool-1.2
+	   >=dev-java/commons-fileupload-1.0
+	   >=dev-java/commons-modeler-1.1
+	   >=dev-java/commons-launcher-0.9
+	   >=dev-java/junit-3.8.1
+	   dev-java/jmx
+	   =dev-java/struts-1.1-r2
+	   >=dev-java/saxpath-1.0
+	   >=dev-java/jaxen-1.0
+	   jikes? ( dev-java/jikes )"
+RDEPEND=">=virtual/jdk-1.4
+		jikes? ( dev-java/jikes )"
+IUSE="doc jikes"
+S=${WORKDIR}/jakarta-${P}-src
+
+TOMCAT_HOME="/opt/${PN}${SLOT}"
+TOMCAT_NAME="${PN}${SLOT}"
+
+src_unpack() {
+	unpack ${A}
+
+	mkdir ${T}/lib
+	cd ${T}/lib
+	java-pkg_jar-from commons-logging
+	java-pkg_jar-from xerces-2
+	java-pkg_jar-from struts
+	java-pkg_jar-from saxpath
+	java-pkg_jar-from jaxen
+	java-pkg_jar-from jmx
+	java-pkg_jar-from commons-beanutils
+
+	cd ${S}
+
+	# update the build.xml to remove downloading
+	epatch ${FILESDIR}/${PV}/build.xml-01.patch
+	epatch ${FILESDIR}/${PV}/build.xml-02.patch
+
+	epatch ${FILESDIR}/${PV}/gentoo.diff
+	use jikes && epatch ${FILESDIR}/${PV}/jikes.diff
+
+}
+
+src_compile(){
+	local antflags="-Dbase.path=${T}"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	antflags="${antflags} -Dcommons-beanutils.jar=${T}/lib/commons-beanutils.jar"
+	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-el.jar=$(java-config -p commons-el)"
+
+	#
+	# Work around for the fact that java-config is unable to return a
+	# particular jar from a package.
+	#
+	antflags="${antflags} -Dcommons-logging.jar=${T}/lib/commons-logging.jar"
+	antflags="${antflags} -Dcommons-logging-api.jar=${T}/lib/commons-logging-api.jar"
+	antflags="${antflags} -Dregexp.jar=$(java-config -p regexp)"
+
+	#
+	# Same work around again
+	#
+	antflags="${antflags} -DxercesImpl.jar=${T}/lib/xercesImpl.jar"
+	antflags="${antflags} -Dxml-apis.jar=${T}/lib/xml-apis.jar"
+	antflags="${antflags} -Dlog4j.jar=$(java-config -p log4j)"
+	antflags="${antflags} -Dcommons-dbcp.jar=$(java-config -p commons-dbcp)"
+	antflags="${antflags} -Dcommons-httpclient.jar=$(java-config -p commons-httpclient)"
+	antflags="${antflags} -Dcommons-pool.jar=$(java-config -p commons-pool)"
+	antflags="${antflags} -Dcommons-fileupload.jar=$(java-config -p commons-fileupload)"
+	antflags="${antflags} -Djunit.jar=$(java-config -p junit)"
+	antflags="${antflags} -Dstruts.jar=${T}/lib/struts.jar"
+
+	antflags="${antflags} -Djmx.jar=${T}/lib/jmxri.jar"
+	antflags="${antflags} -Djmx-tools.jar=${T}/lib/jmxtools.jar"
+	antflags="${antflags} -Dcommons-launcher.jar=$(java-config -p commons-launcher)"
+	#`
+	# This is used to reference the tld files in /usr/share/struts/lib
+	#
+	antflags="${antflags} -Dstruts.home=/usr/share/struts"
+	antflags="${antflags} -Dcommons-modeler.jar=$(java-config -p commons-modeler)"
+	antflags="${antflags} -Dstruts.jar=${T}/lib/struts.jar"
+	antflags="${antflags} -Djaxen.jar=${T}/lib/jaxen-full.jar"
+	antflags="${antflags} -Dsaxpath.jar=${T}/lib/saxpath.jar"
+
+	ant ${antflags} || die "compile failed"
+
+}
+src_install() {
+	cd ${S}/jakarta-tomcat-5/build
+
+	# INIT SCRIPTS AND ENV
+	insinto /etc/init.d
+	insopts -m0750
+	newins ${FILESDIR}/${PV}/tomcat.init ${TOMCAT_NAME}
+
+	insinto /etc/conf.d
+	insopts -m0644
+	newins ${FILESDIR}/${PV}/tomcat.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}
+
+	mv conf/* ${D}/etc/${TOMCAT_NAME} || die "failed to move conf"
+	mv bin common server shared temp work ${D}${TOMCAT_HOME} || die "failed to move"
+	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
+	use doc && 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}
+
+	einfo " "
+	einfo " NOTICE!"
+	einfo " FILE LOCATIONS:"
+	einfo " 1.  Tomcat home directory: ${TOMCAT_HOME}"
+	einfo "     Contains application data, configuration files."
+	einfo " 2.  Runtime settings: /etc/conf.d/${TOMCAT_NAME}"
+	einfo "     Contains CLASSPATH and JAVA_HOME settings."
+	einfo " 3.  Configuration:  /etc/${TOMCAT_NAME}"
+	einfo " 4.  Logs:  /var/log/${TOMCAT_NAME}/"
+	einfo " "
+	einfo " "
+	einfo " STARTING AND STOPPING TOMCAT:"
+	einfo "   /etc/init.d/${TOMCAT_NAME} start"
+	einfo "   /etc/init.d/${TOMCAT_NAME} stop"
+	einfo "   /etc/init.d/${TOMCAT_NAME} restart"
+	einfo " "
+	einfo " "
+	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"
+	einfo " "
+	einfo " NETWORK CONFIGURATION:"
+	einfo " By default, Tomcat runs on port 8080.  You can change this"
+	einfo " value by editing /etc/${TOMCAT_NAME}/server.xml."
+	einfo " "
+	einfo " To test Tomcat while it's running, point your web browser to:"
+	einfo " http://localhost:8080/"
+	! use doc && einfo " You do not have the doc USE flag set, examples have NOT been installed."
+	einfo " "
+	einfo " "
+	einfo " BUGS:"
+	einfo " Please file any bugs at http://bugs.gentoo.org/ or else it"
+	einfo " may not get seen.  Thank you."
+	einfo " "
+}