Version Bump. Thanks to wltjr. You should come back.

(Portage version: 2.1.9.25/cvs/Linux x86_64)

3 files changed, 139 insertions, 1 deletions

diff --git a/dev-java/tomcat-servlet-api/ChangeLog b/dev-java/tomcat-servlet-api/ChangeLog
index 5ded38e81ec3..8997af32f1e1 100644
--- a/dev-java/tomcat-servlet-api/ChangeLog
+++ b/dev-java/tomcat-servlet-api/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-java/tomcat-servlet-api
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.80 2010/08/31 15:12:17 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.81 2010/12/21 08:52:51 ali_bush Exp $
+
+  21 Dec 2010; Alistair Bush <ali_bush@gentoo.org> +files/3.0-build.xml,
+  +tomcat-servlet-api-7.0.5.ebuild:
+  Version Bump.
+
+*tomcat-servlet-api-7.0.5 (21 Dec 2010)
+
+  21 Dec 2010; Alistair Bush <ali_bush@gentoo.org> +files/3.0-build.xml,
+  +tomcat-servlet-api-7.0.5.ebuild:
+  Version Bump
 
 *tomcat-servlet-api-6.0.29 (31 Aug 2010)
 
diff --git a/dev-java/tomcat-servlet-api/files/3.0-build.xml b/dev-java/tomcat-servlet-api/files/3.0-build.xml
new file mode 100644
index 000000000000..c685394d83f9
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/files/3.0-build.xml
@@ -0,0 +1,92 @@
+<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"/>
+  <property name="el-api.jar" value="${tomcat.build}/lib/el-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/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 3.0 Implementation JAR File -->
+    <jar  jarfile="${servlet-api.jar}">
+      <fileset dir="${tomcat.classes}">
+        <include name="javax/servlet/*" />
+        <include name="javax/servlet/annotation/*" />
+        <include name="javax/servlet/descriptor/*" />
+        <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.2 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>
+
+    <!-- JSP 2.2 EL Implementation JAR File -->
+    <jar jarfile="${el-api.jar}">
+      <fileset dir="${tomcat.classes}">
+        <include name="javax/el/**" />
+      </fileset>
+    </jar>
+
+  </target>
+
+</project>
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.5.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.5.ebuild
new file mode 100644
index 000000000000..845b7c52fd73
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2010 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-7.0.5.ebuild,v 1.1 2010/12/21 08:52:51 ali_bush Exp $
+
+EAPI="2"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P/_beta/}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV/_/-}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}/"
+
+java_prepare() {
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml
+	einfo "Removing bundled jars and classes"
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -delete
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}