dev-java/tomcat-servlet-api: version bump

Package-Manager: portage-2.1.9.35/cvs/Linux x86_64

3 files changed, 47 insertions, 3 deletions

diff --git a/dev-java/tomcat-servlet-api/ChangeLog b/dev-java/tomcat-servlet-api/ChangeLog
index 6388596d9092..830dcb589a20 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.82 2010/12/22 19:13:05 ali_bush Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.83 2011/01/30 17:43:38 fordfrog Exp $
+
+*tomcat-servlet-api-7.0.6 (30 Jan 2011)
+
+  30 Jan 2011; Miroslav Šulc <fordfrog@gentoo.org>
+  +tomcat-servlet-api-7.0.6.ebuild:
+  Version bump
 
   22 Dec 2010; Alistair Bush <ali_bush@gentoo.org>
   tomcat-servlet-api-7.0.5.ebuild:
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 1dcb1506978e..930c7cfbe44c 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -10,6 +10,7 @@ DIST apache-tomcat-6.0.26-src.tar.gz 3472211 RMD160 84f8ad4d894204a8930fa57633c3
 DIST apache-tomcat-6.0.28-src.tar.gz 3325872 RMD160 4a699324f332b8c32fa79615f14681a0fa9924b1 SHA1 0df5e58518607ff738bbf440d829747df6acb9ce SHA256 0d6354d45de39e3593ae8f8e6e1361caaa55835e73838f003000e53c6c7ff73a
 DIST apache-tomcat-6.0.29-src.tar.gz 3330475 RMD160 eb789c63aaf629ec897b4280924e086c969169f6 SHA1 255e080706578be0b0f15c67989718ab94e52837 SHA256 9746483edb46b112a81b57376701c7c23c5c657675c2c7efa3187447c07b9d28
 DIST apache-tomcat-7.0.5-src.tar.gz 3790790 RMD160 c09630d499c2bc3e5dfa69b8ff345f53e969a811 SHA1 e69524cca265a34c1abf7c8d53dd52622e22299d SHA256 f289474b8deb869682f5f8fad4355600caa99d779b4414917401ab9a647ee737
+DIST apache-tomcat-7.0.6-src.tar.gz 3811664 RMD160 92c83cb1da590683952deb2f7778c2dae6e0efc9 SHA1 a9fd44482645258c4e7b912be920d291b2341528 SHA256 4965277b2a9b3ceadaef3a6a86ba6af351571269328d5ca4387dff40314f4e83
 DIST jakarta-servletapi-src.tar.gz 65342 RMD160 9fc0def14700c4850455da1312e50135fd56eea9 SHA1 ffa93e8b69e0aa4384b7ce4cbb7f4552b6dd467a SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697
 EBUILD tomcat-servlet-api-3.ebuild 1020 RMD160 3ff4d9ad796f8ab50184cb320ea4ea70dbed90f8 SHA1 274595f3f036af8e7070485848126279b5a0459b SHA256 db3bb41efebee7c7a34a4ec5366ea161f6a4617af17e52ef62229197572bdce6
 EBUILD tomcat-servlet-api-4.1.36.ebuild 1132 RMD160 0015dbbe52367b5f0b984dc2c6238a8976122667 SHA1 9445f4f17a3ee1009177ed614cba92214e31f05c SHA256 53159cd44962ea7175a0bdb4c62500f2ba59a00382ea4e1caf3f9fd643a429af
@@ -20,5 +21,6 @@ EBUILD tomcat-servlet-api-6.0.26.ebuild 1003 RMD160 b20f524bf4727d8025451a83f287
 EBUILD tomcat-servlet-api-6.0.28.ebuild 1011 RMD160 4f32ad1192f3b6e96057554419e04c90f4496cf8 SHA1 1dd611dcf0edcbc41d0141251c027f42ca0068a8 SHA256 8f05c975ef63c5f9037d73d276f2421e59f4e421a9c1b33be3d9a3682cbd9e08
 EBUILD tomcat-servlet-api-6.0.29.ebuild 1009 RMD160 fb863534c730913179f0e4c401d15e211ce5ff0e SHA1 dff3d348ba11015bfe0bfe62f36883da56b33b47 SHA256 1d8a7eef754546daff07695a76c11434845cb1b4f0e2508825526097b50ddce5
 EBUILD tomcat-servlet-api-7.0.5.ebuild 1129 RMD160 59be9ab72a6e01ee1c4986ddf39f27b30a8aae60 SHA1 8c263cca6faea0df36523b2616abcd81e091c2d9 SHA256 09a37112013cb443682f77f227f9186375030beea56374f61c5853e18718ac34
-MISC ChangeLog 13664 RMD160 5a6ed4d5b8bc3af248c8bc4bc186c9db2367ee7d SHA1 891dc64ae31d1ab3c2aad3ca1ac692977927fbb6 SHA256 e535e9371ad2c79268e39b3ac59ec4f73686af56708be8d8e28d1eb952994550
+EBUILD tomcat-servlet-api-7.0.6.ebuild 1117 RMD160 26f484fb17741dec74cd93517c0b9bb57b4e701a SHA1 033f052d10b5ca6ce407fbbcece99dd87075f64c SHA256 7ecdf5a712e8a54eff37783c8fd0847d8e0ee0ec858a70be02ac4caa8d5f8bde
+MISC ChangeLog 13809 RMD160 ed867f2b265cb4ef9852e8ebd503d8fda7b97ec4 SHA1 780337eb9f6c6969f5c5b3d031fe904e37bd3bcc SHA256 e539c0169c98c651e8f649e8eb3bb4b65a9c503c2974a2f82f03375f60c81429
 MISC metadata.xml 265 RMD160 a2216ab83ce6380767c2b520d7db29fbac39758c SHA1 33a911d99c033f3cab73367890ae18925c3b2ce7 SHA256 6b387cd849d192d7139aa572a2638fd4d44d99d7ea78e30f26b0f3f4baeab84b
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.6.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.6.ebuild
new file mode 100644
index 000000000000..49b17fbac7bb
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.6.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2011 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-7.0.6.ebuild,v 1.1 2011/01/30 17:43:38 fordfrog 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 3.0/JSP API 2.2 implementation"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/${PN}-${SLOT}/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}/"
+
+java_prepare() {
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml
+	einfo "Removing bundled jars and classes"
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -delete
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}