Revbump to remove java5 useflag, and default to java5.

Package-Manager: portage-2.2_rc42/cvs/Linux x86_64

3 files changed, 57 insertions, 2 deletions

diff --git a/dev-java/tomcat-servlet-api/ChangeLog b/dev-java/tomcat-servlet-api/ChangeLog
index e215d63f991a..58dbb3531648 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.66 2009/07/04 14:52:12 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.67 2009/10/03 21:47:59 caster Exp $
+
+*tomcat-servlet-api-5.5.27-r1 (03 Oct 2009)
+
+  03 Oct 2009; Vlastimil Babka <caster@gentoo.org>
+  +tomcat-servlet-api-5.5.27-r1.ebuild:
+  Revbump to remove java5 useflag, and default to java5.
 
   04 Jul 2009; Brent Baude <ranger@gentoo.org> tomcat-servlet-api-3.ebuild:
   Marking tomcat-servlet-api-3 ppc64 for bug 274798
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index d394191cc25a..32fc239afed5 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -10,8 +10,9 @@ DIST jakarta-servletapi-src.tar.gz 65342 RMD160 9fc0def14700c4850455da1312e50135
 EBUILD tomcat-servlet-api-3.ebuild 919 RMD160 a7557b0a0b2042eee9952a6e6ea87b16a40f5de7 SHA1 35724bc2cd37e853c751a4c0890b84ba88cdf73a SHA256 0b54c38fbe2fb18b759e8bff7c5f47a87d539a58b8bb0ec6cb82bb96729233db
 EBUILD tomcat-servlet-api-4.1.36.ebuild 1046 RMD160 eab477e4ad085b54dabde31654520ef74ffd3f81 SHA1 926e81d24a7ef3c590260058acd8f99e13315d5d SHA256 c4e3ea9e495a60ec584d54c42e2a5a88d7f027cbf70037c57ee91120e42c95b9
 EBUILD tomcat-servlet-api-5.5.26.ebuild 1584 RMD160 2394b11291ca8baf4392bc4affad2c7afe711ecc SHA1 2db1559c0add43b29cb71db60f88f09800c0745b SHA256 9f59b58dcd58b8873421c142ecf49dcc797f978a20f61101cec1fdb3e32e8a99
+EBUILD tomcat-servlet-api-5.5.27-r1.ebuild 1496 RMD160 4909ebd3c90a65bae18bf1680693f18431e822c3 SHA1 3f69ea91e0917382a812e016a02a8c07a8d1c047 SHA256 b373b98ecedc4ac0af21d704e142d5ca237ea23c69300f08a5b28667ded5ffb2
 EBUILD tomcat-servlet-api-5.5.27.ebuild 1585 RMD160 0be08cfa97abcc4474f40d2eca120fc1d237fce0 SHA1 5f87bd989a3d3ba563ed24937bb7faa909d551fc SHA256 3e1934445c8a022edb1f95c73f3f055be43be9360cfd5b405db9e6faa6fa3b9d
 EBUILD tomcat-servlet-api-6.0.18.ebuild 950 RMD160 c0122ad6f6b49a5e160c73c08e60cc7d5555be35 SHA1 6c4d2d10d5ae15c68d12382fcc6af673fff0d942 SHA256 13d996d9f8637203cc3283f59331022b14f95ff62c4c232c1b2a1e535b0255e3
 EBUILD tomcat-servlet-api-6.0.20.ebuild 938 RMD160 c4554a0185fcf7c6a2e6a3313d5b2eea48a41fff SHA1 f2097291b14954155fe716231d5fc91e43bab8b7 SHA256 60c9e2acc7acdd44f81cf1c94272062700b919a62642954b99400ae5cbeac94a
-MISC ChangeLog 11233 RMD160 f37888a3831a6dec54ff64af5b8a6484c763372a SHA1 d9196aecb259bc4ab1304e283a0f9a8d514a5f94 SHA256 42b91f9985b0ca2f6847b6cdd24d690d75c88d977252a793cd5ddd8091acaad7
+MISC ChangeLog 11427 RMD160 1195e6e839efbffecc3824637a0dc9a04a0f00eb SHA1 650e25c6a981e94aedeabf82037cb0072ea2b949 SHA256 4b98fef1e7a3d3cb4082dee813676fc4d4cb68eac6eb129af9e2dafc9d78059a
 MISC metadata.xml 265 RMD160 a2216ab83ce6380767c2b520d7db29fbac39758c SHA1 33a911d99c033f3cab73367890ae18925c3b2ce7 SHA256 6b387cd849d192d7139aa572a2638fd4d44d99d7ea78e30f26b0f3f4baeab84b
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27-r1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27-r1.ebuild
new file mode 100644
index 000000000000..47f05045f31a
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27-r1.ebuild
@@ -0,0 +1,48 @@
+# 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-5.5.27-r1.ebuild,v 1.1 2009/10/03 21:47:59 caster 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"
+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
+}