1 |
commit: e1d06f474d45a841ca718aa2564b0fbe5cbd5dd9 |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Dec 4 18:03:02 2015 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Dec 4 18:03:02 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1d06f47 |
7 |
|
8 |
dev-java/tomcat-servlet-api: version bump - slot 9 milestone 1 |
9 |
|
10 |
Package-Manager: portage-2.2.26 |
11 |
|
12 |
dev-java/tomcat-servlet-api/Manifest | 1 + |
13 |
dev-java/tomcat-servlet-api/files/4.0-build.xml | 93 ++++++++++++++++++++++ |
14 |
.../tomcat-servlet-api-9.0.0_alpha1.ebuild | 37 +++++++++ |
15 |
3 files changed, 131 insertions(+) |
16 |
|
17 |
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest |
18 |
index 12c7c21..b49cd5a 100644 |
19 |
--- a/dev-java/tomcat-servlet-api/Manifest |
20 |
+++ b/dev-java/tomcat-servlet-api/Manifest |
21 |
@@ -12,4 +12,5 @@ DIST apache-tomcat-8.0.26-src.tar.gz 4904717 SHA256 3725621a73501a6e09438f177acf |
22 |
DIST apache-tomcat-8.0.27-src.tar.gz 4911212 SHA256 149b203c55c08d3ef1e823e8f0f771362bee75ea95db693757e53ddc9fba8fae SHA512 dfb504b37bf991c03b58b50af833d2d84d3f36a1eb5c4290a0eb8abee92811e78798ea69ba21ed72e82abbf8e27f9c2e74fe5989a31e49ee8cecb8530ce3c93a WHIRLPOOL 5dbb965aacbe5c178a4d2dcdf9719821498b3694fd909fe276d8dad7fb96b8c402fcf8d21b6e9b125b55d1c39408cbcb2ce85789c0eb3204d1d9aae5ea1cde3d |
23 |
DIST apache-tomcat-8.0.28-src.tar.gz 4913153 SHA256 441a0a0459b6c2dacab3bcf68a9e512b4bb62f7251a27bd15b909ee31b659367 SHA512 60f9a9f643595cdc87598169b8b66cc1e445445a530cad88d2957e90ca99e7c77be9d3576c7fa3a0e7051166f2a960a1c3bf4103f902d1da122825d41e1154c7 WHIRLPOOL 5867ec0c128fe5247c7b874baf05fba9fc9a5663e1c16ecd60bc6ae1e3c411a43f4d8784db5c915fe6c54bc2ec728a01773708738aede30e5abaf1f77072cdcb |
24 |
DIST apache-tomcat-8.0.29-src.tar.gz 4933339 SHA256 5cb87ae9afd145d68906e93b825a6a41303d7975bafe3d57530e9a8ec01c7c80 SHA512 279c971529f0e7513885a0a201753bc94b1ed7a4f035cb33943bf6ae769102630b94144c65236e8b42c666ded7cc843db54c155e8b5cd1ae175b6385d9c2789b WHIRLPOOL 8cfb5402b877be4bd4306cf5d14cf76302b1904e3530de108f262f9bb3de6f1377882fb5a1406e4b2ffc5c239c541f64df55fc98945157edafbd14586deb26bd |
25 |
+DIST apache-tomcat-9.0.0.M1-src.tar.gz 4984318 SHA256 62fb16ed9743916b643a7b406c4b98b8b9b2df15504e9a66d4a609f6d539b34c SHA512 f47a018e30a0ceb382187de2fef443ea1ef9d6e319ef4f3a027824b7e95fb4b5e9d73531f03357b2a89c5f3baf568ac4cfde83969f9603299dd0cf742c4f6efa WHIRLPOOL ab796c7484fd2c1d5060998910e1bd1cfb4f478b6740d9d105255b1e1b36fc9118048d0089a873699b978be91adbe7e024afcb3a4fc2d5121b17089998cb9210 |
26 |
DIST jakarta-servletapi-src.tar.gz 65342 SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084 WHIRLPOOL beb0e14920a8623d276c8823e6291aacb4b4d5d0539f5de431ce6f94582df9b260d4e04e0d0b650c59f7ca168f4af9352fffbfc0506b2530464a3bcdcf6ac0d1 |
27 |
|
28 |
diff --git a/dev-java/tomcat-servlet-api/files/4.0-build.xml b/dev-java/tomcat-servlet-api/files/4.0-build.xml |
29 |
new file mode 100644 |
30 |
index 0000000..ea0ef87 |
31 |
--- /dev/null |
32 |
+++ b/dev-java/tomcat-servlet-api/files/4.0-build.xml |
33 |
@@ -0,0 +1,93 @@ |
34 |
+ |
35 |
+<project name="Tomcat Serlvet API 3.1/JSP API 2.3" default="deploy" basedir="."> |
36 |
+ |
37 |
+ <property name="compile.source" value="1.7"/> |
38 |
+ |
39 |
+ <property name="tomcat.build" value="${basedir}/output/build"/> |
40 |
+ <property name="tomcat.classes" value="${basedir}/output/classes"/> |
41 |
+ <property name="servlet-api.jar" value="${tomcat.build}/lib/servlet-api.jar"/> |
42 |
+ <property name="jsp-api.jar" value="${tomcat.build}/lib/jsp-api.jar"/> |
43 |
+ <property name="el-api.jar" value="${tomcat.build}/lib/el-api.jar"/> |
44 |
+ |
45 |
+ <!-- Just build Tomcat --> |
46 |
+ <target name="build-prepare"> |
47 |
+ |
48 |
+ <available classname="junit.framework.TestCase" property="junit.present" /> |
49 |
+ |
50 |
+ <mkdir dir="${tomcat.build}"/> |
51 |
+ <mkdir dir="${tomcat.build}/lib"/> |
52 |
+ <mkdir dir="${tomcat.classes}"/> |
53 |
+ |
54 |
+ </target> |
55 |
+ |
56 |
+ <target name="compile"> |
57 |
+ |
58 |
+ <!-- Compile internal server components --> |
59 |
+ <javac srcdir="java" destdir="${tomcat.classes}" |
60 |
+ debug="${compile.debug}" |
61 |
+ deprecation="${compile.deprecation}" |
62 |
+ source="${compile.source}" |
63 |
+ optimize="${compile.optimize}" |
64 |
+ excludes="**/CVS/**,**/.svn/**"> |
65 |
+ <exclude name="java/javax/annotation/**" /> |
66 |
+ <exclude name="java/javax/ejb/**" /> |
67 |
+ <exclude name="java/javax/mail/**" /> |
68 |
+ <exclude name="java/javax/persistence/**" /> |
69 |
+ <exclude name="java/javax/xml/**" /> |
70 |
+ <exclude name="org/**" /> |
71 |
+ </javac> |
72 |
+ <tstamp> |
73 |
+ <format property="TODAY" pattern="MMM d yyyy" locale="en"/> |
74 |
+ <format property="TSTAMP" pattern="hh:mm:ss"/> |
75 |
+ </tstamp> |
76 |
+ <!-- Copy static resource files --> |
77 |
+ <filter token="VERSION" value="${version}"/> |
78 |
+ <filter token="VERSION_NUMBER" value="${version.number}"/> |
79 |
+ <filter token="VERSION_BUILT" value="${TODAY} ${TSTAMP}"/> |
80 |
+ <copy todir="${tomcat.classes}" filtering="true"> |
81 |
+ <fileset dir="java"> |
82 |
+ <include name="**/*.properties"/> |
83 |
+ <include name="**/*.dtd"/> |
84 |
+ <include name="**/*.tasks"/> |
85 |
+ <include name="**/*.xsd"/> |
86 |
+ <include name="**/*.xml"/> |
87 |
+ </fileset> |
88 |
+ </copy> |
89 |
+ |
90 |
+ </target> |
91 |
+ |
92 |
+ <target name="jar" depends="build-prepare,compile"> |
93 |
+ <!-- Servlet 3.1 Implementation JAR File --> |
94 |
+ <jar jarfile="${servlet-api.jar}"> |
95 |
+ <fileset dir="${tomcat.classes}"> |
96 |
+ <include name="javax/servlet/*" /> |
97 |
+ <include name="javax/servlet/annotation/*" /> |
98 |
+ <include name="javax/servlet/descriptor/*" /> |
99 |
+ <include name="javax/servlet/http/*" /> |
100 |
+ <include name="javax/servlet/resources/*" /> |
101 |
+ <!-- Javadoc and i18n exclusions --> |
102 |
+ <exclude name="**/package.html" /> |
103 |
+ <exclude name="**/LocalStrings_*" /> |
104 |
+ </fileset> |
105 |
+ </jar> |
106 |
+ |
107 |
+ <!-- JSP 2.3 Implementation JAR File --> |
108 |
+ <jar jarfile="${jsp-api.jar}"> |
109 |
+ <fileset dir="${tomcat.classes}"> |
110 |
+ <include name="javax/servlet/jsp/**" /> |
111 |
+ <!-- Javadoc and i18n exclusions --> |
112 |
+ <exclude name="**/package.html" /> |
113 |
+ <exclude name="**/LocalStrings_*" /> |
114 |
+ </fileset> |
115 |
+ </jar> |
116 |
+ |
117 |
+ <!-- JSP 2.3 EL Implementation JAR File --> |
118 |
+ <jar jarfile="${el-api.jar}"> |
119 |
+ <fileset dir="${tomcat.classes}"> |
120 |
+ <include name="javax/el/**" /> |
121 |
+ </fileset> |
122 |
+ </jar> |
123 |
+ |
124 |
+ </target> |
125 |
+ |
126 |
+</project> |
127 |
|
128 |
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 |
129 |
new file mode 100644 |
130 |
index 0000000..d48b296 |
131 |
--- /dev/null |
132 |
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.0_alpha1.ebuild |
133 |
@@ -0,0 +1,37 @@ |
134 |
+# Copyright 1999-2015 Gentoo Foundation |
135 |
+# Distributed under the terms of the GNU General Public License v2 |
136 |
+# $Id$ |
137 |
+ |
138 |
+EAPI="5" |
139 |
+JAVA_PKG_IUSE="source" |
140 |
+ |
141 |
+inherit eutils java-pkg-2 java-ant-2 |
142 |
+ |
143 |
+MY_PV="${PV/_alpha/.M}" |
144 |
+MY_A="apache-${PN}-${MY_PV}-src" |
145 |
+MY_P="${MY_A/-servlet-api/}" |
146 |
+DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3 implementation" |
147 |
+HOMEPAGE="http://tomcat.apache.org/" |
148 |
+SRC_URI="mirror://apache/tomcat/tomcat-9/v${MY_PV}/src/${MY_P}.tar.gz" |
149 |
+ |
150 |
+LICENSE="Apache-2.0" |
151 |
+SLOT="4.0" |
152 |
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" |
153 |
+IUSE="" |
154 |
+ |
155 |
+DEPEND=">=virtual/jdk-1.8" |
156 |
+RDEPEND=">=virtual/jre-1.8" |
157 |
+ |
158 |
+S="${WORKDIR}/${MY_P}/" |
159 |
+ |
160 |
+java_prepare() { |
161 |
+ cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml" |
162 |
+ rm -fR */*/build.xml |
163 |
+ einfo "Removing bundled jars and classes" |
164 |
+ find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} + |
165 |
+} |
166 |
+ |
167 |
+src_install() { |
168 |
+ java-pkg_dojar "${S}"/output/build/lib/*.jar |
169 |
+ use source && java-pkg_dosrc java/javax/servlet/ |
170 |
+} |