1 |
commit: 464d54f8a571367cc4e8de86cf45e40d2d4ee31b |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 4 10:07:05 2021 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 4 10:07:05 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=464d54f8 |
7 |
|
8 |
dev-java/tomcat-servlet-api: bump to 9.0.43 |
9 |
|
10 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
11 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
12 |
|
13 |
dev-java/tomcat-servlet-api/Manifest | 1 + |
14 |
.../tomcat-servlet-api-9.0.43.ebuild | 104 +++++++++++++++++++++ |
15 |
2 files changed, 105 insertions(+) |
16 |
|
17 |
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest |
18 |
index 1ddf1fbf61e..78f7caab3ed 100644 |
19 |
--- a/dev-java/tomcat-servlet-api/Manifest |
20 |
+++ b/dev-java/tomcat-servlet-api/Manifest |
21 |
@@ -5,3 +5,4 @@ DIST apache-tomcat-7.0.107-src.tar.gz 5312698 BLAKE2B 1f2712ddce6aa604692aaf6a6c |
22 |
DIST apache-tomcat-8.5.61-src.tar.gz 5840559 BLAKE2B 18e1505b6b7d8e1a024d9f834d33ef105a16e6fc1f9e80abd3e6e88b2326597b9973e13c2ebc030a1db4a2d4dc5572d195b9f61db6cb7bf51e97cbfaa121678a SHA512 fd6bb5926b5e7cf44f359c93dadc4edd87fa5f2e26fb0fb3a9bc0a5c89ae4d844d66872055e1b441392cf03d7690aca3429b66afd8334319784f089f821d8c22 |
23 |
DIST apache-tomcat-8.5.63-src.tar.gz 5853051 BLAKE2B d007d9922d54578bdebcbbaec3e7c0ffcafdce913e52fdd93d5c174c9d1304980b5eb7f126e957c5975a59dfb126857dcc87ef3ca5e479e44cd7910b6183e469 SHA512 d78a140117844675239e834a0890641c0ef0d6fc3c89eb4512536fece2c128f088edfdea15f79ba7a31e0478431f155230f8f60a57bfea0aed191298a95310c4 |
24 |
DIST apache-tomcat-9.0.41-src.tar.gz 6022059 BLAKE2B 6e97390aec956c16f271e57a2fa8805b6f49f593434f0dff8d82e14bc9abc199b00a7523dbb8da335a7ffa9dfee6790430c30f8b0ee90bcd133694c8da42197f SHA512 094e7cbd2519a4b812a2ca865f92802ece3385a20826c5e29b5f7cda8b9265d01ede6f598999f8aa2f1b04bcaca2e67e3f0132781b3f22007356df49ab6b1838 |
25 |
+DIST apache-tomcat-9.0.43-src.tar.gz 6042010 BLAKE2B 78c0e7d711dd826ba93b12db6a96929ddeeb0df189a12e907c51f02baa08d84757915b8744b5ebd027892ff2823b955d7b1c3c749ab54b588686dfd8d3157640 SHA512 8c23f8a371b3ffbc1ab4d5f24be08ecf2c9e6ba466ef36ef97e075bd0f12b1ffc93f63b9ff1def9953b3f791319c7c355a76e7a54061a21d25be37a5dc22da26 |
26 |
|
27 |
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.43.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.43.ebuild |
28 |
new file mode 100644 |
29 |
index 00000000000..6939efb958e |
30 |
--- /dev/null |
31 |
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.43.ebuild |
32 |
@@ -0,0 +1,104 @@ |
33 |
+# Copyright 1999-2021 Gentoo Authors |
34 |
+# Distributed under the terms of the GNU General Public License v2 |
35 |
+ |
36 |
+EAPI=7 |
37 |
+ |
38 |
+JAVA_PKG_IUSE="source" |
39 |
+ |
40 |
+inherit eutils 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 4.0/JSP API 2.3/EL API 3.0 implementation" |
45 |
+HOMEPAGE="https://tomcat.apache.org/" |
46 |
+SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz" |
47 |
+ |
48 |
+LICENSE="Apache-2.0" |
49 |
+SLOT="4.0" |
50 |
+KEYWORDS="~amd64 ~arm ~arm64 ~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 |
+# we don't have the aQute.bnd.annotation.spi packaged |
59 |
+PATCHES=( |
60 |
+ "${FILESDIR}/tomcat-servlet-api-9.0.40-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch" |
61 |
+) |
62 |
+ |
63 |
+JAVA_TEST_SRC_DIR="src/test" |
64 |
+ |
65 |
+SERVLET_API_JAR="servlet-api.jar" |
66 |
+SERVLET_API_SRC="src/main/servlet-api" |
67 |
+SERVLET_API_RESOURCES="src/resources/servlet-api" |
68 |
+EL_API_JAR="el-api.jar" |
69 |
+EL_API_SRC="src/main/el-api" |
70 |
+EL_API_RESOURCES="src/resources/el-api" |
71 |
+JSP_API_JAR="jsp-api.jar" |
72 |
+JSP_API_SRC="src/main/jsp-api" |
73 |
+JSP_API_RESOURCES="src/resources/jsp-api" |
74 |
+ |
75 |
+src_prepare() { |
76 |
+ default |
77 |
+ |
78 |
+ # The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package |
79 |
+ |
80 |
+ mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \ |
81 |
+ ${EL_API_SRC} ${EL_API_RESOURCES} \ |
82 |
+ ${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \ |
83 |
+ ${JAVA_TEST_SRC_DIR} || die "Failed to create source directory" |
84 |
+ |
85 |
+ pushd java || die "Failed to cd to java dir" |
86 |
+ |
87 |
+ cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources" |
88 |
+ mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources" |
89 |
+ cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources" |
90 |
+ |
91 |
+ popd |
92 |
+ |
93 |
+ for file in $(find src -type f | grep -vE "\.java$"); do |
94 |
+ target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g") |
95 |
+ mkdir -p ${target_dir} || die "Failed to create resource directory" |
96 |
+ mv $file ${target_dir} || die "Failed to move resource file" |
97 |
+ done |
98 |
+ |
99 |
+ mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources" |
100 |
+ |
101 |
+ java-pkg-2_src_prepare |
102 |
+} |
103 |
+ |
104 |
+src_compile() { |
105 |
+ JAVA_SRC_DIR="${SERVLET_API_SRC}" |
106 |
+ JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}" |
107 |
+ JAVA_JAR_FILENAME="${SERVLET_API_JAR}" |
108 |
+ java-pkg-simple_src_compile |
109 |
+ rm -fr target || die "Failed to remove compiled files" |
110 |
+ |
111 |
+ JAVA_SRC_DIR="${EL_API_SRC}" |
112 |
+ JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}" |
113 |
+ JAVA_JAR_FILENAME="${EL_API_JAR}" |
114 |
+ java-pkg-simple_src_compile |
115 |
+ rm -fr target || die "Failed to remove compiled files" |
116 |
+ |
117 |
+ JAVA_SRC_DIR="${JSP_API_SRC}" |
118 |
+ JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}" |
119 |
+ JAVA_JAR_FILENAME="${JSP_API_JAR}" |
120 |
+ JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar" |
121 |
+ java-pkg-simple_src_compile |
122 |
+} |
123 |
+ |
124 |
+src_install() { |
125 |
+ JAVA_SRC_DIR="${SERVLET_API_SRC}" |
126 |
+ JAVA_JAR_FILENAME="${SERVLET_API_JAR}" |
127 |
+ java-pkg-simple_src_install |
128 |
+ |
129 |
+ JAVA_SRC_DIR="${EL_API_SRC}" |
130 |
+ JAVA_JAR_FILENAME="${EL_API_JAR}" |
131 |
+ java-pkg-simple_src_install |
132 |
+ |
133 |
+ JAVA_SRC_DIR="${JSP_API_SRC}" |
134 |
+ JAVA_JAR_FILENAME="${JSP_API_JAR}" |
135 |
+ java-pkg-simple_src_install |
136 |
+} |