Bump to latest beta, removed older versions

Package-Manager: portage-2.1.2-r4

8 files changed, 20 insertions, 364 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 0d0e638b2fa6..df23ad631694 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.117 2007/02/04 01:41:46 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.118 2007/02/08 15:21:51 wltjr Exp $
+
+*tomcat-6.0.9_beta (08 Feb 2007)
+
+  08 Feb 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  -tomcat-6.0.7_beta-r6.ebuild, -tomcat-6.0.8_alpha-r3.ebuild,
+  -tomcat-6.0.9_alpha.ebuild, +tomcat-6.0.9_beta.ebuild:
+  Bump to latest beta, removed older versions
 
   04 Feb 2007; William L. Thomson Jr. <wltjr@gentoo.org>
   tomcat-5.0.28-r14.ebuild, tomcat-5.5.20-r8.ebuild,
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index c96eb2388a89..63a2cb0fd827 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -99,8 +99,6 @@ MD5 f6cfbfe83a55a5700ad52d43483be852 files/6/tomcat.init 3291
 RMD160 b6bac4cf4ce2bac5aa0bd9dec28fa88a39c42570 files/6/tomcat.init 3291
 SHA256 5f06449e261300a0f6ba6cb67f0908ddceb8c0ea06178ac41c791055068ec72b files/6/tomcat.init 3291
 DIST apache-tomcat-5.5.20-src.tar.gz 4796377 RMD160 587590d2e272d1ede73501b62933f544cd969822 SHA1 cc416242d8c9e1978702a207e305ca97afe53d4d SHA256 19f24717fb3e2db902c33e21650dfa88bbf98428c15b1ed68ecaf7a9150e4a77
-DIST apache-tomcat-6.0.7-src.tar.gz 3210405 RMD160 830485c5e25926da950e6b2148aa8baae263b351 SHA1 6883fbed7840c20d0967c435deafc0260609200f SHA256 a76be3230db0a3363835916f14afcccce6f18509577c2999f5491c0fb861e4f3
-DIST apache-tomcat-6.0.8-src.tar.gz 3215835 RMD160 678f6a5c6a8709774735c07618512c6fe651d84b SHA1 757cd847d7a2c7de8f121cb99e4a9f6f48310168 SHA256 132d82dc169ce0de9ca9eba2891e7b3b6182ea7080bc41c160335da06e017ba8
 DIST apache-tomcat-6.0.9-src.tar.gz 3218164 RMD160 c35c6441a358926a8bef4bc855b275ad2445f842 SHA1 2194a1162c0de5c5765fcd419145dbec44470be9 SHA256 ce3a2a6976ecf0059245debcb2c69c9b3947baf1ecc383fa80c27e55f2ee5647
 DIST jakarta-tomcat-5.0.28-src.tar.gz 3565766 RMD160 22c5e60b2c5009dc33a62edcefa6760d82da859b SHA1 a4ac2ad52f8b8db8ae8c38979f5f50713e242e36 SHA256 bbf584b3c376d23d92b1a0d306eb8f3729cea244c7a850f81d2527a7df6d20fc
 EBUILD tomcat-5.0.28-r14.ebuild 9331 RMD160 e88ac9bae92fc262ad9b7c37ef692629943167d9 SHA1 ce01158f8823dd521a5a4fadc7cfbd09e4f59a97 SHA256 b92c98a7411e5c80ea220a9245727c528440670fa7c29a025f71b18f97529c49
@@ -115,22 +113,14 @@ EBUILD tomcat-5.5.20-r8.ebuild 10296 RMD160 d745378ce830fbdc415f0f2de81e976cbff9
 MD5 57d15320f6132d2222e2c9036c583f18 tomcat-5.5.20-r8.ebuild 10296
 RMD160 d745378ce830fbdc415f0f2de81e976cbff91993 tomcat-5.5.20-r8.ebuild 10296
 SHA256 72b899ccde992f7248ff3ce20b9274327c45790c94a4b924d4c09e8dd5528035 tomcat-5.5.20-r8.ebuild 10296
-EBUILD tomcat-6.0.7_beta-r6.ebuild 5067 RMD160 b8634faa76352631fdd5f96fc85347006a8997e0 SHA1 f8a29e501177a1a7a2cd6dc2cbe879c797597d36 SHA256 284abcddcda9298131ce6fc3dd68c2893882260c7d987a7fa30758f95dbc1e9d
-MD5 cbbc9587479e4b07318557af4c9cb99f tomcat-6.0.7_beta-r6.ebuild 5067
-RMD160 b8634faa76352631fdd5f96fc85347006a8997e0 tomcat-6.0.7_beta-r6.ebuild 5067
-SHA256 284abcddcda9298131ce6fc3dd68c2893882260c7d987a7fa30758f95dbc1e9d tomcat-6.0.7_beta-r6.ebuild 5067
-EBUILD tomcat-6.0.8_alpha-r3.ebuild 5069 RMD160 72dc68ee0f7e6cbf79250413d29afc79dbd3b64a SHA1 4a2df8a08cebbc147b781275364b1e20cd64b17b SHA256 26731dd290b227bc29e331b4381f9453b06f7cf707e71b60859294cd9d2e9db0
-MD5 3659e0e8059b98c811005674f38fbc21 tomcat-6.0.8_alpha-r3.ebuild 5069
-RMD160 72dc68ee0f7e6cbf79250413d29afc79dbd3b64a tomcat-6.0.8_alpha-r3.ebuild 5069
-SHA256 26731dd290b227bc29e331b4381f9453b06f7cf707e71b60859294cd9d2e9db0 tomcat-6.0.8_alpha-r3.ebuild 5069
-EBUILD tomcat-6.0.9_alpha.ebuild 5159 RMD160 5b4dfa88e87aa6fb4ae794a5493b7758689bc9eb SHA1 46527e01c381a01989fd3eb6e2a8893bfcc7c3a8 SHA256 80aa38967dc2502382f1ea70ec470a5e625d4e1160c666cf3f9a2aa387d0a49f
-MD5 f477a2851bfa0eb31def11a5487e0a07 tomcat-6.0.9_alpha.ebuild 5159
-RMD160 5b4dfa88e87aa6fb4ae794a5493b7758689bc9eb tomcat-6.0.9_alpha.ebuild 5159
-SHA256 80aa38967dc2502382f1ea70ec470a5e625d4e1160c666cf3f9a2aa387d0a49f tomcat-6.0.9_alpha.ebuild 5159
-MISC ChangeLog 37643 RMD160 4e3ee1afdc5c79aa7737c3a96ce83b06f8082808 SHA1 2dc907e98b68ea861a44e7b1f34099771d6664d6 SHA256 14a04dc436a2ace72b9eb7ef47d80afad38f854309ecda208ba7fd17f73d096a
-MD5 0697a2121a5957314e54a74aa454e578 ChangeLog 37643
-RMD160 4e3ee1afdc5c79aa7737c3a96ce83b06f8082808 ChangeLog 37643
-SHA256 14a04dc436a2ace72b9eb7ef47d80afad38f854309ecda208ba7fd17f73d096a ChangeLog 37643
+EBUILD tomcat-6.0.9_beta.ebuild 5064 RMD160 f3357721d7790e34fe2a58bdc5628498ce7ed022 SHA1 e1901b9c13b6ad3e1001186f6a8bd7d71561163f SHA256 b07213fdc87e65f08ccae3fe1007b1ac871499dd7386c58477914c18a25020cd
+MD5 bf2a86d81d57646cd1436f7b25a39490 tomcat-6.0.9_beta.ebuild 5064
+RMD160 f3357721d7790e34fe2a58bdc5628498ce7ed022 tomcat-6.0.9_beta.ebuild 5064
+SHA256 b07213fdc87e65f08ccae3fe1007b1ac871499dd7386c58477914c18a25020cd tomcat-6.0.9_beta.ebuild 5064
+MISC ChangeLog 37901 RMD160 00d19ed1d22c3a3ae0a721db65c3524a19bd4d30 SHA1 577d5201859233f884a6469ab7f9a8f1195a9bdc SHA256 630d287872a43a16088871f41d80a370f1e4cd0c24c6c56e0ec63895948add29
+MD5 f8bff717484b8c477f714c7168460821 ChangeLog 37901
+RMD160 00d19ed1d22c3a3ae0a721db65c3524a19bd4d30 ChangeLog 37901
+SHA256 630d287872a43a16088871f41d80a370f1e4cd0c24c6c56e0ec63895948add29 ChangeLog 37901
 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79
 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556
 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556
@@ -144,12 +134,6 @@ SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/di
 MD5 8adc14a8534e1c6f8d5f96b371e1895f files/digest-tomcat-5.5.20-r8 277
 RMD160 b9c5deac84bf5acd7a65ad80bdfaca9f7e343f3f files/digest-tomcat-5.5.20-r8 277
 SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/digest-tomcat-5.5.20-r8 277
-MD5 ae090639fc2a4b844084020e9fd68796 files/digest-tomcat-6.0.7_beta-r6 274
-RMD160 887290424c340b8a024770ae6ee2adeb0252b5ea files/digest-tomcat-6.0.7_beta-r6 274
-SHA256 8c88ae20979c83fd4529d2493cf5bfc63d86ff37cb46af296db58166d2e0ad3d files/digest-tomcat-6.0.7_beta-r6 274
-MD5 d42fe3d19844276dfb1df24bd3d29897 files/digest-tomcat-6.0.8_alpha-r3 274
-RMD160 831d3266c513184c82d467da6933a289798935b6 files/digest-tomcat-6.0.8_alpha-r3 274
-SHA256 74cd7a38575a75a9f68d2e6da21d94ec2ae7c729431ab90b89716d6a5dcf7374 files/digest-tomcat-6.0.8_alpha-r3 274
-MD5 09759fb978add9cc1dd420dc82345dbb files/digest-tomcat-6.0.9_alpha 274
-RMD160 ff8e425e3de1f5fa5d1c31dd29d40752585d14d4 files/digest-tomcat-6.0.9_alpha 274
-SHA256 80dce4147154d253edad52355cd69b8a6a53e9d8261dee84d9944fa5b9e06600 files/digest-tomcat-6.0.9_alpha 274
+MD5 09759fb978add9cc1dd420dc82345dbb files/digest-tomcat-6.0.9_beta 274
+RMD160 ff8e425e3de1f5fa5d1c31dd29d40752585d14d4 files/digest-tomcat-6.0.9_beta 274
+SHA256 80dce4147154d253edad52355cd69b8a6a53e9d8261dee84d9944fa5b9e06600 files/digest-tomcat-6.0.9_beta 274
diff --git a/www-servers/tomcat/files/digest-tomcat-6.0.7_beta-r6 b/www-servers/tomcat/files/digest-tomcat-6.0.7_beta-r6
deleted file mode 100644
index 1309a094c51c..000000000000
--- a/www-servers/tomcat/files/digest-tomcat-6.0.7_beta-r6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e4043356aeb6fd631df17adb1fbdb76d apache-tomcat-6.0.7-src.tar.gz 3210405
-RMD160 830485c5e25926da950e6b2148aa8baae263b351 apache-tomcat-6.0.7-src.tar.gz 3210405
-SHA256 a76be3230db0a3363835916f14afcccce6f18509577c2999f5491c0fb861e4f3 apache-tomcat-6.0.7-src.tar.gz 3210405
diff --git a/www-servers/tomcat/files/digest-tomcat-6.0.8_alpha-r3 b/www-servers/tomcat/files/digest-tomcat-6.0.8_alpha-r3
deleted file mode 100644
index d9ae7e3b1bba..000000000000
--- a/www-servers/tomcat/files/digest-tomcat-6.0.8_alpha-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 35bcd5d1c0747568aab289881563119c apache-tomcat-6.0.8-src.tar.gz 3215835
-RMD160 678f6a5c6a8709774735c07618512c6fe651d84b apache-tomcat-6.0.8-src.tar.gz 3215835
-SHA256 132d82dc169ce0de9ca9eba2891e7b3b6182ea7080bc41c160335da06e017ba8 apache-tomcat-6.0.8-src.tar.gz 3215835
diff --git a/www-servers/tomcat/files/digest-tomcat-6.0.9_alpha b/www-servers/tomcat/files/digest-tomcat-6.0.9_beta
index ac34a58141dd..ac34a58141dd 100644
--- a/www-servers/tomcat/files/digest-tomcat-6.0.9_alpha
+++ b/www-servers/tomcat/files/digest-tomcat-6.0.9_beta
diff --git a/www-servers/tomcat/tomcat-6.0.8_alpha-r3.ebuild b/www-servers/tomcat/tomcat-6.0.8_alpha-r3.ebuild
deleted file mode 100644
index be002542d47e..000000000000
--- a/www-servers/tomcat/tomcat-6.0.8_alpha-r3.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.8_alpha-r3.ebuild,v 1.3 2007/02/04 01:41:46 wltjr Exp $
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Tomcat Servlet-2.5/JSP-2.1 Container"
-
-MY_P="apache-${P/_alpha/}-src"
-SLOT="6"
-SRC_URI="mirror://apache/${PN}/${PN}-6/v${PV/_/-}/src/${MY_P}.tar.gz"
-HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-LICENSE="Apache-2.0"
-
-IUSE="doc examples source test"
-
-RDEPEND="|| ( >=virtual/jre-1.5 >=virtual/jre-1.6 )
-	=dev-java/eclipse-ecj-3.2*
-	>=dev-java/commons-daemon-1.0.1
-	>=dev-java/commons-dbcp-1.2.1
-	>=dev-java/commons-logging-1.1
-	>=dev-java/commons-pool-1.2
-	~dev-java/tomcat-servlet-api-${PV}"
-
-DEPEND="|| ( >=virtual/jdk-1.5 >=virtual/jdk-1.6 )
-	${RDEPEND}
-	test? ( dev-java/junit )"
-
-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
-
-	WANT_ANT_TASKS="ant-trax"
-}
-
-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
-	# Not sure if this is happening for others
-
-	# Old way
-#	java-pkg_force-compiler ecj-3.2
-
-	# New way if others get out of heap space
-#	ANT_OPTS=-XX:MaxPermSize=128m
-
-	local antflags="build-jasper-jdt deploy -Dbase.path=${T}"
-	antflags="${antflags} -Dcompile.debug=false"
-	if ! use doc; then
-		antflags="${antflags} -Dnobuild.docs=true"
-	fi
-	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)"
-	antflags="${antflags} -Djsp-api.jar=$(java-pkg_getjar tomcat-servlet-api-2.5 jsp-api.jar)"
-	antflags="${antflags} -Dservlet-api.jar=$(java-pkg_getjar tomcat-servlet-api-2.5 servlet-api.jar)"
-	eant ${antflags}
-}
-
-src_install() {
-	local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/
-
-	# init.d, conf.d
-	newinitd ${FILESDIR}/${SLOT}/tomcat.init ${TOMCAT_NAME}
-	newconfd ${FILESDIR}/${SLOT}/tomcat.conf ${TOMCAT_NAME}
-
-	# create dir structure
-	diropts -m755 -o tomcat -g tomcat
-	dodir   /etc/${TOMCAT_NAME}
-	fperms  750 /etc/${TOMCAT_NAME}
-	dodir /usr/share/${TOMCAT_NAME}
-	keepdir /var/log/${TOMCAT_NAME}/
-	keepdir /var/tmp/${TOMCAT_NAME}/
-	keepdir /var/run/${TOMCAT_NAME}/
-	dodir   ${CATALINA_BASE}
-	diropts -m0755
-
-	cd "${S}"
-	# we don't need dos scripts
-	rm -f bin/*.bat
-	chmod 755 bin/*.sh
-
-	# fix context's since upstream is slackin
-	sed -i -e 's:}/server/:}/:' ${S}/webapps/host-manager/host-manager.xml
-	sed -i -e 's:}/server/:}/:' ${S}/webapps/manager/manager.xml
-
-	# copy the manager's context to the right position
-	mkdir -p conf/Catalina/localhost
-	cp ${S}/webapps/host-manager/host-manager.xml conf/Catalina/localhost
-	cp ${S}/webapps/manager/manager.xml conf/Catalina/localhost
-
-	# replace the default pw with a random one, see #92281
-	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
-	sed -e s:SHUTDOWN:${randpw}: -i conf/server.xml
-
-	# copy over the directories
-	chown -R tomcat:tomcat webapps/* conf/*
-	cp -pR conf/* ${D}/etc/${TOMCAT_NAME} || die "failed to copy conf"
-	cp -R bin output/build/bin output/build/lib ${D}/usr/share/${TOMCAT_NAME} \
-		|| die "failed to copy"
-
-	cp ${T}/tomcat6-deps/jdt/jasper-jdt.jar ${D}/usr/share/${TOMCAT_NAME}/lib \
-		|| die "failed to copy"
-
-	keepdir               ${WEBAPPS_DIR}
-	chown  tomcat:tomcat ${D}/${WEBAPPS_DIR} || die "Failed to change owner off ${1}."
-	chmod  750           ${D}/${WEBAPPS_DIR} || die "Failed to change permissions off ${1}."
-
-	cd "${D}/usr/share/${TOMCAT_NAME}/lib"
-	java-pkg_jar-from tomcat-servlet-api-2.5
-
-	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 output/build/webapps/docs ${D}${CATALINA_BASE}/webapps
-	fi
-	if use examples; then
-		cp -pr output/build/webapps/examples ${D}${CATALINA_BASE}/webapps
-	fi
-
-	# symlink the directories to make CATALINA_BASE possible
-	dosym /etc/${TOMCAT_NAME} ${CATALINA_BASE}/conf
-	dosym /var/log/${TOMCAT_NAME} ${CATALINA_BASE}/logs
-	dosym /var/tmp/${TOMCAT_NAME} ${CATALINA_BASE}/temp
-	dosym /var/run/${TOMCAT_NAME} ${CATALINA_BASE}/work
-
-	dodoc  ${S}/{RELEASE-NOTES,RUNNING.txt}
-	fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
-}
-
-pkg_postinst() {
-	elog
-	elog " This ebuild implements a FHS compliant layout for tomcat"
-	elog " Please read http://www.gentoo.org/proj/en/java/tomcat-guide.xml"
-	elog " for more information."
-	elog
-	elog " Please report any bugs to http://bugs.gentoo.org/"
-	elog
-}
diff --git a/www-servers/tomcat/tomcat-6.0.9_alpha.ebuild b/www-servers/tomcat/tomcat-6.0.9_alpha.ebuild
deleted file mode 100644
index 342438e33f0a..000000000000
--- a/www-servers/tomcat/tomcat-6.0.9_alpha.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.9_alpha.ebuild,v 1.2 2007/02/04 01:41:46 wltjr Exp $
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Tomcat Servlet-2.5/JSP-2.1 Container"
-
-MY_P="apache-${P/_alpha/}-src"
-SLOT="6"
-#SRC_URI="mirror://apache/${PN}/${PN}-6/v${PV/_/-}/src/${MY_P}.tar.gz"
-SRC_URI="http://people.apache.org/~remm/tomcat-6/v6.0.9/src/apache-tomcat-6.0.9-src.tar.gz"
-HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-LICENSE="Apache-2.0"
-
-IUSE="doc examples source test"
-
-RDEPEND="|| ( >=virtual/jre-1.5 >=virtual/jre-1.6 )
-	=dev-java/eclipse-ecj-3.2*
-	>=dev-java/commons-daemon-1.0.1
-	>=dev-java/commons-dbcp-1.2.1
-	>=dev-java/commons-logging-1.1
-	>=dev-java/commons-pool-1.2
-	~dev-java/tomcat-servlet-api-${PV}"
-
-DEPEND="|| ( >=virtual/jdk-1.5 >=virtual/jdk-1.6 )
-	${RDEPEND}
-	test? ( dev-java/junit )"
-
-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
-
-	WANT_ANT_TASKS="ant-trax"
-}
-
-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
-	# Not sure if this is happening for others
-
-	# Old way
-#	java-pkg_force-compiler ecj-3.2
-
-	# New way if others get out of heap space
-#	ANT_OPTS=-XX:MaxPermSize=128m
-
-	local antflags="build-jasper-jdt deploy -Dbase.path=${T}"
-	antflags="${antflags} -Dcompile.debug=false"
-	if ! use doc; then
-		antflags="${antflags} -Dnobuild.docs=true"
-	fi
-	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)"
-	antflags="${antflags} -Djsp-api.jar=$(java-pkg_getjar tomcat-servlet-api-2.5 jsp-api.jar)"
-	antflags="${antflags} -Dservlet-api.jar=$(java-pkg_getjar tomcat-servlet-api-2.5 servlet-api.jar)"
-	eant ${antflags}
-}
-
-src_install() {
-	local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/
-
-	# init.d, conf.d
-	newinitd ${FILESDIR}/${SLOT}/tomcat.init ${TOMCAT_NAME}
-	newconfd ${FILESDIR}/${SLOT}/tomcat.conf ${TOMCAT_NAME}
-
-	# create dir structure
-	diropts -m755 -o tomcat -g tomcat
-	dodir   /etc/${TOMCAT_NAME}
-	fperms  750 /etc/${TOMCAT_NAME}
-	dodir /usr/share/${TOMCAT_NAME}
-	keepdir /var/log/${TOMCAT_NAME}/
-	keepdir /var/tmp/${TOMCAT_NAME}/
-	keepdir /var/run/${TOMCAT_NAME}/
-	dodir   ${CATALINA_BASE}
-	diropts -m0755
-
-	cd "${S}"
-	# we don't need dos scripts
-	rm -f bin/*.bat
-	chmod 755 bin/*.sh
-
-	# fix context's since upstream is slackin
-	sed -i -e 's:}/server/:}/:' ${S}/webapps/host-manager/host-manager.xml
-	sed -i -e 's:}/server/:}/:' ${S}/webapps/manager/manager.xml
-
-	# copy the manager's context to the right position
-	mkdir -p conf/Catalina/localhost
-	cp ${S}/webapps/host-manager/host-manager.xml conf/Catalina/localhost
-	cp ${S}/webapps/manager/manager.xml conf/Catalina/localhost
-
-	# replace the default pw with a random one, see #92281
-	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
-	sed -e s:SHUTDOWN:${randpw}: -i conf/server.xml
-
-	# copy over the directories
-	chown -R tomcat:tomcat webapps/* conf/*
-	cp -pR conf/* ${D}/etc/${TOMCAT_NAME} || die "failed to copy conf"
-	cp -R bin output/build/bin output/build/lib ${D}/usr/share/${TOMCAT_NAME} \
-		|| die "failed to copy"
-
-	cp ${T}/tomcat6-deps/jdt/jasper-jdt.jar ${D}/usr/share/${TOMCAT_NAME}/lib \
-		|| die "failed to copy"
-
-	keepdir               ${WEBAPPS_DIR}
-	chown  tomcat:tomcat ${D}/${WEBAPPS_DIR} || die "Failed to change owner off ${1}."
-	chmod  750           ${D}/${WEBAPPS_DIR} || die "Failed to change permissions off ${1}."
-
-	cd "${D}/usr/share/${TOMCAT_NAME}/lib"
-	java-pkg_jar-from tomcat-servlet-api-2.5
-
-	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 output/build/webapps/docs ${D}${CATALINA_BASE}/webapps
-	fi
-	if use examples; then
-		cp -pr output/build/webapps/examples ${D}${CATALINA_BASE}/webapps
-	fi
-
-	# symlink the directories to make CATALINA_BASE possible
-	dosym /etc/${TOMCAT_NAME} ${CATALINA_BASE}/conf
-	dosym /var/log/${TOMCAT_NAME} ${CATALINA_BASE}/logs
-	dosym /var/tmp/${TOMCAT_NAME} ${CATALINA_BASE}/temp
-	dosym /var/run/${TOMCAT_NAME} ${CATALINA_BASE}/work
-
-	dodoc  ${S}/{RELEASE-NOTES,RUNNING.txt}
-	fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
-}
-
-pkg_postinst() {
-	elog
-	elog " This ebuild implements a FHS compliant layout for tomcat"
-	elog " Please read http://www.gentoo.org/proj/en/java/tomcat-guide.xml"
-	elog " for more information."
-	elog
-	elog " Please report any bugs to http://bugs.gentoo.org/"
-	elog
-}
diff --git a/www-servers/tomcat/tomcat-6.0.7_beta-r6.ebuild b/www-servers/tomcat/tomcat-6.0.9_beta.ebuild
index 90503bab8f48..b6410d0107d3 100644
--- a/www-servers/tomcat/tomcat-6.0.7_beta-r6.ebuild
+++ b/www-servers/tomcat/tomcat-6.0.9_beta.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.7_beta-r6.ebuild,v 1.3 2007/02/04 01:41:46 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.9_beta.ebuild,v 1.1 2007/02/08 15:21:51 wltjr Exp $
 
 inherit eutils java-pkg-2 java-ant-2