Synced recent modifications of 5.5.17 init script with 5.0.28. Removed older 5.0.28 ebuilds

Package-Manager: portage-2.1.2_pre1

5 files changed, 15 insertions, 660 deletions

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 518ee8c04d03..ace52c647aa3 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -58,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 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.0.28/tomcat.init 3013 RMD160 360df30bb9bf5b78b7ed0bb159e37c5af1898956 SHA1 ba45943177fc46c1e68958e435c3efc9063a1b9d SHA256 083b5bd790a43c4f161dcce01e75bfc8927aa8f293aad26fe0e2cfba1f918815
+MD5 197b154fc7a14fcd433e86700f082252 files/5.0.28/tomcat.init 3013
+RMD160 360df30bb9bf5b78b7ed0bb159e37c5af1898956 files/5.0.28/tomcat.init 3013
+SHA256 083b5bd790a43c4f161dcce01e75bfc8927aa8f293aad26fe0e2cfba1f918815 files/5.0.28/tomcat.init 3013
 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
@@ -113,22 +113,18 @@ EBUILD tomcat-5.0.27-r6.ebuild 3907 RMD160 470077caf9ebe247c9a19ac69f2f3d4c77720
 MD5 749387e4f40a08f338295901aa1ccd60 tomcat-5.0.27-r6.ebuild 3907
 RMD160 470077caf9ebe247c9a19ac69f2f3d4c777202e7 tomcat-5.0.27-r6.ebuild 3907
 SHA256 9ca756c1e82f2f8a693a64fa154e58b2ce03f04697ac165d2f8b74374e734f23 tomcat-5.0.27-r6.ebuild 3907
-EBUILD tomcat-5.0.28-r12.ebuild 11138 RMD160 7e7a04d273cec10955f8db35da0b39d946a3904a SHA1 f6aba37979417b8bb2f85cfaa827bc2df65376ff SHA256 0cbc5ef6348aa322b258bc63c5db3efbaad54ce9d8b8e487bff3599ca55d4cf1
-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.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.0.28-r14.ebuild 9390 RMD160 478f2fb9f2774698020b4e2d52c46e69a3233c60 SHA1 2e6866689d334bb8184037ed181d9b5036a5f1c0 SHA256 20aab2cf8b43bd6e56d983bd0f7c52139f72ae9258c70356b98d58e13ca7a93e
+MD5 e13a973aead688e85bc744c7832c12e5 tomcat-5.0.28-r14.ebuild 9390
+RMD160 478f2fb9f2774698020b4e2d52c46e69a3233c60 tomcat-5.0.28-r14.ebuild 9390
+SHA256 20aab2cf8b43bd6e56d983bd0f7c52139f72ae9258c70356b98d58e13ca7a93e tomcat-5.0.28-r14.ebuild 9390
 EBUILD tomcat-5.5.17-r6.ebuild 10024 RMD160 e97c1373f46501a034a06eaaf214f47961a64eb2 SHA1 1add453cdf1050770f5179375c3f6c0b56073e9f SHA256 5fcb3706a2a5aa7fd3823b76d8ab57d84e448501c8bac8653b4d8dc14a90ac74
 MD5 eaa1497616248ef70dd7419bd4b39d62 tomcat-5.5.17-r6.ebuild 10024
 RMD160 e97c1373f46501a034a06eaaf214f47961a64eb2 tomcat-5.5.17-r6.ebuild 10024
 SHA256 5fcb3706a2a5aa7fd3823b76d8ab57d84e448501c8bac8653b4d8dc14a90ac74 tomcat-5.5.17-r6.ebuild 10024
-MISC ChangeLog 22921 RMD160 1b987dec882fe86f931dfc90a533c990e73b9742 SHA1 99bbafee0c88a3a64828287bafee82c8e031fe78 SHA256 daa6ad2be6c91916181a9fe22b0dae5231a9035d481baaef21ef1fefaad2732f
-MD5 8d9e17eb50a76ccdeeb1bb37aad4f276 ChangeLog 22921
-RMD160 1b987dec882fe86f931dfc90a533c990e73b9742 ChangeLog 22921
-SHA256 daa6ad2be6c91916181a9fe22b0dae5231a9035d481baaef21ef1fefaad2732f ChangeLog 22921
+MISC ChangeLog 23220 RMD160 a7c6751bd0f7d9af0fcade57675ee8843572dd3e SHA1 f054eebb8544858dcd94ef91caf83e91e1513307 SHA256 801ba3aecf96d849efd2ea9cb7060fe0625c6de345c2807a95117c1af0c5672b
+MD5 6ff36d2c189045b606bb1008236da5bb ChangeLog 23220
+RMD160 a7c6751bd0f7d9af0fcade57675ee8843572dd3e ChangeLog 23220
+SHA256 801ba3aecf96d849efd2ea9cb7060fe0625c6de345c2807a95117c1af0c5672b ChangeLog 23220
 MISC metadata.xml 558 RMD160 f81f3d20ca526007bbd8f0f88deffb7a097334ea SHA1 6ab9eadb2a8f19b0d4ea1f02ba88315d49e61fb1 SHA256 d5b4cdcd581677edce5b62c586d618f4c95660127fcb2fb7157f83e6d0e35fce
 MD5 e26537a19167254676bb36654dc01f91 metadata.xml 558
 RMD160 f81f3d20ca526007bbd8f0f88deffb7a097334ea metadata.xml 558
@@ -136,12 +132,9 @@ SHA256 d5b4cdcd581677edce5b62c586d618f4c95660127fcb2fb7157f83e6d0e35fce metadata
 MD5 a66da3a2fe33d0d76de033fa230407fa files/digest-tomcat-5.0.27-r6 271
 RMD160 e1de763b91076b421b97582141290372d2695077 files/digest-tomcat-5.0.27-r6 271
 SHA256 8adce6bec0e657beb514e68dc8196cca8650ec0f2b5d1e421106ccc9fe954531 files/digest-tomcat-5.0.27-r6 271
-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 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 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 b8576467d4d99bc9c4862c31d5839d56 files/digest-tomcat-5.5.17-r6 277
 RMD160 6a37c8c24770ea3fdb63334615303b56350f1cf9 files/digest-tomcat-5.5.17-r6 277
 SHA256 99d72ea7a66a7df313d7f01eeb4bd0d7e6e0325601affc35142b9df1371398e7 files/digest-tomcat-5.5.17-r6 277
diff --git a/www-servers/tomcat/files/digest-tomcat-5.0.28-r12 b/www-servers/tomcat/files/digest-tomcat-5.0.28-r12
deleted file mode 100644
index 6d150362b56a..000000000000
--- a/www-servers/tomcat/files/digest-tomcat-5.0.28-r12
+++ /dev/null
@@ -1,3 +0,0 @@
-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.0.28-r13 b/www-servers/tomcat/files/digest-tomcat-5.0.28-r13
deleted file mode 100644
index 6d150362b56a..000000000000
--- a/www-servers/tomcat/files/digest-tomcat-5.0.28-r13
+++ /dev/null
@@ -1,3 +0,0 @@
-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/tomcat-5.0.28-r12.ebuild b/www-servers/tomcat/tomcat-5.0.28-r12.ebuild
deleted file mode 100644
index fd1f507275e6..000000000000
--- a/www-servers/tomcat/tomcat-5.0.28-r12.ebuild
+++ /dev/null
@@ -1,340 +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.0.28-r12.ebuild,v 1.4 2006/03/11 17:51:21 betelgeuse 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 jikes"
-
-S=${WORKDIR}/jakarta-${P}-src
-
-TOMCAT_HOME="/usr/share/${PN}-${SLOT}"
-TOMCAT_NAME="${PN}-${SLOT}"
-WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/default/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
-		gentoo.diff
-		scripts.patch
-		setclasspath.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} || 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-r1 ${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 -m755 -o tomcat -g tomcat
-	dodir   /usr/share/${TOMCAT_NAME}
-	keepdir /var/log/${TOMCAT_NAME}/default
-	keepdir /var/tmp/${TOMCAT_NAME}/default
-	keepdir /var/run/${TOMCAT_NAME}/default
-
-	local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/default/
-	dodir   ${CATALINA_BASE}
-	keepdir ${CATALINA_BASE}/shared/lib
-	keepdir ${CATALINA_BASE}/shared/classes
-
-	dodir   /etc/${TOMCAT_NAME}/default
-	fperms  440 /etc/${TOMCAT_NAME}/default
-
-	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
-	chmod -R 750 conf/*
-	chown -R tomcat:tomcat webapps/* conf/*
-	cp -pR conf/* ${D}/etc/${TOMCAT_NAME}/default || 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}/default ${CATALINA_BASE}/conf
-	dosym /var/log/${TOMCAT_NAME}/default ${CATALINA_BASE}/logs
-	dosym /var/tmp/${TOMCAT_NAME}/default ${CATALINA_BASE}/temp
-	dosym /var/run/${TOMCAT_NAME}/default ${CATALINA_BASE}/work
-
-	cp ${FILESDIR}/${PV}/log4j.properties ${D}/etc/${TOMCAT_NAME}/
-	chown tomcat:tomcat ${D}/etc/${TOMCAT_NAME}/log4j.properties
-
-	dodoc  ${S}/jakarta-tomcat-5/{RELEASE-NOTES,RUNNING.txt}
-	fperms 640 /etc/${TOMCAT_NAME}/default/tomcat-users.xml
-}
-
-pkg_postinst() {
-	#due to previous ebuild bloopers, make sure everything is correct
-	chown root:0 /etc/init.d/${TOMCAT_NAME}
-	chown root:0 /etc/conf.d/${TOMCAT_NAME}
-	chmod -R 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."
-	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 examples; then
-		ewarn
-		ewarn "You do not have the examples 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
-
-	einfo "${WEBAPPS_DIR}"
-	einfo "is now owned by tomcat:tomcat and has 750 as permissions."
-	einfo "This is needed to deploy WAR files from the manager webapp."
-	einfo "See bug 99704. If you are upgrading tomcat you need to manually"
-	einfo "change the permissions."
-
-	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.0.28-r13.ebuild b/www-servers/tomcat/tomcat-5.0.28-r13.ebuild
deleted file mode 100644
index 919f2fcec913..000000000000
--- a/www-servers/tomcat/tomcat-5.0.28-r13.ebuild
+++ /dev/null
@@ -1,292 +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.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
-}