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