From 7ab9daf596483ac51f7cabfc5d33be46686eee3f Mon Sep 17 00:00:00 2001
From: William Thomson <wltjr@gentoo.org>
Date: Sun, 10 Dec 2006 21:51:03 +0000
Subject: [PATCH] Updated 2.4 to latest tomcat sources, package needs to be
 renamed and versioned accordingly. Starting to have issues with it being out
 of sync with Tomcat Package-Manager: portage-2.1.2_rc3-r1

---
 dev-java/servletapi/ChangeLog                 | 11 +++-
 .../servletapi/files/digest-servletapi-2.4-r5 |  3 ++
 dev-java/servletapi/servletapi-2.4-r5.ebuild  | 54 +++++++++++++++++++
 3 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 dev-java/servletapi/files/digest-servletapi-2.4-r5
 create mode 100644 dev-java/servletapi/servletapi-2.4-r5.ebuild

diff --git a/dev-java/servletapi/ChangeLog b/dev-java/servletapi/ChangeLog
index b9c89cc55ce8..e8206b04c2ca 100644
--- a/dev-java/servletapi/ChangeLog
+++ b/dev-java/servletapi/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/servletapi
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/ChangeLog,v 1.46 2006/12/09 09:37:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/ChangeLog,v 1.47 2006/12/10 21:51:03 wltjr Exp $
+
+*servletapi-2.4-r5 (10 Dec 2006)
+
+  10 Dec 2006; William L. Thomson Jr. <wltjr@gentoo.org>
+  -servletapi-2.4-r3.ebuild, -servletapi-2.4-r4.ebuild,
+  +servletapi-2.4-r5.ebuild:
+  Updated 2.4 to latest tomcat sources, package needs to be renamed and
+  versioned accordingly. Starting to have issues with it being out of sync
+  with Tomcat
 
   09 Dec 2006; Diego Pettenò <flameeyes@gentoo.org>
   servletapi-2.2-r3.ebuild:
diff --git a/dev-java/servletapi/files/digest-servletapi-2.4-r5 b/dev-java/servletapi/files/digest-servletapi-2.4-r5
new file mode 100644
index 000000000000..25cb711a112c
--- /dev/null
+++ b/dev-java/servletapi/files/digest-servletapi-2.4-r5
@@ -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/servletapi/servletapi-2.4-r5.ebuild b/dev-java/servletapi/servletapi-2.4-r5.ebuild
new file mode 100644
index 000000000000..b9aa373a4c30
--- /dev/null
+++ b/dev-java/servletapi/servletapi-2.4-r5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/servletapi-2.4-r5.ebuild,v 1.1 2006/12/10 21:51:03 wltjr Exp $
+
+inherit eutils java-pkg-2 java-ant-2
+
+TC_VERSION="5.5.20"
+DESCRIPTION="Servlet API 2.4 from jakarta.apache.org"
+HOMEPAGE="http://jakarta.apache.org/"
+SRC_URI="mirror://apache/jakarta/tomcat-5/v${TC_VERSION}/src/apache-tomcat-${TC_VERSION}-src.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="2.4"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="doc source"
+
+DEPEND=">=virtual/jdk-1.4
+	>=dev-java/ant-core-1.5
+	source? ( app-arch/zip )"
+RDEPEND=">=virtual/jdk-1.4"
+
+S="${WORKDIR}/apache-tomcat-${TC_VERSION}-src/servletapi"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	#epatch ${FILESDIR}/gentoo-${P}-patch
+}
+
+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
+}
-- 
2.26.2