Updated 5.5.20 and 6.0.7 init scripts, again :( previous version was borked. Trying to capture std out, which seems to be going no where atm.

(Portage version: 2.1.2_rc4-r6)
 (Unsigned Manifest commit)

5 files changed, 30 insertions, 529 deletions

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index fdea8234b6e8..48b6adf5197e 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -86,10 +86,10 @@ AUX 5.5.20/tomcat.conf 2689 RMD160 476e33ffd9e99215fea1d44cd2bd978ea31d2c69 SHA1
 MD5 8b018a037f70ee95ea823e42356aaeb5 files/5.5.20/tomcat.conf 2689
 RMD160 476e33ffd9e99215fea1d44cd2bd978ea31d2c69 files/5.5.20/tomcat.conf 2689
 SHA256 286400591a4a0b80be72267c016c0b14a2878ba502a6ce2c384b49f4d51bd677 files/5.5.20/tomcat.conf 2689
-AUX 5.5.20/tomcat.init 3302 RMD160 7a530c8b7dc1f92ffd0e8c391e2d12fb54083fe5 SHA1 59980ba5722788f47406e3c478bd732ecdf1b411 SHA256 f0381bc70276ce15f878d9ff4d342d466a17426b6494fd7a9bbb29bc3a41773a
-MD5 e5f9d98ae5043f6243fbe50ca0751acf files/5.5.20/tomcat.init 3302
-RMD160 7a530c8b7dc1f92ffd0e8c391e2d12fb54083fe5 files/5.5.20/tomcat.init 3302
-SHA256 f0381bc70276ce15f878d9ff4d342d466a17426b6494fd7a9bbb29bc3a41773a files/5.5.20/tomcat.init 3302
+AUX 5.5.20/tomcat.init 3402 RMD160 e5a519f5ceaf1ce2bda3a5b3c498371839dbd7a8 SHA1 e0a2fd0323c032ac8a4745cb9b1ed339a2414fb0 SHA256 c0de2947fa3a6f3d5c30a9e283de5aa99914f287b036faa7c509af0533144e52
+MD5 0721156789c9c4e8a8dba6a0bbbac990 files/5.5.20/tomcat.init 3402
+RMD160 e5a519f5ceaf1ce2bda3a5b3c498371839dbd7a8 files/5.5.20/tomcat.init 3402
+SHA256 c0de2947fa3a6f3d5c30a9e283de5aa99914f287b036faa7c509af0533144e52 files/5.5.20/tomcat.init 3402
 AUX 5.5.20/tomcatbuild-xml.patch 12470 RMD160 e936baf49d5f1a34b5b3c5787d62fb5a06ea52a2 SHA1 4857962223dc50dbb43e9e362e53f114723ff4d6 SHA256 d76b0dcc3a6d8d60c0305d74ef980e5461bbcaef1059a306e38e5d358c2a01a4
 MD5 83d2b72b5c1c52e80492ee5199eb3625 files/5.5.20/tomcatbuild-xml.patch 12470
 RMD160 e936baf49d5f1a34b5b3c5787d62fb5a06ea52a2 files/5.5.20/tomcatbuild-xml.patch 12470
@@ -102,10 +102,10 @@ AUX 6/tomcat.conf 2669 RMD160 0f0b660670f1a5fd43aba9bac75d40ee33e902fe SHA1 53bf
 MD5 87c3a871a5f81aa03cec06fe5b195bed files/6/tomcat.conf 2669
 RMD160 0f0b660670f1a5fd43aba9bac75d40ee33e902fe files/6/tomcat.conf 2669
 SHA256 ae15a874568a888d5998db3ddbcc6469ceab1e1dcd72239b441e924ceb0465cb files/6/tomcat.conf 2669
-AUX 6/tomcat.init 3216 RMD160 44bc698612f1518da3a08ef906f45dfa99a8cb05 SHA1 f3d98e4bea588c83b3a6b13b2a75ed132042601d SHA256 3e993e4c3b562feb6cdd1c7e6f80cb7d348294e3d9dd041aa5f4db15a790c0cb
-MD5 a7c4c04d932ce95c3e5e81fecb5ff1eb files/6/tomcat.init 3216
-RMD160 44bc698612f1518da3a08ef906f45dfa99a8cb05 files/6/tomcat.init 3216
-SHA256 3e993e4c3b562feb6cdd1c7e6f80cb7d348294e3d9dd041aa5f4db15a790c0cb files/6/tomcat.init 3216
+AUX 6/tomcat.init 3314 RMD160 93cf9482ae26be1fae13ba2102f57b91f1c0022c SHA1 73f2157d52a27cf90aa1649c996e88b5d2c727b3 SHA256 1ba56d52b64ad7a7bd66fd2b7a40599f60e16cb6306812cbc5129d628ccf358c
+MD5 d1a15665d1ca4b8ce87f4193cf4cdf68 files/6/tomcat.init 3314
+RMD160 93cf9482ae26be1fae13ba2102f57b91f1c0022c files/6/tomcat.init 3314
+SHA256 1ba56d52b64ad7a7bd66fd2b7a40599f60e16cb6306812cbc5129d628ccf358c files/6/tomcat.init 3314
 DIST apache-tomcat-5.5.20-src.tar.gz 4796377 RMD160 587590d2e272d1ede73501b62933f544cd969822 SHA1 cc416242d8c9e1978702a207e305ca97afe53d4d SHA256 19f24717fb3e2db902c33e21650dfa88bbf98428c15b1ed68ecaf7a9150e4a77
 DIST apache-tomcat-6.0.7-src.tar.gz 3210405 RMD160 830485c5e25926da950e6b2148aa8baae263b351 SHA1 6883fbed7840c20d0967c435deafc0260609200f SHA256 a76be3230db0a3363835916f14afcccce6f18509577c2999f5491c0fb861e4f3
 DIST jakarta-tomcat-5.0.27.tar.gz 10298374 RMD160 a333fcb531bb98af20db6e0a10d3e8b2c72ee1fa SHA1 5f3981ecdd67e2b9774e643b336ad98ebc1bd4e3 SHA256 873fc94b4316235091e69bca926bd66a0fb9fab542016e582a03323ed6777d78
@@ -118,22 +118,22 @@ EBUILD tomcat-5.0.28-r14.ebuild 9331 RMD160 443c26d31df8fbd41e2f3e84f14cd47fc4f1
 MD5 1325b1a3c64afbb14284b913313073d9 tomcat-5.0.28-r14.ebuild 9331
 RMD160 443c26d31df8fbd41e2f3e84f14cd47fc4f14d4e tomcat-5.0.28-r14.ebuild 9331
 SHA256 995765389ab7fda0cf3a628f6da919ca1e0c51b4cc7afd9aa371b094e45581d6 tomcat-5.0.28-r14.ebuild 9331
-EBUILD tomcat-5.5.20-r6.ebuild 10201 RMD160 aa7bcc5cf11bc953fcef861efb82525c9f068661 SHA1 ede25afff32b60fc58607fc8dab1838413477050 SHA256 91c10bab78728853cbedabed8c58da01c7fe2f0d70e68ae3ca00f0b5cea88b73
-MD5 49dae314b4c36496a76f62bc20bcb543 tomcat-5.5.20-r6.ebuild 10201
-RMD160 aa7bcc5cf11bc953fcef861efb82525c9f068661 tomcat-5.5.20-r6.ebuild 10201
-SHA256 91c10bab78728853cbedabed8c58da01c7fe2f0d70e68ae3ca00f0b5cea88b73 tomcat-5.5.20-r6.ebuild 10201
-EBUILD tomcat-5.5.20-r7.ebuild 10209 RMD160 1308e327134b2dcc11d5f1f91f70eb6f394449db SHA1 7ab90e13c0f339ffb22b6c43f9339e42c70a790e SHA256 011679cb56939f927a1e71482ad59f6e7844426fb3c7d027baeec90752cca162
-MD5 857f6f98d34fde4536c886e393a163ef tomcat-5.5.20-r7.ebuild 10209
-RMD160 1308e327134b2dcc11d5f1f91f70eb6f394449db tomcat-5.5.20-r7.ebuild 10209
-SHA256 011679cb56939f927a1e71482ad59f6e7844426fb3c7d027baeec90752cca162 tomcat-5.5.20-r7.ebuild 10209
-EBUILD tomcat-6.0.7_beta-r1.ebuild 4631 RMD160 6eefaf1a5001d3e00ae92d0e1567a8d2ff9cb6cc SHA1 dcaa1d8c1a31d788423ea3b1eabece14e0c89e75 SHA256 6fc1f066927987dd20bf65b8932bdbce4a3e7073fd96a594295bbf7dc0ad33d2
-MD5 1e0a2b7d0a810f1c7a9113b0f5b92e1c tomcat-6.0.7_beta-r1.ebuild 4631
-RMD160 6eefaf1a5001d3e00ae92d0e1567a8d2ff9cb6cc tomcat-6.0.7_beta-r1.ebuild 4631
-SHA256 6fc1f066927987dd20bf65b8932bdbce4a3e7073fd96a594295bbf7dc0ad33d2 tomcat-6.0.7_beta-r1.ebuild 4631
-MISC ChangeLog 33112 RMD160 23fbf064ac5e86bd830ad36f5997be4dfef74db2 SHA1 af0d953b53fc00c007bc40ca19f7c8618cd2b916 SHA256 bcecc0bff3a6fa5721ed57313b02119f4348b096180bd065dd5dd85b8db7b14f
-MD5 6d5df9e41624f3d7ff52f51025115a45 ChangeLog 33112
-RMD160 23fbf064ac5e86bd830ad36f5997be4dfef74db2 ChangeLog 33112
-SHA256 bcecc0bff3a6fa5721ed57313b02119f4348b096180bd065dd5dd85b8db7b14f ChangeLog 33112
+EBUILD tomcat-5.5.20-r7.ebuild 10201 RMD160 7a78a19d602a7ba0c9ce9f5995a5ee9c5eb266bd SHA1 c262873810ee860f007b00b52224f5ca0d8783b9 SHA256 e30ed0f802c6884cbe475deae254c1424664f96cecdfca0e1425d4cf0c28e88e
+MD5 82b0faab83bc58a351dd78ae066b5da8 tomcat-5.5.20-r7.ebuild 10201
+RMD160 7a78a19d602a7ba0c9ce9f5995a5ee9c5eb266bd tomcat-5.5.20-r7.ebuild 10201
+SHA256 e30ed0f802c6884cbe475deae254c1424664f96cecdfca0e1425d4cf0c28e88e tomcat-5.5.20-r7.ebuild 10201
+EBUILD tomcat-5.5.20-r8.ebuild 10209 RMD160 38d895b3abae9b4861074c6655a27aed4e06eacc SHA1 dae15498fdefc12d1ace98e16999d5e7de2fd8a6 SHA256 74098fc2db7b9e1de575949802c067e52ac49d505fe17abcfe5354237615cc5e
+MD5 5593c59ecb32a67719db071947c37897 tomcat-5.5.20-r8.ebuild 10209
+RMD160 38d895b3abae9b4861074c6655a27aed4e06eacc tomcat-5.5.20-r8.ebuild 10209
+SHA256 74098fc2db7b9e1de575949802c067e52ac49d505fe17abcfe5354237615cc5e tomcat-5.5.20-r8.ebuild 10209
+EBUILD tomcat-6.0.7_beta-r2.ebuild 4631 RMD160 115de11f9f873aaa75e8c918a213e99f2ffebad3 SHA1 eac23e879a89bee55ff14c6dd4c4d19cf390bb39 SHA256 bb30976c7fceeb989a722939646a11e196c14b21bcb70ad0d2d7b543cfdb1b38
+MD5 5d3c2a84ea94d69cef164a669b978c65 tomcat-6.0.7_beta-r2.ebuild 4631
+RMD160 115de11f9f873aaa75e8c918a213e99f2ffebad3 tomcat-6.0.7_beta-r2.ebuild 4631
+SHA256 bb30976c7fceeb989a722939646a11e196c14b21bcb70ad0d2d7b543cfdb1b38 tomcat-6.0.7_beta-r2.ebuild 4631
+MISC ChangeLog 33575 RMD160 efdc8f63c79adaf4cbde3145db737a35cb1a7c35 SHA1 7f662a86f8301aca3a754d2cf60e4d48da7f279d SHA256 6e1eaee0826c83efaa83492bc806a971c19919e8074356e77c27407e00e8beb5
+MD5 dcc838570f00f79834acd4e236cafc45 ChangeLog 33575
+RMD160 efdc8f63c79adaf4cbde3145db737a35cb1a7c35 ChangeLog 33575
+SHA256 6e1eaee0826c83efaa83492bc806a971c19919e8074356e77c27407e00e8beb5 ChangeLog 33575
 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79
 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556
 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556
@@ -144,12 +144,12 @@ SHA256 8adce6bec0e657beb514e68dc8196cca8650ec0f2b5d1e421106ccc9fe954531 files/di
 MD5 d942ea8b8317ba352e744aed2d284d01 files/digest-tomcat-5.0.28-r14 280
 RMD160 7283323e161ab5dd3a94549def34af040891e49a files/digest-tomcat-5.0.28-r14 280
 SHA256 2c09d3ad89eb04ab24e5c95a9492d7f461e1935bdb076100010cd3d4f7cb8796 files/digest-tomcat-5.0.28-r14 280
-MD5 8adc14a8534e1c6f8d5f96b371e1895f files/digest-tomcat-5.5.20-r6 277
-RMD160 b9c5deac84bf5acd7a65ad80bdfaca9f7e343f3f files/digest-tomcat-5.5.20-r6 277
-SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/digest-tomcat-5.5.20-r6 277
 MD5 8adc14a8534e1c6f8d5f96b371e1895f files/digest-tomcat-5.5.20-r7 277
 RMD160 b9c5deac84bf5acd7a65ad80bdfaca9f7e343f3f files/digest-tomcat-5.5.20-r7 277
 SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/digest-tomcat-5.5.20-r7 277
-MD5 ae090639fc2a4b844084020e9fd68796 files/digest-tomcat-6.0.7_beta-r1 274
-RMD160 887290424c340b8a024770ae6ee2adeb0252b5ea files/digest-tomcat-6.0.7_beta-r1 274
-SHA256 8c88ae20979c83fd4529d2493cf5bfc63d86ff37cb46af296db58166d2e0ad3d files/digest-tomcat-6.0.7_beta-r1 274
+MD5 8adc14a8534e1c6f8d5f96b371e1895f files/digest-tomcat-5.5.20-r8 277
+RMD160 b9c5deac84bf5acd7a65ad80bdfaca9f7e343f3f files/digest-tomcat-5.5.20-r8 277
+SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/digest-tomcat-5.5.20-r8 277
+MD5 ae090639fc2a4b844084020e9fd68796 files/digest-tomcat-6.0.7_beta-r2 274
+RMD160 887290424c340b8a024770ae6ee2adeb0252b5ea files/digest-tomcat-6.0.7_beta-r2 274
+SHA256 8c88ae20979c83fd4529d2493cf5bfc63d86ff37cb46af296db58166d2e0ad3d files/digest-tomcat-6.0.7_beta-r2 274
diff --git a/www-servers/tomcat/files/digest-tomcat-5.5.20-r6 b/www-servers/tomcat/files/digest-tomcat-5.5.20-r6
deleted file mode 100644
index 25cb711a112c..000000000000
--- a/www-servers/tomcat/files/digest-tomcat-5.5.20-r6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5775bae8fac16a0e3a2c913c4768bb37 apache-tomcat-5.5.20-src.tar.gz 4796377
-RMD160 587590d2e272d1ede73501b62933f544cd969822 apache-tomcat-5.5.20-src.tar.gz 4796377
-SHA256 19f24717fb3e2db902c33e21650dfa88bbf98428c15b1ed68ecaf7a9150e4a77 apache-tomcat-5.5.20-src.tar.gz 4796377
diff --git a/www-servers/tomcat/files/digest-tomcat-6.0.7_beta-r1 b/www-servers/tomcat/files/digest-tomcat-6.0.7_beta-r1
deleted file mode 100644
index 1309a094c51c..000000000000
--- a/www-servers/tomcat/files/digest-tomcat-6.0.7_beta-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e4043356aeb6fd631df17adb1fbdb76d apache-tomcat-6.0.7-src.tar.gz 3210405
-RMD160 830485c5e25926da950e6b2148aa8baae263b351 apache-tomcat-6.0.7-src.tar.gz 3210405
-SHA256 a76be3230db0a3363835916f14afcccce6f18509577c2999f5491c0fb861e4f3 apache-tomcat-6.0.7-src.tar.gz 3210405
diff --git a/www-servers/tomcat/tomcat-5.5.20-r6.ebuild b/www-servers/tomcat/tomcat-5.5.20-r6.ebuild
deleted file mode 100644
index cdc53be209a3..000000000000
--- a/www-servers/tomcat/tomcat-5.5.20-r6.ebuild
+++ /dev/null
@@ -1,337 +0,0 @@
-# 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.20-r6.ebuild,v 1.3 2007/01/10 19:44:57 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://tomcat.apache.org/"
-KEYWORDS="amd64 x86 -ppc -ppc64"
-LICENSE="Apache-2.0"
-
-IUSE="admin java5 doc examples source test"
-
-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.1
-	>=dev-java/commons-io-1.1
-	>=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
-	admin? ( =dev-java/struts-1.2* )
-	dev-java/sun-javamail
-	java5? ( >=virtual/jre-1.5 )
-	!java5? (
-		=virtual/jre-1.4*
-		=dev-java/commons-httpclient-2.0*
-		dev-java/sun-jaf
-		>=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}
-	dev-java/ant"
-
-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_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
-
-	java-pkg_filter-compiler ecj-3.1  ecj-3.2
-
-	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 examples; then
-		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-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} -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 mail.jar)"
-	if use admin; then
-		antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts-1.2 struts.jar)"
-		antflags="${antflags} -Dstruts.home=/usr/share/struts"
-	else
-		antflags="${antflags} -Dadmin.build.notrequired=true"
-		antflags="${antflags} -Dadmin.precompile.notrequired=true"
-	fi
-	if ! use examples; then
-		antflags="${antflags} -Dexamples.precompile.notrequired=true"
-	fi
-	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 sun-jaf)"
-		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 xml-commons-external-1.3 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}/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
-	if use admin; then
-		cp ${S}/container/webapps/admin/admin.xml \
-			conf/Catalina/localhost
-	fi
-	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
-	if use admin; then
-		cd server/webapps/admin/WEB-INF/lib
-		rm -f struts.jar
-		java-pkg_jar-from struts-1.2 struts.jar
-		cd ${base}
-	else
-		rm -fR server/webapps/admin
-	fi
-
-	cd server/webapps/manager/WEB-INF/lib
-	java-pkg_jar-from commons-fileupload
-	java-pkg_jar-from commons-io-1
-	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 -HR 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}
-
-	ewarn
-	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!."
-	elog
-	elog " Please file any bugs at http://bugs.gentoo.org/ or else it"
-	elog " may not get seen.  Thank you."
-	elog
-
-#	elog "Run emerge --config =${PF}"
-#	elog "to configure Tomcat if you need to for example"
-#	elog "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 }')"
-
-	elog "The default home directory for Tomcat is /dev/null."
-	elog "You need to change it if your applications needs it to"
-	elog "be an actual directory. Current home directory:"
-	elog "${currentdir}"
-	elog ""
-	elog "Do you want to change it [yes/no]?"
-
-	local answer
-	read answer
-
-	if [[ "${answer}" == "yes" ]]; then
-		elog ""
-		elog "Suggestions:"
-		elog "${WEBAPPS_DIR}"
-		elog ""
-		elog "If you want to suggest a directory, file a bug to"
-		elog "http://bugs.gentoo.org"
-		elog ""
-		elog "Enter home directory:"
-
-		local homedir
-		read homedir
-
-		elog ""
-		elog "Setting home directory to: ${homedir}"
-
-		/usr/sbin/usermod -d"${homedir}" tomcat
-
-		elog "You can run emerge --config =${PF}"
-		elog "again to change to homedir"
-		elog "at any time."
-	fi
-}
diff --git a/www-servers/tomcat/tomcat-6.0.7_beta-r1.ebuild b/www-servers/tomcat/tomcat-6.0.7_beta-r1.ebuild
deleted file mode 100644
index 800e8de48a76..000000000000
--- a/www-servers/tomcat/tomcat-6.0.7_beta-r1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# 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-6.0.7_beta-r1.ebuild,v 1.1 2007/01/10 19:44:57 wltjr Exp $
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Apache Servlet-2.5/JSP-2.1 Container"
-
-MY_P="apache-${P/_beta/}-src"
-SLOT="6"
-SRC_URI="mirror://apache/${PN}/${PN}-6/v${PV/_/-}/src/${MY_P}.tar.gz"
-HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-LICENSE="Apache-2.0"
-
-IUSE="doc examples jni source test"
-
-RDEPEND="|| ( >=virtual/jre-1.5 >=virtual/jre-1.6 )
-	=dev-java/eclipse-ecj-3.2*
-	>=dev-java/commons-daemon-1.0.1
-	>=dev-java/commons-dbcp-1.2.1
-	>=dev-java/commons-logging-1.1
-	>=dev-java/commons-pool-1.2
-	jni? ( dev-java/tomcat-native )"
-
-DEPEND="|| ( >=virtual/jdk-1.5 >=virtual/jdk-1.6 )
-	${RDEPEND}
-	test? (
-		dev-java/junit
-		dev-java/ant
-	)
-	!test? ( dev-java/ant-core )"
-
-S=${WORKDIR}/${MY_P}
-NS=${WORKDIR}/tomcat-native-${TC_NV}-src
-
-TOMCAT_NAME="${PN}-${SLOT}"
-TOMCAT_HOME="/usr/share/${TOMCAT_NAME}"
-WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps"
-
-pkg_setup() {
-	enewgroup tomcat 265
-	enewuser tomcat 265 -1 /dev/null tomcat
-
-	JAVA_PKG_WANT_SOURCE="1.5"
-	JAVA_PKG_WANT_TARGET="1.5"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch "${FILESDIR}/${SLOT}/build-xml.patch"
-
-	cd ${S}/bin
-	java-pkg_jar-from commons-daemon
-}
-
-src_compile(){
-	# Prevent out of memory/heap space errors
-	java-pkg_force-compiler ecj-3.2
-
-	local antflags="build-jasper-jdt build-only -Dbase.path=${T}"
-	antflags="${antflags} -Dant.jar=$(java-pkg_getjar ant-core ant.jar)"
-	antflags="${antflags} -Dcommons-daemon.jar=$(java-pkg_getjar commons-daemon commons-daemon.jar)"
-	antflags="${antflags} -Djdt.jar=$(java-pkg_getjar eclipse-ecj-3.2 ecj.jar)"
-	eant ${antflags}
-}
-
-src_install() {
-	local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/
-
-	# init.d, conf.d
-	newinitd ${FILESDIR}/${SLOT}/tomcat.init ${TOMCAT_NAME}
-	newconfd ${FILESDIR}/${SLOT}/tomcat.conf ${TOMCAT_NAME}
-
-	# create dir structure
-	diropts -m755 -o tomcat -g tomcat
-	dodir   /etc/${TOMCAT_NAME}
-	fperms  750 /etc/${TOMCAT_NAME}
-	dodir /usr/share/${TOMCAT_NAME}
-	keepdir /var/log/${TOMCAT_NAME}/
-	keepdir /var/tmp/${TOMCAT_NAME}/
-	keepdir /var/run/${TOMCAT_NAME}/
-	dodir   ${CATALINA_BASE}
-	diropts -m0755
-
-	cd ${S}
-	# we don't need dos scripts
-	rm -f bin/*.bat
-	chmod 755 bin/*.sh
-
-	# fix context's since upstream is slackin
-	sed -i -e 's:}/server/:}/:' ${S}/webapps/host-manager/host-manager.xml
-	sed -i -e 's:}/server/:}/:' ${S}/webapps/manager/manager.xml
-
-	# copy the manager's context to the right position
-	mkdir -p conf/Catalina/localhost
-	cp ${S}/webapps/host-manager/host-manager.xml conf/Catalina/localhost
-	cp ${S}/webapps/manager/manager.xml conf/Catalina/localhost
-
-	# 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.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 output/build/bin output/build/lib ${D}/usr/share/${TOMCAT_NAME} \
-		|| die "failed to copy"
-
-	cp ${T}/tomcat6-deps/jdt/jasper-jdt.jar ${D}/usr/share/${TOMCAT_NAME}/lib \
-		|| die "failed to copy"
-
-	keepdir               ${WEBAPPS_DIR}
-	chown  tomcat:tomcat ${D}/${WEBAPPS_DIR} || die "Failed to change owner off ${1}."
-	chmod  750           ${D}/${WEBAPPS_DIR} || die "Failed to change permissions off ${1}."
-
-	cd ${S}
-
-	# 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
-
-	mkdir ${D}${TOMCAT_HOME}/webapps
-	chown tomcat:tomcat ${D}${TOMCAT_HOME}/webapps
-	cp -pr webapps/host-manager ${D}${TOMCAT_HOME}/webapps
-	cp -pr webapps/manager ${D}${TOMCAT_HOME}/webapps
-
-	if use doc; then
-		cp -pr webapps/docs ${D}${CATALINA_BASE}/webapps
-	fi
-	if use examples; then
-		cp -pr webapps/examples \
-			${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}/{RELEASE-NOTES,RUNNING.txt}
-	fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
-}
-
-pkg_postinst() {
-	elog
-	elog " This ebuild implements a FHS compliant layout for tomcat"
-	elog " Please read http://www.gentoo.org/proj/en/java/tomcat-guide.xml"
-	elog " for more information."
-	elog
-	elog " Please report any bugs to http://bugs.gentoo.org/"
-	elog
-}