new versions, and slotted

35 files changed, 490 insertions, 1005 deletions

diff --git a/net-www/tomcat/ChangeLog b/net-www/tomcat/ChangeLog
index 66b3770198f8..80c4e02b1e57 100644
--- a/net-www/tomcat/ChangeLog
+++ b/net-www/tomcat/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for net-www/tomcat
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/ChangeLog,v 1.34 2004/06/25 16:10:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/ChangeLog,v 1.35 2004/07/27 13:04:59 axxo Exp $
+
+*tomcat-5.0.27 (27 Jul 2004)
+
+  27 Jul 2004; Thomas Matthijs <axxo@gentoo.org> metadata.xml,
+  +files/3.3.2/21tomcat, +files/3.3.2/gentoo.diff, +files/3.3.2/tomcat.conf,
+  +files/3.3.2/tomcat.init, -files/4.1.29/21tomcat, -files/4.1.29/gentoo.diff,
+  -files/4.1.29/tomcat.conf, -files/4.1.29/tomcat.init,
+  +files/4.1.30/21tomcat, +files/4.1.30/gentoo.diff,
+  +files/4.1.30/tomcat.conf, +files/4.1.30/tomcat.init,
+  -files/5.0.18/21tomcat, -files/5.0.18/gentoo.diff, -files/5.0.18/jikes.diff,
+  -files/5.0.18/tomcat.conf, -files/5.0.18/tomcat.init,
+  -files/5.0.25/21tomcat, -files/5.0.25/gentoo.diff,
+  -files/5.0.25/tomcat.conf, -files/5.0.25/tomcat.init,
+  +files/5.0.27/21tomcat, +files/5.0.27/gentoo.diff,
+  +files/5.0.27/tomcat.conf, +files/5.0.27/tomcat.init, +tomcat-3.3.2.ebuild,
+  -tomcat-4.1.29.ebuild, +tomcat-4.1.30.ebuild, -tomcat-5.0.18.ebuild,
+  -tomcat-5.0.25.ebuild, +tomcat-5.0.27.ebuild:
+  a whole bunch of new ebuilds, slot'ed, they should all work next to eatch
+  other (don't forget to change the ports)
 
   25 Jun 2004; Aron Griffis <agriffis@gentoo.org> tomcat-5.0.18.ebuild:
   QA - fix use invocation
diff --git a/net-www/tomcat/Manifest b/net-www/tomcat/Manifest
index e124f5e5d3be..ec2aa6884c7f 100644
--- a/net-www/tomcat/Manifest
+++ b/net-www/tomcat/Manifest
@@ -1,31 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 5ab23cbb7f6a99761f022b678a83bce2 tomcat-3.3.2.ebuild 2536
+MD5 4a2808566c48c5cd6a82ac196aa0d55e tomcat-4.1.30.ebuild 2553
+MD5 198a7a2450352ed346a20848b87b4589 tomcat-5.0.27.ebuild 2553
 MD5 d809c831ec932b14c1cf88a356a192e4 ChangeLog 6962
-MD5 f6a29bf7a2ea00bd5a0075ab58009769 tomcat-4.1.29.ebuild 4225
-MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 cf2b939b88cef6cf833b3b96a028c192 tomcat-5.0.18.ebuild 4403
-MD5 22d4c2704b41711fcdf6eb816f2cb992 tomcat-5.0.25.ebuild 3177
-MD5 aadebd5a246bdfeb6ccf764f4f9b289b files/digest-tomcat-4.1.29 74
-MD5 16a563fee9101781e780f3d7909f999d files/digest-tomcat-5.0.18 75
-MD5 59c2cca5fed04f099567957c04297f51 files/digest-tomcat-5.0.25 75
-MD5 d686b57da55c6d8da476981c6557a3a1 files/4.1.29/21tomcat 152
-MD5 8e78596e41abd9a751733cc48570d1a4 files/4.1.29/gentoo.diff 5815
-MD5 11071e2c21ebbd59137a5b6dcc529dee files/4.1.29/tomcat.conf 2716
-MD5 9ac2f4222452976240d03bdc6c4743d8 files/4.1.29/tomcat.init 792
-MD5 d686b57da55c6d8da476981c6557a3a1 files/5.0.18/21tomcat 152
-MD5 d0b4b02720bc1672f97f846c44be219e files/5.0.18/gentoo.diff 6359
-MD5 05406ff27a96734864728d6ae8a95482 files/5.0.18/jikes.diff 904
-MD5 763fbe25b75f64b653ae772c5f8a000d files/5.0.18/tomcat.conf 2654
-MD5 47f0dc76c0c9be9c28edbc87dc55e85b files/5.0.18/tomcat.init 792
-MD5 6a2e3734b0dedcf684fb8f6e68b04293 files/5.0.25/21tomcat 155
-MD5 c6fdc8f282deaa092061b338cceb0517 files/5.0.25/gentoo.diff 464
-MD5 9cc257d85ddcda089eb77b4e2fc6134b files/5.0.25/tomcat.conf 2661
-MD5 5244a88702f03f69669c61c3efff888e files/5.0.25/tomcat.init 812
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFA+f5jmdTrptrqvGERAgiKAJ9wKLEPpw/oIIvAEO6Koq4A5JqWAgCeKAsy
-p7OM22CifljYchEzFVtNnF8=
-=nAqT
------END PGP SIGNATURE-----
+MD5 56292f22dced45d993974e198033461d metadata.xml 221
+MD5 6940eb780efc66ecb6ecf11b6b7adb05 files/digest-tomcat-3.3.2 73
+MD5 71d59fd713a960e63c1b894ca5893a1b files/digest-tomcat-4.1.30 74
+MD5 d5a48abc8db5543a73abbbf151d0630e files/digest-tomcat-5.0.27 75
+MD5 eb7830519ae94bb563d39f1f51ab590a files/3.3.2/gentoo.diff 368
+MD5 6d160927e2380e4214041efadd27b816 files/3.3.2/tomcat.conf 904
+MD5 97dc819700955d4b2853c36b867a5bda files/3.3.2/tomcat.init 723
+MD5 5070001a9e7c2627552e04291bae5d8c files/3.3.2/21tomcat 156
+MD5 ff9864386460989231d0d23a5e7a6ece files/4.1.30/gentoo.diff 464
+MD5 ef9ca85a5821f6937f387a7b5aabed66 files/4.1.30/tomcat.conf 2661
+MD5 5244a88702f03f69669c61c3efff888e files/4.1.30/tomcat.init 812
+MD5 53987c0a1c63d681756bd147639cf43f files/4.1.30/21tomcat 156
+MD5 c6fdc8f282deaa092061b338cceb0517 files/5.0.27/gentoo.diff 464
+MD5 fe6512c83157627e6393222940cea95c files/5.0.27/tomcat.conf 2661
+MD5 5244a88702f03f69669c61c3efff888e files/5.0.27/tomcat.init 812
+MD5 a4af2d8c7172284a45409b4c6869c54d files/5.0.27/21tomcat 156
diff --git a/net-www/tomcat/files/3.3.2/21tomcat b/net-www/tomcat/files/3.3.2/21tomcat
new file mode 100644
index 000000000000..b069a3d9c6d0
--- /dev/null
+++ b/net-www/tomcat/files/3.3.2/21tomcat
@@ -0,0 +1,5 @@
+#CATALINA_HOME=/opt/tomcat3
+CONFIG_PROTECT=/etc/tomcat3
+#CATALINA_LIBDIR=/usr/share/tomcat3/lib 
+#CLASSPATH=${CATALINA_LIBDIR} 
+#ENV_VARS="CATALINA_LIBDIR"
diff --git a/net-www/tomcat/files/3.3.2/gentoo.diff b/net-www/tomcat/files/3.3.2/gentoo.diff
new file mode 100644
index 000000000000..f30a6017c879
--- /dev/null
+++ b/net-www/tomcat/files/3.3.2/gentoo.diff
@@ -0,0 +1,13 @@
+--- bin/tomcat     2004-03-07 19:49:41.000000000 +0100
++++ bin/tomcat  2004-07-27 14:10:18.560850792 +0200
+@@ -49,6 +49,9 @@
+ #java -cp lib/tomcat.jar org.apache.tomcat.startup.Main $*
+ #java -jar lib/tomcat.jar
+ 
++source /etc/profile
++source /etc/conf.d/tomcat3
++
+ # OS specific support.  $var _must_ be set to either true or false.
+ cygwin=false
+ case "`uname`" in
+
diff --git a/net-www/tomcat/files/3.3.2/tomcat.conf b/net-www/tomcat/files/3.3.2/tomcat.conf
new file mode 100644
index 000000000000..ab5b373f448c
--- /dev/null
+++ b/net-www/tomcat/files/3.3.2/tomcat.conf
@@ -0,0 +1,32 @@
+# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/files/3.3.2/tomcat.conf,v 1.1 2004/07/27 13:05:00 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.1.01
+
+#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
+TOMCAT_HOME=/opt/tomcat3
+
+# Extra options to pass to Tomcat (see docs)
+#TOMCAT_OPTS=
+
+# Tomcat's User
+TOMCAT_USER=tomcat
+
+# Tomcat Console Log Location
+CONSOLE_LOG=/var/log/tomcat3/console.log
+
+# Location of the Tomcat JARs and classes
+TOMCAT_LIBDIR=/usr/share/tomcat3/lib
+
+TOMCAT_INSTALL=${TOMCAT_HOME}
diff --git a/net-www/tomcat/files/3.3.2/tomcat.init b/net-www/tomcat/files/3.3.2/tomcat.init
new file mode 100644
index 000000000000..7b033a4394cd
--- /dev/null
+++ b/net-www/tomcat/files/3.3.2/tomcat.init
@@ -0,0 +1,40 @@
+#!/sbin/runscript
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/files/3.3.2/tomcat.init,v 1.1 2004/07/27 13:05:00 axxo Exp $
+
+depend() {
+	need net
+	use dns
+}
+
+start_it() {
+	su - ${TOMCAT_USER} -c "${TOMCAT_HOME}/bin/startup >${CONSOLE_LOG} 2>&1 &"
+}
+
+start()	{
+	ebegin "Starting Tomcat"
+	cd ${TOMCAT_HOME}
+	start_it
+	eend $?
+}
+
+stop_it() {
+	su - ${TOMCAT_USER} -c "${TOMCAT_HOME}/bin/shutdown >${CONSOLE_LOG} 2>&1 &"
+}
+
+stop() {
+	ebegin "Stopping Tomcat"
+	stop_it
+	sleep 2
+	eend $?
+}
+
+svc_restart() {
+	ebegin "Restarting Tomcat"
+	stop_it	
+	sleep 5
+	cd ${TOMCAT_HOME}
+	start_it
+	eend $?
+}
diff --git a/net-www/tomcat/files/4.1.29/21tomcat b/net-www/tomcat/files/4.1.29/21tomcat
deleted file mode 100644
index 5deefea5bd61..000000000000
--- a/net-www/tomcat/files/4.1.29/21tomcat
+++ /dev/null
@@ -1,5 +0,0 @@
-CATALINA_HOME=/opt/tomcat
-CONFIG_PROTECT=/etc/tomcat
-#CATALINA_LIBDIR=/usr/share/tomcat/lib 
-#CLASSPATH=${CATALINA_LIBDIR} 
-#ENV_VARS="CATALINA_LIBDIR"
diff --git a/net-www/tomcat/files/4.1.29/gentoo.diff b/net-www/tomcat/files/4.1.29/gentoo.diff
deleted file mode 100644
index 03b539b2f8b7..000000000000
--- a/net-www/tomcat/files/4.1.29/gentoo.diff
+++ /dev/null
@@ -1,164 +0,0 @@
---- bin/setclasspath.sh.orig	2003-10-27 10:26:34.000000000 -0500
-+++ bin/setclasspath.sh	2004-02-11 18:11:06.629521241 -0500
-@@ -6,31 +6,25 @@
- 
- # Make sure prerequisite environment variables are set
- if [ -z "$JAVA_HOME" ]; then
--  echo "The JAVA_HOME environment variable is not defined"
--  echo "This environment variable is needed to run this program"
-+  echo "The JAVA_HOME environment variable is not defined!"
-+  echo "This environment variable is needed to run this program."
-+  echo "See the /etc/conf.d/tomcat file for details."
-   exit 1
- fi
--if $os400; then
--  if [ ! -r "$JAVA_HOME"/bin/java -o ! -r "$JAVA_HOME"/bin/javac ]; then
--    echo "The JAVA_HOME environment variable is not defined correctly"
--    echo "This environment variable is needed to run this program"
--    exit 1
--  fi
--else
--  if [ ! -r "$JAVA_HOME"/bin/java -o ! -r "$JAVA_HOME"/bin/jdb -o ! -r "$JAVA_HOME"/bin/javac ]; then
--    echo "The JAVA_HOME environment variable is not defined correctly"
--    echo "This environment variable is needed to run this program"
--    exit 1
--  fi
-+if [ ! -r "$JAVA_HOME"/bin/java -o ! -r "$JAVA_HOME"/bin/jdb -o ! -r "$JAVA_HOME"/bin/javac ]; then
-+  echo "The JAVA_HOME environment variable is not defined correctly!"
-+  echo "This environment variable is needed to run this program."
-+  echo "See the /etc/conf.d/tomcat file for details."
-+  exit 1
- fi
- if [ -z "$BASEDIR" ]; then
--  echo "The BASEDIR environment variable is not defined"
--  echo "This environment variable is needed to run this program"
-+  echo "The BASEDIR environment variable is not defined!"
-+  echo "This environment variable is needed to run this program."
-   exit 1
- fi
- if [ ! -r "$BASEDIR"/bin/setclasspath.sh ]; then
--  echo "The BASEDIR environment variable is not defined correctly"
--  echo "This environment variable is needed to run this program"
-+  echo "The BASEDIR environment variable is not defined correctly!"
-+  echo "This environment variable is needed to run this program."
-   exit 1
- fi
- 
-@@ -38,22 +32,9 @@
- JAVA_ENDORSED_DIRS="$BASEDIR"/common/endorsed
- 
- # Set standard CLASSPATH
--CLASSPATH="$JAVA_HOME"/lib/tools.jar
--
--# OSX hack to CLASSPATH
--JIKESPATH=
--if [ `uname -s` = "Darwin" ]; then
--  OSXHACK="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Classes"
--  if [ -d "$OSXHACK" ]; then
--    for i in "$OSXHACK"/*.jar; do
--      JIKESPATH="$JIKESPATH":"$i"
--    done
--  fi
--fi
-+CLASSPATH="$CLASSPATH":"$JAVA_HOME"/lib/tools.jar
- 
- # Set standard commands for invoking Java.
- _RUNJAVA="$JAVA_HOME"/bin/java
--if [ ! "$os400" ]; then
--  _RUNJDB="$JAVA_HOME"/bin/jdb
--fi
-+_RUNJDB="$JAVA_HOME"/bin/jdb
- _RUNJAVAC="$JAVA_HOME"/bin/javac
---- bin/catalina.sh.orig	2003-10-27 10:26:22.000000000 -0500
-+++ bin/catalina.sh	2004-02-11 15:39:41.000000000 -0500
-@@ -41,10 +41,6 @@
- # OS specific support.  $var _must_ be set to either true or false.
- cygwin=false
- os400=false
--case "`uname`" in
--CYGWIN*) cygwin=true;;
--OS400*) os400=true;;
--esac
- 
- # resolve links - $0 may be a softlink
- PRG="$0"
-@@ -66,26 +62,8 @@
-   . "$CATALINA_HOME"/bin/setenv.sh
- fi
- 
--# For Cygwin, ensure paths are in UNIX format before anything is touched
--if $cygwin; then
--  [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
--  [ -n "$CATALINA_HOME" ] && CATALINA_HOME=`cygpath --unix "$CATALINA_HOME"`
--  [ -n "$CATALINA_BASE" ] && CATALINA_BASE=`cygpath --unix "$CATALINA_BASE"`
--  [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
--  [ -n "$JSSE_HOME" ] && JSSE_HOME=`cygpath --path --unix "$JSSE_HOME"`
--fi
--
--# For OS400
--if $os400; then
--  # Set job priority to standard for interactive (interactive - 6) by using
--  # the interactive priority - 6, the helper threads that respond to requests
--  # will be running at the same priority as interactive jobs.
--  COMMAND='chgjob job('$JOBNAME') runpty(6)'
--  system $COMMAND
--
--  # Enable multi threading
--  export QIBM_MULTI_THREADED=Y
--fi
-+source /etc/profile
-+source /etc/conf.d/tomcat
- 
- # Get standard Java environment variables
- if [ -r "$CATALINA_HOME"/bin/setclasspath.sh ]; then
-@@ -112,23 +90,8 @@
-   CATALINA_TMPDIR="$CATALINA_BASE"/temp
- fi
- 
--# For Cygwin, switch paths to Windows format before running java
--if $cygwin; then
--  JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
--  CATALINA_HOME=`cygpath --path --windows "$CATALINA_HOME"`
--  CATALINA_BASE=`cygpath --path --windows "$CATALINA_BASE"`
--  CATALINA_TMPDIR=`cygpath --path --windows "$CATALINA_TMPDIR"`
--  CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
--  JSSE_HOME=`cygpath --path --windows "$JSSE_HOME"`
--fi
--
- # ----- Execute The Requested Command -----------------------------------------
- 
--echo "Using CATALINA_BASE:   $CATALINA_BASE"
--echo "Using CATALINA_HOME:   $CATALINA_HOME"
--echo "Using CATALINA_TMPDIR: $CATALINA_TMPDIR"
--echo "Using JAVA_HOME:       $JAVA_HOME"
--
- if [ "$1" = "jpda" ] ; then
-   if [ -z "$JPDA_TRANSPORT" ]; then
-     JPDA_TRANSPORT="dt_socket"
-@@ -210,7 +173,7 @@
- elif [ "$1" = "start" ] ; then
- 
-   shift
--  touch "$CATALINA_BASE"/logs/catalina.out
-+  touch "$CATALINA_OUT"
-   if [ "$1" = "-security" ] ; then
-     echo "Using Security Manager"
-     shift
-@@ -222,7 +185,7 @@
-       -Dcatalina.home="$CATALINA_HOME" \
-       -Djava.io.tmpdir="$CATALINA_TMPDIR" \
-       org.apache.catalina.startup.Bootstrap "$@" start \
--      >> "$CATALINA_BASE"/logs/catalina.out 2>&1 &
-+      >> "$CATALINA_OUT" 2>&1 &
- 
-       if [ ! -z "$CATALINA_PID" ]; then
-         echo $! > $CATALINA_PID
-@@ -234,7 +197,7 @@
-       -Dcatalina.home="$CATALINA_HOME" \
-       -Djava.io.tmpdir="$CATALINA_TMPDIR" \
-       org.apache.catalina.startup.Bootstrap "$@" start \
--      >> "$CATALINA_BASE"/logs/catalina.out 2>&1 &
-+      >> "$CATALINA_OUT" 2>&1 &
- 
-       if [ ! -z "$CATALINA_PID" ]; then
-         echo $! > $CATALINA_PID
diff --git a/net-www/tomcat/files/4.1.29/tomcat.conf b/net-www/tomcat/files/4.1.29/tomcat.conf
deleted file mode 100644
index cdfd9b36d0f8..000000000000
--- a/net-www/tomcat/files/4.1.29/tomcat.conf
+++ /dev/null
@@ -1,76 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/files/4.1.29/tomcat.conf,v 1.2 2004/07/18 04:29:19 dragonheart 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.1.01
-
-JAVA_HOME=`/bin/grep -e "JAVA_HOME" /etc/profile.env | /bin/sed -e "s/^.*'\(.*\)'$/\1/"`
-
-# (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/tomcat
-CATALINA_BASE=${CATALINA_HOME}
-
-# Tomcat's User
-CATALINA_USER=tomcat
-
-# Tomcat Console Log Location
-CATALINA_OUT=/var/log/tomcat/catalina.log
-
-# Location of the Tomcat JARs and classes
-CATALINA_LIBDIR=/usr/share/tomcat/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/net-www/tomcat/files/4.1.29/tomcat.init b/net-www/tomcat/files/4.1.29/tomcat.init
deleted file mode 100644
index 934f239e3dd6..000000000000
--- a/net-www/tomcat/files/4.1.29/tomcat.init
+++ /dev/null
@@ -1,32 +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/net-www/tomcat/files/4.1.29/tomcat.init,v 1.3 2004/07/15 00:35:13 agriffis Exp $
-
-depend() {
-	need net
-	use dns logger mysql postgresql
-}
-
-start()	{
-	ebegin "Starting Tomcat"
-	cd ${CATALINA_HOME}
-	su - ${CATALINA_USER} -c "/opt/tomcat/bin/catalina.sh ${TOMCAT_START}" 
-	eend $?
-}
-
-stop()	{
-	ebegin "Stopping Tomcat"
-	su - ${CATALINA_USER} -c "/opt/tomcat/bin/catalina.sh ${TOMCAT_STOP}"
-	sleep 2
-	eend $?
-}
-
-restart() {
-	ebegin "Restarting Tomcat"
-	su - ${CATALINA_USER} -c "/opt/tomcat/bin/catalina.sh ${TOMCAT_STOP}"
-	sleep 5
-	cd ${CATALINA_HOME}
-	su - ${CATALINA_USER} -c "/opt/tomcat/bin/catalina.sh ${TOMCAT_START}"
-	eend $?
-}
diff --git a/net-www/tomcat/files/4.1.30/21tomcat b/net-www/tomcat/files/4.1.30/21tomcat
new file mode 100644
index 000000000000..b6f3618522b7
--- /dev/null
+++ b/net-www/tomcat/files/4.1.30/21tomcat
@@ -0,0 +1,5 @@
+#CATALINA_HOME=/opt/tomcat4
+CONFIG_PROTECT=/etc/tomcat4
+#CATALINA_LIBDIR=/usr/share/tomcat4/lib 
+#CLASSPATH=${CATALINA_LIBDIR} 
+#ENV_VARS="CATALINA_LIBDIR"
diff --git a/net-www/tomcat/files/4.1.30/gentoo.diff b/net-www/tomcat/files/4.1.30/gentoo.diff
new file mode 100644
index 000000000000..2ff4f7724511
--- /dev/null
+++ b/net-www/tomcat/files/4.1.30/gentoo.diff
@@ -0,0 +1,13 @@
+--- bin/catalina.sh.orig	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/07/27 13:05:00 axxo Exp $
+ # -----------------------------------------------------------------------------
+ 
++# source the appropriate files right away
++source /etc/profile
++source /etc/conf.d/tomcat4
++
+ # OS specific support.  $var _must_ be set to either true or false.
+ cygwin=false
+ os400=false
diff --git a/net-www/tomcat/files/5.0.18/tomcat.conf b/net-www/tomcat/files/4.1.30/tomcat.conf
index 5eae0caf5502..6462270f9925 100644
--- a/net-www/tomcat/files/5.0.18/tomcat.conf
+++ b/net-www/tomcat/files/4.1.30/tomcat.conf
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/files/5.0.18/tomcat.conf,v 1.3 2004/07/18 04:29:19 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/files/4.1.30/tomcat.conf,v 1.1 2004/07/27 13:05:00 axxo Exp $
 
 # JVM Runtime
 # Using the default setting, it will determine your JVM from the system-vm
@@ -6,29 +6,29 @@
 # 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.1.01
+# Example: JAVA_HOME=/opt/sun-jdk-1.4.2.05
 
-JAVA_HOME=`java-config -O`
+#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/tomcat
-CATALINA_BASE=${CATALINA_HOME}
+CATALINA_HOME=/opt/tomcat4
+#CATALINA_BASE=${CATALINA_HOME}
 
 # Tomcat's User
 CATALINA_USER=tomcat
 
 # Tomcat Console Log Location
-CATALINA_OUT=/var/log/tomcat/catalina.log
+CATALINA_OUT=/var/log/tomcat4/catalina.log
 
 # Location of the Tomcat JARs and classes
-CATALINA_LIBDIR=/usr/share/tomcat/lib
+#CATALINA_LIBDIR=/usr/share/tomcat4/lib
 
 # The CLASSPATH for Tomcat to use, plus any others you need.
-CLASSPATH=${CLASSPATH}:${CATALINA_LIBDIR}
+#CLASSPATH=${CLASSPATH}:${CATALINA_LIBDIR}
 
 # (Optional) Directory path location of temporary directory the JVM should 
 # use (java.io.tmpdir).  Defaults to $CATALINA_BASE/temp.
diff --git a/net-www/tomcat/files/5.0.25/tomcat.init b/net-www/tomcat/files/4.1.30/tomcat.init
index e1f08310bda2..fa94bc45bdaf 100644
--- a/net-www/tomcat/files/5.0.25/tomcat.init
+++ b/net-www/tomcat/files/4.1.30/tomcat.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/files/5.0.25/tomcat.init,v 1.2 2004/07/15 00:35:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/files/4.1.30/tomcat.init,v 1.1 2004/07/27 13:05:00 axxo Exp $
 
 depend() {
 	need net
diff --git a/net-www/tomcat/files/5.0.18/21tomcat b/net-www/tomcat/files/5.0.18/21tomcat
deleted file mode 100644
index 5deefea5bd61..000000000000
--- a/net-www/tomcat/files/5.0.18/21tomcat
+++ /dev/null
@@ -1,5 +0,0 @@
-CATALINA_HOME=/opt/tomcat
-CONFIG_PROTECT=/etc/tomcat
-#CATALINA_LIBDIR=/usr/share/tomcat/lib 
-#CLASSPATH=${CATALINA_LIBDIR} 
-#ENV_VARS="CATALINA_LIBDIR"
diff --git a/net-www/tomcat/files/5.0.18/gentoo.diff b/net-www/tomcat/files/5.0.18/gentoo.diff
deleted file mode 100644
index b318aaa1a21a..000000000000
--- a/net-www/tomcat/files/5.0.18/gentoo.diff
+++ /dev/null
@@ -1,173 +0,0 @@
---- bin/setclasspath.sh.orig	2004-01-15 12:24:32.000000000 -0500
-+++ bin/setclasspath.sh	2004-02-11 18:12:57.586170211 -0500
-@@ -6,31 +6,25 @@
- 
- # Make sure prerequisite environment variables are set
- if [ -z "$JAVA_HOME" ]; then
--  echo "The JAVA_HOME environment variable is not defined"
--  echo "This environment variable is needed to run this program"
-+  echo "The JAVA_HOME environment variable is not defined!"
-+  echo "This environment variable is needed to run this program."
-+  echo "See the /etc/conf.d/tomcat file for details."
-   exit 1
- fi
--if $os400; then
--  if [ ! -r "$JAVA_HOME"/bin/java -o ! -r "$JAVA_HOME"/bin/javac ]; then
--    echo "The JAVA_HOME environment variable is not defined correctly"
--    echo "This environment variable is needed to run this program"
--    exit 1
--  fi
--else
--  if [ ! -r "$JAVA_HOME"/bin/java -o ! -r "$JAVA_HOME"/bin/jdb -o ! -r "$JAVA_HOME"/bin/javac ]; then
--    echo "The JAVA_HOME environment variable is not defined correctly"
--    echo "This environment variable is needed to run this program"
--    exit 1
--  fi
-+if [ ! -r "$JAVA_HOME"/bin/java -o ! -r "$JAVA_HOME"/bin/jdb -o ! -r "$JAVA_HOME"/bin/javac ]; then
-+  echo "The JAVA_HOME environment variable is not defined correctly!"
-+  echo "This environment variable is needed to run this program."
-+  echo "See the /etc/conf.d/tomcat file for details."
-+  exit 1
- fi
- if [ -z "$BASEDIR" ]; then
--  echo "The BASEDIR environment variable is not defined"
--  echo "This environment variable is needed to run this program"
-+  echo "The BASEDIR environment variable is not defined!"
-+  echo "This environment variable is needed to run this program."
-   exit 1
- fi
- if [ ! -r "$BASEDIR"/bin/setclasspath.sh ]; then
--  echo "The BASEDIR environment variable is not defined correctly"
--  echo "This environment variable is needed to run this program"
-+  echo "The BASEDIR environment variable is not defined correctly!"
-+  echo "This environment variable is needed to run this program."
-   exit 1
- fi
- 
-@@ -38,22 +32,9 @@
- JAVA_ENDORSED_DIRS="$BASEDIR"/common/endorsed
- 
- # Set standard CLASSPATH
--CLASSPATH="$JAVA_HOME"/lib/tools.jar
--
--# OSX hack to CLASSPATH
--JIKESPATH=
--if [ `uname -s` = "Darwin" ]; then
--  OSXHACK="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Classes"
--  if [ -d "$OSXHACK" ]; then
--    for i in "$OSXHACK"/*.jar; do
--      JIKESPATH="$JIKESPATH":"$i"
--    done
--  fi
--fi
-+CLASSPATH="$CLASSPATH":"$JAVA_HOME"/lib/tools.jar
- 
- # Set standard commands for invoking Java.
- _RUNJAVA="$JAVA_HOME"/bin/java
--if [ $os400 = false ]; then
--  _RUNJDB="$JAVA_HOME"/bin/jdb
--fi
-+_RUNJDB="$JAVA_HOME"/bin/jdb
- _RUNJAVAC="$JAVA_HOME"/bin/javac
---- bin/catalina.sh.orig	2004-01-15 12:24:32.000000000 -0500
-+++ bin/catalina.sh	2004-02-11 16:11:49.000000000 -0500
-@@ -41,10 +41,6 @@
- # OS specific support.  $var _must_ be set to either true or false.
- cygwin=false
- os400=false
--case "`uname`" in
--CYGWIN*) cygwin=true;;
--OS400*) os400=true;;
--esac
- 
- # resolve links - $0 may be a softlink
- PRG="$0"
-@@ -66,26 +62,8 @@
-   . "$CATALINA_HOME"/bin/setenv.sh
- fi
- 
--# For Cygwin, ensure paths are in UNIX format before anything is touched
--if $cygwin; then
--  [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
--  [ -n "$CATALINA_HOME" ] && CATALINA_HOME=`cygpath --unix "$CATALINA_HOME"`
--  [ -n "$CATALINA_BASE" ] && CATALINA_BASE=`cygpath --unix "$CATALINA_BASE"`
--  [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
--  [ -n "$JSSE_HOME" ] && JSSE_HOME=`cygpath --path --unix "$JSSE_HOME"`
--fi
--
--# For OS400
--if $os400; then
--  # Set job priority to standard for interactive (interactive - 6) by using
--  # the interactive priority - 6, the helper threads that respond to requests
--  # will be running at the same priority as interactive jobs.
--  COMMAND='chgjob job('$JOBNAME') runpty(6)'
--  system $COMMAND
--
--  # Enable multi threading
--  export QIBM_MULTI_THREADED=Y
--fi
-+source /etc/profile
-+source /etc/conf.d/tomcat
- 
- # Get standard Java environment variables
- if [ -r "$CATALINA_HOME"/bin/setclasspath.sh ]; then
-@@ -112,16 +90,6 @@
-   CATALINA_TMPDIR="$CATALINA_BASE"/temp
- fi
- 
--# For Cygwin, switch paths to Windows format before running java
--if $cygwin; then
--  JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
--  CATALINA_HOME=`cygpath --path --windows "$CATALINA_HOME"`
--  CATALINA_BASE=`cygpath --path --windows "$CATALINA_BASE"`
--  CATALINA_TMPDIR=`cygpath --path --windows "$CATALINA_TMPDIR"`
--  CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
--  JSSE_HOME=`cygpath --path --windows "$JSSE_HOME"`
--fi
--
- # ----- Execute The Requested Command -----------------------------------------
- 
- echo "Using CATALINA_BASE:   $CATALINA_BASE"
-@@ -199,7 +167,7 @@
- elif [ "$1" = "start" ] ; then
- 
-   shift
--  touch "$CATALINA_BASE"/logs/catalina.out
-+  touch "$CATALINA_OUT"
-   if [ "$1" = "-security" ] ; then
-     echo "Using Security Manager"
-     shift
-@@ -211,7 +179,7 @@
-       -Dcatalina.home="$CATALINA_HOME" \
-       -Djava.io.tmpdir="$CATALINA_TMPDIR" \
-       org.apache.catalina.startup.Bootstrap "$@" start \
--      >> "$CATALINA_BASE"/logs/catalina.out 2>&1 &
-+      >> "$CATALINA_OUT" 2>&1 &
- 
-       if [ ! -z "$CATALINA_PID" ]; then
-         echo $! > $CATALINA_PID
-@@ -223,7 +191,7 @@
-       -Dcatalina.home="$CATALINA_HOME" \
-       -Djava.io.tmpdir="$CATALINA_TMPDIR" \
-       org.apache.catalina.startup.Bootstrap "$@" start \
--      >> "$CATALINA_BASE"/logs/catalina.out 2>&1 &
-+      >> "$CATALINA_OUT" 2>&1 &
- 
-       if [ ! -z "$CATALINA_PID" ]; then
-         echo $! > $CATALINA_PID
-@@ -252,13 +220,8 @@
- 
-   echo "Usage: catalina.sh ( commands ... )"
-   echo "commands:"
--  if $os400; then
--    echo "  debug             Start Catalina in a debugger (not available on OS400)"
--    echo "  debug -security   Debug Catalina with a security manager (not available on OS400)"
--  else
--    echo "  debug             Start Catalina in a debugger"
--    echo "  debug -security   Debug Catalina with a security manager"
--  fi
-+  echo "  debug             Start Catalina in a debugger"
-+  echo "  debug -security   Debug Catalina with a security manager"
-   echo "  jpda start        Start Catalina under JPDA debugger"
-   echo "  run               Start Catalina in the current window"
-   echo "  run -security     Start in the current window with security manager"
diff --git a/net-www/tomcat/files/5.0.18/jikes.diff b/net-www/tomcat/files/5.0.18/jikes.diff
deleted file mode 100644
index 44973c7d9cbf..000000000000
--- a/net-www/tomcat/files/5.0.18/jikes.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- conf/web.xml	2004-01-15 18:28:52.000000000 +0100
-+++ conf/web.xml.jikes	2004-02-09 22:00:33.204381264 +0100
-@@ -184,6 +184,10 @@
-         <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>
-         </init-param>
---- tomcat	2004-02-24 08:08:16.965295648 -0500
-+++ tomcat.conf.patched	2004-02-24 08:09:00.413690488 -0500
-@@ -50,7 +50,7 @@
- 
- # (Optional) Java runtime options used when the "start", "stop", or "run" 
- # commands are executed.
--# CATALINA_OPTS=""
-+CATALINA_OPTS="-Dbuild.compiler.emacs=true"
- 
- # Java Platform Debugger Architecture (JPDA)
- # http://java.sun.com/products/jpda/
diff --git a/net-www/tomcat/files/5.0.18/tomcat.init b/net-www/tomcat/files/5.0.18/tomcat.init
deleted file mode 100644
index 8b3db800c710..000000000000
--- a/net-www/tomcat/files/5.0.18/tomcat.init
+++ /dev/null
@@ -1,32 +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/net-www/tomcat/files/5.0.18/tomcat.init,v 1.3 2004/07/15 00:35:13 agriffis Exp $
-
-depend() {
-	need net
-	use dns logger mysql postgresql
-}
-
-start()	{
-	ebegin "Starting Tomcat"
-	cd ${CATALINA_HOME}
-	su - ${CATALINA_USER} -c "/opt/tomcat/bin/catalina.sh ${TOMCAT_START}" 
-	eend $?
-}
-
-stop()	{
-	ebegin "Stopping Tomcat"
-	su - ${CATALINA_USER} -c "/opt/tomcat/bin/catalina.sh ${TOMCAT_STOP}"
-	sleep 2
-	eend $?
-}
-
-restart() {
-	ebegin "Restarting Tomcat"
-	su - ${CATALINA_USER} -c "/opt/tomcat/bin/catalina.sh ${TOMCAT_STOP}"
-	sleep 5
-	cd ${CATALINA_HOME}
-	su - ${CATALINA_USER} -c "/opt/tomcat/bin/catalina.sh ${TOMCAT_START}"
-	eend $?
-}
diff --git a/net-www/tomcat/files/5.0.25/21tomcat b/net-www/tomcat/files/5.0.27/21tomcat
index b594d1c35c93..57195e8b5481 100644
--- a/net-www/tomcat/files/5.0.25/21tomcat
+++ b/net-www/tomcat/files/5.0.27/21tomcat
@@ -1,4 +1,4 @@
-CATALINA_HOME=/opt/tomcat5
+#CATALINA_HOME=/opt/tomcat5
 CONFIG_PROTECT=/etc/tomcat5
 #CATALINA_LIBDIR=/usr/share/tomcat5/lib 
 #CLASSPATH=${CATALINA_LIBDIR} 
diff --git a/net-www/tomcat/files/5.0.25/gentoo.diff b/net-www/tomcat/files/5.0.27/gentoo.diff
index 1ed154b18d02..e09a69796df3 100644
--- a/net-www/tomcat/files/5.0.25/gentoo.diff
+++ b/net-www/tomcat/files/5.0.27/gentoo.diff
@@ -1,7 +1,7 @@
 --- bin/catalina.sh.orig	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/05/19 17:42:56 zx Exp $
+ # $Id: gentoo.diff,v 1.1 2004/07/27 13:05:00 axxo Exp $
  # -----------------------------------------------------------------------------
  
 +# source the appropriate files right away
diff --git a/net-www/tomcat/files/5.0.25/tomcat.conf b/net-www/tomcat/files/5.0.27/tomcat.conf
index 48e4537ec594..4e57bc6b034e 100644
--- a/net-www/tomcat/files/5.0.25/tomcat.conf
+++ b/net-www/tomcat/files/5.0.27/tomcat.conf
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/files/5.0.25/tomcat.conf,v 1.2 2004/07/18 04:29:19 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/files/5.0.27/tomcat.conf,v 1.1 2004/07/27 13:05:00 axxo Exp $
 
 # JVM Runtime
 # Using the default setting, it will determine your JVM from the system-vm
@@ -6,7 +6,7 @@
 # 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.1.01
+# Example: JAVA_HOME=/opt/sun-jdk-1.4.2.05
 
 #JAVA_HOME=`java-config -O`
 
diff --git a/net-www/tomcat/files/5.0.27/tomcat.init b/net-www/tomcat/files/5.0.27/tomcat.init
new file mode 100644
index 000000000000..a83531c33240
--- /dev/null
+++ b/net-www/tomcat/files/5.0.27/tomcat.init
@@ -0,0 +1,32 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/files/5.0.27/tomcat.init,v 1.1 2004/07/27 13:05:00 axxo Exp $
+
+depend() {
+	need net
+	use dns logger mysql postgresql
+}
+
+start()	{
+	ebegin "Starting Tomcat"
+	cd ${CATALINA_HOME}
+	su - ${CATALINA_USER} -c "${CATALINA_HOME}/bin/catalina.sh ${TOMCAT_START}" 
+	eend $?
+}
+
+stop()	{
+	ebegin "Stopping Tomcat"
+	su - ${CATALINA_USER} -c "${CATALINA_HOME}/bin/catalina.sh ${TOMCAT_STOP}"
+	sleep 2
+	eend $?
+}
+
+restart() {
+	ebegin "Restarting Tomcat"
+	su - ${CATALINA_USER} -c "${CATALINA_HOME}/bin/catalina.sh ${TOMCAT_STOP}"
+	sleep 5
+	cd ${CATALINA_HOME}
+	su - ${CATALINA_USER} -c "${CATALINA_HOME}/bin/catalina.sh ${TOMCAT_START}"
+	eend $?
+}
diff --git a/net-www/tomcat/files/digest-tomcat-3.3.2 b/net-www/tomcat/files/digest-tomcat-3.3.2
new file mode 100644
index 000000000000..44bcb5d64a95
--- /dev/null
+++ b/net-www/tomcat/files/digest-tomcat-3.3.2
@@ -0,0 +1 @@
+MD5 edaa93b5867df0e007be7a9b44f48e0c jakarta-tomcat-3.3.2.tar.gz 6527346
diff --git a/net-www/tomcat/files/digest-tomcat-4.1.29 b/net-www/tomcat/files/digest-tomcat-4.1.29
deleted file mode 100644
index c38a9566e7a2..000000000000
--- a/net-www/tomcat/files/digest-tomcat-4.1.29
+++ /dev/null
@@ -1 +0,0 @@
-MD5 66b03ddd10fb4a9079fe26774436db09 jakarta-tomcat-4.1.29.tar.gz 7711952
diff --git a/net-www/tomcat/files/digest-tomcat-4.1.30 b/net-www/tomcat/files/digest-tomcat-4.1.30
new file mode 100644
index 000000000000..a1651a599a01
--- /dev/null
+++ b/net-www/tomcat/files/digest-tomcat-4.1.30
@@ -0,0 +1 @@
+MD5 ff27f6a5900768c1aafab4a68675b2ed jakarta-tomcat-4.1.30.tar.gz 7894019
diff --git a/net-www/tomcat/files/digest-tomcat-5.0.18 b/net-www/tomcat/files/digest-tomcat-5.0.18
deleted file mode 100644
index 2aa37064144d..000000000000
--- a/net-www/tomcat/files/digest-tomcat-5.0.18
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6653a88da9b805920485071fb73d4017 jakarta-tomcat-5.0.18.tar.gz 10318021
diff --git a/net-www/tomcat/files/digest-tomcat-5.0.25 b/net-www/tomcat/files/digest-tomcat-5.0.25
deleted file mode 100644
index c21d8db0edd1..000000000000
--- a/net-www/tomcat/files/digest-tomcat-5.0.25
+++ /dev/null
@@ -1 +0,0 @@
-MD5 456001c1844b25605e0cf76537fa8504 jakarta-tomcat-5.0.25.tar.gz 10227073
diff --git a/net-www/tomcat/files/digest-tomcat-5.0.27 b/net-www/tomcat/files/digest-tomcat-5.0.27
new file mode 100644
index 000000000000..f96d1cd9d33a
--- /dev/null
+++ b/net-www/tomcat/files/digest-tomcat-5.0.27
@@ -0,0 +1 @@
+MD5 b802ee042677e284bcf65738c7bdc3b6 jakarta-tomcat-5.0.27.tar.gz 10298374
diff --git a/net-www/tomcat/metadata.xml b/net-www/tomcat/metadata.xml
index 838c00a4a448..a215eb3fea96 100644
--- a/net-www/tomcat/metadata.xml
+++ b/net-www/tomcat/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+	<herd>java</herd>
+	<maintainer>
+	  <email>axxo@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-www/tomcat/tomcat-3.3.2.ebuild b/net-www/tomcat/tomcat-3.3.2.ebuild
new file mode 100644
index 000000000000..aa416c709e4d
--- /dev/null
+++ b/net-www/tomcat/tomcat-3.3.2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/tomcat-3.3.2.ebuild,v 1.1 2004/07/27 13:04:59 axxo Exp $
+
+inherit eutils
+
+DESCRIPTION="Apache Servlet-2.2/JSP-1.1 Container"
+
+JT_P="jakarta-${P}.tar.gz"
+S=${WORKDIR}/jakarta-${P}
+SLOT="${PV/.*}"
+SRC_URI="mirror://apache/jakarta/tomcat-${SLOT}/v${PV}/bin/${JT_P}"
+HOMEPAGE="http://jakarta.apache.org/tomcat"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+LICENSE="Apache-2.0"
+DEPEND="sys-apps/sed"
+RDEPEND=">=virtual/jdk-1.3
+		sys-apps/sed"
+IUSE=""
+
+TOMCAT_HOME="/opt/${PN}${SLOT}"
+TOMCAT_NAME="${PN}${SLOT}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}/gentoo.diff
+}
+
+pkg_preinst() {
+	enewgroup tomcat
+	enewuser tomcat -1 /bin/bash /opt/${TOMCAT_NAME} tomcat
+	chown -R tomcat:tomcat ${D}
+	chown -R tomcat:tomcat /var/log/${TOMCAT_NAME}
+}
+
+src_install() {
+	dodoc LICENSE
+
+	# 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}
+
+	insinto /etc/env.d
+	insopts -m0644
+	newins ${FILESDIR}/${PV}/21tomcat 21${TOMCAT_NAME}
+
+	diropts -m750
+	dodir ${TOMCAT_HOME}
+	dodir /var/log/${TOMCAT_NAME}
+	keepdir /var/log/${TOMCAT_NAME}
+
+	mv conf ${D}/etc/${TOMCAT_NAME}
+	mv bin doc lib modules native 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_postinst() {
+	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 " "
+	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/"
+	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 " "
+}
diff --git a/net-www/tomcat/tomcat-4.1.29.ebuild b/net-www/tomcat/tomcat-4.1.29.ebuild
deleted file mode 100644
index 2fb046336d62..000000000000
--- a/net-www/tomcat/tomcat-4.1.29.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/tomcat-4.1.29.ebuild,v 1.4 2004/06/25 01:14:15 agriffis Exp $
-
-inherit eutils
-
-
-At="jakarta-tomcat-${PV}.tar.gz"
-DESCRIPTION="Apache Servlet-2.3/JSP-1.2 Container"
-SRC_URI="http://apache.sunsite.ualberta.ca/jakarta/tomcat-4/v4.1.29/bin/${At}"
-HOMEPAGE="http://jakarta.apache.org/tomcat"
-KEYWORDS="x86 ~ppc ~sparc ~alpha"
-LICENSE="Apache-1.1"
-SLOT="0"
-DEPEND="sys-apps/sed"
-RDEPEND=">=virtual/jdk-1.2"
-IUSE=""
-
-S=${WORKDIR}/jakarta-${P}
-
-src_unpack() {
-	tar xzf ${DISTDIR}/${At} || die
-	cd ${S}
-	epatch ${FILESDIR}/${PV}/gentoo.diff
-}
-
-
-pkg_setup() {
-	USERADDED=false
-	if ! groupmod tomcat >/dev/null 2>&1 ; then
-		groupadd -g 265 tomcat || die "problem adding group tomcat, gid 265"
-		USERADDED=true
-	fi
-	if ! id tomcat >/dev/null 2>&1 ; then
-		useradd -u 265 -g tomcat -s /bin/bash -d /opt/tomcat -c "Apache Tomcat" tomcat || die "problem adding user tomcat, uid 265"
-		USERADDED=true
-	fi
-}
-
-src_install() {
-	TOMCAT_HOME="/opt/tomcat"
-	INSTALLING="yes"
-	DIROPTIONS="--mode=0755 --owner=tomcat --group=tomcat"
-
-	# Create directories
-	dodir ${TOMCAT_HOME}
-	dodir /var/log/${PN}
-	dosym /var/log/${PN} ${TOMCAT_HOME}/logs
-	dodir ${TOMCAT_HOME}/temp
-	dodir ${TOMCAT_HOME}/work
-
-	keepdir /var/log/${PN}
-	keepdir ${TOMCAT_HOME}/temp
-	keepdir ${TOMCAT_HOME}/work
-
-	cd ${S}
-
-	# INIT SCRIPTS AND ENV
-
-	cp -a ${FILESDIR}/${PV}/tomcat.init ${S}/tomcat
-	insinto /etc/init.d
-	insopts -m0755
-	doins ${S}/tomcat
-
-	cp -a ${FILESDIR}/${PV}/tomcat.conf ${S}/tomcat
-	insinto /etc/conf.d
-	insopts -m0644
-	doins ${S}/tomcat
-
-	cp -a ${FILESDIR}/${PV}/21tomcat ${S}/21tomcat
-	insinto /etc/env.d
-	insopts -m0644
-	doins ${S}/21tomcat
-
-	# SEND JARS TO SHARED LOCATION
-	for i in \
-		common/lib/*.jar
-	do
-		dojar ${i}
-		rm ${i}
-	done
-
-	dodoc RELEASE-NOTES-* README.txt RUNNING.txt LICENSE RELEASE-PLAN-4.1.txt
-
-	chown -R tomcat.tomcat ${S}
-	DIROPTIONS="--mode=0755 --owner=tomcat --group=tomcat"
-	dodir ${TOMCAT_HOME}/common
-	dodir ${TOMCAT_HOME}/common/classes
-	dodir ${TOMCAT_HOME}/webapps
-
-	rm bin/*.bat bin/*.exe
-
-	cp -Rdp \
-		bin \
-		server \
-		shared \
-		webapps \
-		work \
-		${D}${TOMCAT_HOME}
-
-	cp -Rdp common/endorsed ${D}${TOMCAT_HOME}/common/
-
-	cp -Rdp conf ${D}/etc/tomcat
-	fperms 640 /etc/tomcat/tomcat-users.xml
-
-	dosym /usr/share/tomcat/package.env ${TOMCAT_HOME}/common/package.env
-	dosym /usr/share/tomcat/lib ${TOMCAT_HOME}/common/lib
-	dosym /etc/tomcat ${TOMCAT_HOME}/conf
-
-}
-
-pkg_postinst() {
-	einfo " "
-	einfo " NOTICE!"
-	if ${USERADDED} ; then
-		einfo " User and group 'tomcat' have been added."
-		einfo " "
-	fi
-	einfo " FILE LOCATIONS:"
-	einfo " 1.  Tomcat home directory: ${TOMCAT_HOME}"
-	einfo "     Contains application data, configuration files."
-	einfo " 2.  Runtime settings: /etc/conf.d/tomcat"
-	einfo "     Contains CLASSPATH and JAVA_HOME settings."
-	einfo " 3.  Configuration:  /etc/tomcat/"
-	einfo " 4.  Logs:  /var/log/tomcat/"
-	einfo " 5.  Executables, libraries:  /usr/share/tomcat/"
-	einfo " "
-	einfo " "
-	einfo " STARTING AND STOPPING TOMCAT:"
-	einfo "   /etc/init.d/tomcat start"
-	einfo "   /etc/init.d/tomcat stop"
-	einfo "   /etc/init.d/tomcat restart"
-	einfo " "
-	einfo " "
-	einfo " NETWORK CONFIGURATION:"
-	einfo " By default, Tomcat runs on port 8080.  You can change this"
-	einfo " value by editing /etc/tomcat/server.xml."
-	einfo " "
-	einfo " To test Tomcat while it's running, point your web browser to:"
-	einfo " http://${HOSTNAME}:8080/"
-	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 " "
-	echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1
-	sleep 10
-}
-
-# pkg_postrm() gets called during an unmerge and seperately (new environment)
-# from the src_install() earlier so setting the INSTALLING var does not work.
-#pkg_postrm() {
-#	if [ -z "${INSTALLING}" ] ; then
-#		einfo ">>> Removing user for Tomcat"
-#		userdel tomcat || die "Error removing Tomcat user"
-#		einfo ">>> Removing group for Tomcat"
-#		groupdel tomcat || die "Error removing Tomcat group"
-#	else
-#		einfo ">>> Tomcat user and group preserved"
-#	fi
-#}
diff --git a/net-www/tomcat/tomcat-4.1.30.ebuild b/net-www/tomcat/tomcat-4.1.30.ebuild
new file mode 100644
index 000000000000..afde31c2f263
--- /dev/null
+++ b/net-www/tomcat/tomcat-4.1.30.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/tomcat-4.1.30.ebuild,v 1.1 2004/07/27 13:04:59 axxo Exp $
+
+inherit eutils
+
+DESCRIPTION="Apache Servlet-2.3/JSP-1.2 Container"
+
+JT_P="jakarta-${P}.tar.gz"
+S=${WORKDIR}/jakarta-${P}
+SLOT="${PV/.*}"
+SRC_URI="mirror://apache/jakarta/tomcat-${SLOT}/v${PV}/bin/${JT_P}"
+HOMEPAGE="http://jakarta.apache.org/tomcat"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+LICENSE="Apache-2.0"
+DEPEND=""
+RDEPEND=">=virtual/jdk-1.3
+		sys-apps/sed"
+IUSE=""
+
+TOMCAT_HOME="/opt/${PN}${SLOT}"
+TOMCAT_NAME="${PN}${SLOT}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}/gentoo.diff
+}
+
+pkg_preinst() {
+	enewgroup tomcat
+	enewuser tomcat -1 /bin/bash /opt/${TOMCAT_NAME} tomcat
+	chown -R tomcat:tomcat ${D}
+	chown -R tomcat:tomcat /var/log/${TOMCAT_NAME}
+}
+
+src_install() {
+	dodoc RELEASE* RUNNING.txt LICENSE
+
+	# 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}
+
+	insinto /etc/env.d
+	insopts -m0644
+	newins ${FILESDIR}/${PV}/21tomcat 21${TOMCAT_NAME}
+
+	diropts -m750
+	dodir ${TOMCAT_HOME}
+	dodir /var/log/${TOMCAT_NAME}
+	keepdir /var/log/${TOMCAT_NAME}
+
+	mv conf ${D}/etc/${TOMCAT_NAME}
+	mv bin common server shared temp webapps work ${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_postinst() {
+	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 " "
+	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/"
+	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 " "
+}
diff --git a/net-www/tomcat/tomcat-5.0.18.ebuild b/net-www/tomcat/tomcat-5.0.18.ebuild
deleted file mode 100644
index 028199ca6a35..000000000000
--- a/net-www/tomcat/tomcat-5.0.18.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/tomcat-5.0.18.ebuild,v 1.9 2004/06/25 16:10:25 agriffis Exp $
-
-inherit eutils
-
-DESCRIPTION="Apache Servlet-2.4/JSP-2.0 Container"
-SRC_URI="http://apache.mirrors.pair.com/jakarta/tomcat-`echo ${PV} | cut -b 1`/v${PV}/bin/jakarta-${P}.tar.gz"
-HOMEPAGE="http://jakarta.apache.org/tomcat"
-KEYWORDS="x86 ppc sparc alpha ~amd64"
-LICENSE="Apache-1.1"
-SLOT="0"
-DEPEND="sys-apps/sed
-		>=dev-java/java-config-1.2.6"
-RDEPEND=">=virtual/jdk-1.2"
-IUSE="doc jikes"
-
-S=${WORKDIR}/jakarta-${P}
-At="jakarta-tomcat-${PV}.tar.gz"
-
-src_unpack() {
-	tar xzf ${DISTDIR}/${At} || die
-	cd ${S}
-	epatch ${FILESDIR}/${PV}/gentoo.diff
-
-	if ! use doc ; then
-		rm -rf webapps/{tomcat-docs,jsp-examples,servlets-examples}
-	fi
-}
-
-
-pkg_setup() {
-	USERADDED=false
-	if ! groupmod tomcat >/dev/null 2>&1 ; then
-		groupadd -g 265 tomcat || die "problem adding group tomcat, gid 265"
-		USERADDED=true
-	fi
-	if ! id tomcat >/dev/null 2>&1 ; then
-		useradd -u 265 -g tomcat -s /bin/bash -d /opt/tomcat -c "Apache Tomcat" tomcat || die "problem adding user tomcat, uid 265"
-		USERADDED=true
-	fi
-}
-
-src_install() {
-	TOMCAT_HOME="/opt/tomcat"
-	INSTALLING="yes"
-	DIROPTIONS="--mode=0750 --owner=tomcat --group=tomcat"
-
-
-	# Create directories
-	dodir ${TOMCAT_HOME}
-	dodir /var/log/${PN}
-	dosym /var/log/${PN} ${TOMCAT_HOME}/logs
-	dodir ${TOMCAT_HOME}/temp
-	dodir ${TOMCAT_HOME}/work
-
-	keepdir /var/log/${PN}
-	keepdir ${TOMCAT_HOME}/temp
-	keepdir ${TOMCAT_HOME}/work
-
-	cd ${S}
-
-	# INIT SCRIPTS AND ENV
-
-	cp -a ${FILESDIR}/${PV}/tomcat.init ${S}/tomcat
-	insinto /etc/init.d
-	insopts -m0750
-	doins ${S}/tomcat
-
-	cp -a ${FILESDIR}/${PV}/tomcat.conf ${S}/tomcat
-	use jikes && epatch ${FILESDIR}/${PV}/jikes.diff
-	insinto /etc/conf.d
-	insopts -m0644
-	doins ${S}/tomcat
-
-	cp -a ${FILESDIR}/${PV}/21tomcat ${S}/21tomcat
-	insinto /etc/env.d
-	insopts -m0644
-	doins ${S}/21tomcat
-
-	# SEND JARS TO SHARED LOCATION
-	for i in \
-		common/lib/*.jar
-	do
-		dojar ${i}
-		rm ${i}
-	done
-
-	dodoc RELEASE-NOTES RUNNING.txt LICENSE
-
-	chown -R tomcat:tomcat ${S}
-	DIROPTIONS="--mode=0750 --owner=tomcat --group=tomcat"
-	dodir ${TOMCAT_HOME}/common
-	dodir ${TOMCAT_HOME}/common/classes
-	dodir ${TOMCAT_HOME}/webapps
-
-	rm bin/*.bat bin/*.exe
-
-	cp -Rdp \
-		bin \
-		server \
-		shared \
-		webapps \
-		work \
-		${D}${TOMCAT_HOME}
-
-	cp -Rdp common/endorsed ${D}${TOMCAT_HOME}/common/
-
-	cp -Rdp conf ${D}/etc/tomcat
-	fperms 640 /etc/tomcat/tomcat-users.xml
-
-	dosym /usr/share/tomcat/package.env ${TOMCAT_HOME}/common/package.env
-	dosym /usr/share/tomcat/lib ${TOMCAT_HOME}/common/lib
-	dosym /etc/tomcat ${TOMCAT_HOME}/conf
-
-}
-
-pkg_postinst() {
-	einfo " "
-	einfo " NOTICE!"
-	if ${USERADDED} ; then
-		einfo " User and group 'tomcat' have been added."
-		einfo " "
-	fi
-	einfo " FILE LOCATIONS:"
-	einfo " 1.  Tomcat home directory: ${TOMCAT_HOME}"
-	einfo "     Contains application data, configuration files."
-	einfo " 2.  Runtime settings: /etc/conf.d/tomcat"
-	einfo "     Contains CLASSPATH and JAVA_HOME settings."
-	einfo " 3.  Configuration:  /etc/tomcat/"
-	einfo " 4.  Logs:  /var/log/tomcat/"
-	einfo " 5.  Executables, libraries:  /usr/share/tomcat/"
-	einfo " "
-	einfo " "
-	einfo " STARTING AND STOPPING TOMCAT:"
-	einfo "   /etc/init.d/tomcat start"
-	einfo "   /etc/init.d/tomcat stop"
-	einfo "   /etc/init.d/tomcat restart"
-	einfo " "
-	einfo " "
-	einfo " NETWORK CONFIGURATION:"
-	einfo " By default, Tomcat runs on port 8080.  You can change this"
-	einfo " value by editing /etc/tomcat/server.xml."
-	einfo " "
-	einfo " To test Tomcat while it's running, point your web browser to:"
-	einfo " http://localhost:8080/"
-	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 " "
-	echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1
-	sleep 10
-}
-
-# pkg_postrm() gets called during an unmerge and seperately (new environment)
-# from the src_install() earlier so setting the INSTALLING var does not work.
-#pkg_postrm() {
-#	if [ -z "${INSTALLING}" ] ; then
-#		einfo ">>> Removing user for Tomcat"
-#		userdel tomcat || die "Error removing Tomcat user"
-#		einfo ">>> Removing group for Tomcat"
-#		groupdel tomcat || die "Error removing Tomcat group"
-#	else
-#		einfo ">>> Tomcat user and group preserved"
-#	fi
-#}
diff --git a/net-www/tomcat/tomcat-5.0.25.ebuild b/net-www/tomcat/tomcat-5.0.25.ebuild
deleted file mode 100644
index bdaa9c26f309..000000000000
--- a/net-www/tomcat/tomcat-5.0.25.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/tomcat-5.0.25.ebuild,v 1.2 2004/06/25 01:14:15 agriffis Exp $
-
-inherit eutils
-
-DESCRIPTION="Apache Servlet-2.4/JSP-2.0 Container"
-
-JT_P="jakarta-${P}.tar.gz"
-S=${WORKDIR}/jakarta-${P}
-SRC_URI="http://mirrors.combose.com/apache/jakarta/tomcat-5/v5.0.25-alpha/bin/${JT_P}"
-HOMEPAGE="http://jakarta.apache.org/tomcat"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-LICENSE="Apache-2.0"
-SLOT="0"
-DEPEND="sys-apps/sed"
-RDEPEND=">=virtual/jdk-1.2"
-RESTRICT="nomirror"
-IUSE=""
-
-src_unpack() {
-	tar xzf ${DISTDIR}/${JT_P} || die
-	cd ${S}
-	epatch ${FILESDIR}/${PV}/gentoo.diff
-}
-
-pkg_setup() {
-	USERADDED=false
-	if ! groupmod tomcat >/dev/null 2>&1 ; then
-		groupadd -g 265 tomcat || die "problem adding group tomcat, gid 265"
-		USERADDED=true
-	fi
-
-	if ! id tomcat >/dev/null 2>&1 ; then
-		useradd -u 265 -g tomcat -s /bin/bash -d /opt/${PN}5 -c "Apache Tomcat" tomcat || die "problem adding user tomcat, uid 265"
-		USERADDED=true
-	fi
-}
-
-src_install() {
-	TOMCAT_HOME="/opt/tomcat5"
-	TOMCAT_NAME="tomcat5"
-	INSTALLING="yes"
-	DIROPTIONS="--mode=0750 --owner=tomcat --group=tomcat"
-
-	# Create directories
-	dodir ${TOMCAT_HOME}
-	dodir /var/log/${TOMCAT_NAME}
-	dosym /var/log/${TOMCAT_NAME} ${TOMCAT_HOME}/logs
-	keepdir /var/log/${TOMCAT_NAME}
-
-	cd ${S}
-
-	# FIX ALL PERMISSIONS
-	chown -R tomcat:tomcat ${S}
-
-	cp -a * ${D}${TOMCAT_HOME}
-
-	# INIT SCRIPTS AND ENV
-	cp -a ${FILESDIR}/${PV}/tomcat.init ${S}/${TOMCAT_NAME}
-	insinto /etc/init.d
-	insopts -m0750
-	doins ${S}/${TOMCAT_NAME}
-
-	cp -a ${FILESDIR}/${PV}/tomcat.conf ${S}/${TOMCAT_NAME}
-	insinto /etc/conf.d
-	insopts -m0644
-	doins ${S}/${TOMCAT_NAME}
-
-	cp -a ${FILESDIR}/${PV}/21tomcat ${S}/21${TOMCAT_NAME}
-	insinto /etc/env.d
-	insopts -m0644
-	doins ${S}/21${TOMCAT_NAME}
-
-	dodir /etc/${TOMCAT_NAME}
-	dosym /etc/${TOMCAT_NAME} ${TOMCAT_HOME}/conf
-}
-
-pkg_postinst() {
-	einfo " "
-	einfo " NOTICE!"
-	if ${USERADDED} ; then
-		einfo " User and group 'tomcat' have been added."
-		einfo " "
-	fi
-	einfo " FILE LOCATIONS:"
-	einfo " 1.  Tomcat home directory: /opt/tomcat5"
-	einfo "     Contains application data, configuration files."
-	einfo " 2.  Runtime settings: /etc/conf.d/tomcat5"
-	einfo "     Contains CLASSPATH and JAVA_HOME settings."
-	einfo " 3.  Configuration:  /etc/tomcat5/"
-	einfo " 4.  Logs:  /var/log/tomcat5/"
-	einfo " 5.  Executables, libraries:  /usr/share/tomcat/"
-	einfo " "
-	einfo " "
-	einfo " STARTING AND STOPPING TOMCAT:"
-	einfo "   /etc/init.d/tomcat5 start"
-	einfo "   /etc/init.d/tomcat5 stop"
-	einfo "   /etc/init.d/tomcat5 restart"
-	einfo " "
-	einfo " "
-	einfo " NETWORK CONFIGURATION:"
-	einfo " By default, Tomcat runs on port 8080.  You can change this"
-	einfo " value by editing /etc/tomcat5/server.xml."
-	einfo " "
-	einfo " To test Tomcat while it's running, point your web browser to:"
-	einfo " http://localhost:8080/"
-	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 " "
-	echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1
-	sleep 10
-}
diff --git a/net-www/tomcat/tomcat-5.0.27.ebuild b/net-www/tomcat/tomcat-5.0.27.ebuild
new file mode 100644
index 000000000000..92b2401f3072
--- /dev/null
+++ b/net-www/tomcat/tomcat-5.0.27.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/tomcat-5.0.27.ebuild,v 1.1 2004/07/27 13:04:59 axxo 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="mirror://apache/jakarta/tomcat-${SLOT}/v${PV}/bin/${JT_P}"
+HOMEPAGE="http://jakarta.apache.org/tomcat"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+LICENSE="Apache-2.0"
+DEPEND=""
+RDEPEND=">=virtual/jdk-1.3
+		sys-apps/sed"
+IUSE=""
+
+TOMCAT_HOME="/opt/${PN}${SLOT}"
+TOMCAT_NAME="${PN}${SLOT}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}/gentoo.diff
+}
+
+pkg_preinst() {
+	enewgroup tomcat
+	enewuser tomcat -1 /bin/bash /opt/${TOMCAT_NAME} tomcat
+	chown -R tomcat:tomcat ${D}
+	chown -R tomcat:tomcat /var/log/${TOMCAT_NAME}
+}
+
+src_install() {
+	dodoc RELEASE* RUNNING.txt LICENSE
+
+	# 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}
+
+	insinto /etc/env.d
+	insopts -m0644
+	newins ${FILESDIR}/${PV}/21tomcat 21${TOMCAT_NAME}
+
+	diropts -m750
+	dodir ${TOMCAT_HOME}
+	dodir /var/log/${TOMCAT_NAME}
+	keepdir /var/log/${TOMCAT_NAME}
+
+	mv conf ${D}/etc/${TOMCAT_NAME}
+	mv bin common server shared temp webapps work ${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_postinst() {
+	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 " "
+	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/"
+	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 " "
+}