1 |
commit: 59908b687ddf2091b250a6cc7e7161aaff968784 |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Apr 1 10:03:53 2022 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Apr 1 10:04:11 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59908b68 |
7 |
|
8 |
dev-java/tomcat-servlet-api: bump to 9.0.62 |
9 |
|
10 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
11 |
|
12 |
dev-java/tomcat-servlet-api/Manifest | 1 + |
13 |
.../tomcat-servlet-api-9.0.62.ebuild | 99 ++++++++++++++++++++++ |
14 |
2 files changed, 100 insertions(+) |
15 |
|
16 |
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest |
17 |
index 7ef5c9e61cd7..8a9ee271439a 100644 |
18 |
--- a/dev-java/tomcat-servlet-api/Manifest |
19 |
+++ b/dev-java/tomcat-servlet-api/Manifest |
20 |
@@ -12,3 +12,4 @@ DIST apache-tomcat-8.5.77-src.tar.gz 5963037 BLAKE2B 63192409b148cf0691e6ad22180 |
21 |
DIST apache-tomcat-9.0.58-src.tar.gz 6142037 BLAKE2B 0515273882468958f5bc2ef95e3085c22975e0ec9f8153a20773266a43710645c2262da8cb10736f0f0b255716fa05a12252194e1f32851704364ef89a62e5e9 SHA512 b2b572dcad2efadf3e5e5a6ae6e108f5699af23b7751ca3c9c00e6ba896f5179745108fa602d8bd87a9611fd8bebe8817fad53c38fc75b0063835b953c67d74a |
22 |
DIST apache-tomcat-9.0.59-src.tar.gz 6142359 BLAKE2B 26dee501a374e54280237dbe392924ac89e3e4b331a11b30c2e0923ac38fa16bb52c02dfc8a9f3597fb0ee169ae2835ac254eab745d1e2ab1e64cfed6395d0c3 SHA512 cea0125ca9b90b247ed114fa7b2e9c63da38b1ef97b3a373a43ed0d775764178534a4014b254219c8c5a26575eaf0ddc25ebc1e276b2ad5086ef3406627f1c80 |
23 |
DIST apache-tomcat-9.0.60-src.tar.gz 6143845 BLAKE2B af7061854659de06afa6a7cf6380c4be4375e18bec896049bf468ddb9139794170271454af4712ade5099b8d46ed7c8d642e9c5f37ea168f0e31394a5128beeb SHA512 e5cb12fb134ff0a59e01a30fbcabc350ddbef6959494176848c2858c3c68444bc520153e00fdcdecb0eefbe7f69876c2965fedbffeeb0aeda7931dc1c11b0de5 |
24 |
+DIST apache-tomcat-9.0.62-src.tar.gz 6156545 BLAKE2B 414f4f7193a8db2bb3d0abcbd2d8c30ede5783e83ba01229ffb322e9bf6b08d2fb10d83ce4742d9e6a4ebc50c9b047679ae798fbd3db8ae165f76d2782034d71 SHA512 7e9cad2703473d9f096009c464b28d54d3765259fab1923ef8c9b1cbfa231fa51cedadfe771a3a95abffd258759a71023e036bda78b949440a5e826fbd4e9e09 |
25 |
|
26 |
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.62.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.62.ebuild |
27 |
new file mode 100644 |
28 |
index 000000000000..09fffd263372 |
29 |
--- /dev/null |
30 |
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.62.ebuild |
31 |
@@ -0,0 +1,99 @@ |
32 |
+# Copyright 1999-2022 Gentoo Authors |
33 |
+# Distributed under the terms of the GNU General Public License v2 |
34 |
+ |
35 |
+EAPI=8 |
36 |
+ |
37 |
+JAVA_PKG_IUSE="source" |
38 |
+ |
39 |
+inherit java-pkg-2 java-pkg-simple |
40 |
+ |
41 |
+MY_A="apache-${PN}-${PV}-src" |
42 |
+MY_P="${MY_A/-servlet-api/}" |
43 |
+DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation" |
44 |
+HOMEPAGE="https://tomcat.apache.org/" |
45 |
+SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz" |
46 |
+ |
47 |
+LICENSE="Apache-2.0" |
48 |
+SLOT="4.0" |
49 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" |
50 |
+IUSE="" |
51 |
+ |
52 |
+DEPEND=">=virtual/jdk-1.8:*" |
53 |
+RDEPEND=">=virtual/jre-1.8:*" |
54 |
+ |
55 |
+S="${WORKDIR}/${MY_P}/" |
56 |
+ |
57 |
+JAVA_TEST_SRC_DIR="src/test" |
58 |
+ |
59 |
+SERVLET_API_JAR="servlet-api.jar" |
60 |
+SERVLET_API_SRC="src/main/servlet-api" |
61 |
+SERVLET_API_RESOURCES="src/resources/servlet-api" |
62 |
+EL_API_JAR="el-api.jar" |
63 |
+EL_API_SRC="src/main/el-api" |
64 |
+EL_API_RESOURCES="src/resources/el-api" |
65 |
+JSP_API_JAR="jsp-api.jar" |
66 |
+JSP_API_SRC="src/main/jsp-api" |
67 |
+JSP_API_RESOURCES="src/resources/jsp-api" |
68 |
+ |
69 |
+src_prepare() { |
70 |
+ default |
71 |
+ |
72 |
+ # The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package |
73 |
+ |
74 |
+ mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \ |
75 |
+ ${EL_API_SRC} ${EL_API_RESOURCES} \ |
76 |
+ ${JSP_API_SRC}/javax/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 javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources" |
82 |
+ mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources" |
83 |
+ cp --parents -R javax/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/javax ${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 |
+} |