From 29a9fb32d58b574655692d0d9666364d09781e7b Mon Sep 17 00:00:00 2001
From: William Thomson <wltjr@gentoo.org>
Date: Fri, 5 Jan 2007 03:27:58 +0000
Subject: [PATCH] Initial new ebuilds for Tomcat's servlet api, 2.4/2.5.
 5.5.20/2.4 is brought over from previous servletapi-2.4 package. 6.0.7_alpha
 still needs work. Resulting jars are not the correct size :( Package-Manager:
 portage-2.1.2_rc4-r3

---
 dev-java/tomcat-servlet-api/ChangeLog         | 14 ++++
 dev-java/tomcat-servlet-api/Manifest          | 28 +++++++
 .../tomcat-servlet-api/files/2.5-build.xml    | 82 +++++++++++++++++++
 .../files/digest-tomcat-servlet-api-5.5.20    |  3 +
 .../digest-tomcat-servlet-api-6.0.7_alpha     |  3 +
 dev-java/tomcat-servlet-api/metadata.xml      | 16 ++++
 .../tomcat-servlet-api-5.5.20.ebuild          | 55 +++++++++++++
 .../tomcat-servlet-api-6.0.7_alpha.ebuild     | 49 +++++++++++
 8 files changed, 250 insertions(+)
 create mode 100644 dev-java/tomcat-servlet-api/ChangeLog
 create mode 100644 dev-java/tomcat-servlet-api/Manifest
 create mode 100644 dev-java/tomcat-servlet-api/files/2.5-build.xml
 create mode 100644 dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-5.5.20
 create mode 100644 dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-6.0.7_alpha
 create mode 100644 dev-java/tomcat-servlet-api/metadata.xml
 create mode 100644 dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.20.ebuild
 create mode 100644 dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.7_alpha.ebuild

diff --git a/dev-java/tomcat-servlet-api/ChangeLog b/dev-java/tomcat-servlet-api/ChangeLog
new file mode 100644
index 000000000000..8a8e28a4d9b2
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/ChangeLog
@@ -0,0 +1,14 @@
+# 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.1 2007/01/05 03:27:58 wltjr Exp $
+
+*tomcat-servlet-api-6.0.7_alpha (05 Jan 2007)
+*tomcat-servlet-api-5.5.20 (05 Jan 2007)
+
+  05 Jan 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  +files/2.5-build.xml, +metadata.xml, +tomcat-servlet-api-5.5.20.ebuild,
+  +tomcat-servlet-api-6.0.7_alpha.ebuild:
+  Initial new ebuilds for Tomcat's servlet api, 2.4/2.5. 5.5.20/2.4 is brought
+  over from previous servletapi-2.4 package. 6.0.7_alpha still needs work.
+  Resulting jars are not the correct size :(
+
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
new file mode 100644
index 000000000000..3ff3c9969f40
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -0,0 +1,28 @@
+AUX 2.5-build.xml 2864 RMD160 d69af37473e7526f17ce99d7e5e624d2edac630b SHA1 f3da528002c5463406141bf63b5301d5518577f5 SHA256 b2cbb540ab2bfacc8044e0c6d67afbbd8c1e2e04a12a9c0f565902e1ef3c687a
+MD5 66ba82dc585e7dec8814097eae04a5d3 files/2.5-build.xml 2864
+RMD160 d69af37473e7526f17ce99d7e5e624d2edac630b files/2.5-build.xml 2864
+SHA256 b2cbb540ab2bfacc8044e0c6d67afbbd8c1e2e04a12a9c0f565902e1ef3c687a files/2.5-build.xml 2864
+DIST apache-tomcat-5.5.20-src.tar.gz 4796377 RMD160 587590d2e272d1ede73501b62933f544cd969822 SHA1 cc416242d8c9e1978702a207e305ca97afe53d4d SHA256 19f24717fb3e2db902c33e21650dfa88bbf98428c15b1ed68ecaf7a9150e4a77
+DIST apache-tomcat-6.0.7-src.tar.gz 3210405 RMD160 830485c5e25926da950e6b2148aa8baae263b351 SHA1 6883fbed7840c20d0967c435deafc0260609200f SHA256 a76be3230db0a3363835916f14afcccce6f18509577c2999f5491c0fb861e4f3
+EBUILD tomcat-servlet-api-5.5.20.ebuild 1440 RMD160 316b56e6991a498ca0f8844d7daa0d5c268156aa SHA1 08d5883a6ffe8100beac1e59c6f2b1a5a811ae61 SHA256 e9feeb4f42b56083e5f18bba0e282ced7eff92d778fbecf217b5c5d47261cc5a
+MD5 782f06de864ecfd3b33556bd587cc08f tomcat-servlet-api-5.5.20.ebuild 1440
+RMD160 316b56e6991a498ca0f8844d7daa0d5c268156aa tomcat-servlet-api-5.5.20.ebuild 1440
+SHA256 e9feeb4f42b56083e5f18bba0e282ced7eff92d778fbecf217b5c5d47261cc5a tomcat-servlet-api-5.5.20.ebuild 1440
+EBUILD tomcat-servlet-api-6.0.7_alpha.ebuild 1248 RMD160 d7b34bc4233ff57cf7fc52ed8681256b81a7ae55 SHA1 359d0b0b9777c5d09ab951f6d62c3aff193cd9e1 SHA256 d213649665e5c840961a0e1258e6fe0b5b8c6029e6482decd6b9d6474918db87
+MD5 85a54115ffabb8f58e72518c55ed44da tomcat-servlet-api-6.0.7_alpha.ebuild 1248
+RMD160 d7b34bc4233ff57cf7fc52ed8681256b81a7ae55 tomcat-servlet-api-6.0.7_alpha.ebuild 1248
+SHA256 d213649665e5c840961a0e1258e6fe0b5b8c6029e6482decd6b9d6474918db87 tomcat-servlet-api-6.0.7_alpha.ebuild 1248
+MISC ChangeLog 687 RMD160 3f9f0b38eec2a7e187802111956e8781d2e8b1b4 SHA1 60a777443bc58a77aa20b7d06191e7e6e1ab537f SHA256 f39262ed5503b825734bd7c3d79d836ef8d93a4e1704a0c2713e5646c57664c4
+MD5 792825f466bbc5cacbb2bdd339ce92f5 ChangeLog 687
+RMD160 3f9f0b38eec2a7e187802111956e8781d2e8b1b4 ChangeLog 687
+SHA256 f39262ed5503b825734bd7c3d79d836ef8d93a4e1704a0c2713e5646c57664c4 ChangeLog 687
+MISC metadata.xml 370 RMD160 80f77811a1330480797cff01b1e90e883ecb4d51 SHA1 0d60a8ede5babbd15577612fe7b9e504e5a73689 SHA256 d82a36005520445f65916bb8e8e5a4e41c3af6cc5be87cb2263337074e39b704
+MD5 eab22d527a1a92afde250a0ff957b829 metadata.xml 370
+RMD160 80f77811a1330480797cff01b1e90e883ecb4d51 metadata.xml 370
+SHA256 d82a36005520445f65916bb8e8e5a4e41c3af6cc5be87cb2263337074e39b704 metadata.xml 370
+MD5 8adc14a8534e1c6f8d5f96b371e1895f files/digest-tomcat-servlet-api-5.5.20 277
+RMD160 b9c5deac84bf5acd7a65ad80bdfaca9f7e343f3f files/digest-tomcat-servlet-api-5.5.20 277
+SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/digest-tomcat-servlet-api-5.5.20 277
+MD5 ae090639fc2a4b844084020e9fd68796 files/digest-tomcat-servlet-api-6.0.7_alpha 274
+RMD160 887290424c340b8a024770ae6ee2adeb0252b5ea files/digest-tomcat-servlet-api-6.0.7_alpha 274
+SHA256 8c88ae20979c83fd4529d2493cf5bfc63d86ff37cb46af296db58166d2e0ad3d files/digest-tomcat-servlet-api-6.0.7_alpha 274
diff --git a/dev-java/tomcat-servlet-api/files/2.5-build.xml b/dev-java/tomcat-servlet-api/files/2.5-build.xml
new file mode 100644
index 000000000000..97ade1678713
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/files/2.5-build.xml
@@ -0,0 +1,82 @@
+<project name="Tomcat Serlvet API 2.5/JSP API 2.1" default="deploy" basedir=".">
+
+  <property name="compile.source" value="1.5"/>
+
+  <property name="tomcat.build"      value="${basedir}/output/build"/>
+  <property name="tomcat.classes"    value="${basedir}/output/classes"/>
+  <property name="servlet-api.jar" value="${tomcat.build}/lib/servlet-api.jar"/>
+  <property name="jsp-api.jar" value="${tomcat.build}/lib/jsp-api.jar"/>
+
+  <!-- Just build Tomcat -->
+  <target name="build-prepare">
+
+    <available classname="junit.framework.TestCase" property="junit.present" />
+
+    <mkdir dir="${tomcat.build}"/>
+    <mkdir dir="${tomcat.build}/lib"/>
+    <mkdir dir="${tomcat.classes}"/>
+
+  </target>
+
+  <target name="compile">
+
+    <!-- Compile internal server components -->
+    <javac srcdir="java" destdir="${tomcat.classes}"
+           debug="${compile.debug}"
+           deprecation="${compile.deprecation}"
+           source="${compile.source}"
+           optimize="${compile.optimize}"
+           excludes="**/CVS/**,**/.svn/**">
+      <exclude name="java/javax/annotation/**" />
+      <exclude name="java/javax/ejb/**" />
+      <exclude name="java/javax/el/**" />
+      <exclude name="java/javax/mail/**" />
+      <exclude name="java/javax/persistence/**" />
+      <exclude name="java/javax/xml/**" />
+      <exclude name="org/**" />
+    </javac>
+    <tstamp>
+      <format property="TODAY" pattern="MMM d yyyy" locale="en"/>
+      <format property="TSTAMP" pattern="hh:mm:ss"/>
+    </tstamp>
+    <!-- Copy static resource files -->
+    <filter token="VERSION" value="${version}"/>
+    <filter token="VERSION_NUMBER" value="${version.number}"/>
+    <filter token="VERSION_BUILT" value="${TODAY} ${TSTAMP}"/>
+    <copy todir="${tomcat.classes}" filtering="true">
+      <fileset dir="java">
+        <include name="**/*.properties"/>
+        <include name="**/*.dtd"/>
+        <include name="**/*.tasks"/>
+        <include name="**/*.xsd"/>
+        <include name="**/*.xml"/>
+      </fileset>
+    </copy>
+
+  </target>
+
+  <target name="jar" depends="build-prepare,compile">
+    <!-- Servlet 2.5 Implementation JAR File -->
+    <jar  jarfile="${servlet-api.jar}">
+      <fileset dir="${tomcat.classes}">
+        <include name="javax/servlet/*" />
+        <include name="javax/servlet/http/*" />
+        <include name="javax/servlet/resources/*" />
+        <!-- Javadoc and i18n exclusions -->
+        <exclude name="**/package.html" />
+        <exclude name="**/LocalStrings_*" />
+      </fileset>
+    </jar>
+
+    <!-- JSP 2.1 Implementation JAR File -->
+    <jar  jarfile="${jsp-api.jar}">
+      <fileset dir="${tomcat.classes}">
+        <include name="javax/servlet/jsp/**" />
+        <!-- Javadoc and i18n exclusions -->
+        <exclude name="**/package.html" />
+        <exclude name="**/LocalStrings_*" />
+      </fileset>
+    </jar>
+  </target>
+
+</project>
diff --git a/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-5.5.20 b/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-5.5.20
new file mode 100644
index 000000000000..25cb711a112c
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-5.5.20
@@ -0,0 +1,3 @@
+MD5 5775bae8fac16a0e3a2c913c4768bb37 apache-tomcat-5.5.20-src.tar.gz 4796377
+RMD160 587590d2e272d1ede73501b62933f544cd969822 apache-tomcat-5.5.20-src.tar.gz 4796377
+SHA256 19f24717fb3e2db902c33e21650dfa88bbf98428c15b1ed68ecaf7a9150e4a77 apache-tomcat-5.5.20-src.tar.gz 4796377
diff --git a/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-6.0.7_alpha b/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-6.0.7_alpha
new file mode 100644
index 000000000000..1309a094c51c
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-6.0.7_alpha
@@ -0,0 +1,3 @@
+MD5 e4043356aeb6fd631df17adb1fbdb76d apache-tomcat-6.0.7-src.tar.gz 3210405
+RMD160 830485c5e25926da950e6b2148aa8baae263b351 apache-tomcat-6.0.7-src.tar.gz 3210405
+SHA256 a76be3230db0a3363835916f14afcccce6f18509577c2999f5491c0fb861e4f3 apache-tomcat-6.0.7-src.tar.gz 3210405
diff --git a/dev-java/tomcat-servlet-api/metadata.xml b/dev-java/tomcat-servlet-api/metadata.xml
new file mode 100644
index 000000000000..dca9c76ca1ed
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+
+	<herd>java</herd>
+
+	<maintainer>
+		<email>wltjr@gentoo.org</email>
+		<name>William L. Thomson Jr.</name>
+	</maintainer>
+
+	<longdescription>
+	The Apache Tomcat implementation of the Servlet API specification.
+	</longdescription>
+
+</pkgmetadata>
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.20.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.20.ebuild
new file mode 100644
index 000000000000..022877956cac
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.20.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2007 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.20.ebuild,v 1.1 2007/01/05 03:27:58 wltjr Exp $
+
+inherit eutils java-pkg-2 java-ant-2
+
+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/jakarta/tomcat-5/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="2.4"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc java5 source"
+
+DEPEND="|| ( >=virtual/jdk-1.4 >=virtual/jdk-1.5 >=virtual/jdk-1.6 )
+	>=dev-java/ant-core-1.5
+	source? ( app-arch/zip )"
+RDEPEND="|| ( >=virtual/jre-1.4 >=virtual/jre-1.5 >=virtual/jre-1.6 )"
+
+S="${WORKDIR}/${MY_P}/servletapi"
+
+pkg_setup() {
+	if use java5; then
+		JAVA_PKG_WANT_SOURCE="1.5"
+		JAVA_PKG_WANT_TARGET="1.5"
+	fi
+}
+
+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-pkg_dojar *.jar
+	use doc && java-pkg_dohtml -r docs/*
+	use source && java-pkg_dosrc jsr{152,154}/src/share/javax
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.7_alpha.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.7_alpha.ebuild
new file mode 100644
index 000000000000..7505bb403d2c
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.7_alpha.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2007 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.7_alpha.ebuild,v 1.1 2007/01/05 03:27:58 wltjr Exp $
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P/_alpha/}-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/jakarta/tomcat-6/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="2.5"
+KEYWORDS="~amd64 ~x86"
+IUSE="source"
+
+DEPEND="|| ( >=virtual/jdk-1.5 >=virtual/jdk-1.6 )
+	>=dev-java/ant-core-1.5
+	source? ( app-arch/zip )"
+RDEPEND="|| ( >=virtual/jre-1.5 >=virtual/jre-1.6 )"
+
+S="${WORKDIR}/${MY_P}/"
+
+pkg_setup() {
+	JAVA_PKG_WANT_SOURCE="1.5"
+	JAVA_PKG_WANT_TARGET="1.5"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	cp ${FILESDIR}/${SLOT}-build.xml build.xml || die "Could not replace build.xml"
+	rm */*/build.xml
+}
+
+src_compile() {
+#	local antflags="jar $(use_doc javadoc examples)"
+	local antflags="jar"
+	eant ${antflags}
+}
+
+src_install() {
+	cd ${S}/output/build/lib
+	java-pkg_dojar *.jar
+#	use doc && java-pkg_dohtml -r docs/*
+	use source && java-pkg_dosrc java/javax/servlet/
+}
-- 
2.26.2