removed a packed struts.jar. generall cleanup, removed old versions.

Package-Manager: portage-2.0.51.19

7 files changed, 17 insertions, 557 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 0d9ed5dac00d..8d838a87b84b 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.21 2005/03/20 16:33:17 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.22 2005/03/22 20:30:33 luckyduck Exp $
+
+  22 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> -tomcat-5.0.28-r1.ebuild,
+  tomcat-5.0.28-r2.ebuild, -tomcat-5.0.28.ebuild:
+  removed a packed struts.jar. generall cleanup, removed old versions.
 
   20 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> -files/3.3.2/gentoo.diff,
   -files/3.3.2/tomcat.conf, -files/3.3.2/tomcat.init,
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 11a02c08e560..452d3d94a791 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -2,15 +2,11 @@
 Hash: SHA1
 
 MD5 0111243c02d84f0284685e7647620eb8 tomcat-5.0.27-r4.ebuild 3776
-MD5 021a5a634771a57a24b83d563a40e165 tomcat-5.0.28.ebuild 9672
-MD5 60044758625d2aeecb8324d9ed326875 tomcat-5.0.28-r2.ebuild 9674
-MD5 611b55460bf24758b6703ca13ae3d03c ChangeLog 14648
+MD5 753a5a04e2a95b030f97e14536dfd078 tomcat-5.0.28-r2.ebuild 9810
+MD5 1770ff00b30a72e9e2b113cde9f9a491 ChangeLog 14848
 MD5 c11ce937193406815ff7a2b306784fd8 metadata.xml 555
-MD5 f4814c52a1bf5c1b61eec3706d86480e tomcat-5.0.28-r1.ebuild 9674
 MD5 d5a48abc8db5543a73abbbf151d0630e files/digest-tomcat-5.0.27-r4 75
-MD5 af26ca4772989a2090085a6e24b71628 files/digest-tomcat-5.0.28-r1 78
 MD5 af26ca4772989a2090085a6e24b71628 files/digest-tomcat-5.0.28-r2 78
-MD5 af26ca4772989a2090085a6e24b71628 files/digest-tomcat-5.0.28 78
 MD5 cbb635ed31e3b7ddabe1db851a8b471e files/5.0.27/gentoo.diff 463
 MD5 38c130772e7d43dcdff78b3d94f96efd files/5.0.27/tomcat.env 27
 MD5 bf74c2bd8c21359ada1793cddfa95f37 files/5.0.27/tomcat.conf 2660
@@ -27,7 +23,7 @@ MD5 98a29b32de00d97f156dc31dfe3cf472 files/5.0.28/jikes.diff 584
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCPaXU06ebR+OMO78RAs8UAJ4q3UzAO9UnRY6maA4rzgirUBZBkgCfalk3
-Px5zDpUFG91VoKpYrKmVlxI=
-=PdbU
+iD8DBQFCQIB+06ebR+OMO78RAkY7AJ9BleudeaASI2RlGdPMQOPgnxZ+zgCfQkOl
+KZo3W41OCXtVKmRclqhJke0=
+=jHZb
 -----END PGP SIGNATURE-----
diff --git a/www-servers/tomcat/files/digest-tomcat-5.0.28 b/www-servers/tomcat/files/digest-tomcat-5.0.28
deleted file mode 100644
index 38ec5031aa8e..000000000000
--- a/www-servers/tomcat/files/digest-tomcat-5.0.28
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8115f86558aef8a17543397e7f9d9469 jakarta-tomcat-5.0.28-src.tar.gz 3565766
diff --git a/www-servers/tomcat/files/digest-tomcat-5.0.28-r1 b/www-servers/tomcat/files/digest-tomcat-5.0.28-r1
deleted file mode 100644
index 38ec5031aa8e..000000000000
--- a/www-servers/tomcat/files/digest-tomcat-5.0.28-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8115f86558aef8a17543397e7f9d9469 jakarta-tomcat-5.0.28-src.tar.gz 3565766
diff --git a/www-servers/tomcat/tomcat-5.0.28-r1.ebuild b/www-servers/tomcat/tomcat-5.0.28-r1.ebuild
deleted file mode 100644
index a3b0db696a1b..000000000000
--- a/www-servers/tomcat/tomcat-5.0.28-r1.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2005 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-r1.ebuild,v 1.2 2005/03/19 13:57:29 luckyduck Exp $
-
-inherit eutils java-pkg
-
-DESCRIPTION="Apache Servlet-2.4/JSP-2.0 Container"
-
-SLOT="${PV/.*}"
-SRC_URI="mirror://apache/jakarta/tomcat-${SLOT}/v${PV}/src/jakarta-${P}-src.tar.gz"
-HOMEPAGE="http://jakarta.apache.org/tomcat"
-KEYWORDS="~x86 ~amd64"
-LICENSE="Apache-2.0"
-DEPEND="sys-apps/sed
-	   >=virtual/jdk-1.4
-	   ${RDEPEND}"
-RDEPEND=">=virtual/jdk-1.4
-	   >=dev-java/commons-beanutils-1.7.0
-	   >=dev-java/commons-collections-3.1
-	   >=dev-java/commons-daemon-1.0
-	   >=dev-java/commons-dbcp-1.2.1
-	   >=dev-java/commons-digester-1.5
-	   >=dev-java/commons-fileupload-1.0
-	   >=dev-java/commons-httpclient-2.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/jaxen-1.0
-	   >=dev-java/junit-3.8.1
-	   dev-java/jmx
-	   >=dev-java/log4j-1.2.8
-	   >=dev-java/regexp-1.3
-	   >=dev-java/saxpath-1.0
-	   ~dev-java/servletapi-2.4
-	   =dev-java/struts-1.1*
-	   dev-java/sun-jaf-bin
-	   >=dev-java/xerces-2.6.2-r1
-		jikes? ( dev-java/jikes )"
-IUSE="doc jikes"
-
-S=${WORKDIR}/jakarta-${P}-src
-
-TOMCAT_HOME="/usr/share/${PN}-${SLOT}"
-TOMCAT_NAME="${PN}-${SLOT}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PV}/build.xml-01.patch
-	epatch ${FILESDIR}/${PV}/build.xml-02.patch
-	epatch ${FILESDIR}/${PV}/gentoo.diff
-	epatch ${FILESDIR}/${PV}/scripts.patch
-	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 jmx jmxri.jar jmx.jar
-	java-pkg_jar-from commons-daemon
-
-	mkdir ../common/endorsed && cd ../common/endorsed
-	java-pkg_jar-from xerces-2 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 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 regexp
-}
-
-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 regexp)"
-	antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts struts.jar)"
-	antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar	commons-beanutils 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_getjar jaxen jaxen-full.jar)"
-	antflags="${antflags} -Djmx.jar=$(java-pkg_getjar jmx jmxri.jar)"
-	antflags="${antflags} -Djmx-tools.jar=$(java-pkg_getjar 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 xerces-2 xml-apis.jar)"
-
-	antflags="${antflags} -Dstruts.home=/usr/share/struts"
-
-	ant ${antflags} || die "compile failed"
-
-}
-src_install() {
-	cd ${S}/jakarta-tomcat-5/build
-
-	# init.d, env.d, conf.d
-	newinitd ${FILESDIR}/${PV}/tomcat.init ${TOMCAT_NAME}
-	newconfd ${FILESDIR}/${PV}/tomcat.conf ${TOMCAT_NAME}
-	newenvd ${FILESDIR}/${PV}/${PN}.env 21${PN}
-
-	if use jikes; then
-		sed -e "\cCATALINA_OPTScaCATALINA_OPTS=\"-Dbuild.compiler.emacs=true\"" \
-			-i ${D}/etc/conf.d/${TOMCAT_NAME}
-	fi
-
-	# create dir structure
-	dodir /usr/share/${TOMCAT_NAME}
-	diropts -m750
-
-	dodir /var/log/${TOMCAT_NAME}/default
-	dodir /etc/${TOMCAT_NAME}/default/
-	dodir /var/tmp/${TOMCAT_NAME}/default
-	dodir /var/run/${TOMCAT_NAME}/default
-	dodir /var/lib/${TOMCAT_NAME}/default
-
-	keepdir /var/log/${TOMCAT_NAME}/default
-	keepdir /etc/${TOMCAT_NAME}/default/
-	keepdir /var/tmp/${TOMCAT_NAME}/default
-	keepdir /var/run/${TOMCAT_NAME}/default
-
-	# 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 $(ls *.jar);
-		do
-			# replace the file with a symlink
-			if [ ! -L ${jar} ]; then
-				java-pkg_dojar ${jar}
-				rm -f ${jar}
-				ln -s ${DESTTREE}/share/${PN}-${SLOT}/lib/${jar} ${jar}
-			fi
-		done
-
-		cd ${base}
-	done
-
-	# copy over the directories 
-	cp -ra conf/* ${D}/etc/${TOMCAT_NAME}/default || die "failed to copy conf"
-	cp -ra bin common server shared ${D}/usr/share/${TOMCAT_NAME} || die "failed to copy"
-
-	# if the useflag is set, copy over the examples
-	if use doc; then
-		dodir /var/lib/${TOMCAT_NAME}/default/webapps
-		cp ../RELEASE-NOTES webapps/ROOT/RELEASE-NOTES.txt
-		cp -r webapps/{tomcat-docs,jsp-examples,servlets-examples,ROOT,webdav} \
-			${D}/var/lib/${TOMCAT_NAME}/default/webapps
-	fi
-
-	# symlink the directories to make CATALINA_BASE possible
-	dosym /etc/${TOMCAT_NAME}/default /var/lib/${TOMCAT_NAME}/default/conf
-	dosym /var/log/${TOMCAT_NAME}/default /var/lib/${TOMCAT_NAME}/default/logs
-	dosym /var/tmp/${TOMCAT_NAME}/default /var/lib/${TOMCAT_NAME}/default/temp
-	dosym /var/run/${TOMCAT_NAME}/default /var/lib/${TOMCAT_NAME}/default/work
-
-	dodoc ${S}/jakarta-tomcat-5/{LICENSE,RELEASE-NOTES,RUNNING.txt}
-	fperms 640 /etc/${TOMCAT_NAME}/default/tomcat-users.xml
-}
-
-
-pkg_preinst() {
-	enewgroup tomcat
-	enewuser tomcat -1 -1 /dev/null tomcat
-
-	chown -R root:tomcat ${D}/usr/share/${TOMCAT_NAME}
-	chown -R tomcat:tomcat ${D}/etc/${TOMCAT_NAME}
-	chown -R tomcat:tomcat ${D}/var/log/${TOMCAT_NAME}
-	chown -R tomcat:tomcat ${D}/var/tmp/${TOMCAT_NAME}
-	chown -R tomcat:tomcat ${D}/var/run/${TOMCAT_NAME}
-	chown -R tomcat:tomcat ${D}/var/lib/${TOMCAT_NAME}
-}
-
-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}
-
-	# These directories contain the runtime files and
-	# are therefor owned by tomcat
-	chown -R tomcat:tomcat /etc/${TOMCAT_NAME}
-	chown -R tomcat:tomcat /var/log/${TOMCAT_NAME}
-	chown -R tomcat:tomcat /var/tmp/${TOMCAT_NAME}
-	chown -R tomcat:tomcat /var/run/${TOMCAT_NAME}
-	chown -R tomcat:tomcat /var/lib/${TOMCAT_NAME}
-
-
-	chmod 750 /etc/${TOMCAT_NAME}
-
-	einfo " "
-	einfo " NOTICE!"
-	einfo " FILE LOCATIONS:"
-	einfo " 1.  Tomcat home directory: ${TOMCAT_HOME}"
-	einfo "     Contains application data, configuration files."
-	einfo " 2.  Runtime settings: /etc/conf.d/${TOMCAT_NAME}"
-	einfo "     Contains CLASSPATH and JAVA_HOME settings."
-	einfo " 3.  Configuration:  /etc/${TOMCAT_NAME}/default"
-	einfo " 4.  Logs:  /var/log/${TOMCAT_NAME}/default"
-	einfo " "
-	einfo " "
-	einfo " STARTING AND STOPPING TOMCAT:"
-	einfo "   /etc/init.d/${TOMCAT_NAME} start"
-	einfo "   /etc/init.d/${TOMCAT_NAME} stop"
-	einfo "   /etc/init.d/${TOMCAT_NAME} restart"
-	einfo " "
-	einfo " "
-	ewarn " If you are upgrading from older ebuild do NOT use"
-	ewarn " /etc/init.d/tomcat and /etc/conf.d/tomcat you probably"
-	ewarn " want to remove these. "
-	ewarn " A version number has been appended so that tomcat 3, 4 and 5"
-	ewarn " can be installed side by side"
-	einfo " "
-	ewarn " This ebuild implements a new filesystem layout for tomcat"
-	ewarn " please read http://gentoo-wiki.com/Tomcat_Gentoo_ebuild for"
-	ewarn " more information!."
-	einfo " "
-	einfo " NETWORK CONFIGURATION:"
-	einfo " By default, Tomcat runs on port 8080.  You can change this"
-	einfo " value by editing /etc/${TOMCAT_NAME}/default/server.xml."
-	einfo " "
-	einfo " To test Tomcat while it's running, point your web browser to:"
-	einfo " http://localhost:8080/"
-	if ! use doc; then
-		ewarn ""
-		ewarn "You do not have the doc USE flag set, examples have NOT been installed."
-		ewarn " "
-	fi
-	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/www-servers/tomcat/tomcat-5.0.28-r2.ebuild b/www-servers/tomcat/tomcat-5.0.28-r2.ebuild
index 87baa928d0cd..69c21efe17af 100644
--- a/www-servers/tomcat/tomcat-5.0.28-r2.ebuild
+++ b/www-servers/tomcat/tomcat-5.0.28-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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-r2.ebuild,v 1.1 2005/03/19 22:56:38 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.0.28-r2.ebuild,v 1.2 2005/03/22 20:30:33 luckyduck Exp $
 
 inherit eutils java-pkg
 
@@ -175,6 +175,12 @@ src_install() {
 		cd ${base}
 	done
 
+	# replace a packed struts.jar
+	cd server/webapps/admin/WEB-INF/lib
+	rm -f struts.jar
+	java-pkg_jar-from struts struts.jar
+	cd ${base}
+
 	# copy over the directories 
 	cp -ra conf/* ${D}/etc/${TOMCAT_NAME}/default || die "failed to copy conf"
 	cp -ra bin common server shared ${D}/usr/share/${TOMCAT_NAME} || die "failed to copy"
diff --git a/www-servers/tomcat/tomcat-5.0.28.ebuild b/www-servers/tomcat/tomcat-5.0.28.ebuild
deleted file mode 100644
index 002853180910..000000000000
--- a/www-servers/tomcat/tomcat-5.0.28.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.0.28.ebuild,v 1.10 2005/02/14 00:11:02 luckyduck Exp $
-
-inherit eutils java-pkg
-
-DESCRIPTION="Apache Servlet-2.4/JSP-2.0 Container"
-
-SLOT="${PV/.*}"
-SRC_URI="mirror://apache/jakarta/tomcat-${SLOT}/v${PV}/src/jakarta-${P}-src.tar.gz"
-HOMEPAGE="http://jakarta.apache.org/tomcat"
-KEYWORDS="~x86 ~amd64"
-LICENSE="Apache-2.0"
-DEPEND="sys-apps/sed
-	   >=virtual/jdk-1.4
-	   ${RDEPEND}"
-RDEPEND=">=virtual/jdk-1.4
-	   >=dev-java/commons-beanutils-1.7.0
-	   >=dev-java/commons-collections-3.1
-	   >=dev-java/commons-daemon-1.0
-	   >=dev-java/commons-dbcp-1.2.1
-	   >=dev-java/commons-digester-1.5
-	   >=dev-java/commons-fileupload-1.0
-	   >=dev-java/commons-httpclient-2.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/jaxen-1.0
-	   >=dev-java/junit-3.8.1
-	   dev-java/jmx
-	   >=dev-java/log4j-1.2.8
-	   >=dev-java/regexp-1.3
-	   >=dev-java/saxpath-1.0
-	   ~dev-java/servletapi-2.4
-	   =dev-java/struts-1.1*
-	   dev-java/sun-jaf-bin
-	   >=dev-java/xerces-2.6.2-r1
-		jikes? ( dev-java/jikes )"
-IUSE="doc jikes"
-
-S=${WORKDIR}/jakarta-${P}-src
-
-TOMCAT_HOME="/usr/share/${PN}-${SLOT}"
-TOMCAT_NAME="${PN}-${SLOT}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PV}/build.xml-01.patch
-	epatch ${FILESDIR}/${PV}/build.xml-02.patch
-	epatch ${FILESDIR}/${PV}/gentoo.diff
-	epatch ${FILESDIR}/${PV}/scripts.patch
-	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 jmx jmxri.jar jmx.jar
-	java-pkg_jar-from commons-daemon
-
-	mkdir ../common/endorsed && cd ../common/endorsed
-	java-pkg_jar-from xerces-2 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 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 regexp
-}
-
-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 regexp)"
-	antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts struts.jar)"
-	antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar	commons-beanutils 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_getjar jaxen jaxen-full.jar)"
-	antflags="${antflags} -Djmx.jar=$(java-pkg_getjar jmx jmxri.jar)"
-	antflags="${antflags} -Djmx-tools.jar=$(java-pkg_getjar 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 xerces-2 xml-apis.jar)"
-
-	antflags="${antflags} -Dstruts.home=/usr/share/struts"
-
-	ant ${antflags} || die "compile failed"
-
-}
-src_install() {
-	cd ${S}/jakarta-tomcat-5/build
-
-	# init.d, env.d, conf.d
-	newinitd ${FILESDIR}/${PV}/tomcat.init ${TOMCAT_NAME}
-	newconfd ${FILESDIR}/${PV}/tomcat.conf ${TOMCAT_NAME}
-	newenvd ${FILESDIR}/${PV}/${PN}.env 21${PN}
-
-	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 -m750
-	dodir /usr/share/${TOMCAT_NAME}
-
-	dodir /var/log/${TOMCAT_NAME}/default
-	dodir /etc/${TOMCAT_NAME}/default/
-	dodir /var/tmp/${TOMCAT_NAME}/default
-	dodir /var/run/${TOMCAT_NAME}/default
-	dodir /var/lib/${TOMCAT_NAME}/default
-
-	keepdir /var/log/${TOMCAT_NAME}/default
-	keepdir /etc/${TOMCAT_NAME}/default/
-	keepdir /var/tmp/${TOMCAT_NAME}/default
-	keepdir /var/run/${TOMCAT_NAME}/default
-
-	# 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 $(ls *.jar);
-		do
-			# replace the file with a symlink
-			if [ ! -L ${jar} ]; then
-				java-pkg_dojar ${jar}
-				rm -f ${jar}
-				ln -s ${DESTTREE}/share/${PN}-${SLOT}/lib/${jar} ${jar}
-			fi
-		done
-
-		cd ${base}
-	done
-
-	# copy over the directories 
-	cp -ra conf/* ${D}/etc/${TOMCAT_NAME}/default || die "failed to copy conf"
-	cp -ra bin common server shared ${D}/usr/share/${TOMCAT_NAME} || die "failed to copy"
-
-	# if the useflag is set, copy over the examples
-	if use doc; then
-		dodir /var/lib/${TOMCAT_NAME}/default/webapps
-		cp ../RELEASE-NOTES webapps/ROOT/RELEASE-NOTES.txt
-		cp -r webapps/{tomcat-docs,jsp-examples,servlets-examples,ROOT,webdav} \
-			${D}/var/lib/${TOMCAT_NAME}/default/webapps
-	fi
-
-	# symlink the directories to make CATALINA_BASE possible
-	dosym /etc/${TOMCAT_NAME}/default /var/lib/${TOMCAT_NAME}/default/conf
-	dosym /var/log/${TOMCAT_NAME}/default /var/lib/${TOMCAT_NAME}/default/logs
-	dosym /var/tmp/${TOMCAT_NAME}/default /var/lib/${TOMCAT_NAME}/default/temp
-	dosym /var/run/${TOMCAT_NAME}/default /var/lib/${TOMCAT_NAME}/default/work
-
-	dodoc ${S}/jakarta-tomcat-5/{LICENSE,RELEASE-NOTES,RUNNING.txt}
-	fperms 640 /etc/${TOMCAT_NAME}/default/tomcat-users.xml
-}
-
-
-pkg_preinst() {
-	enewgroup tomcat
-	enewuser tomcat -1 -1 /dev/null tomcat
-
-	chown -R root:tomcat ${D}/usr/share/${TOMCAT_NAME}
-	chown -R tomcat:tomcat ${D}/etc/${TOMCAT_NAME}
-	chown -R tomcat:tomcat ${D}/var/log/${TOMCAT_NAME}
-	chown -R tomcat:tomcat ${D}/var/tmp/${TOMCAT_NAME}
-	chown -R tomcat:tomcat ${D}/var/run/${TOMCAT_NAME}
-	chown -R tomcat:tomcat ${D}/var/lib/${TOMCAT_NAME}
-}
-
-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}
-
-	# These directories contain the runtime files and
-	# are therefor owned by tomcat
-	chown -R tomcat:tomcat /etc/${TOMCAT_NAME}
-	chown -R tomcat:tomcat /var/log/${TOMCAT_NAME}
-	chown -R tomcat:tomcat /var/tmp/${TOMCAT_NAME}
-	chown -R tomcat:tomcat /var/run/${TOMCAT_NAME}
-	chown -R tomcat:tomcat /var/lib/${TOMCAT_NAME}
-
-
-	chmod 750 /etc/${TOMCAT_NAME}
-
-	einfo " "
-	einfo " NOTICE!"
-	einfo " FILE LOCATIONS:"
-	einfo " 1.  Tomcat home directory: ${TOMCAT_HOME}"
-	einfo "     Contains application data, configuration files."
-	einfo " 2.  Runtime settings: /etc/conf.d/${TOMCAT_NAME}"
-	einfo "     Contains CLASSPATH and JAVA_HOME settings."
-	einfo " 3.  Configuration:  /etc/${TOMCAT_NAME}/default"
-	einfo " 4.  Logs:  /var/log/${TOMCAT_NAME}/default"
-	einfo " "
-	einfo " "
-	einfo " STARTING AND STOPPING TOMCAT:"
-	einfo "   /etc/init.d/${TOMCAT_NAME} start"
-	einfo "   /etc/init.d/${TOMCAT_NAME} stop"
-	einfo "   /etc/init.d/${TOMCAT_NAME} restart"
-	einfo " "
-	einfo " "
-	ewarn " If you are upgrading from older ebuild do NOT use"
-	ewarn " /etc/init.d/tomcat and /etc/conf.d/tomcat you probably"
-	ewarn " want to remove these. "
-	ewarn " A version number has been appended so that tomcat 3, 4 and 5"
-	ewarn " can be installed side by side"
-	einfo " "
-	ewarn " This ebuild implements a new filesystem layout for tomcat"
-	ewarn " please read http://gentoo-wiki.com/Tomcat_Gentoo_ebuild for"
-	ewarn " more information!."
-	einfo " "
-	einfo " NETWORK CONFIGURATION:"
-	einfo " By default, Tomcat runs on port 8080.  You can change this"
-	einfo " value by editing /etc/${TOMCAT_NAME}/default/server.xml."
-	einfo " "
-	einfo " To test Tomcat while it's running, point your web browser to:"
-	einfo " http://localhost:8080/"
-	if ! use doc; then
-		ewarn ""
-		ewarn "You do not have the doc USE flag set, examples have NOT been installed."
-		ewarn " "
-	fi
-	einfo " "
-	einfo " BUGS:"
-	einfo " Please file any bugs at http://bugs.gentoo.org/ or else it"
-	einfo " may not get seen.  Thank you."
-	einfo " "
-}