1 |
commit: 8902fc267f3699f86ba5eb487980bb1bc191ae8c |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jun 17 07:26:31 2021 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jun 17 07:27:43 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8902fc26 |
7 |
|
8 |
dev-java/tomcat-servlet-api: bump to 8.5.66 |
9 |
|
10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
11 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
12 |
|
13 |
dev-java/tomcat-servlet-api/Manifest | 1 + |
14 |
.../tomcat-servlet-api-8.5.68.ebuild | 99 ++++++++++++++++++++++ |
15 |
2 files changed, 100 insertions(+) |
16 |
|
17 |
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest |
18 |
index 6d3f07bcfc2..ea2523c28b3 100644 |
19 |
--- a/dev-java/tomcat-servlet-api/Manifest |
20 |
+++ b/dev-java/tomcat-servlet-api/Manifest |
21 |
@@ -4,4 +4,5 @@ DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e |
22 |
DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c |
23 |
DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce |
24 |
DIST apache-tomcat-8.5.66-src.tar.gz 5879748 BLAKE2B bfef20872bd19ffa2bb34b98a1da875fdd5f232e681458f0aef093b7eecd63a95c1cd26130f54251f149249e639d0da2577770e43314d2a86b8ee9b48b675f0d SHA512 322fda683197898f873feb375791092d33c90aac08a54889fabab0f59ecbc7b27784f027b37008c6893fdbf8ca7973b73268f42673d7e8df762419b5a536593b |
25 |
+DIST apache-tomcat-8.5.68-src.tar.gz 5907026 BLAKE2B 2312edb94f98ee98b594325fbc32521776e9cadc4422a3a46f3651f1fee072a99c5f6874378ac06215396504d34ad750edd6ec3399a3931554068195a8ee15ef SHA512 579a35f944ead756995d288b66ea8a4ab30289a90c32aa01119abcea85a8524f6594ce5cb7ac9df6d352c1e3b54a18c814b5d3a6409dce6a43614e3a89284066 |
26 |
DIST apache-tomcat-9.0.46-src.tar.gz 6068533 BLAKE2B 400814281aedd588c008a1363199f8602e856870d4c39d536b13f8a357c2390d2db689940f4a6971ec74a84e8e400174e72610e0d64a220de41f2dff419dda3c SHA512 dc380e23aa87273c6ba32e79659e768c551b07812635c2f1c62d2c34b493b1d3d51b4548fec5014fdb36f8461fc90942aa7917874ddf3d6f5c5345d8ca02dfc1 |
27 |
|
28 |
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.68.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.68.ebuild |
29 |
new file mode 100644 |
30 |
index 00000000000..eaffc40f403 |
31 |
--- /dev/null |
32 |
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.68.ebuild |
33 |
@@ -0,0 +1,99 @@ |
34 |
+# Copyright 1999-2021 Gentoo Authors |
35 |
+# Distributed under the terms of the GNU General Public License v2 |
36 |
+ |
37 |
+EAPI=7 |
38 |
+ |
39 |
+JAVA_PKG_IUSE="source" |
40 |
+ |
41 |
+inherit java-pkg-2 java-pkg-simple |
42 |
+ |
43 |
+MY_A="apache-${P}-src" |
44 |
+MY_P="${MY_A/-servlet-api/}" |
45 |
+DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation" |
46 |
+HOMEPAGE="https://tomcat.apache.org/" |
47 |
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz" |
48 |
+ |
49 |
+LICENSE="Apache-2.0" |
50 |
+SLOT="3.1" |
51 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" |
52 |
+IUSE="" |
53 |
+ |
54 |
+DEPEND=">=virtual/jdk-1.8:*" |
55 |
+RDEPEND=">=virtual/jre-1.8:*" |
56 |
+ |
57 |
+S="${WORKDIR}/${MY_P}/" |
58 |
+ |
59 |
+JAVA_TEST_SRC_DIR="src/test" |
60 |
+ |
61 |
+SERVLET_API_JAR="servlet-api.jar" |
62 |
+SERVLET_API_SRC="src/main/servlet-api" |
63 |
+SERVLET_API_RESOURCES="src/resources/servlet-api" |
64 |
+EL_API_JAR="el-api.jar" |
65 |
+EL_API_SRC="src/main/el-api" |
66 |
+EL_API_RESOURCES="src/resources/el-api" |
67 |
+JSP_API_JAR="jsp-api.jar" |
68 |
+JSP_API_SRC="src/main/jsp-api" |
69 |
+JSP_API_RESOURCES="src/resources/jsp-api" |
70 |
+ |
71 |
+src_prepare() { |
72 |
+ default |
73 |
+ |
74 |
+ # The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package |
75 |
+ |
76 |
+ mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \ |
77 |
+ ${EL_API_SRC} ${EL_API_RESOURCES} \ |
78 |
+ ${JSP_API_SRC}/javax/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 javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources" |
84 |
+ mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources" |
85 |
+ cp --parents -R javax/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/javax ${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 |
+} |