Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/tomcat-servlet-api/
Date: Wed, 01 Jun 2022 05:51:34
Message-Id: 1654062681.71d70747cb64a68f2b346d3bfe61e776c3cc499b.fordfrog@gentoo
1 commit: 71d70747cb64a68f2b346d3bfe61e776c3cc499b
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 1 05:51:21 2022 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 1 05:51:21 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71d70747
7
8 dev-java/tomcat-servlet-api: dropped obsolete 9.0.60 & 10.0.18
9
10 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
11
12 dev-java/tomcat-servlet-api/Manifest | 2 -
13 .../tomcat-servlet-api-10.0.18.ebuild | 98 ---------------------
14 .../tomcat-servlet-api-9.0.60.ebuild | 99 ----------------------
15 3 files changed, 199 deletions(-)
16
17 diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
18 index 4ed21f0d343f..d5fbce26304a 100644
19 --- a/dev-java/tomcat-servlet-api/Manifest
20 +++ b/dev-java/tomcat-servlet-api/Manifest
21 @@ -1,4 +1,3 @@
22 -DIST apache-tomcat-10.0.18-src.tar.gz 6088118 BLAKE2B 7d3fdb5a682dd44d358a619a18ca3df3bde27c9fc963436c9bce86baf07a42e87ba80724afdc6ce72b493d2fb35dda644eba29df7d4434f8c815ada4cb5d2ca3 SHA512 001205f382f44163f08dba1d306472b7ef3256e31a522c3f1f7595bca4fd084776a0c1f69b241302fa5d0d2f143ac063cb34d4fcf79a51ec9722f2f2ce3f1dab
23 DIST apache-tomcat-10.0.20-src.tar.gz 6097471 BLAKE2B 77df97d73ff87a5ad55dfc3a0df02e3a306e619a5ae4bd2df0a0e3d42d236ccf2c6a6c46f60f56311f9be1bd561be9096d810d932f136b5856ff275fb3ae8368 SHA512 1e75b0bad54a9fac6ddc650156fac88bc91933ff0bf4e9a62948f5e116454b6def10d7ad632968e709e8aac72b15c567e4497cdb9b594352cd12d7518fdaf18f
24 DIST apache-tomcat-10.0.21-src.tar.gz 6109792 BLAKE2B c650a2e0cb8c6424d98539eaa802c788ff212b014e614123841a806fc9845a953911b5964f67cfc8c1f2ce33dfe627636b5af2f1eaa4b4c985ef4b78d0d831bf SHA512 925bb61ca8b6432e4aef5d5088838e811dbfc0a7b6190354b6ffd957d4ebf145ac1bf4a919b368def0cf63c86c28caf78faf78b190a6e54e085cbf4f108836a1
25 DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc3871beeddccdb4cfed05ba176581ebb50f52ba867bed8dbc500e97b7348a3a87b9693fb73eb81209df4f31e8c1ced7e30a6af30b SHA512 c455fa3da9da8fcbf1d54ae5dce808f8a4520ccafd627a6b2d1b003c37e8395d8b2a55d5471bf6c196549d082715862b3b8958aef88613293a07fc0160aa5c6e
26 @@ -8,6 +7,5 @@ DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a88
27 DIST apache-tomcat-8.5.77-src.tar.gz 5963037 BLAKE2B 63192409b148cf0691e6ad22180e4f79d8603e89633598ee3f1dcfdd7d55b88530ecb1aa7c585920e086a7582dea78fcbcd1498ed2552e0f8d17127658769f66 SHA512 a0d2f77540b5370e09d03d04340e0c7f539eb5761b84ea3c8ef924e2a3e7f9528b3ed83a0c8e413bc9335cee6052135788e48e30d95f231ba3ade7f0b53ec157
28 DIST apache-tomcat-8.5.78-src.tar.gz 5972826 BLAKE2B 93acb2e997a877a2195642da7d896ec4f08bebd83aa12d868607056c23722bdb90147814173dde17fc142a9e4e434e4570a15ebfa1f8b1c7911a16408728b4bb SHA512 b58fdaa57420fcf7759420fba26bfd6edaa5174f5d3a81fdf8783f19d5385e2502d2ad4bfa0e4a77c6a084bf6d97a6d3cd274ab0ab3f2311d23079e273c41b32
29 DIST apache-tomcat-8.5.79-src.tar.gz 5983349 BLAKE2B 8be7a268462c7edfd31636f2790ae83b8dbc16b8c0193f6a02f9f8591ffa9c91683b2042038661a0254fdab66f740b7ab99c1e6f11f0bd1245a836def9011533 SHA512 198f3eefe8445c050a98cf6d69597c17eee76158534c18a636f2285143c0cd248b939b8233618438330aedcd936d76505a064842619b077d8c2fa43244c7a8ff
30 -DIST apache-tomcat-9.0.60-src.tar.gz 6143845 BLAKE2B af7061854659de06afa6a7cf6380c4be4375e18bec896049bf468ddb9139794170271454af4712ade5099b8d46ed7c8d642e9c5f37ea168f0e31394a5128beeb SHA512 e5cb12fb134ff0a59e01a30fbcabc350ddbef6959494176848c2858c3c68444bc520153e00fdcdecb0eefbe7f69876c2965fedbffeeb0aeda7931dc1c11b0de5
31 DIST apache-tomcat-9.0.62-src.tar.gz 6156545 BLAKE2B 414f4f7193a8db2bb3d0abcbd2d8c30ede5783e83ba01229ffb322e9bf6b08d2fb10d83ce4742d9e6a4ebc50c9b047679ae798fbd3db8ae165f76d2782034d71 SHA512 7e9cad2703473d9f096009c464b28d54d3765259fab1923ef8c9b1cbfa231fa51cedadfe771a3a95abffd258759a71023e036bda78b949440a5e826fbd4e9e09
32 DIST apache-tomcat-9.0.63-src.tar.gz 6167222 BLAKE2B b608c61fa0584927f4a0ba1d945a41aa626f9441305855bcd2f613fa339fee8be5fbf1b85d96efe94ea5da7dbde2721761ea91d66a66ca11dc8195e33dd572e8 SHA512 9be4b85e2c39702fc4c80b285d7df1d192ab5024452c75d77e1072438a3051dd3056d080cab4834cc9682fd641a8c9ee0484a16b8d21008b944a870016fb04f3
33
34 diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.18.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.18.ebuild
35 deleted file mode 100644
36 index 440d44e0a658..000000000000
37 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.18.ebuild
38 +++ /dev/null
39 @@ -1,98 +0,0 @@
40 -# Copyright 1999-2022 Gentoo Authors
41 -# Distributed under the terms of the GNU General Public License v2
42 -
43 -EAPI=8
44 -
45 -JAVA_PKG_IUSE="source"
46 -
47 -inherit java-pkg-2 java-pkg-simple
48 -
49 -MY_A="apache-${PN}-${PV}-src"
50 -MY_P="${MY_A/-servlet-api/}"
51 -DESCRIPTION="Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation"
52 -HOMEPAGE="https://tomcat.apache.org/"
53 -SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"
54 -
55 -LICENSE="Apache-2.0"
56 -SLOT="5.0"
57 -KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
58 -IUSE=""
59 -
60 -DEPEND=">=virtual/jdk-1.8:*"
61 -RDEPEND=">=virtual/jre-1.8:*"
62 -
63 -S="${WORKDIR}/${MY_P}/"
64 -
65 -JAVA_TEST_SRC_DIR="src/test"
66 -
67 -SERVLET_API_JAR="servlet-api.jar"
68 -SERVLET_API_SRC="src/main/servlet-api"
69 -SERVLET_API_RESOURCES="src/resources/servlet-api"
70 -EL_API_JAR="el-api.jar"
71 -EL_API_SRC="src/main/el-api"
72 -EL_API_RESOURCES="src/resources/el-api"
73 -JSP_API_JAR="jsp-api.jar"
74 -JSP_API_SRC="src/main/jsp-api"
75 -JSP_API_RESOURCES="src/resources/jsp-api"
76 -
77 -src_prepare() {
78 - default
79 -
80 - # The sources and also resources are mixed together so we first give it a structure to make it easier to compile and package
81 - mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
82 - ${EL_API_SRC} ${EL_API_RESOURCES} \
83 - ${JSP_API_SRC}/jakarta/servlet ${JSP_API_RESOURCES} \
84 - ${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
85 -
86 - pushd java || die "Failed to cd to java dir"
87 -
88 - cp --parents -R jakarta/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
89 - mv "${S}/${SERVLET_API_SRC}/jakarta/servlet/jsp" "${S}/${JSP_API_SRC}/jakarta/servlet" || die "Failed to copy jsp-api sources"
90 - cp --parents -R jakarta/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
91 -
92 - popd
93 -
94 - for file in $(find src -type f | grep -vE "\.java$"); do
95 - target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
96 - mkdir -p ${target_dir} || die "Failed to create resource directory"
97 - mv $file ${target_dir} || die "Failed to move resource file"
98 - done
99 -
100 - mv test/jakarta ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
101 -
102 - java-pkg-2_src_prepare
103 -}
104 -
105 -src_compile() {
106 - JAVA_SRC_DIR="${SERVLET_API_SRC}"
107 - JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
108 - JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
109 - java-pkg-simple_src_compile
110 - rm -fr target || die "Failed to remove compiled files"
111 -
112 - JAVA_SRC_DIR="${EL_API_SRC}"
113 - JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
114 - JAVA_JAR_FILENAME="${EL_API_JAR}"
115 - java-pkg-simple_src_compile
116 - rm -fr target || die "Failed to remove compiled files"
117 -
118 - JAVA_SRC_DIR="${JSP_API_SRC}"
119 - JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
120 - JAVA_JAR_FILENAME="${JSP_API_JAR}"
121 - JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
122 - java-pkg-simple_src_compile
123 -}
124 -
125 -src_install() {
126 - JAVA_SRC_DIR="${SERVLET_API_SRC}"
127 - JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
128 - java-pkg-simple_src_install
129 -
130 - JAVA_SRC_DIR="${EL_API_SRC}"
131 - JAVA_JAR_FILENAME="${EL_API_JAR}"
132 - java-pkg-simple_src_install
133 -
134 - JAVA_SRC_DIR="${JSP_API_SRC}"
135 - JAVA_JAR_FILENAME="${JSP_API_JAR}"
136 - java-pkg-simple_src_install
137 -}
138
139 diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.60.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.60.ebuild
140 deleted file mode 100644
141 index f1c865a27bec..000000000000
142 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.60.ebuild
143 +++ /dev/null
144 @@ -1,99 +0,0 @@
145 -# Copyright 1999-2022 Gentoo Authors
146 -# Distributed under the terms of the GNU General Public License v2
147 -
148 -EAPI=8
149 -
150 -JAVA_PKG_IUSE="source"
151 -
152 -inherit java-pkg-2 java-pkg-simple
153 -
154 -MY_A="apache-${PN}-${PV}-src"
155 -MY_P="${MY_A/-servlet-api/}"
156 -DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation"
157 -HOMEPAGE="https://tomcat.apache.org/"
158 -SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
159 -
160 -LICENSE="Apache-2.0"
161 -SLOT="4.0"
162 -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
163 -IUSE=""
164 -
165 -DEPEND=">=virtual/jdk-1.8:*"
166 -RDEPEND=">=virtual/jre-1.8:*"
167 -
168 -S="${WORKDIR}/${MY_P}/"
169 -
170 -JAVA_TEST_SRC_DIR="src/test"
171 -
172 -SERVLET_API_JAR="servlet-api.jar"
173 -SERVLET_API_SRC="src/main/servlet-api"
174 -SERVLET_API_RESOURCES="src/resources/servlet-api"
175 -EL_API_JAR="el-api.jar"
176 -EL_API_SRC="src/main/el-api"
177 -EL_API_RESOURCES="src/resources/el-api"
178 -JSP_API_JAR="jsp-api.jar"
179 -JSP_API_SRC="src/main/jsp-api"
180 -JSP_API_RESOURCES="src/resources/jsp-api"
181 -
182 -src_prepare() {
183 - default
184 -
185 - # The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package
186 -
187 - mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
188 - ${EL_API_SRC} ${EL_API_RESOURCES} \
189 - ${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \
190 - ${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
191 -
192 - pushd java || die "Failed to cd to java dir"
193 -
194 - cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
195 - mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources"
196 - cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
197 -
198 - popd
199 -
200 - for file in $(find src -type f | grep -vE "\.java$"); do
201 - target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
202 - mkdir -p ${target_dir} || die "Failed to create resource directory"
203 - mv $file ${target_dir} || die "Failed to move resource file"
204 - done
205 -
206 - mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
207 -
208 - java-pkg-2_src_prepare
209 -}
210 -
211 -src_compile() {
212 - JAVA_SRC_DIR="${SERVLET_API_SRC}"
213 - JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
214 - JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
215 - java-pkg-simple_src_compile
216 - rm -fr target || die "Failed to remove compiled files"
217 -
218 - JAVA_SRC_DIR="${EL_API_SRC}"
219 - JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
220 - JAVA_JAR_FILENAME="${EL_API_JAR}"
221 - java-pkg-simple_src_compile
222 - rm -fr target || die "Failed to remove compiled files"
223 -
224 - JAVA_SRC_DIR="${JSP_API_SRC}"
225 - JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
226 - JAVA_JAR_FILENAME="${JSP_API_JAR}"
227 - JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
228 - java-pkg-simple_src_compile
229 -}
230 -
231 -src_install() {
232 - JAVA_SRC_DIR="${SERVLET_API_SRC}"
233 - JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
234 - java-pkg-simple_src_install
235 -
236 - JAVA_SRC_DIR="${EL_API_SRC}"
237 - JAVA_JAR_FILENAME="${EL_API_JAR}"
238 - java-pkg-simple_src_install
239 -
240 - JAVA_SRC_DIR="${JSP_API_SRC}"
241 - JAVA_JAR_FILENAME="${JSP_API_JAR}"
242 - java-pkg-simple_src_install
243 -}