Bumped to latest release

Package-Manager: portage-2.2_rc3/cvs/Linux 2.6.24-gentoo-r4 x86_64

3 files changed, 45 insertions, 2 deletions

diff --git a/dev-java/tomcat-servlet-api/ChangeLog b/dev-java/tomcat-servlet-api/ChangeLog
index 4b39d37e8f46..8928e022f60f 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.50 2008/05/30 17:18:39 ken69267 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.51 2008/08/02 01:19:55 wltjr Exp $
+
+*tomcat-servlet-api-6.0.18 (02 Aug 2008)
+
+  02 Aug 2008; William L. Thomson Jr. <wltjr@gentoo.org>
+  +tomcat-servlet-api-6.0.18.ebuild:
+  Bumped to latest release
 
   30 May 2008; Kenneth Prugh <ken69267@gentoo.org>
   tomcat-servlet-api-3.ebuild:
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index ccb44db2cc6a..9b1bdad1d52e 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -4,10 +4,12 @@ AUX servlet-api-2.4-manifest 310 RMD160 7ac278202ae5e30561cea42d602504bbdbb84dae
 DIST apache-tomcat-4.1.36-src.tar.gz 3715200 RMD160 344230cac551a483cef439153dd18bc5ff570f1a SHA1 7116af55e2e3f964d834da325694e2d4f9a27a36 SHA256 51f9139f10cd865fc331cf5def49faa718ab4a510790af3582b4189a48a5b951
 DIST apache-tomcat-5.5.26-src.tar.gz 5062991 RMD160 c82e7640b36c27cfc6ea51f01dc3ff492441a930 SHA1 1eb1c479023d3a7e459ce03860d9d984b673ab27 SHA256 ddc677d7391c438e6102d0b3e9653eaca661344ef74b0260c1f488340d660395
 DIST apache-tomcat-6.0.16-src.tar.gz 3527896 RMD160 8e6c0900889439f4cb89db35afb0c27e77103c00 SHA1 74127ba3da450a97869f2a2a2f0e134d23474018 SHA256 9e0a776f9d9c5fe935a39b066f74c07e7d26b4f30b66b22622a20dec235b0a7f
+DIST apache-tomcat-6.0.18-src.tar.gz 3484249 RMD160 ef85db0d65a4f3bdd3ca821420d06535050b6a93 SHA1 9182b0d6b2d0cb2d60f04be6211f3b3516bc518e SHA256 f5ad5dd12e221d75e25234ca734fb434cf45f3fcea93623232a73dc9bfd03dc4
 DIST jakarta-servletapi-src.tar.gz 65342 RMD160 9fc0def14700c4850455da1312e50135fd56eea9 SHA1 ffa93e8b69e0aa4384b7ce4cbb7f4552b6dd467a SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697
 EBUILD tomcat-servlet-api-3.ebuild 928 RMD160 cd6a3c5b2ad5a88b308d80329a0ba0a065c6a0d1 SHA1 f3511ee1f4104f6209f27939231bc6917052a9e5 SHA256 7fd7df38cd26899ca305e3be34980b85596cfc80653cde937514172e3e08923f
 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-6.0.16.ebuild 946 RMD160 35a6a20d81008810ccd71bfddc6ee03656b6be9a SHA1 330764d34f15d1f6c93ec0af7b2a29326db6e13f SHA256 0ff193f6a1b887e4c6dcf7e50c7b03e6297a763cdf7a9da8fe7cd575e5442e44
-MISC ChangeLog 9025 RMD160 186d1fc3331e864287f0f94ae3d3a5af0edcc199 SHA1 970f11309812419f86ddeb11314958f05fac8daf SHA256 9958ef58e79aa7fb9209c2606029020d3b79aff3240420c7f067363daf9ab701
+EBUILD tomcat-servlet-api-6.0.18.ebuild 949 RMD160 3b4e8faa641bf01c3b7c0a2c9f946a29ae94e4bb SHA1 9b769465d0557517db00615df7be0ae15347a2d9 SHA256 9f07db02f04a3834fdecc82817d4f4008089fd061e5b5ff055648314c747bd71
+MISC ChangeLog 9186 RMD160 42e4e9b4b1291cf904965302390a04bc5c5bb9c8 SHA1 70fc828857bdd8b2e083ed9c7df253a399442301 SHA256 78ee9e56059afdb20246197f74e8b0966656830f3231cfdf7149acbab81057bd
 MISC metadata.xml 370 RMD160 80f77811a1330480797cff01b1e90e883ecb4d51 SHA1 0d60a8ede5babbd15577612fe7b9e504e5a73689 SHA256 d82a36005520445f65916bb8e8e5a4e41c3af6cc5be87cb2263337074e39b704
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.18.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.18.ebuild
new file mode 100644
index 000000000000..55c1e69c8675
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.18.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2008 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.18.ebuild,v 1.1 2008/08/02 01:19:55 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 source && java-pkg_dosrc java/javax/servlet/
+}