Removed eant || die from ebuilds. Sync 5.0.28 ebuild with one in overlay that is more current. Removed older versions of 5.5.17 ebuild.

Package-Manager: portage-2.1.1_rc1-r5

7 files changed, 703 insertions, 23 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index e4da78cbb3bc..410755588e63 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.58 2006/09/09 14:33:24 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.59 2006/09/09 21:20:21 wltjr Exp $
+
+*tomcat-5.5.17-r4 (09 Sep 2006)
+*tomcat-5.0.28-r13 (09 Sep 2006)
+
+  09 Sep 2006; <wlt@gentoo.org> files/5.0.28/tomcat.conf,
+  files/5.0.28/tomcat.init, +tomcat-5.0.28-r13.ebuild,
+  -tomcat-5.5.17-r1.ebuild, -tomcat-5.5.17-r2.ebuild,
+  +tomcat-5.5.17-r4.ebuild:
+  Removed eant || die from ebuilds. Sync 5.0.28 ebuild with one in overlay
+  that is more current. Removed older versions of 5.5.17 ebuild.
 
   09 Sep 2006; Petteri Räty <betelgeuse@gentoo.org>
   tomcat-5.5.17-r3.ebuild:
diff --git a/www-servers/tomcat/files/5.0.28/tomcat.conf b/www-servers/tomcat/files/5.0.28/tomcat.conf
index c2e686472f45..8aef879d0cd8 100644
--- a/www-servers/tomcat/files/5.0.28/tomcat.conf
+++ b/www-servers/tomcat/files/5.0.28/tomcat.conf
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.0.28/tomcat.conf,v 1.4 2005/09/18 14:10:44 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.0.28/tomcat.conf,v 1.5 2006/09/09 21:20:21 wltjr Exp $
 
 # JVM Runtime
 # Using the default setting, it will determine your JVM from the system-vm
@@ -8,36 +8,32 @@
 # 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`
+JAVA_HOME=`java-config --jre-home`
 
 # (Optional) Java runtime options used when the "start", "stop", or "run"
 # commands are executed.
 # JAVA_OPTS=""
 
-# profile
-PROFILE=default
-
 # Where your web applications are located
-CATALINA_HOME=/usr/share/tomcat-5
-CATALINA_BASE=/var/lib/tomcat-5/${PROFILE}
+CATALINA_HOME=/usr/share/tomcat-5/
+CATALINA_BASE=/var/lib/tomcat-5/
 
 # Tomcat's User
 CATALINA_USER=tomcat
 
 # Location of the Tomcat JARs and classes
-CATALINA_LIBDIR=/usr/share/tomcat-5/server/lib
+CATALINA_LIBDIR=/usr/share/tomcat-5/server/lib/
 
 # The CLASSPATH for Tomcat to use, plus any others you need.
-#CLASSPATH=${CLASSPATH}:${CATALINA_LIBDIR}
+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/${PROFILE}"
+CATALINA_TMPDIR="/var/tmp/tomcat-5/"
 
 # 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
@@ -50,7 +46,7 @@ TOMCAT_STOP="stop"
 
 # (Optional) Java runtime options used when the "start", "stop", or "run" 
 # commands are executed.
-#CATALINA_OPTS="-Dlog4j.configuration=file:/etc/tomcat-5/log4j.properties"
+# CATALINA_OPTS=""
 
 # Java Platform Debugger Architecture (JPDA)
 # http://java.sun.com/products/jpda/
diff --git a/www-servers/tomcat/files/5.0.28/tomcat.init b/www-servers/tomcat/files/5.0.28/tomcat.init
index 2bce4eb1328f..7f8e7d4c6157 100644
--- a/www-servers/tomcat/files/5.0.28/tomcat.init
+++ b/www-servers/tomcat/files/5.0.28/tomcat.init
@@ -1,26 +1,80 @@
 #!/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.6 2005/11/14 20:17:58 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.0.28/tomcat.init,v 1.7 2006/09/09 21:20:21 wltjr Exp $
+
+init_env_vars() {
+	# Set some sane defaults
+	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
+	CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar:${CATALINA_HOME}/bin/commons-logging-api.jar"
+
+	# 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 "
+}
+
+start-helper() {
+	local executor=${1}
+	shift
+	local arguments="--start --quiet --background --chuid tomcat:tomcat \
+		--make-pidfile --pidfile /var/run/tomcat.pid"
+	start-stop-daemon ${arguments} --exec ${executor} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${TOMCAT_START}
+	return $?
+}
 
 depend() {
-	use dns logger mysql postgresql net
+	use dns logger net
 }
 
 start()	{
 	ebegin "Starting Tomcat"
-	cd ${CATALINA_BASE}/webapps
-	start-stop-daemon --start --quiet --chuid tomcat:tomcat \
-	          --make-pidfile --pidfile /var/run/tomcat.pid \
-			  --exec ${CATALINA_HOME}/bin/catalina.sh \
-			  --background -- ${TOMCAT_START}
+	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=/etc/tomcat-5/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=/etc/tomcat-5/catalina.policy
+	else
+		eerror "Invalid TOMCAT_START variable value, or one is not set"
+		eerror "Please see /etc/conf.d/tomcat-5 for more information"
+		eend 1
+	fi
 	eend $?
 }
 
 stop()	{
 	ebegin "Stopping Tomcat"
-	start-stop-daemon --start --quiet --chuid tomcat:tomcat \
-			  --exec ${CATALINA_HOME}/bin/catalina.sh \
-		 	  --background -- ${TOMCAT_STOP}
+	init_env_vars
+	start-stop-daemon --stop --quiet \
+	       	--make-pidfile --pidfile /var/run/tomcat.pid \
+			--exec $JAVA_HOME/bin/java -- ${OPTS_CP} ${CATALINA_ARGS} stop
 	eend $?
 }
diff --git a/www-servers/tomcat/files/digest-tomcat-5.0.28-r13 b/www-servers/tomcat/files/digest-tomcat-5.0.28-r13
new file mode 100644
index 000000000000..6d150362b56a
--- /dev/null
+++ b/www-servers/tomcat/files/digest-tomcat-5.0.28-r13
@@ -0,0 +1,3 @@
+MD5 8115f86558aef8a17543397e7f9d9469 jakarta-tomcat-5.0.28-src.tar.gz 3565766
+RMD160 22c5e60b2c5009dc33a62edcefa6760d82da859b jakarta-tomcat-5.0.28-src.tar.gz 3565766
+SHA256 bbf584b3c376d23d92b1a0d306eb8f3729cea244c7a850f81d2527a7df6d20fc jakarta-tomcat-5.0.28-src.tar.gz 3565766
diff --git a/www-servers/tomcat/files/digest-tomcat-5.5.17-r4 b/www-servers/tomcat/files/digest-tomcat-5.5.17-r4
new file mode 100644
index 000000000000..51d603367aa1
--- /dev/null
+++ b/www-servers/tomcat/files/digest-tomcat-5.5.17-r4
@@ -0,0 +1,3 @@
+MD5 afedf090888029b19a1bebc471264105 apache-tomcat-5.5.17-src.tar.gz 4282022
+RMD160 004d87bc64b32eee42f9979d2fdbb36836b69015 apache-tomcat-5.5.17-src.tar.gz 4282022
+SHA256 295c9fa64d9aa81d5c836b694804d8d57fcfdbc76b9889a044852aa73f2c3ad8 apache-tomcat-5.5.17-src.tar.gz 4282022
diff --git a/www-servers/tomcat/tomcat-5.0.28-r13.ebuild b/www-servers/tomcat/tomcat-5.0.28-r13.ebuild
new file mode 100644
index 000000000000..919f2fcec913
--- /dev/null
+++ b/www-servers/tomcat/tomcat-5.0.28-r13.ebuild
@@ -0,0 +1,292 @@
+# Copyright 1999-2006 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-r13.ebuild,v 1.1 2006/09/09 21:20:21 wltjr Exp $
+
+inherit eutils java-pkg
+
+DESCRIPTION="Apache Servlet-2.4/JSP-2.0 Container"
+
+SLOT="${PV/.*}"
+SRC_URI="mirror://apache/tomcat/tomcat-${SLOT}/v${PV}/src/jakarta-${P}-src.tar.gz"
+HOMEPAGE="http://tomcat.apache.org/"
+KEYWORDS="~x86 ~amd64 -ppc64"
+LICENSE="Apache-2.0"
+#only one accepted revision of struts to force upgrading because of slot changes
+RDEPEND=">=virtual/jdk-1.4
+	=dev-java/commons-beanutils-1.7*
+	>=dev-java/commons-collections-3.1
+	>=dev-java/commons-daemon-1.0
+	>=dev-java/commons-dbcp-1.2.1
+	>=dev-java/commons-digester-1.5
+	>=dev-java/commons-fileupload-1.0
+	=dev-java/commons-httpclient-2*
+	>=dev-java/commons-el-1.0
+	>=dev-java/commons-launcher-0.9
+	>=dev-java/commons-logging-1.0.4
+	>=dev-java/commons-modeler-1.1
+	>=dev-java/commons-pool-1.2
+	~dev-java/jaxen-1.0
+	>=dev-java/junit-3.8.1
+	dev-java/sun-jmx
+	>=dev-java/log4j-1.2.8
+	=dev-java/jakarta-regexp-1.3*
+	>=dev-java/saxpath-1.0
+	~dev-java/servletapi-2.4
+	=dev-java/struts-1.1-r4
+	dev-java/sun-jaf-bin
+	>=dev-java/xerces-2.6.2-r1
+	=dev-java/xml-commons-external-1.3*
+	jikes? ( dev-java/jikes )"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}
+	sys-apps/sed
+	dev-java/ant"
+IUSE="doc examples source jikes"
+
+S=${WORKDIR}/jakarta-${P}-src
+
+TOMCAT_HOME="/usr/share/${PN}-${SLOT}"
+TOMCAT_NAME="${PN}-${SLOT}"
+WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps"
+
+pkg_setup() {
+	# new user for tomcat
+	enewgroup tomcat
+	enewuser tomcat -1 -1 /dev/null tomcat
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	local PATCHES="
+		build.xml-01.patch
+		build.xml-02.patch
+	"
+	for patch in ${PATCHES}; do
+		epatch "${FILESDIR}/${PV}/${patch}"
+	done
+
+	use jikes && epatch ${FILESDIR}/${PV}/jikes.diff
+
+	# avoid packed jars :-)
+	mkdir -p ${S}/jakarta-tomcat-5/build/common
+	cd ${S}/jakarta-tomcat-5/build
+
+	mkdir ./bin && cd ./bin
+	java-pkg_jar-from commons-logging commons-logging-api.jar
+	java-pkg_jar-from sun-jmx jmxri.jar jmx.jar
+	java-pkg_jar-from commons-daemon
+
+	mkdir ../common/endorsed && cd ../common/endorsed
+	java-pkg_jar-from xml-commons-external-1.3 xml-apis.jar
+	java-pkg_jar-from xerces-2 xercesImpl.jar
+
+	mkdir ../lib && cd ../lib
+	java-pkg_jar-from ant-core
+	java-pkg_jar-from commons-collections
+	java-pkg_jar-from commons-dbcp
+	java-pkg_jar-from commons-el
+	java-pkg_jar-from commons-pool
+	java-pkg_jar-from servletapi-2.4
+
+	mkdir -p ../../server/lib && cd ../../server/lib
+	java-pkg_jar-from commons-beanutils-1.7 commons-beanutils.jar
+	java-pkg_jar-from commons-digester
+	java-pkg_jar-from commons-fileupload
+	java-pkg_jar-from commons-modeler
+	java-pkg_jar-from jakarta-regexp-1.3
+}
+
+src_compile(){
+	local antflags="-Dbase.path=${T}"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+
+	antflags="${antflags} -Dactivation.jar=$(java-config -p sun-jaf-bin)"
+	antflags="${antflags} -Dcommons-collections.jar=$(java-config -p commons-collections)"
+	antflags="${antflags} -Dcommons-daemon.jar=$(java-config -p commons-daemon)"
+	antflags="${antflags} -Dcommons-digester.jar=$(java-config -p commons-digester)"
+	antflags="${antflags} -Dcommons-dbcp.jar=$(java-config -p commons-dbcp)"
+	antflags="${antflags} -Dcommons-el.jar=$(java-config -p commons-el)"
+	antflags="${antflags} -Dcommons-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} -Dcommons-launcher.jar=$(java-config -p commons-launcher)"
+	antflags="${antflags} -Dcommons-modeler.jar=$(java-config -p commons-modeler)"
+	antflags="${antflags} -Djunit.jar=$(java-config -p junit)"
+	antflags="${antflags} -Dlog4j.jar=$(java-config -p log4j)"
+	antflags="${antflags} -Dregexp.jar=$(java-config -p jakarta-regexp-1.3)"
+	antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts-1.1 struts.jar)"
+	antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.7 commons-beanutils.jar)"
+	antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)"
+	antflags="${antflags} -Dcommons-logging-api.jar=$(java-pkg_getjar commons-logging commons-logging-api.jar)"
+	antflags="${antflags} -Djaxen.jar=$(java-pkg_getjars jaxen)"
+	antflags="${antflags} -Djmx.jar=$(java-pkg_getjar sun-jmx jmxri.jar)"
+	antflags="${antflags} -Djmx-tools.jar=$(java-pkg_getjar sun-jmx jmxtools.jar)"
+	antflags="${antflags} -Dsaxpath.jar=$(java-pkg_getjar saxpath saxpath.jar)"
+	antflags="${antflags} -DxercesImpl.jar=$(java-pkg_getjar xerces-2 xercesImpl.jar)"
+	antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xml-commons-external-1.3 xml-apis.jar)"
+	antflags="${antflags} -Dstruts.home=/usr/share/struts-1.1/"
+
+	ant ${antflags}
+
+}
+src_install() {
+	cd ${S}/jakarta-tomcat-5/build
+
+	# init.d, conf.d
+	newinitd ${FILESDIR}/${PV}/tomcat.init ${TOMCAT_NAME}
+	newconfd ${FILESDIR}/${PV}/tomcat.conf ${TOMCAT_NAME}
+
+	if use jikes; then
+		sed -e "\cCATALINA_OPTScaCATALINA_OPTS=\"-Dbuild.compiler.emacs=true\"" \
+			-i ${D}/etc/conf.d/${TOMCAT_NAME}
+	fi
+
+	# create dir structure
+	diropts -m755 -o tomcat -g tomcat
+	dodir /usr/share/${TOMCAT_NAME}
+	keepdir /var/log/${TOMCAT_NAME}/
+	keepdir /var/tmp/${TOMCAT_NAME}/
+	keepdir /var/run/${TOMCAT_NAME}/
+
+	local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/
+	dodir   ${CATALINA_BASE}
+	keepdir ${CATALINA_BASE}/shared/lib
+	keepdir ${CATALINA_BASE}/shared/classes
+
+	dodir   /etc/${TOMCAT_NAME}
+	fperms  750 /etc/${TOMCAT_NAME}
+
+	diropts -m0755
+
+	# we don't need dos scripts
+	rm -f bin/*.bat
+
+	# copy the manager and admin context's to the right position
+	mkdir -p conf/Catalina/localhost
+	cp ${S}/jakarta-tomcat-catalina/webapps/admin/admin.xml \
+		conf/Catalina/localhost
+	cp ${S}/jakarta-tomcat-catalina/webapps/manager/manager.xml \
+		conf/Catalina/localhost
+
+	# make the jars available via java-config -p and jar-from, etc
+	base=$(pwd)
+	libdirs="common/lib server/lib"
+	for dir in ${libdirs}
+	do
+		cd ${dir}
+
+		for jar in *.jar;
+		do
+			# replace the file with a symlink
+			if [ ! -L ${jar} ]; then
+				java-pkg_dojar ${jar}
+				rm -f ${jar}
+				ln -s ${DESTTREE}/share/${TOMCAT_NAME}/lib/${jar} ${jar}
+			fi
+		done
+
+		cd ${base}
+	done
+
+	# replace a packed struts.jar
+	cd server/webapps/admin/WEB-INF/lib
+	rm -f struts.jar
+	java-pkg_jar-from struts-1.1 struts.jar
+	cd ${base}
+
+	# replace the default pw with a random one, see #92281
+	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
+	sed -e s:SHUTDOWN:${randpw}: -i conf/{server,server-minimal}.xml
+
+	# copy over the directories
+	chown -R tomcat:tomcat webapps/* conf/*
+	cp -pR conf/* ${D}/etc/${TOMCAT_NAME} || die "failed to copy conf"
+	cp -R bin common server ${D}/usr/share/${TOMCAT_NAME} || die "failed to copy"
+
+	keepdir               ${WEBAPPS_DIR}
+	set_webapps_perms     ${D}/${WEBAPPS_DIR}
+
+	# if the useflag is set, copy over the examples
+	if use examples; then
+		cp -p ../RELEASE-NOTES webapps/ROOT/RELEASE-NOTES.txt
+		cp -pr webapps/{tomcat-docs,jsp-examples,servlets-examples,ROOT,webdav} \
+			${D}${CATALINA_BASE}/webapps
+	fi
+
+	# symlink the directories to make CATALINA_BASE possible
+	dosym /etc/${TOMCAT_NAME} ${CATALINA_BASE}/conf
+	dosym /var/log/${TOMCAT_NAME} ${CATALINA_BASE}/logs
+	dosym /var/tmp/${TOMCAT_NAME} ${CATALINA_BASE}/temp
+	dosym /var/run/${TOMCAT_NAME} ${CATALINA_BASE}/work
+
+	cp ${FILESDIR}/${PV}/log4j.properties ${D}/etc/${TOMCAT_NAME}/
+	chown tomcat:tomcat ${D}/etc/${TOMCAT_NAME}/log4j.properties
+
+	dodoc  ${S}/build/{RELEASE-NOTES,RUNNING.txt}
+	fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
+}
+
+pkg_postinst() {
+	#due to previous ebuild bloopers, make sure everything is correct
+	chown root:root /etc/init.d/${TOMCAT_NAME}
+	chown root:root /etc/conf.d/${TOMCAT_NAME}
+
+	einfo
+	ewarn " This ebuild implements a new filesystem layout for tomcat"
+	ewarn " please read http://www.gentoo.org/proj/en/java/tomcat-guide.xml"
+	ewarn " for more information!."
+	einfo
+	einfo " Please file any bugs at http://bugs.gentoo.org/ or else it"
+	einfo " may not get seen.  Thank you."
+	einfo
+
+#	einfo "Run emerge --config =${PF}"
+#	einfo "to configure Tomcat if you need to for example"
+#	einfo "change the home directory of the Tomcat user."
+}
+
+#helpers
+set_webapps_perms() {
+	chown  tomcat:tomcat ${1} || die "Failed to change owner off ${1}."
+	chmod  750           ${1} || die "Failed to change permissions off ${1}."
+}
+
+pkg_config() {
+	# Better suggestions are welcome
+	local currentdir="$(getent passwd tomcat | gawk -F':' '{ print $6 }')"
+
+	einfo "The default home directory for Tomcat is /dev/null."
+	einfo "You need to change it if your applications needs it to"
+	einfo "be an actual directory. Current home directory:"
+	einfo "${currentdir}"
+	einfo ""
+	einfo "Do you want to change it [yes/no]?"
+
+	local answer
+	read answer
+
+	if [[ "${answer}" == "yes" ]]; then
+		einfo ""
+		einfo "Suggestions:"
+		einfo "${WEBAPPS_DIR}"
+		einfo ""
+		einfo "If you want to suggest a directory, file a bug to"
+		einfo "http://bugs.gentoo.org"
+		einfo ""
+		einfo "Enter home directory:"
+
+		local homedir
+		read homedir
+
+		einfo ""
+		einfo "Setting home directory to: ${homedir}"
+
+		/usr/sbin/usermod -d"${homedir}" tomcat
+
+		einfo "You can run emerge --config =${PF}"
+		einfo "again to change to homedir"
+		einfo "at any time."
+	fi
+}
diff --git a/www-servers/tomcat/tomcat-5.5.17-r4.ebuild b/www-servers/tomcat/tomcat-5.5.17-r4.ebuild
new file mode 100644
index 000000000000..12d444d3a824
--- /dev/null
+++ b/www-servers/tomcat/tomcat-5.5.17-r4.ebuild
@@ -0,0 +1,322 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.17-r4.ebuild,v 1.1 2006/09/09 21:20:21 wltjr Exp $
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Apache Servlet-2.4/JSP-2.0 Container"
+
+MY_P="apache-${P}-src"
+SLOT="5.5"
+SRC_URI="mirror://apache/${PN}/${PN}-5/v${PV}/src/${MY_P}.tar.gz"
+HOMEPAGE="http://jakarta.apache.org/tomcat"
+KEYWORDS="~amd64 ~x86"
+LICENSE="Apache-2.0"
+
+RDEPEND="=dev-java/eclipse-ecj-3.1*
+	=dev-java/commons-beanutils-1.7*
+	>=dev-java/commons-collections-3.1
+	>=dev-java/commons-daemon-1.0.1
+	>=dev-java/commons-dbcp-1.2.1
+	>=dev-java/commons-digester-1.7
+	>=dev-java/commons-fileupload-1.0
+	>=dev-java/commons-el-1.0
+	>=dev-java/commons-launcher-0.9
+	>=dev-java/commons-logging-1.0.4
+	>=dev-java/commons-modeler-1.1
+	>=dev-java/commons-pool-1.2
+	>=dev-java/log4j-1.2.9
+	~dev-java/servletapi-2.4
+	=dev-java/struts-1.2*
+	dev-java/sun-javamail-bin
+	java5? ( >=virtual/jre-1.5 )
+	!java5? (
+		=virtual/jre-1.4*
+		>=dev-java/commons-httpclient-2.0
+		=dev-java/gnu-jaf-1*
+		~dev-java/jaxen-1.0
+		>=dev-java/junit-3.8.1
+		=dev-java/mx4j-3*
+		>=dev-java/saxpath-1.0
+		>=dev-java/xerces-2.7.1
+	   	=dev-java/xml-commons-external-1.3*
+	   )"
+DEPEND="java5? ( >=virtual/jdk-1.5 )
+	!java5? ( =virtual/jdk-1.4* )
+	${RDEPEND}
+	sys-apps/sed
+	dev-java/ant"
+IUSE="java5 doc examples source test"
+
+if ! use java5; then
+	JAVA_PKG_NV_DEPEND="=virtual/jdk-1.4*"
+else
+	JAVA_PKG_NV_DEPEND="=virtual/jdk-1.5*"
+fi
+
+S=${WORKDIR}/${MY_P}
+
+TOMCAT_HOME="/usr/share/${PN}-${SLOT}"
+TOMCAT_NAME="${PN}-${SLOT}"
+WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps"
+
+pkg_setup() {
+	# new user for tomcat
+	enewgroup tomcat
+	enewuser tomcat -1 -1 /dev/null tomcat
+
+	if use java5; then
+		JAVA_PKG_WANT_SOURCE="1.5"
+		JAVA_PKG_WANT_TARGET="1.5"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	local PATCHES="
+		mainbuild-xml.patch
+		tomcatbuild-xml.patch
+		catalinabuild-xml.patch
+		jasperbuild-xml.patch
+	"
+	for patch in ${PATCHES}; do
+		epatch "${FILESDIR}/${PV}/${patch}"
+	done
+	if ! use doc; then
+		epatch "${FILESDIR}/${PV}/tomcatbuild-xml-docs.patch"
+	fi
+	if ! use examples; then
+		epatch "${FILESDIR}/${PV}/tomcatbuild-xml-examples.patch"
+		epatch "${FILESDIR}/${PV}/jsr152build-xml-examples.patch"
+		epatch "${FILESDIR}/${PV}/jsr154build-xml-examples.patch"
+	fi
+
+	# avoid packed jars :-)
+	mkdir -p ${S}/build/build/common
+	cd ${S}/build/build
+
+	mkdir ./bin && cd ./bin
+	java-pkg_jar-from commons-logging commons-logging-api.jar
+	java-pkg_jar-from commons-daemon
+	if ! use java5; then
+		java-pkg_jar-from mx4j-3.0 mx4j.jar jmx.jar
+		java-pkg_jar-from mx4j-3.0 mx4j-rjmx.jar jmx-remote.jar
+	fi
+
+	if ! use java5; then
+		mkdir ${S}/build/build/common/endorsed && cd ${S}/build/build/common/endorsed
+		java-pkg_jar-from xml-commons-external-1.3 xml-apis.jar
+		java-pkg_jar-from xerces-2 xercesImpl.jar
+	fi
+
+	mkdir ${S}/build/build/common/lib && cd ${S}/build/build/common/lib
+	java-pkg_jar-from ant-core
+	java-pkg_jar-from commons-collections
+	java-pkg_jar-from commons-dbcp
+	java-pkg_jar-from commons-el
+	java-pkg_jar-from commons-pool
+	java-pkg_jar-from servletapi-2.4
+
+	mkdir -p ${S}/build/build/server/lib && cd ${S}/build/build/server/lib
+	java-pkg_jar-from commons-beanutils-1.7 commons-beanutils.jar
+	java-pkg_jar-from commons-digester
+	java-pkg_jar-from commons-fileupload
+	java-pkg_jar-from commons-modeler
+}
+
+src_compile(){
+	local antflags="-Dbase.path=${T}"
+
+	antflags="${antflags} -Dcommons-collections.jar=$(java-config -p commons-collections)"
+	antflags="${antflags} -Dcommons-daemon.jar=$(java-config -p commons-daemon)"
+	antflags="${antflags} -Dcommons-digester.jar=$(java-config -p commons-digester)"
+	antflags="${antflags} -Dcommons-dbcp.jar=$(java-config -p commons-dbcp)"
+	antflags="${antflags} -Dcommons-el.jar=$(java-config -p commons-el)"
+	antflags="${antflags} -Dcommons-pool.jar=$(java-config -p commons-pool)"
+	antflags="${antflags} -Dcommons-fileupload.jar=$(java-config -p commons-fileupload)"
+	antflags="${antflags} -Dcommons-launcher.jar=$(java-config -p commons-launcher)"
+	antflags="${antflags} -Dcommons-modeler.jar=$(java-config -p commons-modeler)"
+	antflags="${antflags} -Djunit.jar=$(java-config -p junit)"
+	antflags="${antflags} -Djdt.jar=$(java-pkg_getjar eclipse-ecj-3.1 ecj.jar)"
+	antflags="${antflags} -Dlog4j.jar=$(java-config -p log4j)"
+	antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts-1.2 struts.jar)"
+	antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.7 commons-beanutils.jar)"
+	antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)"
+	antflags="${antflags} -Dcommons-logging-api.jar=$(java-pkg_getjar commons-logging commons-logging-api.jar)"
+	antflags="${antflags} -Dmail.jar=$(java-pkg_getjar sun-javamail-bin mail.jar)"
+	antflags="${antflags} -Dstruts.home=/usr/share/struts"
+	antflags="${antflags} -Djasper.home=${S}/jasper"
+	if ! use java5; then
+		antflags="${antflags} -Dcommons-httpclient.jar=$(java-config -p commons-httpclient)"
+		antflags="${antflags} -Dactivation.jar=$(java-config -p gnu-jaf-1)"
+		antflags="${antflags} -Djaxen.jar=$(java-pkg_getjar jaxen jaxen-full.jar)"
+		antflags="${antflags} -Djmx.jar=$(java-pkg_getjar mx4j-3.0 mx4j.jar)"
+		antflags="${antflags} -Djmx-remote.jar=$(java-pkg_getjar mx4j-3.0 mx4j-rjmx.jar)"
+		antflags="${antflags} -Dsaxpath.jar=$(java-pkg_getjar saxpath saxpath.jar)"
+		antflags="${antflags} -DxercesImpl.jar=$(java-pkg_getjar xerces-2 xercesImpl.jar)"
+		antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xerces-2 xml-apis.jar)"
+	fi
+
+	eant ${antflags}
+
+}
+
+src_install() {
+	cd ${S}/build/build
+
+	# init.d, conf.d
+	newinitd ${FILESDIR}/${PV}/tomcat.init ${TOMCAT_NAME}
+	newconfd ${FILESDIR}/${PV}/tomcat.conf ${TOMCAT_NAME}
+
+	# create dir structure
+	diropts -m755 -o tomcat -g tomcat
+	dodir /usr/share/${TOMCAT_NAME}
+	keepdir /var/log/${TOMCAT_NAME}/
+	keepdir /var/tmp/${TOMCAT_NAME}/
+	keepdir /var/run/${TOMCAT_NAME}/
+
+	local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/
+	dodir   ${CATALINA_BASE}
+	keepdir ${CATALINA_BASE}/shared/lib
+	keepdir ${CATALINA_BASE}/shared/classes
+
+	keepdir /usr/share/${TOMCAT_NAME}/${CATALIA_HOME}/common/lib
+
+	dodir   /etc/${TOMCAT_NAME}
+	fperms  750 /etc/${TOMCAT_NAME}
+
+	diropts -m0755
+
+	# we don't need dos scripts
+	rm -f bin/*.bat
+
+	# copy the manager and admin context's to the right position
+	mkdir -p conf/Catalina/localhost
+	cp ${S}/container/webapps/admin/admin.xml \
+		conf/Catalina/localhost
+	cp ${S}/container/webapps/manager/manager.xml \
+		conf/Catalina/localhost
+
+	# make the jars available via java-config -p and jar-from, etc
+	base=$(pwd)
+	libdirs="common/lib server/lib"
+	for dir in ${libdirs}
+	do
+		cd ${dir}
+
+		for jar in *.jar;
+		do
+			# replace the file with a symlink
+			if [ ! -L ${jar} ]; then
+				java-pkg_dojar ${jar}
+				rm -f ${jar}
+				ln -s ${DESTTREE}/share/${TOMCAT_NAME}/lib/${jar} ${jar}
+			fi
+		done
+
+		cd ${base}
+	done
+
+	# replace a packed struts.jar
+	cd server/webapps/admin/WEB-INF/lib
+	rm -f struts.jar
+	java-pkg_jar-from struts-1.2 struts.jar
+	cd ${base}
+
+	# replace the default pw with a random one, see #92281
+	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
+	sed -e s:SHUTDOWN:${randpw}: -i conf/{server,server-minimal}.xml
+
+	# copy over the directories
+	chown -R tomcat:tomcat webapps/* conf/*
+	cp -pR conf/* ${D}/etc/${TOMCAT_NAME} || die "failed to copy conf"
+	cp -R bin common server ${D}/usr/share/${TOMCAT_NAME} || die "failed to copy"
+
+	keepdir               ${WEBAPPS_DIR}
+	set_webapps_perms     ${D}/${WEBAPPS_DIR}
+
+	# Copy over webapps, some controlled by use flags
+	cp -p ../RELEASE-NOTES webapps/ROOT/RELEASE-NOTES.txt
+	cp -pr webapps/ROOT ${D}${CATALINA_BASE}/webapps
+	if use doc; then
+		cp -pr webapps/tomcat-docs ${D}${CATALINA_BASE}/webapps
+	fi
+	if use examples; then
+		cp -pr webapps/{jsp-examples,servlets-examples,webdav} \
+			${D}${CATALINA_BASE}/webapps
+	fi
+
+	# symlink the directories to make CATALINA_BASE possible
+	dosym /etc/${TOMCAT_NAME} ${CATALINA_BASE}/conf
+	dosym /var/log/${TOMCAT_NAME} ${CATALINA_BASE}/logs
+	dosym /var/tmp/${TOMCAT_NAME} ${CATALINA_BASE}/temp
+	dosym /var/run/${TOMCAT_NAME} ${CATALINA_BASE}/work
+
+	dodoc  ${S}/build/{RELEASE-NOTES,RUNNING.txt}
+	fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
+}
+
+pkg_postinst() {
+	#due to previous ebuild bloopers, make sure everything is correct
+	chown root:root /etc/init.d/${TOMCAT_NAME}
+	chown root:root /etc/conf.d/${TOMCAT_NAME}
+
+	einfo
+	ewarn " This ebuild implements a new filesystem layout for tomcat"
+	ewarn " please read http://www.gentoo.org/proj/en/java/tomcat-guide.xml"
+	ewarn " for more information!."
+	einfo
+	einfo " Please file any bugs at http://bugs.gentoo.org/ or else it"
+	einfo " may not get seen.  Thank you."
+	einfo
+
+#	einfo "Run emerge --config =${PF}"
+#	einfo "to configure Tomcat if you need to for example"
+#	einfo "change the home directory of the Tomcat user."
+}
+
+#helpers
+set_webapps_perms() {
+	chown  tomcat:tomcat ${1} || die "Failed to change owner off ${1}."
+	chmod  750           ${1} || die "Failed to change permissions off ${1}."
+}
+
+pkg_config() {
+	# Better suggestions are welcome
+	local currentdir="$(getent passwd tomcat | gawk -F':' '{ print $6 }')"
+
+	einfo "The default home directory for Tomcat is /dev/null."
+	einfo "You need to change it if your applications needs it to"
+	einfo "be an actual directory. Current home directory:"
+	einfo "${currentdir}"
+	einfo ""
+	einfo "Do you want to change it [yes/no]?"
+
+	local answer
+	read answer
+
+	if [[ "${answer}" == "yes" ]]; then
+		einfo ""
+		einfo "Suggestions:"
+		einfo "${WEBAPPS_DIR}"
+		einfo ""
+		einfo "If you want to suggest a directory, file a bug to"
+		einfo "http://bugs.gentoo.org"
+		einfo ""
+		einfo "Enter home directory:"
+
+		local homedir
+		read homedir
+
+		einfo ""
+		einfo "Setting home directory to: ${homedir}"
+
+		/usr/sbin/usermod -d"${homedir}" tomcat
+
+		einfo "You can run emerge --config =${PF}"
+		einfo "again to change to homedir"
+		einfo "at any time."
+	fi
+}