Bumped to latest version, removed past version of 6.0.x

Package-Manager: portage-2.1.3.7

6 files changed, 71 insertions, 52 deletions

diff --git a/dev-java/tomcat-servlet-api/ChangeLog b/dev-java/tomcat-servlet-api/ChangeLog
index 83a075aa77e2..9609e70622fc 100644
--- a/dev-java/tomcat-servlet-api/ChangeLog
+++ b/dev-java/tomcat-servlet-api/ChangeLog
@@ -1,6 +1,12 @@
 # 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.32 2007/09/02 15:05:55 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.33 2007/09/08 16:14:42 wltjr Exp $
+
+*tomcat-servlet-api-5.5.25 (08 Sep 2007)
+
+  08 Sep 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  +tomcat-servlet-api-5.5.25.ebuild, -tomcat-servlet-api-6.0.13.ebuild:
+  Bumped to latest version, removed past version of 6.0.x
 
   02 Sep 2007; Markus Rothe <corsair@gentoo.org>
   tomcat-servlet-api-6.0.14.ebuild:
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 71f5ebefb0aa..b8d2eeaa3fc0 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -3,24 +3,24 @@ MD5 66ba82dc585e7dec8814097eae04a5d3 files/2.5-build.xml 2864
 RMD160 d69af37473e7526f17ce99d7e5e624d2edac630b files/2.5-build.xml 2864
 SHA256 b2cbb540ab2bfacc8044e0c6d67afbbd8c1e2e04a12a9c0f565902e1ef3c687a files/2.5-build.xml 2864
 DIST apache-tomcat-5.5.23-src.tar.gz 4895919 RMD160 fe669f6b864fd7dcf4ad74dad22a0256e5417005 SHA1 59272b5eedde9c32a126679ff9e1d2a5f56265c8 SHA256 e2f7ce250643349507b511a5ea96df7364030a061a8f4d5b71d8b5a099e2b6bd
-DIST apache-tomcat-6.0.13-src.tar.gz 3454302 RMD160 2ef73ec380736661969f28c231a4a0c9fbd6d29c SHA1 8a60e80b878609dc207a357fede749c67857dd54 SHA256 273c6d56283677c0c7033e6ecce53ba7f1fac6930e20e83acccfe2ac88c6a6ff
+DIST apache-tomcat-5.5.25-src.tar.gz 5106363 RMD160 83bb506b3f0fbde75e346e02832645bd6526fa7d SHA1 81ef41e25f805831aa63353f52e5b498c74a3414 SHA256 b7618f0a1e04623bfc9e14bdb51ae54203fa1e80f6c7ee61e2387cb11de8736f
 DIST apache-tomcat-6.0.14-src.tar.gz 3458776 RMD160 24f586d946654edcc70c5ec1ee457022c4a5d070 SHA1 3156b0b853f8f340ef825c58d0281cdda3f5816e SHA256 ef57398cc8e0294fb74d0d76debdaebf51ec47f18c9c927ddc98530dfa93cf88
 EBUILD tomcat-servlet-api-5.5.23.ebuild 1330 RMD160 e69e8d92f055d8c0c463caf264b29f94983b6256 SHA1 d0e57246b2bdba8d0147cc7788b06ed76e035156 SHA256 fd160f69463ee0b0d55f88e45a289fb5e423ce11a15471b6c8a64df6f5edc06d
 MD5 7d5dc89ccdc67e124929e42f2d4cd818 tomcat-servlet-api-5.5.23.ebuild 1330
 RMD160 e69e8d92f055d8c0c463caf264b29f94983b6256 tomcat-servlet-api-5.5.23.ebuild 1330
 SHA256 fd160f69463ee0b0d55f88e45a289fb5e423ce11a15471b6c8a64df6f5edc06d tomcat-servlet-api-5.5.23.ebuild 1330
-EBUILD tomcat-servlet-api-6.0.13.ebuild 983 RMD160 4ab2bcb0a1211303ecf4dae790948ed5820fdb18 SHA1 a6504d1832af7ff92145405e8d07dfe88062230d SHA256 6b5dd0202c80500d32937a56d35d581e9dff648281344b1f05ed8d6329ed6f4a
-MD5 cf6399755aa6b262cdb51f2d3b966da2 tomcat-servlet-api-6.0.13.ebuild 983
-RMD160 4ab2bcb0a1211303ecf4dae790948ed5820fdb18 tomcat-servlet-api-6.0.13.ebuild 983
-SHA256 6b5dd0202c80500d32937a56d35d581e9dff648281344b1f05ed8d6329ed6f4a tomcat-servlet-api-6.0.13.ebuild 983
+EBUILD tomcat-servlet-api-5.5.25.ebuild 1330 RMD160 7a7deb222b55fda9d775a0c74da6111926b50972 SHA1 2dfb5d4bb28bd8d341ff5447ae7406c5cc3661a0 SHA256 fb9ba557b20808de9153bf76fd59637755f28f0fc11b28c896c676918d3d952a
+MD5 8c6058156b601f89c606ff3a85a42a36 tomcat-servlet-api-5.5.25.ebuild 1330
+RMD160 7a7deb222b55fda9d775a0c74da6111926b50972 tomcat-servlet-api-5.5.25.ebuild 1330
+SHA256 fb9ba557b20808de9153bf76fd59637755f28f0fc11b28c896c676918d3d952a tomcat-servlet-api-5.5.25.ebuild 1330
 EBUILD tomcat-servlet-api-6.0.14.ebuild 984 RMD160 14851b92f80049999b647e97930b5e0857958151 SHA1 a09ce5590ed658922f072fef320e4df4e1c3db14 SHA256 cd3eff1ed604184255f8abd2fe55fa18f0b8f3ea453ac84963aceaa596c1c726
 MD5 8eb340f8371c4aafe075baeb708c42d3 tomcat-servlet-api-6.0.14.ebuild 984
 RMD160 14851b92f80049999b647e97930b5e0857958151 tomcat-servlet-api-6.0.14.ebuild 984
 SHA256 cd3eff1ed604184255f8abd2fe55fa18f0b8f3ea453ac84963aceaa596c1c726 tomcat-servlet-api-6.0.14.ebuild 984
-MISC ChangeLog 6038 RMD160 9dccd67b5e82f2ce720d31783b96dc2d8526a43a SHA1 46e0d6bb209faacb524249ef89ac81a692bf690b SHA256 cac985e7ec1746242c5fffd062460643081afeb7425b0afc530d75c9bb6012a7
-MD5 d713b3f92dc291d496a6dac3ede390ed ChangeLog 6038
-RMD160 9dccd67b5e82f2ce720d31783b96dc2d8526a43a ChangeLog 6038
-SHA256 cac985e7ec1746242c5fffd062460643081afeb7425b0afc530d75c9bb6012a7 ChangeLog 6038
+MISC ChangeLog 6266 RMD160 0f4867cddef9f438f8ef026b73d568ace3edb7c4 SHA1 a0747114611fcc0c53fc25a6e9107e5b12bd5443 SHA256 fe1f6fa070367015af812b70abfdafadad1c9c97dcc03050b68b1262182f330f
+MD5 c4768a3586aab17f73441f36aba33d94 ChangeLog 6266
+RMD160 0f4867cddef9f438f8ef026b73d568ace3edb7c4 ChangeLog 6266
+SHA256 fe1f6fa070367015af812b70abfdafadad1c9c97dcc03050b68b1262182f330f ChangeLog 6266
 MISC metadata.xml 370 RMD160 80f77811a1330480797cff01b1e90e883ecb4d51 SHA1 0d60a8ede5babbd15577612fe7b9e504e5a73689 SHA256 d82a36005520445f65916bb8e8e5a4e41c3af6cc5be87cb2263337074e39b704
 MD5 eab22d527a1a92afde250a0ff957b829 metadata.xml 370
 RMD160 80f77811a1330480797cff01b1e90e883ecb4d51 metadata.xml 370
@@ -28,9 +28,9 @@ SHA256 d82a36005520445f65916bb8e8e5a4e41c3af6cc5be87cb2263337074e39b704 metadata
 MD5 6947c731df35ce2149f4a2f8009b575f files/digest-tomcat-servlet-api-5.5.23 277
 RMD160 c7a3b4f7dd1b085332606c3d6a68cc21f0ff78e2 files/digest-tomcat-servlet-api-5.5.23 277
 SHA256 7c1430575374307e6337ec7f22b7822c2093deb36bb3e9fffaa4cf8b23f34051 files/digest-tomcat-servlet-api-5.5.23 277
-MD5 689139367c10950ec819a442eb5dd0c1 files/digest-tomcat-servlet-api-6.0.13 277
-RMD160 ede80f760c03677d75cfabf3c000208361d6c3c0 files/digest-tomcat-servlet-api-6.0.13 277
-SHA256 66e25a7d2aed203cbc675c9e7c247da0627936e4bb7c7f9b992e511110f2993c files/digest-tomcat-servlet-api-6.0.13 277
+MD5 f45055e32dc243804c4240a2ab984673 files/digest-tomcat-servlet-api-5.5.25 277
+RMD160 81361671958b982e7c3b93e7abead7beebb748a8 files/digest-tomcat-servlet-api-5.5.25 277
+SHA256 62a62e662e5449578b99f58640a48aa3f35383ef644f130064503b469689212b files/digest-tomcat-servlet-api-5.5.25 277
 MD5 40b1111393676c7daa27f18d8959234e files/digest-tomcat-servlet-api-6.0.14 277
 RMD160 473b4b9d359d3cdbff1e3cf049766a860bf358f2 files/digest-tomcat-servlet-api-6.0.14 277
 SHA256 11687ab86da3ae9d5b5f6a655e0a315ab2bc30285221a64716f3ea7b120739e5 files/digest-tomcat-servlet-api-6.0.14 277
diff --git a/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-5.5.25 b/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-5.5.25
new file mode 100644
index 000000000000..f35f6957fec8
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-5.5.25
@@ -0,0 +1,3 @@
+MD5 2d6cc9a16aceeef4ec3610cd782d5c9d apache-tomcat-5.5.25-src.tar.gz 5106363
+RMD160 83bb506b3f0fbde75e346e02832645bd6526fa7d apache-tomcat-5.5.25-src.tar.gz 5106363
+SHA256 b7618f0a1e04623bfc9e14bdb51ae54203fa1e80f6c7ee61e2387cb11de8736f apache-tomcat-5.5.25-src.tar.gz 5106363
diff --git a/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-6.0.13 b/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-6.0.13
deleted file mode 100644
index d9bfd1fdd00f..000000000000
--- a/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-6.0.13
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 50b3744d734eb12b679c25ac34f8a6ab apache-tomcat-6.0.13-src.tar.gz 3454302
-RMD160 2ef73ec380736661969f28c231a4a0c9fbd6d29c apache-tomcat-6.0.13-src.tar.gz 3454302
-SHA256 273c6d56283677c0c7033e6ecce53ba7f1fac6930e20e83acccfe2ac88c6a6ff apache-tomcat-6.0.13-src.tar.gz 3454302
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.25.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.25.ebuild
new file mode 100644
index 000000000000..8ff9240854a1
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.25.ebuild
@@ -0,0 +1,49 @@
+# 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-5.5.25.ebuild,v 1.1 2007/09/08 16:14:42 wltjr Exp $
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_P="apache-${P/-servlet-api/}-src"
+DESCRIPTION="Tomcat's Servlet API 2.4/JSP API 2.0 implementation"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-5/v${PV/_/-}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="2.4"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+IUSE="doc java5 source"
+
+DEPEND="java5? ( >=virtual/jdk-1.5 )
+	!java5? ( =virtual/jdk-1.4* )
+	source? ( app-arch/zip )"
+RDEPEND="java5? ( >=virtual/jdk-1.5 )
+	!java5? ( =virtual/jdk-1.4* )"
+
+S="${WORKDIR}/${MY_P}/servletapi"
+
+src_compile() {
+	local antflags="jar $(use_doc javadoc examples)"
+	eant ${antflags} -f jsr154/build.xml
+	eant ${antflags} -f jsr152/build.xml
+}
+
+src_install() {
+	mv jsr{154,152}/dist/lib/*.jar ${S}
+
+	if use doc ; then
+		mkdir docs
+		cd ${S}/jsr154/build
+		mv docs ${S}/docs/servlet
+		mv examples ${S}/docs/servlet/examples
+
+		cd ${S}/jsr152/build
+		mv docs ${S}/docs/jsp
+		mv examples ${S}/docs/jsp/examples
+	fi
+
+	cd ${S}
+	java-pkg_dojar *.jar
+	use doc && java-pkg_dohtml -r docs/*
+	use source && java-pkg_dosrc jsr{152,154}/src/share/javax
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.13.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.13.ebuild
deleted file mode 100644
index 7ce79c0ffb15..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.13.ebuild
+++ /dev/null
@@ -1,36 +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.13.ebuild,v 1.6 2007/08/15 21:22:11 wltjr Exp $
-
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-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/"
-SRC_URI="mirror://apache/tomcat/tomcat-6/v${PV/_/-}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="2.5"
-KEYWORDS="amd64 ~ppc ppc64 x86 ~x86-fbsd"
-
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5"
-
-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_install() {
-	java-pkg_dojar "${S}"/output/build/lib/*.jar
-#	use doc && java-pkg_dohtml -r docs/*
-	use source && java-pkg_dosrc java/javax/servlet/
-}