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.

(Portage version: 2.1.1_rc1-r5)
 (Unsigned Manifest commit)

5 files changed, 26 insertions, 644 deletions

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 27e7c68c84f1..e176275b40e1 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 5.0.27/gentoo.diff 463 RMD160 ace3fcd5d4d42e987840a0ba46c2f2e5db545dfc SHA1 2cac8406125e5bd360fed919eeb0d4685969462b SHA256 d8c9da161ae1274479f88f69821be780bd70ebfe7ad9c2f92db0f03f4b4c9401
 MD5 cbb635ed31e3b7ddabe1db851a8b471e files/5.0.27/gentoo.diff 463
 RMD160 ace3fcd5d4d42e987840a0ba46c2f2e5db545dfc files/5.0.27/gentoo.diff 463
@@ -49,10 +46,10 @@ AUX 5.0.28/setclasspath.patch 652 RMD160 9ac071e8750358eaf4ad0a4ad879dfc74db4208
 MD5 e27a41dfeb80703ec4a3433942541b7d files/5.0.28/setclasspath.patch 652
 RMD160 9ac071e8750358eaf4ad0a4ad879dfc74db42081 files/5.0.28/setclasspath.patch 652
 SHA256 962eecbac7eb433b5b19d2027328bd78aa3b6348b5809b1617dc3d15bde72e35 files/5.0.28/setclasspath.patch 652
-AUX 5.0.28/tomcat.conf 2707 RMD160 0df8bc479a09f908d681e800572b0c03805dc04f SHA1 7e41463f9eccc52fb2141901a98f7c5209e5469f SHA256 5a90e14f18d0ed11bf9bb7b0f0fcfaa4311dce775a452e16672824734a90c5f3
-MD5 a4df0ce5b57f2bcaa707ff3b5858bee4 files/5.0.28/tomcat.conf 2707
-RMD160 0df8bc479a09f908d681e800572b0c03805dc04f files/5.0.28/tomcat.conf 2707
-SHA256 5a90e14f18d0ed11bf9bb7b0f0fcfaa4311dce775a452e16672824734a90c5f3 files/5.0.28/tomcat.conf 2707
+AUX 5.0.28/tomcat.conf 2543 RMD160 ce3b811fff1be4bad4a1edcfdad4ba7fbfe49ac6 SHA1 5d8d25970f368168366538d33f280b9320135c3e SHA256 500239635621b0cd06d49765e39edaa5e02b976a6524cfe35983b9e0262ac811
+MD5 9903b7aa822fccd115c921a3031a0758 files/5.0.28/tomcat.conf 2543
+RMD160 ce3b811fff1be4bad4a1edcfdad4ba7fbfe49ac6 files/5.0.28/tomcat.conf 2543
+SHA256 500239635621b0cd06d49765e39edaa5e02b976a6524cfe35983b9e0262ac811 files/5.0.28/tomcat.conf 2543
 AUX 5.0.28/tomcat.conf-r1 2837 RMD160 b9efd9d61d9a97f777d92d9a22b6842f92b261b7 SHA1 a382b8c481062be7d5988487ce2b073b714a7810 SHA256 9c185c41ead0e07acb07bcb07e52ab4631613ecdbefcdd0b795a368f045faa88
 MD5 a279252c639b232107c83c6cb981c261 files/5.0.28/tomcat.conf-r1 2837
 RMD160 b9efd9d61d9a97f777d92d9a22b6842f92b261b7 files/5.0.28/tomcat.conf-r1 2837
@@ -61,10 +58,10 @@ AUX 5.0.28/tomcat.env 34 RMD160 8a7d78c3d0289e43e1ad1c4be1d586feb2f99946 SHA1 82
 MD5 286d3dcf80a376b72913412cec25e496 files/5.0.28/tomcat.env 34
 RMD160 8a7d78c3d0289e43e1ad1c4be1d586feb2f99946 files/5.0.28/tomcat.env 34
 SHA256 390292b910cca172d660b71bb4fe0bf3ac0bd3cb7d08b1a1bb9b72272be22d84 files/5.0.28/tomcat.env 34
-AUX 5.0.28/tomcat.init 766 RMD160 3707c1d282f10d2aa6c3fabde14d670d71210b07 SHA1 4d531bddce0ed71d604b040ed01e66794a2004aa SHA256 8cf86bad1b667774aa89c0f63facd1aafdea45ff0f117a7879208bee92337763
-MD5 c84cd76463e0c773cc3c58f9d6ea7e92 files/5.0.28/tomcat.init 766
-RMD160 3707c1d282f10d2aa6c3fabde14d670d71210b07 files/5.0.28/tomcat.init 766
-SHA256 8cf86bad1b667774aa89c0f63facd1aafdea45ff0f117a7879208bee92337763 files/5.0.28/tomcat.init 766
+AUX 5.0.28/tomcat.init 2898 RMD160 b2b43107c5158c9d4034b08a80e04fe5a63c5f42 SHA1 f164804435cca6b890629bbec161b544f9599267 SHA256 c7b26e3764ffce78b6b1abdab74ffcd81e6181bf98beb8ba6005e2ca45bd552e
+MD5 52864dec9827c6b2b513eef010fe3f21 files/5.0.28/tomcat.init 2898
+RMD160 b2b43107c5158c9d4034b08a80e04fe5a63c5f42 files/5.0.28/tomcat.init 2898
+SHA256 c7b26e3764ffce78b6b1abdab74ffcd81e6181bf98beb8ba6005e2ca45bd552e files/5.0.28/tomcat.init 2898
 AUX 5.5.17/catalinabuild-xml.patch 1149 RMD160 9622ca4f688e2c57e4bc34f08ceebb651f75deb1 SHA1 8eda11132851da5773ceb33f90515f0c8ffabdb6 SHA256 dc2d7255dd990359f765f329a04825aca18888e505b4024bb64e0dc6e348498e
 MD5 4b2dbaa2a74776229f4fffa1274d0a13 files/5.5.17/catalinabuild-xml.patch 1149
 RMD160 9622ca4f688e2c57e4bc34f08ceebb651f75deb1 files/5.5.17/catalinabuild-xml.patch 1149
@@ -120,22 +117,22 @@ EBUILD tomcat-5.0.28-r12.ebuild 11138 RMD160 7e7a04d273cec10955f8db35da0b39d946a
 MD5 935b85f96588785ea578042c3984ef28 tomcat-5.0.28-r12.ebuild 11138
 RMD160 7e7a04d273cec10955f8db35da0b39d946a3904a tomcat-5.0.28-r12.ebuild 11138
 SHA256 0cbc5ef6348aa322b258bc63c5db3efbaad54ce9d8b8e487bff3599ca55d4cf1 tomcat-5.0.28-r12.ebuild 11138
-EBUILD tomcat-5.5.17-r1.ebuild 9057 RMD160 24d1a4dec51d3367cc9f882ac7c1729d2d3573ce SHA1 d33ce5b9a5e591676c557a0d06ecf5a6dbf769b3 SHA256 6a660f7cca4e926ef48d5e32ea4a86d9ed0ac9baf1a011ca5940c8e69d8540b8
-MD5 af8ee37a2c1c163778ef2bb1350937c7 tomcat-5.5.17-r1.ebuild 9057
-RMD160 24d1a4dec51d3367cc9f882ac7c1729d2d3573ce tomcat-5.5.17-r1.ebuild 9057
-SHA256 6a660f7cca4e926ef48d5e32ea4a86d9ed0ac9baf1a011ca5940c8e69d8540b8 tomcat-5.5.17-r1.ebuild 9057
-EBUILD tomcat-5.5.17-r2.ebuild 9784 RMD160 4adabdf5f2d24596e32539333db0c9aa3f231cb8 SHA1 738782a275c672e46836db0541fed3d9bcbe51b7 SHA256 e4890983762a7db9f3575601ab0324b0eb3a6eba73ce55bf06ab883533852cb2
-MD5 60c82299c60006368169e6dc8a57535a tomcat-5.5.17-r2.ebuild 9784
-RMD160 4adabdf5f2d24596e32539333db0c9aa3f231cb8 tomcat-5.5.17-r2.ebuild 9784
-SHA256 e4890983762a7db9f3575601ab0324b0eb3a6eba73ce55bf06ab883533852cb2 tomcat-5.5.17-r2.ebuild 9784
+EBUILD tomcat-5.0.28-r13.ebuild 9390 RMD160 edc2241e882d1b2e3b297927765c5358fd8fce32 SHA1 f1441fe515dc6bd9dc1cfb60fe0bf3d81316458c SHA256 4a6b027e912c7ff680421cedf22b2dbc009f2639d076c5a1b3d3ad7e625ee502
+MD5 1533455980569c6999d5b9fe276d913f tomcat-5.0.28-r13.ebuild 9390
+RMD160 edc2241e882d1b2e3b297927765c5358fd8fce32 tomcat-5.0.28-r13.ebuild 9390
+SHA256 4a6b027e912c7ff680421cedf22b2dbc009f2639d076c5a1b3d3ad7e625ee502 tomcat-5.0.28-r13.ebuild 9390
 EBUILD tomcat-5.5.17-r3.ebuild 10053 RMD160 58a43bdfd1c1ca129c64963b34faa70122c0971c SHA1 d42e8f7e5c1b29d760b93fecdf9b7c83f68c3dfd SHA256 e6959fb8c5bd09675ae04111a2f1c6f009037744bf50d8190e5897688407c729
 MD5 b05aa6889edc42a90e7254af4c8666fa tomcat-5.5.17-r3.ebuild 10053
 RMD160 58a43bdfd1c1ca129c64963b34faa70122c0971c tomcat-5.5.17-r3.ebuild 10053
 SHA256 e6959fb8c5bd09675ae04111a2f1c6f009037744bf50d8190e5897688407c729 tomcat-5.5.17-r3.ebuild 10053
-MISC ChangeLog 21853 RMD160 f7aea509c08e266b89b870ca572c87318ed84f75 SHA1 ef2a1b15dfab47b2eca2868e3cdb29bcd66c01c3 SHA256 7c07a9070fba8f05b8368b802e953274029be483170b57df6f2d5ae808a8583b
-MD5 c8fb5c913032ec65007daa33c14255ef ChangeLog 21853
-RMD160 f7aea509c08e266b89b870ca572c87318ed84f75 ChangeLog 21853
-SHA256 7c07a9070fba8f05b8368b802e953274029be483170b57df6f2d5ae808a8583b ChangeLog 21853
+EBUILD tomcat-5.5.17-r4.ebuild 10024 RMD160 f7290ad1c512f21ba1bf2438976460164dcb7823 SHA1 c337e729d3362c15d0cdd0f12edf658196894547 SHA256 97dbe290a8f8449d069cc9a1c861ce12cf3962e20589c2477edfa9567cf95eaa
+MD5 4f894fdb598e788028129044b66e5a0d tomcat-5.5.17-r4.ebuild 10024
+RMD160 f7290ad1c512f21ba1bf2438976460164dcb7823 tomcat-5.5.17-r4.ebuild 10024
+SHA256 97dbe290a8f8449d069cc9a1c861ce12cf3962e20589c2477edfa9567cf95eaa tomcat-5.5.17-r4.ebuild 10024
+MISC ChangeLog 22250 RMD160 5b2f92cd81b3c6c5b336458833ae1443ac31f1e2 SHA1 d21d46ddba126684d9dda5703f554c2f314ba1af SHA256 e2388bf7ce8d9a93d9b7988ace7a7cf4f8c0a0cb3f18f286bb7aa37055c84cfd
+MD5 7f85de061d8167f181ec8579cbd02e4b ChangeLog 22250
+RMD160 5b2f92cd81b3c6c5b336458833ae1443ac31f1e2 ChangeLog 22250
+SHA256 e2388bf7ce8d9a93d9b7988ace7a7cf4f8c0a0cb3f18f286bb7aa37055c84cfd ChangeLog 22250
 MISC metadata.xml 558 RMD160 f81f3d20ca526007bbd8f0f88deffb7a097334ea SHA1 6ab9eadb2a8f19b0d4ea1f02ba88315d49e61fb1 SHA256 d5b4cdcd581677edce5b62c586d618f4c95660127fcb2fb7157f83e6d0e35fce
 MD5 e26537a19167254676bb36654dc01f91 metadata.xml 558
 RMD160 f81f3d20ca526007bbd8f0f88deffb7a097334ea metadata.xml 558
@@ -146,19 +143,12 @@ SHA256 8adce6bec0e657beb514e68dc8196cca8650ec0f2b5d1e421106ccc9fe954531 files/di
 MD5 d942ea8b8317ba352e744aed2d284d01 files/digest-tomcat-5.0.28-r12 280
 RMD160 7283323e161ab5dd3a94549def34af040891e49a files/digest-tomcat-5.0.28-r12 280
 SHA256 2c09d3ad89eb04ab24e5c95a9492d7f461e1935bdb076100010cd3d4f7cb8796 files/digest-tomcat-5.0.28-r12 280
-MD5 b8576467d4d99bc9c4862c31d5839d56 files/digest-tomcat-5.5.17-r1 277
-RMD160 6a37c8c24770ea3fdb63334615303b56350f1cf9 files/digest-tomcat-5.5.17-r1 277
-SHA256 99d72ea7a66a7df313d7f01eeb4bd0d7e6e0325601affc35142b9df1371398e7 files/digest-tomcat-5.5.17-r1 277
-MD5 b8576467d4d99bc9c4862c31d5839d56 files/digest-tomcat-5.5.17-r2 277
-RMD160 6a37c8c24770ea3fdb63334615303b56350f1cf9 files/digest-tomcat-5.5.17-r2 277
-SHA256 99d72ea7a66a7df313d7f01eeb4bd0d7e6e0325601affc35142b9df1371398e7 files/digest-tomcat-5.5.17-r2 277
+MD5 d942ea8b8317ba352e744aed2d284d01 files/digest-tomcat-5.0.28-r13 280
+RMD160 7283323e161ab5dd3a94549def34af040891e49a files/digest-tomcat-5.0.28-r13 280
+SHA256 2c09d3ad89eb04ab24e5c95a9492d7f461e1935bdb076100010cd3d4f7cb8796 files/digest-tomcat-5.0.28-r13 280
 MD5 b8576467d4d99bc9c4862c31d5839d56 files/digest-tomcat-5.5.17-r3 277
 RMD160 6a37c8c24770ea3fdb63334615303b56350f1cf9 files/digest-tomcat-5.5.17-r3 277
 SHA256 99d72ea7a66a7df313d7f01eeb4bd0d7e6e0325601affc35142b9df1371398e7 files/digest-tomcat-5.5.17-r3 277
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFAtC+cxLzpIGCsLQRAgXoAKCKesT3oSFGqh6t6yNBbPpHXunuYACdH+Qo
-k0FPfdTeOwn1Hx/miJNH90I=
-=xmy4
------END PGP SIGNATURE-----
+MD5 b8576467d4d99bc9c4862c31d5839d56 files/digest-tomcat-5.5.17-r4 277
+RMD160 6a37c8c24770ea3fdb63334615303b56350f1cf9 files/digest-tomcat-5.5.17-r4 277
+SHA256 99d72ea7a66a7df313d7f01eeb4bd0d7e6e0325601affc35142b9df1371398e7 files/digest-tomcat-5.5.17-r4 277
diff --git a/www-servers/tomcat/files/digest-tomcat-5.5.17-r1 b/www-servers/tomcat/files/digest-tomcat-5.5.17-r1
deleted file mode 100644
index 51d603367aa1..000000000000
--- a/www-servers/tomcat/files/digest-tomcat-5.5.17-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-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/files/digest-tomcat-5.5.17-r2 b/www-servers/tomcat/files/digest-tomcat-5.5.17-r2
deleted file mode 100644
index 51d603367aa1..000000000000
--- a/www-servers/tomcat/files/digest-tomcat-5.5.17-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-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.5.17-r1.ebuild b/www-servers/tomcat/tomcat-5.5.17-r1.ebuild
deleted file mode 100644
index 2a86ac34effd..000000000000
--- a/www-servers/tomcat/tomcat-5.5.17-r1.ebuild
+++ /dev/null
@@ -1,285 +0,0 @@
-# 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-r1.ebuild,v 1.3 2006/09/04 06:31:38 mr_bones_ Exp $
-
-inherit eutils java-pkg
-
-DESCRIPTION="Apache Servlet-2.4/JSP-2.0 Container"
-
-MY_P="apache-${P}-src"
-SLOT="5.5"
-#SRC_URI="mirror://apache/tomcat-5/v${PV}/src/apache-${P}-src.tar.gz"
-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=">=virtual/jdk-1.4
-	=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-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/mx4j-3*
-	>=dev-java/log4j-1.2.9
-	>=dev-java/saxpath-1.0
-	~dev-java/servletapi-2.4
-	=dev-java/struts-1.2*
-	=dev-java/gnu-jaf-1*
-	>=dev-java/xerces-2.7.1"
-DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}
-	sys-apps/sed
-	dev-java/ant"
-IUSE="doc examples source test"
-
-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
-}
-
-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
-
-	# 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 mx4j-3.0 mx4j.jar jmx.jar
-	java-pkg_jar-from mx4j-3.0 mx4j-rjmx.jar jmx-remote.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-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} -Dactivation.jar=$(java-config -p gnu-jaf-1)"
-	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} -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} -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)"
-	antflags="${antflags} -Dstruts.home=/usr/share/struts"
-	antflags="${antflags} -Djasper.home=${S}/jasper"
-
-	ant ${antflags} || die "compile failed"
-
-}
-src_install() {
-	cd ${S}/build/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}
-
-	# 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}/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 shared ${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
-
-	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-r2.ebuild b/www-servers/tomcat/tomcat-5.5.17-r2.ebuild
deleted file mode 100644
index ac5398e8443e..000000000000
--- a/www-servers/tomcat/tomcat-5.5.17-r2.ebuild
+++ /dev/null
@@ -1,317 +0,0 @@
-# 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-r2.ebuild,v 1.3 2006/09/04 16:49:36 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
-	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} -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} -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} || die "compile failed"
-
-}
-
-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
-}