Changed SRC_URI to reflect changes upstream. Fixes bug #124237. Thanks to Beech Horn <beech@metalshark.co.uk> for reporting. Also removed old revisions.

(Portage version: 2.1_pre5-r4)

8 files changed, 24 insertions, 654 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 50dfbe6e1d5f..8e6e77c20833 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,13 @@
 # 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.47 2006/02/09 22:20:19 tove Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.48 2006/03/11 17:38:31 betelgeuse Exp $
+
+  11 Mar 2006; Petteri Räty <betelgeuse@gentoo.org>
+  tomcat-5.0.27-r6.ebuild, -tomcat-5.0.28-r9.ebuild,
+  -tomcat-5.0.28-r10.ebuild, tomcat-5.0.28-r12.ebuild:
+  Changed SRC_URI to reflect changes upstream. Fixes bug #124237. Thanks to
+  Beech Horn <beech@metalshark.co.uk> for reporting. Also removed old
+  revisions.
 
   30 Dec 2005; Petteri Räty <betelgeuse@gentoo.org>
   tomcat-5.0.27-r6.ebuild, tomcat-5.0.28-r9.ebuild,
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 435f92ba259c..abd55ff82c57 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 23027f6934f334a1049693179a79a649 ChangeLog 19732
-RMD160 79359fb56f92394e4ae78e8c9b62d5156f32cfbe ChangeLog 19732
-SHA256 bd061989983a858402ce5fcdc34f6da012febe6f1626197bb7126a1bede9e5a6 ChangeLog 19732
+MD5 55e0580c54faa479e269ed27be874181 ChangeLog 20053
+RMD160 339a14a41bf7ebb978013ec00866ec2ac0c6c5ae ChangeLog 20053
+SHA256 e36abbf123c06503e7cd425cc8a1b132ac6e7cb371dc1333fa82c9e5237d0c1b ChangeLog 20053
 MD5 cbb635ed31e3b7ddabe1db851a8b471e files/5.0.27/gentoo.diff 463
 RMD160 ace3fcd5d4d42e987840a0ba46c2f2e5db545dfc files/5.0.27/gentoo.diff 463
 SHA256 d8c9da161ae1274479f88f69821be780bd70ebfe7ad9c2f92db0f03f4b4c9401 files/5.0.27/gentoo.diff 463
@@ -55,34 +52,15 @@ SHA256 8cf86bad1b667774aa89c0f63facd1aafdea45ff0f117a7879208bee92337763 files/5.
 MD5 d5a48abc8db5543a73abbbf151d0630e files/digest-tomcat-5.0.27-r6 75
 RMD160 3843a247e62d3b5c6599f88b7481309502a402ef files/digest-tomcat-5.0.27-r6 75
 SHA256 ba86ada6197fb755ad685d43494a6126a2813a89d27a38bc78dd69f95bc58f26 files/digest-tomcat-5.0.27-r6 75
-MD5 af26ca4772989a2090085a6e24b71628 files/digest-tomcat-5.0.28-r10 78
-RMD160 86c227b07b6a1bd09b18bebe86f675bd9f602c5e files/digest-tomcat-5.0.28-r10 78
-SHA256 381352960bb01a46b97c4feb79994745d425e647e8eb4068ad2f8fddff3b0fe3 files/digest-tomcat-5.0.28-r10 78
 MD5 af26ca4772989a2090085a6e24b71628 files/digest-tomcat-5.0.28-r12 78
 RMD160 86c227b07b6a1bd09b18bebe86f675bd9f602c5e files/digest-tomcat-5.0.28-r12 78
 SHA256 381352960bb01a46b97c4feb79994745d425e647e8eb4068ad2f8fddff3b0fe3 files/digest-tomcat-5.0.28-r12 78
-MD5 af26ca4772989a2090085a6e24b71628 files/digest-tomcat-5.0.28-r9 78
-RMD160 86c227b07b6a1bd09b18bebe86f675bd9f602c5e files/digest-tomcat-5.0.28-r9 78
-SHA256 381352960bb01a46b97c4feb79994745d425e647e8eb4068ad2f8fddff3b0fe3 files/digest-tomcat-5.0.28-r9 78
 MD5 f994107ba9a296c7de72d951eb9ddb29 metadata.xml 454
 RMD160 c40a7fbdb01b9716f9d163e051184ddfc386e880 metadata.xml 454
 SHA256 c8affe406c8353e5ba4a811a2ea2016dfa0626858ef3413dade2a266f78ee82c metadata.xml 454
-MD5 fc6c52a228cf906a11d207e37015e5d5 tomcat-5.0.27-r6.ebuild 3885
-RMD160 5d9ca46b14f426ea4f5280c186628288ec26986d tomcat-5.0.27-r6.ebuild 3885
-SHA256 0edf3c88bfbc9e81dde762c006b4e2d1aba0d67a71eff2a8b5fd2a71d87bcbbe tomcat-5.0.27-r6.ebuild 3885
-MD5 cf04a4db6cf838817d0c4a18fdc6bc00 tomcat-5.0.28-r10.ebuild 11054
-RMD160 029d4ed09bbe6c0e130364a9c96fe4d45e61abb1 tomcat-5.0.28-r10.ebuild 11054
-SHA256 54d4814f4b028d8bd97dee03dbfa5c4dccce215156e386524c8ca82c31931815 tomcat-5.0.28-r10.ebuild 11054
-MD5 f0801475f3134340cad674593a4d9c66 tomcat-5.0.28-r12.ebuild 11122
-RMD160 db1b44682fe353e681861104085db867d08cde74 tomcat-5.0.28-r12.ebuild 11122
-SHA256 48a88aecd7b2c8a8b19d7846b3de7bc9c3ee3959b82222d956ce5a403a300471 tomcat-5.0.28-r12.ebuild 11122
-MD5 5868ff090304d6806ed030323c330f2c tomcat-5.0.28-r9.ebuild 9994
-RMD160 a89c44db382816410e1658ccb7ad0ea7455e2eeb tomcat-5.0.28-r9.ebuild 9994
-SHA256 16b4185e6ca808dcffb44d32b6b36942cb0116fe21060d629898678a48a2ca1d tomcat-5.0.28-r9.ebuild 9994
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD68AwV3J2n04EauwRAkjaAKC9x00EKV7o5Or8X7hkThDJxuPnxwCfZNMN
-2gLaDgpklkZIJsVaCvYU7XE=
-=uFdv
------END PGP SIGNATURE-----
+MD5 0f89ced6d63ce19c8639f14398ccb147 tomcat-5.0.27-r6.ebuild 3907
+RMD160 90c320b2ce47836651a04245483c7d735954821e tomcat-5.0.27-r6.ebuild 3907
+SHA256 af6c0bad6f64f3b3b0339a06c00c64fbc54a69c94a994c9a1b9b05af9cc2a135 tomcat-5.0.27-r6.ebuild 3907
+MD5 5b1310287070a931aa8fe40d72976d30 tomcat-5.0.28-r12.ebuild 11121
+RMD160 551d02c46f1361520dda6486195d2e9408d3c64e tomcat-5.0.28-r12.ebuild 11121
+SHA256 69265940388903af794ceb475225a8a262c45cd6728aeb36352badcda84bf089 tomcat-5.0.28-r12.ebuild 11121
diff --git a/www-servers/tomcat/files/digest-tomcat-5.0.28-r10 b/www-servers/tomcat/files/digest-tomcat-5.0.28-r10
deleted file mode 100644
index 38ec5031aa8e..000000000000
--- a/www-servers/tomcat/files/digest-tomcat-5.0.28-r10
+++ /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-r9 b/www-servers/tomcat/files/digest-tomcat-5.0.28-r9
deleted file mode 100644
index 38ec5031aa8e..000000000000
--- a/www-servers/tomcat/files/digest-tomcat-5.0.28-r9
+++ /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.27-r6.ebuild b/www-servers/tomcat/tomcat-5.0.27-r6.ebuild
index bfb72e9da271..8e2d01007866 100644
--- a/www-servers/tomcat/tomcat-5.0.27-r6.ebuild
+++ b/www-servers/tomcat/tomcat-5.0.27-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.27-r6.ebuild,v 1.4 2005/12/30 22:03:03 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.0.27-r6.ebuild,v 1.5 2006/03/11 17:38:31 betelgeuse Exp $
 
 inherit eutils
 
@@ -9,7 +9,7 @@ DESCRIPTION="Apache Servlet-2.4/JSP-2.0 Container"
 JT_P="jakarta-${P}.tar.gz"
 S=${WORKDIR}/jakarta-${P}
 SLOT="${PV/.*/}"
-SRC_URI="mirror://apache/jakarta/tomcat-${SLOT}/v${PV}/bin/${JT_P}"
+SRC_URI="http://archive.apache.org/dist/tomcat/tomcat-${SLOT}/archive/v${PV}/bin/${JT_P}"
 HOMEPAGE="http://tomcat.apache.org/"
 KEYWORDS="x86 ppc ~sparc ~alpha ~amd64 ~ppc64"
 LICENSE="Apache-2.0"
diff --git a/www-servers/tomcat/tomcat-5.0.28-r10.ebuild b/www-servers/tomcat/tomcat-5.0.28-r10.ebuild
deleted file mode 100644
index 8a441046455e..000000000000
--- a/www-servers/tomcat/tomcat-5.0.28-r10.ebuild
+++ /dev/null
@@ -1,328 +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-r10.ebuild,v 1.2 2005/12/30 22:03:03 betelgeuse 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://tomcat.apache.org/"
-KEYWORDS="~x86 ~amd64 -ppc64 ~sparc"
-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
-	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"
-
-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 sun-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-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_getjar jaxen jaxen-full.jar)"
-	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 xerces-2 xml-apis.jar)"
-	antflags="${antflags} -Dstruts.home=/usr/share/struts-1.1/"
-
-	ant ${antflags} || die "compile failed"
-
-}
-src_install() {
-	# new user for tomcat
-	enewgroup tomcat
-	enewuser tomcat -1 -1 /dev/null tomcat
-
-	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-r12.ebuild b/www-servers/tomcat/tomcat-5.0.28-r12.ebuild
index 1446bb9b01cc..5c3229d5cbc4 100644
--- a/www-servers/tomcat/tomcat-5.0.28-r12.ebuild
+++ b/www-servers/tomcat/tomcat-5.0.28-r12.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.2 2005/12/30 22:03:03 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.0.28-r12.ebuild,v 1.3 2006/03/11 17:38:31 betelgeuse 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"
+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"
diff --git a/www-servers/tomcat/tomcat-5.0.28-r9.ebuild b/www-servers/tomcat/tomcat-5.0.28-r9.ebuild
deleted file mode 100644
index 3c3890408864..000000000000
--- a/www-servers/tomcat/tomcat-5.0.28-r9.ebuild
+++ /dev/null
@@ -1,285 +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-r9.ebuild,v 1.2 2005/12/30 22:03:03 betelgeuse 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://tomcat.apache.org/"
-KEYWORDS="~x86 ~amd64 -ppc64 ~sparc"
-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
-	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"
-
-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 sun-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-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_getjar jaxen jaxen-full.jar)"
-	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 xerces-2 xml-apis.jar)"
-	antflags="${antflags} -Dstruts.home=/usr/share/struts-1.1/"
-
-	ant ${antflags} || die "compile failed"
-
-}
-src_install() {
-	# new user for tomcat
-	enewgroup tomcat
-	enewuser tomcat -1 -1 /dev/null tomcat
-
-	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."
-}
-
-#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}."
-}