1 |
commit: 55b54b52b0af5967b203d59e55d7a06182fea75d |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 21 11:12:30 2021 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 21 11:13:54 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55b54b52 |
7 |
|
8 |
dev-java/tomcat-servlet-api: bump to 8.5.71 |
9 |
|
10 |
Package-Manager: Portage-3.0.23, 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.71.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 82a992d8997..405b483b94d 100644 |
19 |
--- a/dev-java/tomcat-servlet-api/Manifest |
20 |
+++ b/dev-java/tomcat-servlet-api/Manifest |
21 |
@@ -6,5 +6,6 @@ DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713 |
22 |
DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce |
23 |
DIST apache-tomcat-8.5.69-src.tar.gz 5916996 BLAKE2B 4a3ef958b6bb0089149877c25baaa2c1a0bcee473c0942b419c5c1d7071dcae4f8a6e6f1805efdee1201042feedc64e213fffbcdb35cf2b7f9a67217b8dcad48 SHA512 467dd38bd77d8b5ac6fa2acf9f6ee71d04467a3182647757fa47f5d1d9576c96e5061db61ba08b04318f1db9ee4f2bcac7b45f1f9f4f81cd1807a57483dd7bbb |
24 |
DIST apache-tomcat-8.5.70-src.tar.gz 5939095 BLAKE2B 9a2bf14c9b9f551af15ebf2b95ffede140b3accdb9fc1b9836c980169b597e8c796d5aa59df28cd42ccff67dbda83c7b7ced8b0ac2954a40214a0767ad8b90ce SHA512 fe752c4196d12496a3dcb4e6b59df30da10cd52b8642f9273de7158dcf6dd16d2443675744db0033e6dc5c1cf0aeaf0125c9921e1e36ceb8dea9ba58328a4133 |
25 |
+DIST apache-tomcat-8.5.71-src.tar.gz 5945776 BLAKE2B b7a5b344dbe09ef88ee046dcce701ea65d8587f1d8c2f980c67fff5466979d15dea019a9abae6d48a45797a989ebddb4dbdbc5196c8740cde9ebc45041b857ef SHA512 df99749d7ef387e29c1d2976c584dc219fc8764f618a004a646564315ab3f00a71ca94408d1fbaff20c3bab3911c82af4f7cf2ec02f0408d9e829c27f8aabdba |
26 |
DIST apache-tomcat-9.0.50-src.tar.gz 6086608 BLAKE2B 59b5eb1616d377193f330fd8c5abb6e98926ab0a2f75b1ea14251d249837aad733f55a0b79f2a67de57f612dd1afdeae53836be97e81701d8dc27ecb0a381d4a SHA512 1032d2d5c342fb495b76426fdc301e0e5546815e709e604061d7aa2cdab19bcd376adc957fd25dee1d574306186eafd2e9d24140dd5e725b130128592cac47a2 |
27 |
DIST apache-tomcat-9.0.52-src.tar.gz 6110883 BLAKE2B 8d2d4e3640fdc43a3b20d9722a73a8756de7ad71b2f05e8b2090bc712811cfcf6f8e79eeded039291b9306d1c49aec46fe8c7e347aab10384ca293894984ab27 SHA512 8b1817c171fa49e5568fb24a72b6b7533c5eb3ddd6d232b78e67186574f70bb311bbef9a58af047caa14bdae57c27c6a3df721c4583072740fec0a3863bb068d |
28 |
|
29 |
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.71.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.71.ebuild |
30 |
new file mode 100644 |
31 |
index 00000000000..eaffc40f403 |
32 |
--- /dev/null |
33 |
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.71.ebuild |
34 |
@@ -0,0 +1,99 @@ |
35 |
+# Copyright 1999-2021 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 |
+} |