Bumped 6.0 to latest alpha. Fixed home page link on 5.5 ebuilds. Dropped ~x86-fbsd keyword from 5.5.20-r5 due to dev-java/commons-httpclient-2.0 not being keyworded for that arch.

(Portage version: 2.1.1-r2)
 (Unsigned Manifest commit)

3 files changed, 20 insertions, 197 deletions

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index bfd7d5526630..75bbb7b39cba 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
@@ -110,7 +107,7 @@ MD5 87bdf76317cb433fb0cd98a6fc10b630 files/6/tomcat.init 3077
 RMD160 4fc1fdda60f82037e6f1cd0ca264d5e348a2fbd4 files/6/tomcat.init 3077
 SHA256 ac4e4c30a09662dc44ff1c413d30a5a5db0be8e8f47983d94f21d50a8fab236e files/6/tomcat.init 3077
 DIST apache-tomcat-5.5.20-src.tar.gz 4796377 RMD160 587590d2e272d1ede73501b62933f544cd969822 SHA1 cc416242d8c9e1978702a207e305ca97afe53d4d SHA256 19f24717fb3e2db902c33e21650dfa88bbf98428c15b1ed68ecaf7a9150e4a77
-DIST apache-tomcat-6.0.6-src.tar.gz 3209780 RMD160 34d41faf8d106dd4e745dcc2f94375792101cb2a SHA1 f10c302147b872c5b967dcd348c17e87f1cce76f SHA256 277de58ebaccbe347afe87c94ec8d3393964e564e9450010d75f4f1219e66879
+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
 DIST jakarta-tomcat-5.0.28-src.tar.gz 3565766 RMD160 22c5e60b2c5009dc33a62edcefa6760d82da859b SHA1 a4ac2ad52f8b8db8ae8c38979f5f50713e242e36 SHA256 bbf584b3c376d23d92b1a0d306eb8f3729cea244c7a850f81d2527a7df6d20fc
 EBUILD tomcat-5.0.27-r6.ebuild 3881 RMD160 80b96c74656e19ac148a68a8047b74066e5709b4 SHA1 8bb842e8a2f594593fab407e7f14d35f4a50ad38 SHA256 c750b594d6f7397f4dfa775738db62238391e86c347a3c5bbcc744d8394974ba
@@ -121,22 +118,22 @@ EBUILD tomcat-5.0.28-r14.ebuild 9357 RMD160 a9a37ab6ec5479ff613eb071548285d62597
 MD5 0bf6de6439b6a7f67509fe51bedbefab tomcat-5.0.28-r14.ebuild 9357
 RMD160 a9a37ab6ec5479ff613eb071548285d62597e183 tomcat-5.0.28-r14.ebuild 9357
 SHA256 a107e5be63f23f54b0664bcc71db4c825683aa18e2a9badfe3cd97805667dcfc tomcat-5.0.28-r14.ebuild 9357
-EBUILD tomcat-5.5.20-r4.ebuild 10287 RMD160 ed109116274dae6c54cc7267b5ceb0a3be4a6886 SHA1 daf2a2fa283919c5f239a58bf1c16dfbc602412a SHA256 a7e598213063d52d9f80a977774b4c6f6a42c255a72ba7902e56db56ab2f68aa
-MD5 b635b81d3b425e1cf1290152b978ef2a tomcat-5.5.20-r4.ebuild 10287
-RMD160 ed109116274dae6c54cc7267b5ceb0a3be4a6886 tomcat-5.5.20-r4.ebuild 10287
-SHA256 a7e598213063d52d9f80a977774b4c6f6a42c255a72ba7902e56db56ab2f68aa tomcat-5.5.20-r4.ebuild 10287
-EBUILD tomcat-5.5.20-r5.ebuild 10246 RMD160 71646b8a67f436cde0e449fff28c77de1d995012 SHA1 1ec2c2921b99518dda445a7324fa696264e6b647 SHA256 287446f4d2faca01a3e6aba1484522f0f0e8d343887e7b691fb9b91c2013b24c
-MD5 cf1f248cd77cad7f897bf5178d6839bf tomcat-5.5.20-r5.ebuild 10246
-RMD160 71646b8a67f436cde0e449fff28c77de1d995012 tomcat-5.5.20-r5.ebuild 10246
-SHA256 287446f4d2faca01a3e6aba1484522f0f0e8d343887e7b691fb9b91c2013b24c tomcat-5.5.20-r5.ebuild 10246
-EBUILD tomcat-6.0.6.ebuild 4715 RMD160 da719bb505293b8280db45c82e84a454a82ae98a SHA1 223cd5c4535630d7918f947e45b083e150326387 SHA256 88da5fa96e0e911853b8264d1fd24dd92200ce263a5f201d1fc546e039185acd
-MD5 5e13c46eed44f09d62d4a5208b13caac tomcat-6.0.6.ebuild 4715
-RMD160 da719bb505293b8280db45c82e84a454a82ae98a tomcat-6.0.6.ebuild 4715
-SHA256 88da5fa96e0e911853b8264d1fd24dd92200ce263a5f201d1fc546e039185acd tomcat-6.0.6.ebuild 4715
-MISC ChangeLog 30548 RMD160 77517f66659ddc80aa655d51b4e7820c16347926 SHA1 a7722ba5930a4fca35df9b97b83bc4e29278b239 SHA256 72b29ae24b440cef528f0dbabac51ee1ed4dbe5273ee91b247c586d0d1f9d8b5
-MD5 3d2dbc656c296d61e17dd2b43d4cccf3 ChangeLog 30548
-RMD160 77517f66659ddc80aa655d51b4e7820c16347926 ChangeLog 30548
-SHA256 72b29ae24b440cef528f0dbabac51ee1ed4dbe5273ee91b247c586d0d1f9d8b5 ChangeLog 30548
+EBUILD tomcat-5.5.20-r4.ebuild 10275 RMD160 dc6fa27938de9727f61eeb34aed286fc74f1e39f SHA1 9b2e96b2ca259b5a1c8005448af02fa4013531b6 SHA256 f5d6420cd9d389bb4c1ff77d290caa8a29812d9c2730f50e3126bffae6a3c742
+MD5 14bc174c3ca92f03d2d3cf74ce12c405 tomcat-5.5.20-r4.ebuild 10275
+RMD160 dc6fa27938de9727f61eeb34aed286fc74f1e39f tomcat-5.5.20-r4.ebuild 10275
+SHA256 f5d6420cd9d389bb4c1ff77d290caa8a29812d9c2730f50e3126bffae6a3c742 tomcat-5.5.20-r4.ebuild 10275
+EBUILD tomcat-5.5.20-r5.ebuild 10224 RMD160 304d441ac70e022fdc30511283a5ed557a4f1c14 SHA1 30260d0a87127f5b641cb94d7300546718511ce1 SHA256 6a9d1e35d2189bdb72e5f34900307cd8b7fa847055fc16f7ce3aa383bd50a76f
+MD5 980a1532d47ee1af5d9c1ad1fe1466b7 tomcat-5.5.20-r5.ebuild 10224
+RMD160 304d441ac70e022fdc30511283a5ed557a4f1c14 tomcat-5.5.20-r5.ebuild 10224
+SHA256 6a9d1e35d2189bdb72e5f34900307cd8b7fa847055fc16f7ce3aa383bd50a76f tomcat-5.5.20-r5.ebuild 10224
+EBUILD tomcat-6.0.7_alpha.ebuild 4758 RMD160 d395e07d803c48f26798779d76865a162855b0b0 SHA1 b59e0aaabf881ec145758063e86820585d6ea59d SHA256 0b5dfb4451a1440e85d954bcb12c3dd0ebbe167e3a5774c8755ded544f2da711
+MD5 b8af73771d4b8fc79e21020b3b68de09 tomcat-6.0.7_alpha.ebuild 4758
+RMD160 d395e07d803c48f26798779d76865a162855b0b0 tomcat-6.0.7_alpha.ebuild 4758
+SHA256 0b5dfb4451a1440e85d954bcb12c3dd0ebbe167e3a5774c8755ded544f2da711 tomcat-6.0.7_alpha.ebuild 4758
+MISC ChangeLog 30926 RMD160 67cc41d3eef6bf78076430e9f2034f919e699c53 SHA1 4e7efac5679b76b6bd7e8f99ac089441accdad77 SHA256 662837e86f33ce06a8a65ab832cb975e6a623f0a88942a6e4ca7fbd1aa76c31a
+MD5 20a400873804730070722fbfc74d2a55 ChangeLog 30926
+RMD160 67cc41d3eef6bf78076430e9f2034f919e699c53 ChangeLog 30926
+SHA256 662837e86f33ce06a8a65ab832cb975e6a623f0a88942a6e4ca7fbd1aa76c31a ChangeLog 30926
 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79
 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556
 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556
@@ -153,13 +150,6 @@ SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/di
 MD5 8adc14a8534e1c6f8d5f96b371e1895f files/digest-tomcat-5.5.20-r5 277
 RMD160 b9c5deac84bf5acd7a65ad80bdfaca9f7e343f3f files/digest-tomcat-5.5.20-r5 277
 SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/digest-tomcat-5.5.20-r5 277
-MD5 448da02765cca1f68bb511db94de7366 files/digest-tomcat-6.0.6 274
-RMD160 fb076827535974cf7e7e029bcab60a02b5d7ff37 files/digest-tomcat-6.0.6 274
-SHA256 ea09af990170d2bcb09eb9d9c3adfec910e0428b33ea736c4afe80cbd5edd755 files/digest-tomcat-6.0.6 274
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFFkW5EcxLzpIGCsLQRAl4AAKCLS672b4WMuhCwGwcjvnKgD/+BCQCeNmcv
-QkiQIbx15DnnnWzmJqrYRLs=
-=SUSB
------END PGP SIGNATURE-----
+MD5 ae090639fc2a4b844084020e9fd68796 files/digest-tomcat-6.0.7_alpha 274
+RMD160 887290424c340b8a024770ae6ee2adeb0252b5ea files/digest-tomcat-6.0.7_alpha 274
+SHA256 8c88ae20979c83fd4529d2493cf5bfc63d86ff37cb46af296db58166d2e0ad3d files/digest-tomcat-6.0.7_alpha 274
diff --git a/www-servers/tomcat/files/digest-tomcat-6.0.6 b/www-servers/tomcat/files/digest-tomcat-6.0.6
deleted file mode 100644
index 965222a75786..000000000000
--- a/www-servers/tomcat/files/digest-tomcat-6.0.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c53e20521a59fdd4abda76c9e5137a3a apache-tomcat-6.0.6-src.tar.gz 3209780
-RMD160 34d41faf8d106dd4e745dcc2f94375792101cb2a apache-tomcat-6.0.6-src.tar.gz 3209780
-SHA256 277de58ebaccbe347afe87c94ec8d3393964e564e9450010d75f4f1219e66879 apache-tomcat-6.0.6-src.tar.gz 3209780
diff --git a/www-servers/tomcat/tomcat-6.0.6.ebuild b/www-servers/tomcat/tomcat-6.0.6.ebuild
deleted file mode 100644
index 05833f52b0e9..000000000000
--- a/www-servers/tomcat/tomcat-6.0.6.ebuild
+++ /dev/null
@@ -1,164 +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-6.0.6.ebuild,v 1.1 2006/12/18 14:35:24 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="6"
-SRC_URI="mirror://apache/${PN}/${PN}-6/v${PV}/src/${MY_P}.tar.gz"
-HOMEPAGE="http://jakarta.apache.org/tomcat"
-KEYWORDS="~amd64 ~x86 -ppc -ppc64"
-LICENSE="Apache-2.0"
-
-IUSE="doc examples jni source test"
-
-RDEPEND=">=virtual/jre-1.5
-	=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-libs/apr
-		dev-libs/openssl )"
-
-DEPEND=">=virtual/jdk-1.5
-	${RDEPEND}
-	test? (
-		dev-java/junit
-		dev-java/ant
-	)
-	!test? ( dev-java/ant-core )"
-
-JAVA_PKG_NV_DEPEND="=virtual/jdk-1.5*"
-
-S=${WORKDIR}/${MY_P}
-
-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}
-
-	if use jni; then
-		cd ${S}/native/connector
-		sh buildconf --with-apr=/usr || die
-		econf --with-apr=/usr --with-ssl=/usr || die
-		make || die
-	fi
-}
-
-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
-
-	# 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() {
-	einfo
-	einfo " This ebuild implements a FHS compliant layout for tomcat"
-	einfo " Please read http://www.gentoo.org/proj/en/java/tomcat-guide.xml"
-	einfo " for more information."
-	einfo
-	einfo " Please report any bugs to http://bugs.gentoo.org/"
-	einfo
-}