Version bump.

Package-Manager: portage-2.2_rc33/cvs/Linux i686

3 files changed, 47 insertions, 5 deletions

diff --git a/dev-java/tomcat-servlet-api/ChangeLog b/dev-java/tomcat-servlet-api/ChangeLog
index 8b49c40402d4..abc877ac2e17 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.59 2009/06/13 15:58:06 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.60 2009/06/13 17:17:36 betelgeuse Exp $
+
+*tomcat-servlet-api-6.0.20 (13 Jun 2009)
+
+  13 Jun 2009; Petteri Räty <betelgeuse@gentoo.org>
+  +tomcat-servlet-api-6.0.20.ebuild:
+  Version bump.
 
   13 Jun 2009; Petteri Räty <betelgeuse@gentoo.org>
   -tomcat-servlet-api-6.0.16.ebuild:
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 8674e45352a8..698f813c410d 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -8,18 +8,20 @@ DIST apache-tomcat-4.1.36-src.tar.gz 3715200 RMD160 344230cac551a483cef439153dd1
 DIST apache-tomcat-5.5.26-src.tar.gz 5062991 RMD160 c82e7640b36c27cfc6ea51f01dc3ff492441a930 SHA1 1eb1c479023d3a7e459ce03860d9d984b673ab27 SHA256 ddc677d7391c438e6102d0b3e9653eaca661344ef74b0260c1f488340d660395
 DIST apache-tomcat-5.5.27-src.tar.gz 7382057 RMD160 8114fa3be19fd28a5d2d0d7e7087f6d82e0f111f SHA1 c6217d78d2e64fa839a30372bd2724ba75030c14 SHA256 90bc8abcddda604e855c37035653b1e24b31c2f09b7a29235e92d65025f7a334
 DIST apache-tomcat-6.0.18-src.tar.gz 3484249 RMD160 ef85db0d65a4f3bdd3ca821420d06535050b6a93 SHA1 9182b0d6b2d0cb2d60f04be6211f3b3516bc518e SHA256 f5ad5dd12e221d75e25234ca734fb434cf45f3fcea93623232a73dc9bfd03dc4
+DIST apache-tomcat-6.0.20-src.tar.gz 3590562 RMD160 65b1b56132c03855e352e44a24b761bccd65b90c SHA1 ab538484d8d05c83a69c70ab6bf07606282633d8 SHA256 e8f709f0aeda8e164362144aca253249f050bc330e622dbb4196434db9933298
 DIST jakarta-servletapi-src.tar.gz 65342 RMD160 9fc0def14700c4850455da1312e50135fd56eea9 SHA1 ffa93e8b69e0aa4384b7ce4cbb7f4552b6dd467a SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697
 EBUILD tomcat-servlet-api-3.ebuild 925 RMD160 6d8d80e218e190a67a8641cbc4c79501a8e7fbed SHA1 c7dcdf87de3b01bc01cdbfc0d8eccb5aa33903b1 SHA256 9df50057ea6521bccbccb00f6db79fc479d1198fdf8e88ccd66a17ce05b50268
 EBUILD tomcat-servlet-api-4.1.36.ebuild 1044 RMD160 5f5dc80493e82c01705225f3f77e7d48f716030d SHA1 c82d406993ff1f1ab59c612649064d129f4db570 SHA256 bd903f29c3102ee50aeac49e3b6f20d4035d54e313096308c968b850573ebb75
 EBUILD tomcat-servlet-api-5.5.26.ebuild 1580 RMD160 cb2e756d2b499af0a84c0d1e1c644eb96236bb7d SHA1 b26f142ba4d256d5325cb05d795091caf3b6d899 SHA256 1f02a66e0483c48714a6d2147d961e301490ee3ebd5b6f16f159fcf44031af99
 EBUILD tomcat-servlet-api-5.5.27.ebuild 1581 RMD160 86a6b91794ec79d3d481413c2ebe25721fcc03b0 SHA1 9c2ed160be634c01a3d7d4cbd3e5430fc863e5f2 SHA256 b0ce99e4512b8a8bb48bd98d154e3461c9d04586cb81bc9e0e1cc2cf59a2042d
 EBUILD tomcat-servlet-api-6.0.18.ebuild 947 RMD160 0b169de5ba5fe6e2f80aac83a56478ce943235ee SHA1 69a081efc87f16ed6d2449d89d4d32ca39604a00 SHA256 81b6a3cbe96d60aa9f11cfad00fc90b167e4e11614c9f8f51def93ec8cb18ee6
-MISC ChangeLog 10177 RMD160 df695202ebae7e0eb477f3133c66dc2698b3691c SHA1 97612fbf38fa06291d8d473e7e7d2e4bb6b02524 SHA256 c2dba3a62f3cf44034ec830f832bf25ab095653a51e38b02dfaa5a1ba71fce83
+EBUILD tomcat-servlet-api-6.0.20.ebuild 948 RMD160 d323129878fd55472fb6e2c8b4b3ed7d21e1ee77 SHA1 e6e97d2d01914365330b4d0aed235b742841623e SHA256 071c7ecf5b59accec241f85d9e933466dc4310ac4663e97c6f8e57ab5426584d
+MISC ChangeLog 10326 RMD160 4fdf1717bcfe565d1aaecdd38601b3d3a2ea5b79 SHA1 2d16c3e8b2c01753523df30593e1692e60f9596f SHA256 dad67651109066ccce4c631376322937f1b4e6597334f4dd9f14bf4600bdf72e
 MISC metadata.xml 265 RMD160 a2216ab83ce6380767c2b520d7db29fbac39758c SHA1 33a911d99c033f3cab73367890ae18925c3b2ce7 SHA256 6b387cd849d192d7139aa572a2638fd4d44d99d7ea78e30f26b0f3f4baeab84b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkozzIQACgkQcxLzpIGCsLSRxACZAUExO+MzVPoJ7+CgW+ukFdg9
-8KQAni1v7pFz73SFB/QWFjGkkU60pa/Y
-=vl15
+iEYEARECAAYFAkoz3yMACgkQcxLzpIGCsLQk+gCfaxLGtLgUNoSZcjHAxmsTtZHn
+UloAn2RyARvWfvtuOk7QAsUwEYFwwnSm
+=erJK
 -----END PGP SIGNATURE-----
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.20.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.20.ebuild
new file mode 100644
index 000000000000..07bc36eea673
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.20.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2009 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.20.ebuild,v 1.1 2009/06/13 17:17:36 betelgeuse Exp $
+
+EAPI="2"
+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-2.0"
+SLOT="2.5"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.5"
+RDEPEND=">=virtual/jre-1.5"
+
+S="${WORKDIR}/${MY_P}/"
+
+java_prepare() {
+	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 source && java-pkg_dosrc java/javax/servlet/
+}