Bumped 5.5 to latest development release

(Portage version: 2.1.2-r9)

3 files changed, 69 insertions, 1 deletions

diff --git a/dev-java/tomcat-servlet-api/ChangeLog b/dev-java/tomcat-servlet-api/ChangeLog
index 287a9e2e296d..6ede5824afcd 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.12 2007/02/13 19:24:37 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.13 2007/02/13 21:03:56 wltjr Exp $
+
+*tomcat-servlet-api-5.5.22_pre (13 Feb 2007)
+
+  13 Feb 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  +tomcat-servlet-api-5.5.22_pre.ebuild:
+  Bumped 5.5 to latest development release
 
 *tomcat-servlet-api-6.0.10_pre (13 Feb 2007)
 
diff --git a/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-5.5.22_pre b/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-5.5.22_pre
new file mode 100644
index 000000000000..9f11a897bf7a
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-5.5.22_pre
@@ -0,0 +1,3 @@
+MD5 1af391c1647752d4fd8e2c3892e1be68 apache-tomcat-5.5.22-src.tar.gz 4888257
+RMD160 39a5da86cce996c7c41baddfab825e5bfbd334db apache-tomcat-5.5.22-src.tar.gz 4888257
+SHA256 206fa6040b06cc98d705afe3594d588e2556dc15eb73083d4c1da146b997216a apache-tomcat-5.5.22-src.tar.gz 4888257
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.22_pre.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.22_pre.ebuild
new file mode 100644
index 000000000000..e6c01c0b2eab
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.22_pre.ebuild
@@ -0,0 +1,59 @@
+# 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.22_pre.ebuild,v 1.1 2007/02/13 21:03:56 wltjr Exp $
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_P="apache-${P/-servlet-api/}-src"
+MY_P="${MY_P/_pre/}"
+DESCRIPTION="Tomcat's Servlet API 2.4/JSP API 2.0 implementation"
+HOMEPAGE="http://tomcat.apache.org/"
+#SRC_URI="mirror://apache/tomcat-5/v${PV}/src/${MY_P}.tar.gz"
+SRC_URI="http://people.apache.org/~fhanik/tomcat/tomcat-5.5/v${PV/_pre/}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="2.4"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+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 )
+	>=dev-java/java-config-2.0.31"
+RDEPEND="|| ( >=virtual/jre-1.4 >=virtual/jre-1.5 >=virtual/jre-1.6 )
+	>=dev-java/java-config-2.0.31"
+
+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
+}