6 files changed, 11 insertions, 56 deletions
diff --git a/dev-java/tomcat-servlet-api/ChangeLog b/dev-java/tomcat-servlet-api/ChangeLog
index 5d709bee810d..f560a55e93ab 100644
--- a/dev-java/tomcat-servlet-api/ChangeLog
+++ b/dev-java/tomcat-servlet-api/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/tomcat-servlet-api
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.9 2007/02/02 21:20:12 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.10 2007/02/08 15:21:12 wltjr Exp $
+
+*tomcat-servlet-api-6.0.9_beta (08 Feb 2007)
+
+  08 Feb 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  -tomcat-servlet-api-6.0.8_alpha-r1.ebuild,
+  -tomcat-servlet-api-6.0.9_alpha.ebuild,
+  +tomcat-servlet-api-6.0.9_beta.ebuild:
+  Bump to latest beta, removed older versions
 
 *tomcat-servlet-api-6.0.9_alpha (02 Feb 2007)
 
diff --git a/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-6.0.7_beta-r1 b/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-6.0.7_beta-r1
deleted file mode 100644
index 1309a094c51c..000000000000
--- a/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-6.0.7_beta-r1
+++ /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/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-6.0.8_alpha-r1 b/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-6.0.8_alpha-r1
deleted file mode 100644
index d9ae7e3b1bba..000000000000
--- a/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-6.0.8_alpha-r1
+++ /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/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-6.0.9_alpha b/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-6.0.9_beta
index ac34a58141dd..ac34a58141dd 100644
--- a/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-6.0.9_alpha
+++ b/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-6.0.9_beta
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.9_alpha.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.9_alpha.ebuild
deleted file mode 100644
index 6708e8c6baca..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.9_alpha.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.9_alpha.ebuild,v 1.1 2007/02/02 21:20:12 wltjr Exp $
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_A="apache-${P/_alpha/}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 2.5/JSP API 2.1 implementation"
-HOMEPAGE="http://tomcat.apache.org/"
-#SRC_URI="mirror://apache/jakarta/tomcat-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"
-
-LICENSE="Apache-1.1"
-SLOT="2.5"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="source"
-
-DEPEND="|| ( >=virtual/jdk-1.5 >=virtual/jdk-1.6 )
-	source? ( app-arch/zip )"
-RDEPEND="|| ( >=virtual/jre-1.5 >=virtual/jre-1.6 )"
-
-S="${WORKDIR}/${MY_P}/"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	cp ${FILESDIR}/${SLOT}-build.xml build.xml || die "Could not replace build.xml"
-	rm */*/build.xml
-}
-
-src_compile() {
-#	local antflags="jar $(use_doc javadoc examples)"
-	local antflags="jar"
-	eant ${antflags}
-}
-
-src_install() {
-	cd "${S}/output/build/lib"
-	java-pkg_dojar *.jar
-#	use doc && java-pkg_dohtml -r docs/*
-	if use source; then
-		cd "${S}"
-		java-pkg_dosrc java/javax/servlet/
-	fi
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.8_alpha-r1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.9_beta.ebuild
index 43ea9fed2685..d20408c4f714 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.8_alpha-r1.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.9_beta.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.8_alpha-r1.ebuild,v 1.1 2007/01/31 06:49:12 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.9_beta.ebuild,v 1.1 2007/02/08 15:21:12 wltjr Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
-MY_A="apache-${P/_alpha/}-src"
+MY_A="apache-${P/_beta/}-src"
 MY_P="${MY_A/-servlet-api/}"
 DESCRIPTION="Tomcat's Servlet API 2.5/JSP API 2.1 implementation"
 HOMEPAGE="http://tomcat.apache.org/"