commit: e1d06f474d45a841ca718aa2564b0fbe5cbd5dd9
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 4 18:03:02 2015 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Dec 4 18:03:02 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1d06f47
dev-java/tomcat-servlet-api: version bump - slot 9 milestone 1
Package-Manager: portage-2.2.26
dev-java/tomcat-servlet-api/Manifest | 1 +
dev-java/tomcat-servlet-api/files/4.0-build.xml | 93 ++++++++++++++++++++++
.../tomcat-servlet-api-9.0.0_alpha1.ebuild | 37 +++++++++
3 files changed, 131 insertions(+)
diff --git a/dev-java/tomcat-servlet-api/Manifest
b/dev-java/tomcat-servlet-api/Manifest
index 12c7c21..b49cd5a 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -12,4 +12,5 @@ DIST apache-tomcat-8.0.26-src.tar.gz 4904717 SHA256
3725621a73501a6e09438f177acf
DIST apache-tomcat-8.0.27-src.tar.gz 4911212 SHA256
149b203c55c08d3ef1e823e8f0f771362bee75ea95db693757e53ddc9fba8fae SHA512
dfb504b37bf991c03b58b50af833d2d84d3f36a1eb5c4290a0eb8abee92811e78798ea69ba21ed72e82abbf8e27f9c2e74fe5989a31e49ee8cecb8530ce3c93a
WHIRLPOOL
5dbb965aacbe5c178a4d2dcdf9719821498b3694fd909fe276d8dad7fb96b8c402fcf8d21b6e9b125b55d1c39408cbcb2ce85789c0eb3204d1d9aae5ea1cde3d
DIST apache-tomcat-8.0.28-src.tar.gz 4913153 SHA256
441a0a0459b6c2dacab3bcf68a9e512b4bb62f7251a27bd15b909ee31b659367 SHA512
60f9a9f643595cdc87598169b8b66cc1e445445a530cad88d2957e90ca99e7c77be9d3576c7fa3a0e7051166f2a960a1c3bf4103f902d1da122825d41e1154c7
WHIRLPOOL
5867ec0c128fe5247c7b874baf05fba9fc9a5663e1c16ecd60bc6ae1e3c411a43f4d8784db5c915fe6c54bc2ec728a01773708738aede30e5abaf1f77072cdcb
DIST apache-tomcat-8.0.29-src.tar.gz 4933339 SHA256
5cb87ae9afd145d68906e93b825a6a41303d7975bafe3d57530e9a8ec01c7c80 SHA512
279c971529f0e7513885a0a201753bc94b1ed7a4f035cb33943bf6ae769102630b94144c65236e8b42c666ded7cc843db54c155e8b5cd1ae175b6385d9c2789b
WHIRLPOOL
8cfb5402b877be4bd4306cf5d14cf76302b1904e3530de108f262f9bb3de6f1377882fb5a1406e4b2ffc5c239c541f64df55fc98945157edafbd14586deb26bd
+DIST apache-tomcat-9.0.0.M1-src.tar.gz 4984318 SHA256
62fb16ed9743916b643a7b406c4b98b8b9b2df15504e9a66d4a609f6d539b34c SHA512
f47a018e30a0ceb382187de2fef443ea1ef9d6e319ef4f3a027824b7e95fb4b5e9d73531f03357b2a89c5f3baf568ac4cfde83969f9603299dd0cf742c4f6efa
WHIRLPOOL
ab796c7484fd2c1d5060998910e1bd1cfb4f478b6740d9d105255b1e1b36fc9118048d0089a873699b978be91adbe7e024afcb3a4fc2d5121b17089998cb9210
DIST jakarta-servletapi-src.tar.gz 65342 SHA256
404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697 SHA512
7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084
WHIRLPOOL
beb0e14920a8623d276c8823e6291aacb4b4d5d0539f5de431ce6f94582df9b260d4e04e0d0b650c59f7ca168f4af9352fffbfc0506b2530464a3bcdcf6ac0d1
diff --git a/dev-java/tomcat-servlet-api/files/4.0-build.xml
b/dev-java/tomcat-servlet-api/files/4.0-build.xml
new file mode 100644
index 0000000..ea0ef87
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/files/4.0-build.xml
@@ -0,0 +1,93 @@
+
+<project name="Tomcat Serlvet API 3.1/JSP API 2.3" default="deploy"
basedir=".">
+
+ <property name="compile.source" value="1.7"/>
+
+ <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.1 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.3 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.3 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-9.0.0_alpha1.ebuild
b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.0_alpha1.ebuild
new file mode 100644
index 0000000..d48b296
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.0_alpha1.ebuild
@@ -0,0 +1,37 @@
+# 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_PV="${PV/_alpha/.M}"
+MY_A="apache-${PN}-${MY_PV}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3 implementation"
+HOMEPAGE="http://tomcat.apache.org/";
+SRC_URI="mirror://apache/tomcat/tomcat-9/v${MY_PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4.0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux
~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8"
+
+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' ')' -exec rm -frv {} +
+}
+
+src_install() {
+ java-pkg_dojar "${S}"/output/build/lib/*.jar
+ use source && java-pkg_dosrc java/javax/servlet/
+}
