Bumped 5.5 to latest development release

Package-Manager: portage-2.1.2-r9

4 files changed, 81 insertions, 5 deletions

diff --git a/dev-java/tomcat-servlet-api/ChangeLog b/dev-java/tomcat-servlet-api/ChangeLog
index 287a9e2e296d..6ede5824afcd 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.12 2007/02/13 19:24:37 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.13 2007/02/13 21:03:56 wltjr Exp $
+
+*tomcat-servlet-api-5.5.22_pre (13 Feb 2007)
+
+  13 Feb 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  +tomcat-servlet-api-5.5.22_pre.ebuild:
+  Bumped 5.5 to latest development release
 
 *tomcat-servlet-api-6.0.10_pre (13 Feb 2007)
 
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 6db10c1895ad..1eebcf73e8ad 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -3,12 +3,17 @@ 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.20-src.tar.gz 4796377 RMD160 587590d2e272d1ede73501b62933f544cd969822 SHA1 cc416242d8c9e1978702a207e305ca97afe53d4d SHA256 19f24717fb3e2db902c33e21650dfa88bbf98428c15b1ed68ecaf7a9150e4a77
+DIST apache-tomcat-5.5.22-src.tar.gz 4888257 RMD160 39a5da86cce996c7c41baddfab825e5bfbd334db SHA1 9b9ad830c4db0f0668aa2500cc1d954c1bf95b96 SHA256 206fa6040b06cc98d705afe3594d588e2556dc15eb73083d4c1da146b997216a
 DIST apache-tomcat-6.0.10-src.tar.gz 3221070 RMD160 64762f16606645c6ef507906f2eb8eeb102173bb SHA1 4ec1acda174ab19082c4900c293d8bc7f9544a69 SHA256 54ae6b89a3ac3e3e33a580708403ca4ea0a449f287b91e6246bb6a6550e39199
 DIST apache-tomcat-6.0.9-src.tar.gz 3218164 RMD160 c35c6441a358926a8bef4bc855b275ad2445f842 SHA1 2194a1162c0de5c5765fcd419145dbec44470be9 SHA256 ce3a2a6976ecf0059245debcb2c69c9b3947baf1ecc383fa80c27e55f2ee5647
 EBUILD tomcat-servlet-api-5.5.20.ebuild 1517 RMD160 c6ed5b794b16d915d910987f6610e6aae82bafd5 SHA1 89a688794a84231a4bdfbf7f1efe05186083c894 SHA256 4a265b37fe9254ffa1cf72f702bdc991039cb18b20a7e2af026a2c99259acdfa
 MD5 09830f34f72c1f4d6e6751ed1fbf4330 tomcat-servlet-api-5.5.20.ebuild 1517
 RMD160 c6ed5b794b16d915d910987f6610e6aae82bafd5 tomcat-servlet-api-5.5.20.ebuild 1517
 SHA256 4a265b37fe9254ffa1cf72f702bdc991039cb18b20a7e2af026a2c99259acdfa tomcat-servlet-api-5.5.20.ebuild 1517
+EBUILD tomcat-servlet-api-5.5.22_pre.ebuild 1628 RMD160 212c9061e97beefc0d15a7821432b26e3481ea68 SHA1 408d7abc289d3d4c05c3db8bcb261bd788c23816 SHA256 b47887c4fdb30156e55ff0f34b86e823b70b8bde6f6528937b383fdfc0b2b2b2
+MD5 a1944260d4c7d59bb218175fb9543030 tomcat-servlet-api-5.5.22_pre.ebuild 1628
+RMD160 212c9061e97beefc0d15a7821432b26e3481ea68 tomcat-servlet-api-5.5.22_pre.ebuild 1628
+SHA256 b47887c4fdb30156e55ff0f34b86e823b70b8bde6f6528937b383fdfc0b2b2b2 tomcat-servlet-api-5.5.22_pre.ebuild 1628
 EBUILD tomcat-servlet-api-6.0.10_pre.ebuild 1277 RMD160 969d3d54783b3552e3a508f6c33dbd48a644b1c0 SHA1 5fb255695c7d1bb63b87928bbf5e9f253a602730 SHA256 0a2338faf500e3ed16b7de492f0c280d2a643dcb27ef7fcbc838d4c69916c220
 MD5 b7ce422c2e398464181c4fa729a6dbfd tomcat-servlet-api-6.0.10_pre.ebuild 1277
 RMD160 969d3d54783b3552e3a508f6c33dbd48a644b1c0 tomcat-servlet-api-6.0.10_pre.ebuild 1277
@@ -17,10 +22,10 @@ EBUILD tomcat-servlet-api-6.0.9_beta.ebuild 1195 RMD160 903a8fb4e39b3b1b6b200d47
 MD5 899e6092a39ab251173e3c7f7be9ccdc tomcat-servlet-api-6.0.9_beta.ebuild 1195
 RMD160 903a8fb4e39b3b1b6b200d47ddb694638d25e774 tomcat-servlet-api-6.0.9_beta.ebuild 1195
 SHA256 8fd594b3642a446c0f6a9bf2fbf7c65eeed9677035bc528de869413f12249e56 tomcat-servlet-api-6.0.9_beta.ebuild 1195
-MISC ChangeLog 2888 RMD160 d310ee8755d77c496b5d0b711ebc5a637df181d4 SHA1 c08cdb6dd273a003ccb790a270cd9a1b1d9e08de SHA256 799ec759fc7c726788d544198c9fdd363a709e9023e89f5d7ae9518c0e47a047
-MD5 ff9ca4520cbacf56add076f43781d7c6 ChangeLog 2888
-RMD160 d310ee8755d77c496b5d0b711ebc5a637df181d4 ChangeLog 2888
-SHA256 799ec759fc7c726788d544198c9fdd363a709e9023e89f5d7ae9518c0e47a047 ChangeLog 2888
+MISC ChangeLog 3076 RMD160 803d805f1cc613e151222f8fe27c2b3b9109e7f9 SHA1 6b5e42ec37f7e5d5d17f99dccf6f4441e26a15d7 SHA256 53eefcac9b7e7a0b1fc0a86213f9c798b3de5d801ce8121209b9a4f1937512fe
+MD5 10378a67089ed98148f9de26afe5ad17 ChangeLog 3076
+RMD160 803d805f1cc613e151222f8fe27c2b3b9109e7f9 ChangeLog 3076
+SHA256 53eefcac9b7e7a0b1fc0a86213f9c798b3de5d801ce8121209b9a4f1937512fe ChangeLog 3076
 MISC metadata.xml 370 RMD160 80f77811a1330480797cff01b1e90e883ecb4d51 SHA1 0d60a8ede5babbd15577612fe7b9e504e5a73689 SHA256 d82a36005520445f65916bb8e8e5a4e41c3af6cc5be87cb2263337074e39b704
 MD5 eab22d527a1a92afde250a0ff957b829 metadata.xml 370
 RMD160 80f77811a1330480797cff01b1e90e883ecb4d51 metadata.xml 370
@@ -28,6 +33,9 @@ SHA256 d82a36005520445f65916bb8e8e5a4e41c3af6cc5be87cb2263337074e39b704 metadata
 MD5 8adc14a8534e1c6f8d5f96b371e1895f files/digest-tomcat-servlet-api-5.5.20 277
 RMD160 b9c5deac84bf5acd7a65ad80bdfaca9f7e343f3f files/digest-tomcat-servlet-api-5.5.20 277
 SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/digest-tomcat-servlet-api-5.5.20 277
+MD5 688aca3d811cb2516ca3d4e7efa05bb6 files/digest-tomcat-servlet-api-5.5.22_pre 277
+RMD160 bab389aec90e5bd2a4a67d940e7e2171ac94d257 files/digest-tomcat-servlet-api-5.5.22_pre 277
+SHA256 52c8b51127d5456a17e54290706ca09621523d7befa04bd76dd74ced904cad11 files/digest-tomcat-servlet-api-5.5.22_pre 277
 MD5 5f9244a61bfa0875478e8849b6cb845e files/digest-tomcat-servlet-api-6.0.10_pre 277
 RMD160 3d16b85b1dcb55e6874b535c06f2a5df00b46ce1 files/digest-tomcat-servlet-api-6.0.10_pre 277
 SHA256 49aef00c733c574a5c8536a6e5406769105dbe0b64ad0ea9b9682ca42bff23f0 files/digest-tomcat-servlet-api-6.0.10_pre 277
diff --git a/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-5.5.22_pre b/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-5.5.22_pre
new file mode 100644
index 000000000000..9f11a897bf7a
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-5.5.22_pre
@@ -0,0 +1,3 @@
+MD5 1af391c1647752d4fd8e2c3892e1be68 apache-tomcat-5.5.22-src.tar.gz 4888257
+RMD160 39a5da86cce996c7c41baddfab825e5bfbd334db apache-tomcat-5.5.22-src.tar.gz 4888257
+SHA256 206fa6040b06cc98d705afe3594d588e2556dc15eb73083d4c1da146b997216a apache-tomcat-5.5.22-src.tar.gz 4888257
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.22_pre.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.22_pre.ebuild
new file mode 100644
index 000000000000..e6c01c0b2eab
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.22_pre.ebuild
@@ -0,0 +1,59 @@
+# 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.22_pre.ebuild,v 1.1 2007/02/13 21:03:56 wltjr Exp $
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_P="apache-${P/-servlet-api/}-src"
+MY_P="${MY_P/_pre/}"
+DESCRIPTION="Tomcat's Servlet API 2.4/JSP API 2.0 implementation"
+HOMEPAGE="http://tomcat.apache.org/"
+#SRC_URI="mirror://apache/tomcat-5/v${PV}/src/${MY_P}.tar.gz"
+SRC_URI="http://people.apache.org/~fhanik/tomcat/tomcat-5.5/v${PV/_pre/}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="2.4"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="doc java5 source"
+
+DEPEND="|| ( >=virtual/jdk-1.4 >=virtual/jdk-1.5 >=virtual/jdk-1.6 )
+	>=dev-java/ant-core-1.5
+	source? ( app-arch/zip )
+	>=dev-java/java-config-2.0.31"
+RDEPEND="|| ( >=virtual/jre-1.4 >=virtual/jre-1.5 >=virtual/jre-1.6 )
+	>=dev-java/java-config-2.0.31"
+
+S="${WORKDIR}/${MY_P}/servletapi"
+
+pkg_setup() {
+	if use java5; then
+		JAVA_PKG_WANT_SOURCE="1.5"
+		JAVA_PKG_WANT_TARGET="1.5"
+	fi
+}
+
+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
+}