From: William Thomson <wltjr@gentoo.org>
Date: Fri, 9 Mar 2007 17:33:04 +0000 (+0000)
Subject: Bumped 5.5 to latest release, removed pre-release version
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f843e91dfc1667f7087b5aec908d809a3eb13958;p=gentoo.git

Bumped 5.5 to latest release, removed pre-release version
Package-Manager: portage-2.1.2.1
---

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index f3e91bbde5f8..9210c031e6d3 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.124 2007/03/01 00:11:13 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.125 2007/03/09 17:33:04 wltjr Exp $
+
+*tomcat-5.5.23 (09 Mar 2007)
+
+  09 Mar 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  -files/5.5.22/catalinabuild-xml.patch,
+  -files/5.5.22/jasperbuild-xml.patch,
+  -files/5.5.22/jsr152_examples_build-xml.patch,
+  -files/5.5.22/jsr152build-xml-examples.patch,
+  -files/5.5.22/jsr154_examples_build-xml.patch,
+  -files/5.5.22/jsr154build-xml-examples.patch,
+  -files/5.5.22/mainbuild-xml.patch, -files/5.5.22/tomcat.conf,
+  -files/5.5.22/tomcat.init, -files/5.5.22/tomcatbuild-xml.patch,
+  +files/5.5/catalina_build_xml.patch,
+  +files/5.5/jsr152_examples_build_xml.patch, +files/5.5/tomcat.init,
+  +files/5.5/jasper_build_xml.patch,
+  +files/5.5/jsr154_examples_build_xml.patch,
+  +files/5.5/main_build_xml.patch, +files/5.5/tomcat.conf,
+  +files/5.5/tomcat_build_xml.patch, -tomcat-5.5.22_pre-r1.ebuild,
+  +tomcat-5.5.23.ebuild:
+  Bumped 5.5 to latest release, removed pre-release version
 
 *tomcat-6.0.10 (01 Mar 2007)
 
diff --git a/www-servers/tomcat/files/5.5.22/catalinabuild-xml.patch b/www-servers/tomcat/files/5.5.22/catalinabuild-xml.patch
deleted file mode 100644
index da6b96901aab..000000000000
--- a/www-servers/tomcat/files/5.5.22/catalinabuild-xml.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- apache-tomcat-5.5.15-src/container/catalina/build.xml	2006-01-03 10:15:07.000000000 -0500
-+++ container/catalina/build.xml	2006-01-28 11:57:25.000000000 -0500
-@@ -60,6 +60,7 @@
-     <pathelement location="${jaas.jar}"/>
-     <pathelement location="${javagroups.jar}"/>
-     <pathelement location="${jcert.jar}"/>
-+    <pathelement location="${jdt.jar}"/>
-     <pathelement location="${jmx.jar}"/>
-     <pathelement location="${jmx-remote.jar}"/>
-     <pathelement location="${jndi.jar}"/>
-@@ -91,6 +92,7 @@
-     <pathelement location="${commons-modeler.jar}"/>
-     <pathelement location="${jaas.jar}"/>
-     <pathelement location="${jcert.jar}"/>
-+    <pathelement location="${jdt.jar}"/>
-     <pathelement location="${jmx.jar}"/>
-     <pathelement location="${jndi.jar}"/>
-     <pathelement location="${jnet.jar}"/>
-@@ -548,9 +550,10 @@
- <!--
-     <copy todir="${catalina.build}/common/lib" file="${servlet-api.jar}"/>
- -->
-+    <!--
-     <copy todir="${catalina.build}/common/lib"
-            file="${tomcat-dbcp.jar}" />
--
-+    -->
-     <!-- Configuration Files -->
-     <copy todir="${catalina.build}/conf">
-       <fileset dir="src/conf">
diff --git a/www-servers/tomcat/files/5.5.22/jasperbuild-xml.patch b/www-servers/tomcat/files/5.5.22/jasperbuild-xml.patch
deleted file mode 100644
index 1f0de5f8a04f..000000000000
--- a/www-servers/tomcat/files/5.5.22/jasperbuild-xml.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- jasper/build.xml	2005-02-13 19:28:36.000000000 +0100
-+++ jasper/build.xml	2005-02-13 20:46:15.554972064 +0100
-@@ -30,6 +30,7 @@
-     <pathelement location="${jsp-api.jar}"/>
-     <pathelement location="${tools.jar}"/>
-     <pathelement location="${jasper-compiler-jdt.jar}"/>
-+    <pathelement location="${jdt.jar}"/>
-     <pathelement location="${xerces.jar}"/>
-     <pathelement location="${xercesImpl.jar}"/>
-     <pathelement location="${xml-apis.jar}"/>
diff --git a/www-servers/tomcat/files/5.5.22/jsr152_examples_build-xml.patch b/www-servers/tomcat/files/5.5.22/jsr152_examples_build-xml.patch
deleted file mode 100644
index 1e4e013b741d..000000000000
--- a/www-servers/tomcat/files/5.5.22/jsr152_examples_build-xml.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- apache-tomcat-5.5.20-src/servletapi/jsr152/build.xml	2007-01-27 00:02:27.000000000 -0500
-+++ build.xml	2007-01-27 00:02:44.000000000 -0500
-@@ -20,6 +20,7 @@
- 
-   <path id="examples.classpath">
-     <pathelement location="${jsp-api.build}/classes"/>
-+    <pathelement location="${jsp-api.jar}"/>
-     <pathelement location="${servlet-api.jar}"/>
-     <pathelement location="${mail.jar}"/>
-   </path>
diff --git a/www-servers/tomcat/files/5.5.22/jsr152build-xml-examples.patch b/www-servers/tomcat/files/5.5.22/jsr152build-xml-examples.patch
deleted file mode 100644
index 933e2aa48242..000000000000
--- a/www-servers/tomcat/files/5.5.22/jsr152build-xml-examples.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- apache-tomcat-5.5.17-src/servletapi/jsr152/build.xml	2006-07-29 14:13:41.000000000 -0400
-+++ servletapi/jsr152/build.xml	2006-07-29 14:13:17.000000000 -0400
-@@ -119,6 +119,7 @@
-                 classpath="${jsp-anttask.jar}" />
-   </target>
-   
-+  <!--
-   <target name="examples" depends="prepare,ant">
- 
-     <copy todir="${jsp-api.build}/examples">
-@@ -221,7 +222,7 @@
-            basedir="${jsp-api.build}/examples" includes="**"/>
- 
-   </target>
--
-+  -->
- 
-   <!-- ===================== Distribution Files ========================= -->
-   <target name="jar" depends="compile"
-@@ -245,7 +246,7 @@
- 
-   </target>
- 
--  <target name="dist" depends="compile,examples,javadoc,jar"
-+  <target name="dist" depends="compile,javadoc,jar"
-    description="Create binary distribution">
- 
-     <!-- Copy Javadocs -->
diff --git a/www-servers/tomcat/files/5.5.22/jsr154_examples_build-xml.patch b/www-servers/tomcat/files/5.5.22/jsr154_examples_build-xml.patch
deleted file mode 100644
index 9c7b417a3b1f..000000000000
--- a/www-servers/tomcat/files/5.5.22/jsr154_examples_build-xml.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- apache-tomcat-5.5.20-src/servletapi/jsr154/build.xml	2007-01-26 23:50:15.000000000 -0500
-+++ build.xml	2007-01-26 23:56:03.000000000 -0500
-@@ -17,6 +17,7 @@
-   <property name="servlet-api.jar" value="${servlet-api.dist}/lib/servlet-api.jar"/>
-   <path id="examples.classpath">
-     <pathelement location="${servlet-api.build}/classes"/>
-+    <pathelement location="${servlet-api.jar}"/>
-   </path>
- 
- 
diff --git a/www-servers/tomcat/files/5.5.22/jsr154build-xml-examples.patch b/www-servers/tomcat/files/5.5.22/jsr154build-xml-examples.patch
deleted file mode 100644
index 4dac35390f1d..000000000000
--- a/www-servers/tomcat/files/5.5.22/jsr154build-xml-examples.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- apache-tomcat-5.5.17-src/servletapi/jsr154/build.xml	2006-04-14 14:12:10.000000000 -0400
-+++ servletapi/jsr154/build.xml	2006-07-29 14:41:05.000000000 -0400
-@@ -99,6 +99,7 @@
- 
- 
-   <!-- ======================== Build JavaDoc =========================== -->
-+  <!--
-   <target name="examples" depends="prepare">
- 
-     <copy todir="${servlet-api.build}/examples">
-@@ -119,7 +120,7 @@
-            basedir="${servlet-api.build}/examples" includes="**"/>
- 
-   </target>
--
-+  -->
- 
-   <!-- ===================== Distribution Files ========================= -->
-   <target name="jar" depends="compile"
-@@ -144,7 +145,7 @@
- 
-   </target>
- 
--  <target name="dist" depends="compile,examples,javadoc,jar"
-+  <target name="dist" depends="compile,javadoc,jar"
-           description="Create binary distribution">
- 
-     <!-- Copy Javadocs -->
diff --git a/www-servers/tomcat/files/5.5.22/mainbuild-xml.patch b/www-servers/tomcat/files/5.5.22/mainbuild-xml.patch
deleted file mode 100644
index 07c58ea73c09..000000000000
--- a/www-servers/tomcat/files/5.5.22/mainbuild-xml.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- build.xml.orig	2007-02-13 13:17:34.000000000 -0500
-+++ build.xml	2007-02-13 16:57:38.000000000 -0500
-@@ -66,12 +66,10 @@
-   <target name="checkout"
-           description="Update or checkout required sources from SVN">
- 
-+    <!--
-     <echo level="info"
-           message="If the checkout fails, see http://tomcat.apache.org/svn.html and http://subversion.tigris.org/faq.html#proxy" />
- 
--    <!-- Bugzilla 37977: http://issues.apache.org/bugzilla/show_bug.cgi?id=37977 -->
--    <!--  hackish: inputstring="t${line.separator}" is t+<enter> for svn         -->
--    <!--  to temporarily accept the certificate of svn.apache.org.               -->
-     <exec dir="${basedir}"
-           executable="svn"
-           inputstring="t${line.separator}"
-@@ -80,6 +78,7 @@
-       <arg value="${svnroot}/${current.loc}" />
-       <arg value="${basedir}" />
-     </exec>
-+    -->
- 
-   </target>
- 
diff --git a/www-servers/tomcat/files/5.5.22/tomcat.conf b/www-servers/tomcat/files/5.5.22/tomcat.conf
deleted file mode 100644
index 5305af87f79b..000000000000
--- a/www-servers/tomcat/files/5.5.22/tomcat.conf
+++ /dev/null
@@ -1,75 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.5.22/tomcat.conf,v 1.1 2007/02/13 22:39:09 wltjr 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 --jre-home`
-
-# (Optional) Java runtime options used when the "start", "stop", or "run"
-# commands are executed.
-# JAVA_OPTS=""
-
-# Where your web applications are located
-CATALINA_HOME=/usr/share/tomcat-5.5/
-CATALINA_BASE=/var/lib/tomcat-5.5/
-
-# Tomcat's User/Group
-# Change these at your own risk!!! These are not supported so if it 
-# breaks something, you are on your own.
-CATALINA_USER=tomcat
-CATALINA_GROUP=tomcat
-
-# Location of the Tomcat JARs and classes
-CATALINA_LIBDIR=/usr/share/tomcat-5.5/server/lib/
-
-# The CLASSPATH for Tomcat to use, plus any others you need.
-CLASSPATH=${CATALINA_LIBDIR}
-
-# (Optional) Directory path location of temporary directory the JVM should 
-# use (java.io.tmpdir).  Defaults to $CATALINA_BASE/temp.
-CATALINA_TMPDIR="/var/tmp/tomcat-5.5/"
-
-# TOMCAT STARTUP/SHUTDOWN
-# 	debug             Start Catalina in a debugger
-# 	debug -security   Debug Catalina with a security manager
-# 	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.5.22/tomcat.init b/www-servers/tomcat/files/5.5.22/tomcat.init
deleted file mode 100755
index 455ea37a1c8c..000000000000
--- a/www-servers/tomcat/files/5.5.22/tomcat.init
+++ /dev/null
@@ -1,91 +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.5.22/tomcat.init,v 1.1 2007/02/13 22:39:09 wltjr Exp $
-
-init_env_vars() {
-	# Set some sane defaults
-	if [ -z "${CATALINA_TMPDIR}" ] ; then
-		CATALINA_TMPDIR="${CATALINA_BASE}"/temp
-	fi
-	JPDA_TRANSPORT=${JPDA_TRANSPORT:="dt_socket"}
-	JPDA_ADDRESS=${JPDA_ADDRESS:="8000"}
-	JPDA_OPTS=${JPDA_OPTS="-Xdebug -Xrunjdwp:transport=${JPDA_TRANSPORT},address=${JPDA_ADDRESS},server=y,suspend=n"}
-
-	# Activate Logging
-	if [[ -r "${CATALINA_HOME}"/bin/tomcat-juli.jar ]]; then
-		JAVA_OPTS="${JAVA_OPTS} -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager \
-			-Djava.util.logging.config.file=${CATALINA_BASE}/conf/logging.properties"
-	fi
-
-	# Populate the classpath
-	CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/server/lib:${JAVA_HOME}/lib/tools.jar"
-	if [[ -n "${JSSE_HOME}" ]]; then
-		CLASSPATH="${CLASSPATH}:${JSSE_HOME}/lib/jcert.jar:${JSSE_HOME}/lib/jnet.jar:${JSSE_HOME}/lib/jsse.jar"
-	fi
-	CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar:${CATALINA_HOME}/bin/commons-logging-api.jar"
-
-	OPTS_CP="${JAVA_OPTS} ${CATALINA_OPTS} \
-			 -Djava.endorsed.dirs=${CATALINA_HOME}/common/endorsed \
-			 -classpath ${CLASSPATH}"
-
-	CATALINA_ARGS="-Dcatalina.base=${CATALINA_BASE} \
-				   -Dcatalina.home=${CATALINA_HOME} \
-				   -Djava.io.tmpdir=${CATALINA_TMPDIR} \
-				   org.apache.catalina.startup.Bootstrap "
-
-	if [ ! -f "${CATALINA_BASE}logs/catalina.out" ]; then
-		touch "${CATALINA_BASE}logs/catalina.out"
-		chown tomcat:tomcat "${CATALINA_BASE}logs/catalina.out"
-	fi
-}
-
-start-helper() {
-	local executor=${1}
-	shift
-	local arguments="--start --quiet --background --chuid ${CATALINA_USER}:${CATALINA_GROUP} \
-		--make-pidfile --pidfile /var/run/tomcat.pid"
-	start-stop-daemon ${arguments} --exec ${executor} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${TOMCAT_START} >> "$CATALINA_BASE"/logs/catalina.out 2>&1
-	return $?
-}
-
-depend() {
-	use dns logger net
-}
-
-start()	{
-	ebegin "Starting Tomcat"
-	init_env_vars
-	# Figure out what arguments to pass start-helper based on TOMCAT_START
-	if [[ "${TOMCAT_START}" == "debug" ]] ; then
-		start-helper ${JAVA_HOME}/bin/jdb \
-			-sourcepath ${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share
-	elif [[ "${TOMCAT_START}" == "debug -security" ]] ; then
-		start-helper ${JAVA_HOME}/bin/jdb \
-			-sourcepath ${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share \
-			-Djava.security.manager \
-			-Djava.security.policy=${CATALINA_BASE}/conf/catalina.policy
-	elif [[ "${TOMCAT_START}" == "jpda start" ]] ; then
-		start-helper ${JAVA_HOME}/bin/java ${JPDA_OPTS}
-	elif [[ "${TOMCAT_START}" == "start" ]] ; then
-		start-helper ${JAVA_HOME}/bin/java
-	elif [[ "${TOMCAT_START}" == "start -security" ]] ; then
-		start-helper ${JAVA_HOME}/bin/java \
-			-Djava.security.manager \
-			-Djava.security.policy=${CATALINA_BASE}/conf/catalina.policy
-	else
-		eerror "Invalid TOMCAT_START variable value, or one is not set"
-		eerror "Please see /etc/conf.d/tomcat-5.5 for more information"
-		eend 1
-	fi
-	eend $?
-}
-
-stop()	{
-	ebegin "Stopping Tomcat"
-	init_env_vars
-	start-stop-daemon --stop --quiet \
-	       	--make-pidfile --pidfile /var/run/tomcat.pid \
-			--exec ${JAVA_HOME}/bin/java -- ${OPTS_CP} ${CATALINA_ARGS} ${STD_OUT} stop
-	eend $?
-}
diff --git a/www-servers/tomcat/files/5.5.22/tomcatbuild-xml.patch b/www-servers/tomcat/files/5.5.22/tomcatbuild-xml.patch
deleted file mode 100644
index 109caf67af37..000000000000
--- a/www-servers/tomcat/files/5.5.22/tomcatbuild-xml.patch
+++ /dev/null
@@ -1,367 +0,0 @@
---- apache-tomcat-5.5.20-src/build/build.xml	2007-01-26 19:10:26.000000000 -0500
-+++ build.xml	2007-01-26 19:31:49.000000000 -0500
-@@ -143,6 +143,7 @@
- 
-   <!-- ====================== DEPLOY: Copy Static Files =================== -->
-   <target name="deploy-static" depends="init">
-+  <!--
-     <copy file="${jsp-api.jar}"  todir="${tomcat.build}/common/lib"/>
-     <copy file="${servlet-api.jar}" todir="${tomcat.build}/common/lib"/>
- 
-@@ -161,9 +162,9 @@
-     <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
-             file="${tomcat-native.tar.gz}" />
- 
--    <!-- <copy todir="${tomcat.build}/common/lib" file="${ant.jar}"/>
--    <copy todir="${tomcat.build}/common/lib" file="${ant-launcher.jar}"/> -->
-+    <copy todir="${tomcat.build}/common/lib" file="${ant-launcher.jar}"/>
-     <copy todir="${tomcat.build}/common/lib" file="${jasper-compiler-jdt.jar}"/>
-+    -->
-   </target>
- 
-   <!-- ====================== Build all components =================== -->
-@@ -395,15 +396,14 @@
-   <target name="build-webapps-precompile"
-           depends="init" description="Precompile webapps" >
- 
-+    <antcall target="build-webapp-precompile-admin" />
-+    <antcall target="build-webapp-precompile-examples" />
-+
-     <!-- JSPC -->
--    <property name="admin.base" location="${tomcat.build}/server/webapps/admin" />
-     <property name="ROOT.base" location="${tomcat.build}/webapps/ROOT" />
--    <property name="jsp-examples.base" location="${tomcat.build}/webapps/jsp-examples" />
- 
--    <mkdir dir="${admin.base}/WEB-INF/src/admin" />
-     <mkdir dir="${ROOT.base}/WEB-INF/src" />
-     <mkdir dir="${ROOT.base}/WEB-INF/classes" />
--    <mkdir dir="${jsp-examples.base}/WEB-INF/src" />
- 
-     <path id="jspc.classpath">
-       <pathelement location="${java.home}/../lib/tools.jar"/>
-@@ -437,23 +437,6 @@
-              addWebXmlMappings="true"
-              outputDir="${ROOT.base}/WEB-INF/src" />
- 
--    <jasper2
--             compile="false"
--             validateXml="false"
--             uriroot="${jsp-examples.base}"
--         webXmlFragment="${jsp-examples.base}/WEB-INF/generated_web.xml"
--             addWebXmlMappings="true"
--             outputDir="${jsp-examples.base}/WEB-INF/src" />
--
--    <jasper2
--             package="admin"
--             compile="false"
--             validateXml="false"
--             uriroot="${admin.base}"
--             webXmlFragment="${admin.base}/WEB-INF/generated_web.xml"
--             addWebXmlMappings="true"
--             outputDir="${admin.base}/WEB-INF/src/admin" />
--
-     <javac destdir="${ROOT.base}/WEB-INF/classes"
-            optimize="off"
-            debug="${compile.debug}"
-@@ -475,61 +458,90 @@
-       <include name="**" />
-     </javac>
- 
--    <mkdir dir="${jsp-examples.base}/WEB-INF/src/tags"/>
--    <copy todir="${jsp-examples.base}/WEB-INF/classes">
--      <fileset dir="${jsp-examples.base}/WEB-INF/src">
--        <include name="**/*.class" />
--      </fileset>
--    </copy>
-+  </target>
- 
--    <javac destdir="${jsp-examples.base}/WEB-INF/classes"
-+  <target name="build-webapp-precompile-admin" unless="admin.precompile.notrequired">
-+    <property name="admin.base" location="${tomcat.build}/server/webapps/admin" />
-+    <mkdir dir="${admin.base}/WEB-INF/src/admin" />
-+    <taskdef classname="org.apache.jasper.JspC" name="jasper2" >
-+      <classpath refid="jspc.classpath"/>
-+    </taskdef>
-+    <jasper2
-+             package="admin"
-+             compile="false"
-+             validateXml="false"
-+             uriroot="${admin.base}"
-+             webXmlFragment="${admin.base}/WEB-INF/generated_web.xml"
-+             addWebXmlMappings="true"
-+             outputDir="${admin.base}/WEB-INF/src/admin" />
-+    <javac destdir="${admin.base}/WEB-INF/classes"
-            optimize="off"
-            debug="${compile.debug}"
-            deprecation="${compile.deprecation}"
-            source="${compile.source}"
-            failonerror="false"
--           srcdir="${jsp-examples.base}/WEB-INF/src"
-+           srcdir="${admin.base}/WEB-INF/src"
-        excludes="**/*.smap">
-       <classpath>
-         <pathelement location="${java.home}/../lib/tools.jar"/>
-         <fileset dir="${tomcat.build}/server/lib">
-           <include name="*.jar"/>
-         </fileset>
--        <fileset dir="${jsp-examples.base}/WEB-INF/lib">
-+        <fileset dir="${admin.base}/WEB-INF/lib">
-           <include name="*.jar"/>
-         </fileset>
-         <fileset dir="${tomcat.build}/common/lib">
-           <include name="*.jar"/>
-         </fileset>
-         <pathelement location="${tomcat.build}/classes"/>
--        <pathelement location="${jsp-examples.base}/WEB-INF/classes"/>
-       </classpath>
--      <include name="**" />
--      <exclude name="tags/**" />
-+      <include name="admin/**" />
-     </javac>
--
--    <javac destdir="${admin.base}/WEB-INF/classes"
-+  </target>
-+  
-+  <target name="build-webapp-precompile-examples" unless="examples.precompile.notrequired">
-+    <property name="jsp-examples.base" location="${tomcat.build}/webapps/jsp-examples" />
-+    <mkdir dir="${jsp-examples.base}/WEB-INF/src" />
-+    <taskdef classname="org.apache.jasper.JspC" name="jasper2" >
-+      <classpath refid="jspc.classpath"/>
-+    </taskdef>
-+    <jasper2
-+             compile="false"
-+             validateXml="false"
-+             uriroot="${jsp-examples.base}"
-+         webXmlFragment="${jsp-examples.base}/WEB-INF/generated_web.xml"
-+             addWebXmlMappings="true"
-+             outputDir="${jsp-examples.base}/WEB-INF/src" />
-+    <mkdir dir="${jsp-examples.base}/WEB-INF/src/tags"/>
-+    <copy todir="${jsp-examples.base}/WEB-INF/classes">
-+      <fileset dir="${jsp-examples.base}/WEB-INF/src">
-+        <include name="**/*.class" />
-+      </fileset>
-+    </copy>
-+    <javac destdir="${jsp-examples.base}/WEB-INF/classes"
-            optimize="off"
-            debug="${compile.debug}"
-            deprecation="${compile.deprecation}"
-            source="${compile.source}"
-            failonerror="false"
--           srcdir="${admin.base}/WEB-INF/src"
-+           srcdir="${jsp-examples.base}/WEB-INF/src"
-        excludes="**/*.smap">
-       <classpath>
-         <pathelement location="${java.home}/../lib/tools.jar"/>
-         <fileset dir="${tomcat.build}/server/lib">
-           <include name="*.jar"/>
-         </fileset>
--        <fileset dir="${admin.base}/WEB-INF/lib">
-+        <fileset dir="${jsp-examples.base}/WEB-INF/lib">
-           <include name="*.jar"/>
-         </fileset>
-         <fileset dir="${tomcat.build}/common/lib">
-           <include name="*.jar"/>
-         </fileset>
-         <pathelement location="${tomcat.build}/classes"/>
-+        <pathelement location="${jsp-examples.base}/WEB-INF/classes"/>
-       </classpath>
--      <include name="admin/**" />
-+      <include name="**" />
-+      <exclude name="tags/**" />
-     </javac>
-   </target>
- 
-@@ -653,28 +665,8 @@
- 
-     <!-- <antcall target="build-commons-modeler" /> -->
-     <!-- <antcall target="build-commons-daemon"  /> -->
--
--    <antcall target="downloadgz">
--      <param name="sourcefile" value="${commons-collections-src.loc}"/>
--      <param name="destfile" value="${tomcat-dbcp.jar}" />
--    </antcall>
--    <antcall target="downloadgz">
--      <param name="sourcefile" value="${commons-pool-src.loc}"/>
--      <param name="destfile" value="${tomcat-dbcp.jar}" />
--    </antcall>
--    <antcall target="downloadgz">
--      <param name="sourcefile" value="${commons-dbcp-src.loc}"/>
--      <param name="destfile" value="${tomcat-dbcp.jar}" />
--    </antcall>
--
--    <antcall target="build-tomcat-dbcp" />
--
--    <antcall target="downloadzip">
--      <param name="sourcefile" value="${jdt.loc}"/>
--      <param name="destfile" value="${jdt.jar}"/>
--      <param name="destdir" value="${base.path}"/>
--    </antcall>
--    <antcall target="build-jasper-compiler-jdt" />
-+    <!-- <antcall target="build-tomcat-dbcp" /> -->
-+    <!-- <antcall target="build-jasper-compiler-jdt" /> -->
-   </target>
- 
-   <target name="build-tomcat-dbcp">
-@@ -754,19 +746,11 @@
-         </jar>
-       </target>
- 
--  <target name="build-webapps" depends="init"
--          description="build  webapps">
--
--    <echo>========== Building: webapps </echo>
--
--    <mkdir dir="${tomcat.build}/webapps" />
--    <mkdir dir="${tomcat.build}/server/webapps" />
-+  <target name="build-examples" unless="examples.build.notrequired">
- 
-     <!-- The build files are far too difficult to hack - just build it and copy -->
--    <ant dir="${api.home}/jsr154" target="dist">
--    </ant>
--    <ant dir="${api.home}/jsr152" target="dist">
--    </ant>
-+    <ant dir="${api.home}/jsr154" target="examples" />
-+    <ant dir="${api.home}/jsr152" target="examples" />
- 
-     <mkdir dir="${tomcat.build}/webapps/servlets-examples"/>
-     <copy todir="${tomcat.build}/webapps/servlets-examples">
-@@ -779,6 +763,18 @@
-         <exclude name="WEB-INF/tagPlugins.xml" />
-       </fileset>
-     </copy>
-+    
-+  </target>
-+
-+  <target name="build-webapps" depends="init"
-+          description="build  webapps">
-+
-+    <echo>========== Building: webapps </echo>
-+
-+    <mkdir dir="${tomcat.build}/webapps" />
-+    <mkdir dir="${tomcat.build}/server/webapps" />
-+
-+	<antcall target="build-examples" />
- 
-     <ant dir="${catalina.home}/webapps/ROOT" target="build-main">
-         <property name="webapps.build" value="${tomcat.build}/webapps" />
-@@ -850,14 +846,7 @@
-         filtering="true" />
- 
-     <!-- Build JARs for webapps classes -->
--    <mkdir dir="${tomcat.build}/server/webapps/admin/WEB-INF/lib" />
--    <jar jarfile="${tomcat.build}/server/webapps/admin/WEB-INF/lib/catalina-admin.jar"
--         index="true">
--       <fileset dir="${tomcat.build}/server/webapps/admin/WEB-INF/classes">
--          <include name="**/*.class" />
--          <include name="**/*.properties" />
--       </fileset>
--    </jar>
-+    <antcall target="fix-admin-webapp" />
-     <mkdir dir="${tomcat.build}/server/webapps/manager/WEB-INF/lib" />
-     <jar jarfile="${tomcat.build}/server/webapps/manager/WEB-INF/lib/catalina-manager.jar"
-          index="true">
-@@ -896,9 +885,20 @@
-          todir="${tomcat.build}/conf/Catalina/localhost" />
-     <copy file="${tomcat.build}/server/webapps/host-manager/host-manager.xml"
-          todir="${tomcat.build}/conf/Catalina/localhost" />
-+
-+  </target>
-+
-+  <target name="fix-admin-webapp" unless="admin.build.notrequired">
-+    <mkdir dir="${tomcat.build}/server/webapps/admin/WEB-INF/lib" />
-+    <jar jarfile="${tomcat.build}/server/webapps/admin/WEB-INF/lib/catalina-admin.jar"
-+         index="true">
-+       <fileset dir="${tomcat.build}/server/webapps/admin/WEB-INF/classes">
-+          <include name="**/*.class" />
-+          <include name="**/*.properties" />
-+       </fileset>
-+    </jar>
-     <copy file="${tomcat.build}/server/webapps/admin/admin.xml"
-          todir="${tomcat.build}/conf/Catalina/localhost" />
--
-   </target>
- 
-   <!-- ====================== Embed target =================== -->
-@@ -1041,11 +1041,11 @@
-   <!-- ====================== Compat target =================== -->
- 
-   <target name="compat" description="Create compatibility binaries for JREs before 1.5" >
--
-+    <!--
-     <copy todir="${tomcat.compat}/common/endorsed" file="${xercesImpl.jar}"/>
-     <copy todir="${tomcat.compat}/common/endorsed" file="${xml-apis.jar}"/>
-     <copy tofile="${tomcat.compat}/bin/jmx.jar" file="${jmx.jar}"/>
--
-+    -->
-   </target>
- 
-   <!-- ====================== DEPLOY: Deploy Components =================== -->
-@@ -1092,8 +1092,9 @@
-     <!-- Copy Unix JSVC from commons-daemon -->
-     <copy file="${commons-daemon.jsvc.tar.gz}"
-         tofile="${tomcat.dist}/bin/jsvc.tar.gz" />
-+    <!--
-     <copy todir="${tomcat.build}/bin" file="${commons-daemon.jar}" />
--
-+    -->
-     <echo>Target: Webapps precompilation ...</echo>
- 
-     <antcall target="build-admin"/>
-@@ -1188,10 +1189,11 @@
-    description="Catalina Tests" depends="dist-tester">
- 
-     <!-- For Java 1.4 -->
-+    <!--
-     <copy file="${jmx.jar}" tofile="${tomcat.build}/bin/jmx.jar" />
-     <copy todir="${tomcat.build}/common/endorsed" file="${xercesImpl.jar}"/>
-     <copy todir="${tomcat.build}/common/endorsed" file="${xml-apis.jar}"/>
--
-+    -->
-     <parallel>
- 
-         <java classname="LauncherBootstrap" fork="yes">
-@@ -1871,10 +1873,10 @@
- 
-     <!-- commons-digester needs ../LICENSE -->
-     <!-- 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}"/>
-@@ -1916,7 +1918,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>
-@@ -1937,7 +1938,6 @@
-       <param name="destfile" value="${commons-launcher.jar}"/>
-     </antcall>
- 
--    <!--
-     <antcall target="downloadgz">
-       <param name="sourcefile" value="${commons-pool.loc}"/>
-       <param name="destfile" value="${commons-pool.jar}"/>
-@@ -1948,7 +1948,6 @@
-       <param name="destfile" value="${commons-dbcp.jar}"/>
-       <param name="destdir" value="${base.path}"/>
-     </antcall>
--    -->
- 
-     <antcall target="downloadgz">
-       <param name="sourcefile" value="${commons-httpclient.loc}"/>
-@@ -1976,7 +1975,7 @@
-       <param name="destfile" value="${tomcat-native.tar.gz}"/>
-       <param name="destdir" value="${tomcat-native.home}"/>
-     </antcall>
--
-+    -->
-     <!-- Build the dependencies that are not yet released -->
-     <antcall target="build-depends"/>
- 
diff --git a/www-servers/tomcat/files/digest-tomcat-5.5.22_pre-r1 b/www-servers/tomcat/files/digest-tomcat-5.5.22_pre-r1
deleted file mode 100644
index 9f11a897bf7a..000000000000
--- a/www-servers/tomcat/files/digest-tomcat-5.5.22_pre-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1af391c1647752d4fd8e2c3892e1be68 apache-tomcat-5.5.22-src.tar.gz 4888257
-RMD160 39a5da86cce996c7c41baddfab825e5bfbd334db apache-tomcat-5.5.22-src.tar.gz 4888257
-SHA256 206fa6040b06cc98d705afe3594d588e2556dc15eb73083d4c1da146b997216a apache-tomcat-5.5.22-src.tar.gz 4888257
diff --git a/www-servers/tomcat/files/digest-tomcat-5.5.23 b/www-servers/tomcat/files/digest-tomcat-5.5.23
new file mode 100644
index 000000000000..e0e59f68fbb2
--- /dev/null
+++ b/www-servers/tomcat/files/digest-tomcat-5.5.23
@@ -0,0 +1,3 @@
+MD5 362d1d8b15dc09882440dcab8c592dd7 apache-tomcat-5.5.23-src.tar.gz 4895919
+RMD160 fe669f6b864fd7dcf4ad74dad22a0256e5417005 apache-tomcat-5.5.23-src.tar.gz 4895919
+SHA256 e2f7ce250643349507b511a5ea96df7364030a061a8f4d5b71d8b5a099e2b6bd apache-tomcat-5.5.23-src.tar.gz 4895919
diff --git a/www-servers/tomcat/tomcat-5.5.22_pre-r1.ebuild b/www-servers/tomcat/tomcat-5.5.23.ebuild
similarity index 93%
rename from www-servers/tomcat/tomcat-5.5.22_pre-r1.ebuild
rename to www-servers/tomcat/tomcat-5.5.23.ebuild
index a8505390b6a9..08d19b5d2db6 100644
--- a/www-servers/tomcat/tomcat-5.5.22_pre-r1.ebuild
+++ b/www-servers/tomcat/tomcat-5.5.23.ebuild
@@ -1,6 +1,6 @@
 # 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.22_pre-r1.ebuild,v 1.2 2007/02/27 18:54:16 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.23.ebuild,v 1.1 2007/03/09 17:33:04 wltjr Exp $
 
 WANT_ANT_TASKS="ant-trax"
 
@@ -8,11 +8,9 @@ inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="Tomcat Servlet-2.4/JSP-2.0 Container"
 
-MY_P="apache-${P/_pre/}-src"
-MY_PV="${PV/_pre/}"
+MY_P="apache-${P}-src"
 SLOT="5.5"
-#SRC_URI="mirror://apache/${PN}/${PN}-5/v${PV}/src/${MY_P}.tar.gz"
-SRC_URI="http://people.apache.org/~fhanik/${PN}/${PN}-5.5/v${MY_PV}/src/${MY_P}.tar.gz"
+SRC_URI="mirror://apache/${PN}/${PN}-5/v${PV}/src/${MY_P}.tar.gz"
 HOMEPAGE="http://tomcat.apache.org/"
 KEYWORDS="~amd64 -ppc -ppc64 ~x86 ~x86-fbsd"
 LICENSE="Apache-2.0"
@@ -31,7 +29,7 @@ RDEPEND="=dev-java/eclipse-ecj-3.2*
 	>=dev-java/commons-el-1.0
 	>=dev-java/commons-launcher-0.9
 	>=dev-java/commons-logging-1.0.4
-	>=dev-java/commons-modeler-2.0
+	>=dev-java/commons-modeler-1.1
 	>=dev-java/commons-pool-1.2
 	>=dev-java/junit-3.8.1
 	>=dev-java/log4j-1.2.9
@@ -70,17 +68,17 @@ src_unpack() {
 	cd ${S}
 
 	local PATCHES="
-		mainbuild-xml.patch
-		tomcatbuild-xml.patch
-		catalinabuild-xml.patch
-		jasperbuild-xml.patch
+		main_build_xml.patch
+		tomcat_build_xml.patch
+		catalina_build_xml.patch
+		jasper_build_xml.patch
 	"
 	for patch in ${PATCHES}; do
-		epatch "${FILESDIR}/${MY_PV}/${patch}"
+		epatch "${FILESDIR}/${SLOT}/${patch}"
 	done
 	if use examples; then
-		epatch "${FILESDIR}/${MY_PV}/jsr152_examples_build-xml.patch"
-		epatch "${FILESDIR}/${MY_PV}/jsr154_examples_build-xml.patch"
+		epatch "${FILESDIR}/${SLOT}/jsr152_examples_build_xml.patch"
+		epatch "${FILESDIR}/${SLOT}/jsr154_examples_build_xml.patch"
 	fi
 
 	# avoid packed jars :-)
@@ -166,8 +164,8 @@ src_install() {
 	cd ${S}/build/build
 
 	# init.d, conf.d
-	newinitd ${FILESDIR}/${MY_PV}/tomcat.init ${TOMCAT_NAME}
-	newconfd ${FILESDIR}/${MY_PV}/tomcat.conf ${TOMCAT_NAME}
+	newinitd ${FILESDIR}/${SLOT}/tomcat.init ${TOMCAT_NAME}
+	newconfd ${FILESDIR}/${SLOT}/tomcat.conf ${TOMCAT_NAME}
 
 	# create dir structure
 	diropts -m755 -o tomcat -g tomcat