1 |
commit: 1c8ce1c03b57c254f5e7f4982424790edce198a1 |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Apr 4 05:31:33 2022 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Apr 4 05:31:33 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c8ce1c0 |
7 |
|
8 |
dev-java/tomcat-servlet-api: removed obsolete 8.5.75, 9.0.58 & 10.0.16 |
9 |
|
10 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
11 |
|
12 |
dev-java/tomcat-servlet-api/Manifest | 3 - |
13 |
.../tomcat-servlet-api-10.0.16.ebuild | 98 --------------------- |
14 |
.../tomcat-servlet-api-8.5.75.ebuild | 99 ---------------------- |
15 |
.../tomcat-servlet-api-9.0.58.ebuild | 99 ---------------------- |
16 |
4 files changed, 299 deletions(-) |
17 |
|
18 |
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest |
19 |
index 1ed42be88206..f2d24ce3298f 100644 |
20 |
--- a/dev-java/tomcat-servlet-api/Manifest |
21 |
+++ b/dev-java/tomcat-servlet-api/Manifest |
22 |
@@ -1,4 +1,3 @@ |
23 |
-DIST apache-tomcat-10.0.16-src.tar.gz 6088262 BLAKE2B f02a5b08e4502d4e7be2fa14f8dae8760c2844f262cdc75e2cc821038d248ed961281d11f7bb847cf55ecf012ee05c870366508fb1fe1485da2100e87aa13c55 SHA512 44a1ac752077603c5366ec92c6a5860d33ce810bf2554190a013329106ec118d1a18d1a26823b3024d046b05160a20dda65573365451d0481be8be97218445c8 |
24 |
DIST apache-tomcat-10.0.17-src.tar.gz 6086996 BLAKE2B ff3584e58ec6f22f493cf7f32435423d68b941d9eec22441ee54ba69af03b50b687b23012129108485c9db147c8e7364ded037cf9ed2add174e6c928b927382a SHA512 1cc0f8e2187934c6dac3e31739f8c53a0a152527a98210deab8ce027c1347cbbd1cef3bdf0294bee3c4dbed20ba57b2291bcd887f353837fd505ea2d17e7ba3d |
25 |
DIST apache-tomcat-10.0.18-src.tar.gz 6088118 BLAKE2B 7d3fdb5a682dd44d358a619a18ca3df3bde27c9fc963436c9bce86baf07a42e87ba80724afdc6ce72b493d2fb35dda644eba29df7d4434f8c815ada4cb5d2ca3 SHA512 001205f382f44163f08dba1d306472b7ef3256e31a522c3f1f7595bca4fd084776a0c1f69b241302fa5d0d2f143ac063cb34d4fcf79a51ec9722f2f2ce3f1dab |
26 |
DIST apache-tomcat-10.0.20-src.tar.gz 6097471 BLAKE2B 77df97d73ff87a5ad55dfc3a0df02e3a306e619a5ae4bd2df0a0e3d42d236ccf2c6a6c46f60f56311f9be1bd561be9096d810d932f136b5856ff275fb3ae8368 SHA512 1e75b0bad54a9fac6ddc650156fac88bc91933ff0bf4e9a62948f5e116454b6def10d7ad632968e709e8aac72b15c567e4497cdb9b594352cd12d7518fdaf18f |
27 |
@@ -6,11 +5,9 @@ DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc387 |
28 |
DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7 |
29 |
DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c |
30 |
DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce |
31 |
-DIST apache-tomcat-8.5.75-src.tar.gz 5961981 BLAKE2B a8d3c0ef390ce6b12b09cedb71cd9c102e3a37265f7ef6db9797eb7eaf04429f75bdedf6a7dbaa7ade0b57a12cbb461498c37d9c7e234bb9dc98e3d095b66b8a SHA512 c1c2609db623eb94a5e177c0f7ccabf8753a34151961ddc0fdea47704aca86123ef63f746b7ca76e818185cae19121823f7700f9bd47ba27625b3c801ddc8bad |
32 |
DIST apache-tomcat-8.5.76-src.tar.gz 5961741 BLAKE2B 4c661c2f753edac48c28fdec3caa06c487e1546feb91f2d69003a4d9f71fb023eb2314520bb156f3087656d655acdfdbdff3f68cd3f81d0d9dfbb2c9577898ee SHA512 b1c1b8c870c77e46969fe64acc71194d37605e5ccda87d105186d8070ec2dd0b7b9c64cf2f9b276db140fd3927832405123018f6fe8f46c0ebda50af6404d8b9 |
33 |
DIST apache-tomcat-8.5.77-src.tar.gz 5963037 BLAKE2B 63192409b148cf0691e6ad22180e4f79d8603e89633598ee3f1dcfdd7d55b88530ecb1aa7c585920e086a7582dea78fcbcd1498ed2552e0f8d17127658769f66 SHA512 a0d2f77540b5370e09d03d04340e0c7f539eb5761b84ea3c8ef924e2a3e7f9528b3ed83a0c8e413bc9335cee6052135788e48e30d95f231ba3ade7f0b53ec157 |
34 |
DIST apache-tomcat-8.5.78-src.tar.gz 5972826 BLAKE2B 93acb2e997a877a2195642da7d896ec4f08bebd83aa12d868607056c23722bdb90147814173dde17fc142a9e4e434e4570a15ebfa1f8b1c7911a16408728b4bb SHA512 b58fdaa57420fcf7759420fba26bfd6edaa5174f5d3a81fdf8783f19d5385e2502d2ad4bfa0e4a77c6a084bf6d97a6d3cd274ab0ab3f2311d23079e273c41b32 |
35 |
-DIST apache-tomcat-9.0.58-src.tar.gz 6142037 BLAKE2B 0515273882468958f5bc2ef95e3085c22975e0ec9f8153a20773266a43710645c2262da8cb10736f0f0b255716fa05a12252194e1f32851704364ef89a62e5e9 SHA512 b2b572dcad2efadf3e5e5a6ae6e108f5699af23b7751ca3c9c00e6ba896f5179745108fa602d8bd87a9611fd8bebe8817fad53c38fc75b0063835b953c67d74a |
36 |
DIST apache-tomcat-9.0.59-src.tar.gz 6142359 BLAKE2B 26dee501a374e54280237dbe392924ac89e3e4b331a11b30c2e0923ac38fa16bb52c02dfc8a9f3597fb0ee169ae2835ac254eab745d1e2ab1e64cfed6395d0c3 SHA512 cea0125ca9b90b247ed114fa7b2e9c63da38b1ef97b3a373a43ed0d775764178534a4014b254219c8c5a26575eaf0ddc25ebc1e276b2ad5086ef3406627f1c80 |
37 |
DIST apache-tomcat-9.0.60-src.tar.gz 6143845 BLAKE2B af7061854659de06afa6a7cf6380c4be4375e18bec896049bf468ddb9139794170271454af4712ade5099b8d46ed7c8d642e9c5f37ea168f0e31394a5128beeb SHA512 e5cb12fb134ff0a59e01a30fbcabc350ddbef6959494176848c2858c3c68444bc520153e00fdcdecb0eefbe7f69876c2965fedbffeeb0aeda7931dc1c11b0de5 |
38 |
DIST apache-tomcat-9.0.62-src.tar.gz 6156545 BLAKE2B 414f4f7193a8db2bb3d0abcbd2d8c30ede5783e83ba01229ffb322e9bf6b08d2fb10d83ce4742d9e6a4ebc50c9b047679ae798fbd3db8ae165f76d2782034d71 SHA512 7e9cad2703473d9f096009c464b28d54d3765259fab1923ef8c9b1cbfa231fa51cedadfe771a3a95abffd258759a71023e036bda78b949440a5e826fbd4e9e09 |
39 |
|
40 |
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.16.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.16.ebuild |
41 |
deleted file mode 100644 |
42 |
index 440d44e0a658..000000000000 |
43 |
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.16.ebuild |
44 |
+++ /dev/null |
45 |
@@ -1,98 +0,0 @@ |
46 |
-# Copyright 1999-2022 Gentoo Authors |
47 |
-# Distributed under the terms of the GNU General Public License v2 |
48 |
- |
49 |
-EAPI=8 |
50 |
- |
51 |
-JAVA_PKG_IUSE="source" |
52 |
- |
53 |
-inherit java-pkg-2 java-pkg-simple |
54 |
- |
55 |
-MY_A="apache-${PN}-${PV}-src" |
56 |
-MY_P="${MY_A/-servlet-api/}" |
57 |
-DESCRIPTION="Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation" |
58 |
-HOMEPAGE="https://tomcat.apache.org/" |
59 |
-SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz" |
60 |
- |
61 |
-LICENSE="Apache-2.0" |
62 |
-SLOT="5.0" |
63 |
-KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" |
64 |
-IUSE="" |
65 |
- |
66 |
-DEPEND=">=virtual/jdk-1.8:*" |
67 |
-RDEPEND=">=virtual/jre-1.8:*" |
68 |
- |
69 |
-S="${WORKDIR}/${MY_P}/" |
70 |
- |
71 |
-JAVA_TEST_SRC_DIR="src/test" |
72 |
- |
73 |
-SERVLET_API_JAR="servlet-api.jar" |
74 |
-SERVLET_API_SRC="src/main/servlet-api" |
75 |
-SERVLET_API_RESOURCES="src/resources/servlet-api" |
76 |
-EL_API_JAR="el-api.jar" |
77 |
-EL_API_SRC="src/main/el-api" |
78 |
-EL_API_RESOURCES="src/resources/el-api" |
79 |
-JSP_API_JAR="jsp-api.jar" |
80 |
-JSP_API_SRC="src/main/jsp-api" |
81 |
-JSP_API_RESOURCES="src/resources/jsp-api" |
82 |
- |
83 |
-src_prepare() { |
84 |
- default |
85 |
- |
86 |
- # The sources and also resources are mixed together so we first give it a structure to make it easier to compile and package |
87 |
- mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \ |
88 |
- ${EL_API_SRC} ${EL_API_RESOURCES} \ |
89 |
- ${JSP_API_SRC}/jakarta/servlet ${JSP_API_RESOURCES} \ |
90 |
- ${JAVA_TEST_SRC_DIR} || die "Failed to create source directory" |
91 |
- |
92 |
- pushd java || die "Failed to cd to java dir" |
93 |
- |
94 |
- cp --parents -R jakarta/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources" |
95 |
- mv "${S}/${SERVLET_API_SRC}/jakarta/servlet/jsp" "${S}/${JSP_API_SRC}/jakarta/servlet" || die "Failed to copy jsp-api sources" |
96 |
- cp --parents -R jakarta/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources" |
97 |
- |
98 |
- popd |
99 |
- |
100 |
- for file in $(find src -type f | grep -vE "\.java$"); do |
101 |
- target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g") |
102 |
- mkdir -p ${target_dir} || die "Failed to create resource directory" |
103 |
- mv $file ${target_dir} || die "Failed to move resource file" |
104 |
- done |
105 |
- |
106 |
- mv test/jakarta ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources" |
107 |
- |
108 |
- java-pkg-2_src_prepare |
109 |
-} |
110 |
- |
111 |
-src_compile() { |
112 |
- JAVA_SRC_DIR="${SERVLET_API_SRC}" |
113 |
- JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}" |
114 |
- JAVA_JAR_FILENAME="${SERVLET_API_JAR}" |
115 |
- java-pkg-simple_src_compile |
116 |
- rm -fr target || die "Failed to remove compiled files" |
117 |
- |
118 |
- JAVA_SRC_DIR="${EL_API_SRC}" |
119 |
- JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}" |
120 |
- JAVA_JAR_FILENAME="${EL_API_JAR}" |
121 |
- java-pkg-simple_src_compile |
122 |
- rm -fr target || die "Failed to remove compiled files" |
123 |
- |
124 |
- JAVA_SRC_DIR="${JSP_API_SRC}" |
125 |
- JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}" |
126 |
- JAVA_JAR_FILENAME="${JSP_API_JAR}" |
127 |
- JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar" |
128 |
- java-pkg-simple_src_compile |
129 |
-} |
130 |
- |
131 |
-src_install() { |
132 |
- JAVA_SRC_DIR="${SERVLET_API_SRC}" |
133 |
- JAVA_JAR_FILENAME="${SERVLET_API_JAR}" |
134 |
- java-pkg-simple_src_install |
135 |
- |
136 |
- JAVA_SRC_DIR="${EL_API_SRC}" |
137 |
- JAVA_JAR_FILENAME="${EL_API_JAR}" |
138 |
- java-pkg-simple_src_install |
139 |
- |
140 |
- JAVA_SRC_DIR="${JSP_API_SRC}" |
141 |
- JAVA_JAR_FILENAME="${JSP_API_JAR}" |
142 |
- java-pkg-simple_src_install |
143 |
-} |
144 |
|
145 |
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.75.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.75.ebuild |
146 |
deleted file mode 100644 |
147 |
index 888295412849..000000000000 |
148 |
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.75.ebuild |
149 |
+++ /dev/null |
150 |
@@ -1,99 +0,0 @@ |
151 |
-# Copyright 1999-2022 Gentoo Authors |
152 |
-# Distributed under the terms of the GNU General Public License v2 |
153 |
- |
154 |
-EAPI=7 |
155 |
- |
156 |
-JAVA_PKG_IUSE="source" |
157 |
- |
158 |
-inherit java-pkg-2 java-pkg-simple |
159 |
- |
160 |
-MY_A="apache-${P}-src" |
161 |
-MY_P="${MY_A/-servlet-api/}" |
162 |
-DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation" |
163 |
-HOMEPAGE="https://tomcat.apache.org/" |
164 |
-SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz" |
165 |
- |
166 |
-LICENSE="Apache-2.0" |
167 |
-SLOT="3.1" |
168 |
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" |
169 |
-IUSE="" |
170 |
- |
171 |
-DEPEND=">=virtual/jdk-1.8:*" |
172 |
-RDEPEND=">=virtual/jre-1.8:*" |
173 |
- |
174 |
-S="${WORKDIR}/${MY_P}/" |
175 |
- |
176 |
-JAVA_TEST_SRC_DIR="src/test" |
177 |
- |
178 |
-SERVLET_API_JAR="servlet-api.jar" |
179 |
-SERVLET_API_SRC="src/main/servlet-api" |
180 |
-SERVLET_API_RESOURCES="src/resources/servlet-api" |
181 |
-EL_API_JAR="el-api.jar" |
182 |
-EL_API_SRC="src/main/el-api" |
183 |
-EL_API_RESOURCES="src/resources/el-api" |
184 |
-JSP_API_JAR="jsp-api.jar" |
185 |
-JSP_API_SRC="src/main/jsp-api" |
186 |
-JSP_API_RESOURCES="src/resources/jsp-api" |
187 |
- |
188 |
-src_prepare() { |
189 |
- default |
190 |
- |
191 |
- # The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package |
192 |
- |
193 |
- mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \ |
194 |
- ${EL_API_SRC} ${EL_API_RESOURCES} \ |
195 |
- ${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \ |
196 |
- ${JAVA_TEST_SRC_DIR} || die "Failed to create source directory" |
197 |
- |
198 |
- pushd java || die "Failed to cd to java dir" |
199 |
- |
200 |
- cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources" |
201 |
- mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources" |
202 |
- cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources" |
203 |
- |
204 |
- popd |
205 |
- |
206 |
- for file in $(find src -type f | grep -vE "\.java$"); do |
207 |
- target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g") |
208 |
- mkdir -p ${target_dir} || die "Failed to create resource directory" |
209 |
- mv $file ${target_dir} || die "Failed to move resource file" |
210 |
- done |
211 |
- |
212 |
- mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources" |
213 |
- |
214 |
- java-pkg-2_src_prepare |
215 |
-} |
216 |
- |
217 |
-src_compile() { |
218 |
- JAVA_SRC_DIR="${SERVLET_API_SRC}" |
219 |
- JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}" |
220 |
- JAVA_JAR_FILENAME="${SERVLET_API_JAR}" |
221 |
- java-pkg-simple_src_compile |
222 |
- rm -fr target || die "Failed to remove compiled files" |
223 |
- |
224 |
- JAVA_SRC_DIR="${EL_API_SRC}" |
225 |
- JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}" |
226 |
- JAVA_JAR_FILENAME="${EL_API_JAR}" |
227 |
- java-pkg-simple_src_compile |
228 |
- rm -fr target || die "Failed to remove compiled files" |
229 |
- |
230 |
- JAVA_SRC_DIR="${JSP_API_SRC}" |
231 |
- JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}" |
232 |
- JAVA_JAR_FILENAME="${JSP_API_JAR}" |
233 |
- JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar" |
234 |
- java-pkg-simple_src_compile |
235 |
-} |
236 |
- |
237 |
-src_install() { |
238 |
- JAVA_SRC_DIR="${SERVLET_API_SRC}" |
239 |
- JAVA_JAR_FILENAME="${SERVLET_API_JAR}" |
240 |
- java-pkg-simple_src_install |
241 |
- |
242 |
- JAVA_SRC_DIR="${EL_API_SRC}" |
243 |
- JAVA_JAR_FILENAME="${EL_API_JAR}" |
244 |
- java-pkg-simple_src_install |
245 |
- |
246 |
- JAVA_SRC_DIR="${JSP_API_SRC}" |
247 |
- JAVA_JAR_FILENAME="${JSP_API_JAR}" |
248 |
- java-pkg-simple_src_install |
249 |
-} |
250 |
|
251 |
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.58.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.58.ebuild |
252 |
deleted file mode 100644 |
253 |
index f1c865a27bec..000000000000 |
254 |
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.58.ebuild |
255 |
+++ /dev/null |
256 |
@@ -1,99 +0,0 @@ |
257 |
-# Copyright 1999-2022 Gentoo Authors |
258 |
-# Distributed under the terms of the GNU General Public License v2 |
259 |
- |
260 |
-EAPI=8 |
261 |
- |
262 |
-JAVA_PKG_IUSE="source" |
263 |
- |
264 |
-inherit java-pkg-2 java-pkg-simple |
265 |
- |
266 |
-MY_A="apache-${PN}-${PV}-src" |
267 |
-MY_P="${MY_A/-servlet-api/}" |
268 |
-DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation" |
269 |
-HOMEPAGE="https://tomcat.apache.org/" |
270 |
-SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz" |
271 |
- |
272 |
-LICENSE="Apache-2.0" |
273 |
-SLOT="4.0" |
274 |
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" |
275 |
-IUSE="" |
276 |
- |
277 |
-DEPEND=">=virtual/jdk-1.8:*" |
278 |
-RDEPEND=">=virtual/jre-1.8:*" |
279 |
- |
280 |
-S="${WORKDIR}/${MY_P}/" |
281 |
- |
282 |
-JAVA_TEST_SRC_DIR="src/test" |
283 |
- |
284 |
-SERVLET_API_JAR="servlet-api.jar" |
285 |
-SERVLET_API_SRC="src/main/servlet-api" |
286 |
-SERVLET_API_RESOURCES="src/resources/servlet-api" |
287 |
-EL_API_JAR="el-api.jar" |
288 |
-EL_API_SRC="src/main/el-api" |
289 |
-EL_API_RESOURCES="src/resources/el-api" |
290 |
-JSP_API_JAR="jsp-api.jar" |
291 |
-JSP_API_SRC="src/main/jsp-api" |
292 |
-JSP_API_RESOURCES="src/resources/jsp-api" |
293 |
- |
294 |
-src_prepare() { |
295 |
- default |
296 |
- |
297 |
- # The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package |
298 |
- |
299 |
- mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \ |
300 |
- ${EL_API_SRC} ${EL_API_RESOURCES} \ |
301 |
- ${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \ |
302 |
- ${JAVA_TEST_SRC_DIR} || die "Failed to create source directory" |
303 |
- |
304 |
- pushd java || die "Failed to cd to java dir" |
305 |
- |
306 |
- cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources" |
307 |
- mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources" |
308 |
- cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources" |
309 |
- |
310 |
- popd |
311 |
- |
312 |
- for file in $(find src -type f | grep -vE "\.java$"); do |
313 |
- target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g") |
314 |
- mkdir -p ${target_dir} || die "Failed to create resource directory" |
315 |
- mv $file ${target_dir} || die "Failed to move resource file" |
316 |
- done |
317 |
- |
318 |
- mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources" |
319 |
- |
320 |
- java-pkg-2_src_prepare |
321 |
-} |
322 |
- |
323 |
-src_compile() { |
324 |
- JAVA_SRC_DIR="${SERVLET_API_SRC}" |
325 |
- JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}" |
326 |
- JAVA_JAR_FILENAME="${SERVLET_API_JAR}" |
327 |
- java-pkg-simple_src_compile |
328 |
- rm -fr target || die "Failed to remove compiled files" |
329 |
- |
330 |
- JAVA_SRC_DIR="${EL_API_SRC}" |
331 |
- JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}" |
332 |
- JAVA_JAR_FILENAME="${EL_API_JAR}" |
333 |
- java-pkg-simple_src_compile |
334 |
- rm -fr target || die "Failed to remove compiled files" |
335 |
- |
336 |
- JAVA_SRC_DIR="${JSP_API_SRC}" |
337 |
- JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}" |
338 |
- JAVA_JAR_FILENAME="${JSP_API_JAR}" |
339 |
- JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar" |
340 |
- java-pkg-simple_src_compile |
341 |
-} |
342 |
- |
343 |
-src_install() { |
344 |
- JAVA_SRC_DIR="${SERVLET_API_SRC}" |
345 |
- JAVA_JAR_FILENAME="${SERVLET_API_JAR}" |
346 |
- java-pkg-simple_src_install |
347 |
- |
348 |
- JAVA_SRC_DIR="${EL_API_SRC}" |
349 |
- JAVA_JAR_FILENAME="${EL_API_JAR}" |
350 |
- java-pkg-simple_src_install |
351 |
- |
352 |
- JAVA_SRC_DIR="${JSP_API_SRC}" |
353 |
- JAVA_JAR_FILENAME="${JSP_API_JAR}" |
354 |
- java-pkg-simple_src_install |
355 |
-} |