1 |
commit: 9467908b2af05d4a57e5f41929fa46d65729bdfd |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Apr 1 09:49:39 2022 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Apr 1 09:50:07 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9467908b |
7 |
|
8 |
dev-java/tomcat-servlet-api: bump to 10.0.20 |
9 |
|
10 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
11 |
|
12 |
dev-java/tomcat-servlet-api/Manifest | 1 + |
13 |
.../tomcat-servlet-api-10.0.20.ebuild | 98 ++++++++++++++++++++++ |
14 |
2 files changed, 99 insertions(+) |
15 |
|
16 |
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest |
17 |
index f45b4ccec684..7ef5c9e61cd7 100644 |
18 |
--- a/dev-java/tomcat-servlet-api/Manifest |
19 |
+++ b/dev-java/tomcat-servlet-api/Manifest |
20 |
@@ -1,6 +1,7 @@ |
21 |
DIST apache-tomcat-10.0.16-src.tar.gz 6088262 BLAKE2B f02a5b08e4502d4e7be2fa14f8dae8760c2844f262cdc75e2cc821038d248ed961281d11f7bb847cf55ecf012ee05c870366508fb1fe1485da2100e87aa13c55 SHA512 44a1ac752077603c5366ec92c6a5860d33ce810bf2554190a013329106ec118d1a18d1a26823b3024d046b05160a20dda65573365451d0481be8be97218445c8 |
22 |
DIST apache-tomcat-10.0.17-src.tar.gz 6086996 BLAKE2B ff3584e58ec6f22f493cf7f32435423d68b941d9eec22441ee54ba69af03b50b687b23012129108485c9db147c8e7364ded037cf9ed2add174e6c928b927382a SHA512 1cc0f8e2187934c6dac3e31739f8c53a0a152527a98210deab8ce027c1347cbbd1cef3bdf0294bee3c4dbed20ba57b2291bcd887f353837fd505ea2d17e7ba3d |
23 |
DIST apache-tomcat-10.0.18-src.tar.gz 6088118 BLAKE2B 7d3fdb5a682dd44d358a619a18ca3df3bde27c9fc963436c9bce86baf07a42e87ba80724afdc6ce72b493d2fb35dda644eba29df7d4434f8c815ada4cb5d2ca3 SHA512 001205f382f44163f08dba1d306472b7ef3256e31a522c3f1f7595bca4fd084776a0c1f69b241302fa5d0d2f143ac063cb34d4fcf79a51ec9722f2f2ce3f1dab |
24 |
+DIST apache-tomcat-10.0.20-src.tar.gz 6097471 BLAKE2B 77df97d73ff87a5ad55dfc3a0df02e3a306e619a5ae4bd2df0a0e3d42d236ccf2c6a6c46f60f56311f9be1bd561be9096d810d932f136b5856ff275fb3ae8368 SHA512 1e75b0bad54a9fac6ddc650156fac88bc91933ff0bf4e9a62948f5e116454b6def10d7ad632968e709e8aac72b15c567e4497cdb9b594352cd12d7518fdaf18f |
25 |
DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc3871beeddccdb4cfed05ba176581ebb50f52ba867bed8dbc500e97b7348a3a87b9693fb73eb81209df4f31e8c1ced7e30a6af30b SHA512 c455fa3da9da8fcbf1d54ae5dce808f8a4520ccafd627a6b2d1b003c37e8395d8b2a55d5471bf6c196549d082715862b3b8958aef88613293a07fc0160aa5c6e |
26 |
DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7 |
27 |
DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c |
28 |
|
29 |
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.20.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.20.ebuild |
30 |
new file mode 100644 |
31 |
index 000000000000..5ed928878473 |
32 |
--- /dev/null |
33 |
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.20.ebuild |
34 |
@@ -0,0 +1,98 @@ |
35 |
+# Copyright 1999-2022 Gentoo Authors |
36 |
+# Distributed under the terms of the GNU General Public License v2 |
37 |
+ |
38 |
+EAPI=8 |
39 |
+ |
40 |
+JAVA_PKG_IUSE="source" |
41 |
+ |
42 |
+inherit java-pkg-2 java-pkg-simple |
43 |
+ |
44 |
+MY_A="apache-${PN}-${PV}-src" |
45 |
+MY_P="${MY_A/-servlet-api/}" |
46 |
+DESCRIPTION="Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation" |
47 |
+HOMEPAGE="https://tomcat.apache.org/" |
48 |
+SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz" |
49 |
+ |
50 |
+LICENSE="Apache-2.0" |
51 |
+SLOT="5.0" |
52 |
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" |
53 |
+IUSE="" |
54 |
+ |
55 |
+DEPEND=">=virtual/jdk-1.8:*" |
56 |
+RDEPEND=">=virtual/jre-1.8:*" |
57 |
+ |
58 |
+S="${WORKDIR}/${MY_P}/" |
59 |
+ |
60 |
+JAVA_TEST_SRC_DIR="src/test" |
61 |
+ |
62 |
+SERVLET_API_JAR="servlet-api.jar" |
63 |
+SERVLET_API_SRC="src/main/servlet-api" |
64 |
+SERVLET_API_RESOURCES="src/resources/servlet-api" |
65 |
+EL_API_JAR="el-api.jar" |
66 |
+EL_API_SRC="src/main/el-api" |
67 |
+EL_API_RESOURCES="src/resources/el-api" |
68 |
+JSP_API_JAR="jsp-api.jar" |
69 |
+JSP_API_SRC="src/main/jsp-api" |
70 |
+JSP_API_RESOURCES="src/resources/jsp-api" |
71 |
+ |
72 |
+src_prepare() { |
73 |
+ default |
74 |
+ |
75 |
+ # The sources and also resources are mixed together so we first give it a structure to make it easier to compile and package |
76 |
+ mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \ |
77 |
+ ${EL_API_SRC} ${EL_API_RESOURCES} \ |
78 |
+ ${JSP_API_SRC}/jakarta/servlet ${JSP_API_RESOURCES} \ |
79 |
+ ${JAVA_TEST_SRC_DIR} || die "Failed to create source directory" |
80 |
+ |
81 |
+ pushd java || die "Failed to cd to java dir" |
82 |
+ |
83 |
+ cp --parents -R jakarta/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources" |
84 |
+ mv "${S}/${SERVLET_API_SRC}/jakarta/servlet/jsp" "${S}/${JSP_API_SRC}/jakarta/servlet" || die "Failed to copy jsp-api sources" |
85 |
+ cp --parents -R jakarta/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources" |
86 |
+ |
87 |
+ popd |
88 |
+ |
89 |
+ for file in $(find src -type f | grep -vE "\.java$"); do |
90 |
+ target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g") |
91 |
+ mkdir -p ${target_dir} || die "Failed to create resource directory" |
92 |
+ mv $file ${target_dir} || die "Failed to move resource file" |
93 |
+ done |
94 |
+ |
95 |
+ mv test/jakarta ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources" |
96 |
+ |
97 |
+ java-pkg-2_src_prepare |
98 |
+} |
99 |
+ |
100 |
+src_compile() { |
101 |
+ JAVA_SRC_DIR="${SERVLET_API_SRC}" |
102 |
+ JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}" |
103 |
+ JAVA_JAR_FILENAME="${SERVLET_API_JAR}" |
104 |
+ java-pkg-simple_src_compile |
105 |
+ rm -fr target || die "Failed to remove compiled files" |
106 |
+ |
107 |
+ JAVA_SRC_DIR="${EL_API_SRC}" |
108 |
+ JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}" |
109 |
+ JAVA_JAR_FILENAME="${EL_API_JAR}" |
110 |
+ java-pkg-simple_src_compile |
111 |
+ rm -fr target || die "Failed to remove compiled files" |
112 |
+ |
113 |
+ JAVA_SRC_DIR="${JSP_API_SRC}" |
114 |
+ JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}" |
115 |
+ JAVA_JAR_FILENAME="${JSP_API_JAR}" |
116 |
+ JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar" |
117 |
+ java-pkg-simple_src_compile |
118 |
+} |
119 |
+ |
120 |
+src_install() { |
121 |
+ JAVA_SRC_DIR="${SERVLET_API_SRC}" |
122 |
+ JAVA_JAR_FILENAME="${SERVLET_API_JAR}" |
123 |
+ java-pkg-simple_src_install |
124 |
+ |
125 |
+ JAVA_SRC_DIR="${EL_API_SRC}" |
126 |
+ JAVA_JAR_FILENAME="${EL_API_JAR}" |
127 |
+ java-pkg-simple_src_install |
128 |
+ |
129 |
+ JAVA_SRC_DIR="${JSP_API_SRC}" |
130 |
+ JAVA_JAR_FILENAME="${JSP_API_JAR}" |
131 |
+ java-pkg-simple_src_install |
132 |
+} |