1 |
commit: ed73e4d5741d27b4df35d01e413a988b275e6def |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jun 17 14:07:55 2021 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jun 17 14:07:55 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed73e4d5 |
7 |
|
8 |
dev-java/tomcat-servlet-api: bump to 9.0.48 |
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-9.0.48.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 ea2523c28b3..5bc69a1d636 100644 |
19 |
--- a/dev-java/tomcat-servlet-api/Manifest |
20 |
+++ b/dev-java/tomcat-servlet-api/Manifest |
21 |
@@ -6,3 +6,4 @@ DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a88 |
22 |
DIST apache-tomcat-8.5.66-src.tar.gz 5879748 BLAKE2B bfef20872bd19ffa2bb34b98a1da875fdd5f232e681458f0aef093b7eecd63a95c1cd26130f54251f149249e639d0da2577770e43314d2a86b8ee9b48b675f0d SHA512 322fda683197898f873feb375791092d33c90aac08a54889fabab0f59ecbc7b27784f027b37008c6893fdbf8ca7973b73268f42673d7e8df762419b5a536593b |
23 |
DIST apache-tomcat-8.5.68-src.tar.gz 5907026 BLAKE2B 2312edb94f98ee98b594325fbc32521776e9cadc4422a3a46f3651f1fee072a99c5f6874378ac06215396504d34ad750edd6ec3399a3931554068195a8ee15ef SHA512 579a35f944ead756995d288b66ea8a4ab30289a90c32aa01119abcea85a8524f6594ce5cb7ac9df6d352c1e3b54a18c814b5d3a6409dce6a43614e3a89284066 |
24 |
DIST apache-tomcat-9.0.46-src.tar.gz 6068533 BLAKE2B 400814281aedd588c008a1363199f8602e856870d4c39d536b13f8a357c2390d2db689940f4a6971ec74a84e8e400174e72610e0d64a220de41f2dff419dda3c SHA512 dc380e23aa87273c6ba32e79659e768c551b07812635c2f1c62d2c34b493b1d3d51b4548fec5014fdb36f8461fc90942aa7917874ddf3d6f5c5345d8ca02dfc1 |
25 |
+DIST apache-tomcat-9.0.48-src.tar.gz 6080015 BLAKE2B 9b2cac8143ca8186857d7d53e8737f2f7d2ec8e0ca03d32447ad25b429cbf37c1c7b39bc6e4b93679c08bd5f4940280d00946a70e9fa82f8c2a596ea18a2a4c6 SHA512 9b762f6d1a1f6c75e10f1bc05c39a647ae2165f3b81c09ff73cc286f3c487b034b9d14c73b808c73b35f55f642848831a0329d9d611c8bbb3928559e552a3ff3 |
26 |
|
27 |
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.48.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.48.ebuild |
28 |
new file mode 100644 |
29 |
index 00000000000..4a8d22d1286 |
30 |
--- /dev/null |
31 |
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.48.ebuild |
32 |
@@ -0,0 +1,99 @@ |
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 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 ~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 compila and package |
74 |
+ |
75 |
+ mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \ |
76 |
+ ${EL_API_SRC} ${EL_API_RESOURCES} \ |
77 |
+ ${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \ |
78 |
+ ${JAVA_TEST_SRC_DIR} || die "Failed to create source directory" |
79 |
+ |
80 |
+ pushd java || die "Failed to cd to java dir" |
81 |
+ |
82 |
+ cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources" |
83 |
+ mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources" |
84 |
+ cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources" |
85 |
+ |
86 |
+ popd |
87 |
+ |
88 |
+ for file in $(find src -type f | grep -vE "\.java$"); do |
89 |
+ target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g") |
90 |
+ mkdir -p ${target_dir} || die "Failed to create resource directory" |
91 |
+ mv $file ${target_dir} || die "Failed to move resource file" |
92 |
+ done |
93 |
+ |
94 |
+ mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources" |
95 |
+ |
96 |
+ java-pkg-2_src_prepare |
97 |
+} |
98 |
+ |
99 |
+src_compile() { |
100 |
+ JAVA_SRC_DIR="${SERVLET_API_SRC}" |
101 |
+ JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}" |
102 |
+ JAVA_JAR_FILENAME="${SERVLET_API_JAR}" |
103 |
+ java-pkg-simple_src_compile |
104 |
+ rm -fr target || die "Failed to remove compiled files" |
105 |
+ |
106 |
+ JAVA_SRC_DIR="${EL_API_SRC}" |
107 |
+ JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}" |
108 |
+ JAVA_JAR_FILENAME="${EL_API_JAR}" |
109 |
+ java-pkg-simple_src_compile |
110 |
+ rm -fr target || die "Failed to remove compiled files" |
111 |
+ |
112 |
+ JAVA_SRC_DIR="${JSP_API_SRC}" |
113 |
+ JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}" |
114 |
+ JAVA_JAR_FILENAME="${JSP_API_JAR}" |
115 |
+ JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar" |
116 |
+ java-pkg-simple_src_compile |
117 |
+} |
118 |
+ |
119 |
+src_install() { |
120 |
+ JAVA_SRC_DIR="${SERVLET_API_SRC}" |
121 |
+ JAVA_JAR_FILENAME="${SERVLET_API_JAR}" |
122 |
+ java-pkg-simple_src_install |
123 |
+ |
124 |
+ JAVA_SRC_DIR="${EL_API_SRC}" |
125 |
+ JAVA_JAR_FILENAME="${EL_API_JAR}" |
126 |
+ java-pkg-simple_src_install |
127 |
+ |
128 |
+ JAVA_SRC_DIR="${JSP_API_SRC}" |
129 |
+ JAVA_JAR_FILENAME="${JSP_API_JAR}" |
130 |
+ java-pkg-simple_src_install |
131 |
+} |