commit: 42c8662316ff8c71bcdfff8c0af171117ffa1a04
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 25 22:34:37 2015 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 23:22:10 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42c86623
dev-java/tomcat-servlet-api: Build el-api.jar for 6, fixes bug #558728
Also zip up the sources from the right directory.
Package-Manager: portage-2.2.20.1
dev-java/tomcat-servlet-api/files/2.5-build-r1.xml | 90 ++++++++++++++++++++++
.../tomcat-servlet-api-6.0.44-r1.ebuild | 35 +++++++++
2 files changed, 125 insertions(+)
diff --git a/dev-java/tomcat-servlet-api/files/2.5-build-r1.xml
b/dev-java/tomcat-servlet-api/files/2.5-build-r1.xml
new file mode 100644
index 0000000..585ed9f
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/files/2.5-build-r1.xml
@@ -0,0 +1,90 @@
+<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 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>
+
+ <!-- JSP 2.1 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-6.0.44-r1.ebuild
b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44-r1.ebuild
new file mode 100644
index 0000000..676adc0
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-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/tomcat/tomcat-6/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2.5"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd
~amd64-linux ~x86-linux ~x64-macos ~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-r1.xml" build.xml || die "Could not
replace build.xml"
+ rm -r */*/build.xml java/javax/{annotation,ejb,mail,persistence,xml}/
|| die
+ find -name '*.jar' -delete || die
+}
+
+src_install() {
+ java-pkg_dojar "${S}"/output/build/lib/*.jar
+ use source && java-pkg_dosrc java/javax
+}
