Brand new 0 day release version of Tomcat 6.0.x :). Removed older development versions. Long live tc 6.0.x die <=5.5.x

(Portage version: 2.1.2-r11)

5 files changed, 11 insertions, 53 deletions

diff --git a/dev-java/tomcat-servlet-api/ChangeLog b/dev-java/tomcat-servlet-api/ChangeLog
index 7d3fbac44b19..e1596bd83e20 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.14 2007/02/15 02:48:16 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.15 2007/03/01 00:08:01 wltjr Exp $
+
+*tomcat-servlet-api-6.0.10 (01 Mar 2007)
+
+  01 Mar 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  -tomcat-servlet-api-6.0.9_beta.ebuild,
+  -tomcat-servlet-api-6.0.10_pre.ebuild, +tomcat-servlet-api-6.0.10.ebuild:
+  Brand new 0 day release version of Tomcat 6.0.x :). Removed older
+  development versions. Long live tc 6.0.x die <=5.5.x
 
   15 Feb 2007; William L. Thomson Jr. <wltjr@gentoo.org>
   tomcat-servlet-api-5.5.20.ebuild, tomcat-servlet-api-5.5.22_pre.ebuild:
diff --git a/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-6.0.10_pre b/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-6.0.10
index 3dd91cc642dc..3dd91cc642dc 100644
--- a/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-6.0.10_pre
+++ b/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-6.0.10
diff --git a/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-6.0.9_beta b/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-6.0.9_beta
deleted file mode 100644
index ac34a58141dd..000000000000
--- a/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-6.0.9_beta
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f22e59e244270d8aef6e96d5026e8e1b apache-tomcat-6.0.9-src.tar.gz 3218164
-RMD160 c35c6441a358926a8bef4bc855b275ad2445f842 apache-tomcat-6.0.9-src.tar.gz 3218164
-SHA256 ce3a2a6976ecf0059245debcb2c69c9b3947baf1ecc383fa80c27e55f2ee5647 apache-tomcat-6.0.9-src.tar.gz 3218164
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.9_beta.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.10.ebuild
index d20408c4f714..2353a6dc790b 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.9_beta.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.10.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.9_beta.ebuild,v 1.1 2007/02/08 15:21:12 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.10.ebuild,v 1.1 2007/03/01 00:08:01 wltjr Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
-MY_A="apache-${P/_beta/}-src"
+MY_A="apache-${P}-src"
 MY_P="${MY_A/-servlet-api/}"
 DESCRIPTION="Tomcat's Servlet API 2.5/JSP API 2.1 implementation"
 HOMEPAGE="http://tomcat.apache.org/"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.10_pre.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.10_pre.ebuild
deleted file mode 100644
index 30b875c90a88..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.10_pre.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.10_pre.ebuild,v 1.1 2007/02/13 19:24:37 wltjr Exp $
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_A="apache-${P/_pre/}-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/v${PV/_pre/}/src/${MY_P}.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
-}