Minor change to produce OSGi usable jars.

(Portage version: 2.1.3.19)

5 files changed, 82 insertions, 2 deletions

diff --git a/dev-java/tomcat-servlet-api/ChangeLog b/dev-java/tomcat-servlet-api/ChangeLog
index e2454df135f6..c0b07a25db7d 100644
--- a/dev-java/tomcat-servlet-api/ChangeLog
+++ b/dev-java/tomcat-servlet-api/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/tomcat-servlet-api
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.35 2007/11/03 02:01:25 wltjr Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.36 2008/01/15 16:19:10 elvanor Exp $
+
+*tomcat-servlet-api-5.5.25-r1 (15 Jan 2008)
+
+  15 Jan 2008; Jean-Noël Rivasseau <elvanor@gentoo.org>
+  +files/jsp-api-2.0-manifest, +files/servlet-api-2.4-manifest,
+  +tomcat-servlet-api-5.5.25-r1.ebuild:
+  Minor change to produce OSGi usable jars.
 
 *tomcat-servlet-api-4.1.36 (03 Nov 2007)
 *tomcat-servlet-api-3 (03 Nov 2007)
diff --git a/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-5.5.25-r1 b/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-5.5.25-r1
new file mode 100644
index 000000000000..f35f6957fec8
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-5.5.25-r1
@@ -0,0 +1,3 @@
+MD5 2d6cc9a16aceeef4ec3610cd782d5c9d apache-tomcat-5.5.25-src.tar.gz 5106363
+RMD160 83bb506b3f0fbde75e346e02832645bd6526fa7d apache-tomcat-5.5.25-src.tar.gz 5106363
+SHA256 b7618f0a1e04623bfc9e14bdb51ae54203fa1e80f6c7ee61e2387cb11de8736f apache-tomcat-5.5.25-src.tar.gz 5106363
diff --git a/dev-java/tomcat-servlet-api/files/jsp-api-2.0-manifest b/dev-java/tomcat-servlet-api/files/jsp-api-2.0-manifest
new file mode 100644
index 000000000000..dfaa006ea009
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/files/jsp-api-2.0-manifest
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0

+Bundle-ManifestVersion: 2

+Bundle-Name: %bundleName

+Bundle-Vendor: %vendorName

+Bundle-Localization: plugin

+Import-Package: javax.servlet; version=2.4,javax.servlet.http; version=2.4,javax.servlet.resources; version=2.4

+Export-Package: javax.servlet.jsp; version=2.0,javax.servlet.jsp.el; version=2.0, javax.servlet.jsp.resources; version=2.0,

+ javax.servlet.jsp.tagext; version=2.0

+Bundle-Version: 2.0

+Bundle-SymbolicName: javax.servlet.jsp

+

diff --git a/dev-java/tomcat-servlet-api/files/servlet-api-2.4-manifest b/dev-java/tomcat-servlet-api/files/servlet-api-2.4-manifest
new file mode 100644
index 000000000000..77e19f1d9ae8
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/files/servlet-api-2.4-manifest
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0

+Bundle-ManifestVersion: 2

+Bundle-Name: %bundleName

+Bundle-Vendor: %vendorName

+Bundle-Localization: plugin

+Export-Package: javax.servlet;version="2.4",javax.servlet.http;version="2.4",javax.servlet.resources;version="2.4"

+Bundle-Version: 2.4.0

+Bundle-SymbolicName: javax.servlet

+

diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.25-r1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.25-r1.ebuild
new file mode 100644
index 000000000000..b201008ee606
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.25-r1.ebuild
@@ -0,0 +1,50 @@
+# 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-5.5.25-r1.ebuild,v 1.1 2008/01/15 16:19:10 elvanor 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-1.1"
+SLOT="2.4"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="doc java5 source"
+
+DEPEND="java5? ( >=virtual/jdk-1.5 )
+	!java5? ( =virtual/jdk-1.4* )
+	source? ( app-arch/zip )"
+RDEPEND="java5? ( >=virtual/jdk-1.5 )
+	!java5? ( =virtual/jdk-1.4* )"
+
+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
+}