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