From: Miroslav Šulc <fordfrog@gentoo.org>
Date: Sat, 24 Dec 2011 20:26:32 +0000 (+0000)
Subject: dev-java/tomcat-servlet-api: version bump
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=010b7f434a2fc64755940b90b995ba11f0efcfe4;p=gentoo.git

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

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

diff --git a/dev-java/tomcat-servlet-api/ChangeLog b/dev-java/tomcat-servlet-api/ChangeLog
index 326c3f572ee5..27fd1c76edf4 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.111 2011/12/24 19:40:05 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.112 2011/12/24 20:26:32 fordfrog Exp $
+
+*tomcat-servlet-api-5.5.34 (24 Dec 2011)
+
+  24 Dec 2011; Miroslav Å ulc <fordfrog@gentoo.org>
+  +tomcat-servlet-api-5.5.34.ebuild:
+  Version bump
 
 *tomcat-servlet-api-6.0.35 (24 Dec 2011)
 
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 29bbd43d7685..eec9bef0939e 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -4,6 +4,7 @@ AUX jsp-api-2.0-manifest 474 RMD160 a443fc3b2085d4eb9bb494202025e03e8123f9e9 SHA
 AUX servlet-api-2.4-manifest 310 RMD160 7ac278202ae5e30561cea42d602504bbdbb84dae SHA1 4faf5f3e370e8b2741b7eeae9a5181853b496eda SHA256 134371e8d3d0b137096e268df05751c4bcb29911d62746c70510253d6b334fd5
 DIST apache-tomcat-4.1.36-src.tar.gz 3715200 RMD160 344230cac551a483cef439153dd18bc5ff570f1a SHA1 7116af55e2e3f964d834da325694e2d4f9a27a36 SHA256 51f9139f10cd865fc331cf5def49faa718ab4a510790af3582b4189a48a5b951
 DIST apache-tomcat-5.5.27-src.tar.gz 7382057 RMD160 8114fa3be19fd28a5d2d0d7e7087f6d82e0f111f SHA1 c6217d78d2e64fa839a30372bd2724ba75030c14 SHA256 90bc8abcddda604e855c37035653b1e24b31c2f09b7a29235e92d65025f7a334
+DIST apache-tomcat-5.5.34-src.tar.gz 3720299 RMD160 d8c845a356f732dff656a21589cdd678c70d41a3 SHA1 6dd6b2a6a3bb6cb3485bb5b910d899efeff8e2e6 SHA256 a52e7f2abf0fbdd9665ca398d2b39f99b80683b0ee43c72751390e88dcd6114d
 DIST apache-tomcat-6.0.32-src.tar.gz 3394648 RMD160 e6203645e6570564b25154018436d908c5b1a71a SHA1 ec94c511e54da2b02dd2ba45b9fd1703d5771a45 SHA256 aa2b72343f2d7f5090e8aabdbf6e0c4f65cd504a719ebb2e18268207ff2c426c
 DIST apache-tomcat-6.0.33-src.tar.gz 3389376 RMD160 24bd6c0e1bee7daa4cb59ec56552599330f0bb4c SHA1 437db0ba55c6e398fe3af73c4fa5eed3c4666842 SHA256 6dbd5d6eedcf3acd8bf7b6e32544a6e94ec595f7c921baa92f08adb5a5d91b64
 DIST apache-tomcat-6.0.35-src.tar.gz 3403286 RMD160 d292b210fe62aafec4a074e3a626766585367a3e SHA1 1a47ad41d52a27757cfeddf7fa1627688ed4027a SHA256 6e5205834bd595250c8e0b640e2345ef643f23364ae0e099334b5132103be764
@@ -13,10 +14,11 @@ DIST jakarta-servletapi-src.tar.gz 65342 RMD160 9fc0def14700c4850455da1312e50135
 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
 EBUILD tomcat-servlet-api-5.5.27-r1.ebuild 1564 RMD160 6746a53dd8bc508b9787548c05baff4a578e177e SHA1 14f16e87bf641e42d5df46ee638f2c03a6271344 SHA256 c13fc57ccc2bbff29c27a40d1fe61394ff7fc6dfe741727af3c9b018fa28ef5a
+EBUILD tomcat-servlet-api-5.5.34.ebuild 1565 RMD160 717ccb930f6b4a690e1a4422f7519e766dc1a6b6 SHA1 48a0b107bb0ad26d2bb0283e88290d4bec72db06 SHA256 126b680c27d69375f9fa5d8f18896ace4a7fa48d33b5c02b816e4490a20ced60
 EBUILD tomcat-servlet-api-6.0.32.ebuild 1005 RMD160 c8e74032f6786421216f83c2745a1382158ec7ca SHA1 d7296f1815a04d36790616e369311c4364276f1a SHA256 e0104a014337a4805370254e92f2257b7208fa8cb3f4a5729bee9b6a3cda5ea4
 EBUILD tomcat-servlet-api-6.0.33.ebuild 1005 RMD160 d4b1e37e3809290c247f5c97d25ae7daac64e363 SHA1 9ecf4cc11576d3fd9bc40f049401aab3518b0f5b SHA256 8e6f6480bb9c2924d45932744efb985dd9a5763fe433258221e76f18080cb664
 EBUILD tomcat-servlet-api-6.0.35.ebuild 1009 RMD160 f806976e211af2fbb71bb45cb20f511d3a0fcdf3 SHA1 294476a7662e9df62ba1afb91a08f60d49861c8c SHA256 58204dcacf3f31c1d26896bdaa1a7763ee4825ca6815bb83d3c9d77a851ec24e
 EBUILD tomcat-servlet-api-7.0.22.ebuild 1108 RMD160 86f5c6008fb76f0645a57e507bb04408ca812722 SHA1 e58bf7b193504b11599d7537d8eedd7669f95784 SHA256 0fe5117d12935504cb27829ba7181bf2406e5adf7a0193724ee14f2bc816d45b
 EBUILD tomcat-servlet-api-7.0.23.ebuild 1114 RMD160 0191ac478a81554ec51510c4646a96fa7129ee9e SHA1 405a1a6a142144d13443e7cb16458f8dd1fb9d4f SHA256 eb480791efc727adcf01efc2f9b7ddcf5230bfdd8c1f3f62e9978f602cc2c59e
-MISC ChangeLog 18149 RMD160 592460dfeb2a00a9421a96feb33a4bf85b41b451 SHA1 f2055967ff75cf925eb1c96b2e9576a6863d66b3 SHA256 6035ea416e3211d74a03cf745671bedfc8ab0287e932aed022bb40cb760af293
+MISC ChangeLog 18296 RMD160 5f01628f7ae43df5a9b80e48e5ca5dc6344478ec SHA1 ecf1d220d992ddb76bfa50e4a53304725650e4c4 SHA256 0740c1ddc5e42a6f05dfe0340fb3e8dfc08eed107b3e77d48bca8f69ac2cc8c1
 MISC metadata.xml 265 RMD160 a2216ab83ce6380767c2b520d7db29fbac39758c SHA1 33a911d99c033f3cab73367890ae18925c3b2ce7 SHA256 6b387cd849d192d7139aa572a2638fd4d44d99d7ea78e30f26b0f3f4baeab84b
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.34.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.34.ebuild
new file mode 100644
index 000000000000..c394b6029ae5
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.34.ebuild
@@ -0,0 +1,48 @@
+# 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-5.5.34.ebuild,v 1.1 2011/12/24 20:26:32 fordfrog Exp $
+
+inherit eutils java-pkg-2 java-ant-2 java-osgi
+
+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-2.0"
+SLOT="2.4"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc source"
+
+DEPEND=">=virtual/jdk-1.5
+	source? ( app-arch/zip )"
+RDEPEND=">=virtual/jdk-1.5"
+
+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-osgi_dojar-fromfile --no-auto-version "jsp-api.jar" "${FILESDIR}/jsp-api-2.0-manifest" "Java Server Pages API Bundle"
+	java-osgi_dojar-fromfile --no-auto-version "servlet-api.jar" "${FILESDIR}/servlet-api-2.4-manifest" "Servlet API Bundle"
+	use doc && java-pkg_dohtml -r docs/*
+	use source && java-pkg_dosrc jsr{152,154}/src/share/javax
+}