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: Thu, 16 Nov 2017 08:54:48
Message-Id: 1510822468.0caf08ad3e134580fbd5f306a073f69b915b007a.fordfrog@gentoo
1 commit: 0caf08ad3e134580fbd5f306a073f69b915b007a
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Thu Nov 16 08:52:28 2017 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Thu Nov 16 08:54:28 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0caf08ad
7
8 dev-java/tomcat-servlet-api: removed obsolete versions
9
10 Package-Manager: Portage-2.3.14, Repoman-2.3.6
11
12 dev-java/tomcat-servlet-api/Manifest | 5 ---
13 .../tomcat-servlet-api-7.0.79.ebuild | 38 ---------------------
14 .../tomcat-servlet-api-7.0.81.ebuild | 38 ---------------------
15 .../tomcat-servlet-api-8.0.45.ebuild | 35 -------------------
16 .../tomcat-servlet-api-8.0.46.ebuild | 35 -------------------
17 .../tomcat-servlet-api-8.5.20.ebuild | 39 ----------------------
18 6 files changed, 190 deletions(-)
19
20 diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
21 index a7b52035962..679e73c2081 100644
22 --- a/dev-java/tomcat-servlet-api/Manifest
23 +++ b/dev-java/tomcat-servlet-api/Manifest
24 @@ -4,14 +4,9 @@ DIST apache-tomcat-5.5.34-src.tar.gz 3720299 SHA256 a52e7f2abf0fbdd9665ca398d2b3
25 DIST apache-tomcat-6.0.44-src.tar.gz 3447711 SHA256 c6f01526d58f2ba7b9da496e959d9e68cc49183006077704ab91c36ebebf5a4a SHA512 0d6a1539b28fa8ca3442557889d7d21cc523b18136f6998820ba13f41420536aba65ce78bac526002ee1dd86df3cbc80d9f043a3f765d7cf0b79e58e516030be WHIRLPOOL c65e704466191a0f98ec777e95dda889599ff6a545e7c013fd04bc0b72e0d0edf4491415f243d6a4de60cf76abe5c13ffbcc6d98f78b51490f7b7b43b24ecb97
26 DIST apache-tomcat-6.0.45-src.tar.gz 3494054 SHA256 d464b3e770197f026bf802d19be0195b941e8c3be7e552dc2f8eb563f9cc010e SHA512 d300e6b805bb70fc348133467b2aeac728dc0ae44f2fc1f309c3b2971987c1e46b81f156ebd7ddfda38f6746e90af1402c4e16a2d30bc7b081b761c87df8ffab WHIRLPOOL 144678884f75034f1d692619ea8064daf02aee03bcac62fb0b666b5c0283f5abf93414d636c03c94488632cd13081cf00e69a9ddf19f4c8bafd80e7eca5a69da
27 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 SHA256 0392a1d04554c91b8efc3c62becbda634de2031f0366925378047062a2098d30 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c WHIRLPOOL 1892d71346e9261afabe5a42ee961c9b61379ac17a91d98da5dda8136aedb406c57cb42ba2fa1b7e35d1cf142d7132456a065fbdf34a35452462bb7140fce675
28 -DIST apache-tomcat-7.0.79-src.tar.gz 4682119 SHA256 b5373951afe41ffd27348bb57cff80bc7d86a5669bdedb0b4bbe1d567009dc32 SHA512 75c29fd7de8c245502cae4db845a508f320739625d726fe892924b639e7333b76b3446f36cb67b9ad9500e95823b5eadaf056c4cb6bea962a59eb5491696e0b2 WHIRLPOOL 5db799cfbd061a199270b0ebb971c4fe43632522a23f590b7a46e021af5c8b0bce4a711e16bd0416b5baa6f2556cf8178bf14abadf4d493ece44c9eb2c4cdae2
29 -DIST apache-tomcat-7.0.81-src.tar.gz 4689428 SHA256 fca79afb210cfbc8f9ebcdebdd048ecb7ea370ac0f94040cbcc0287fe5d85e66 SHA512 25e237aa7189cf9a9617badf8936fd7ec64550bcac3bab2e2afe51d5e199eddfe17e0d6d27ac7ebf3543d1601467fcd8362ddf9a5b708c50b223d7c8d18bbb3b WHIRLPOOL 1016a02b4a30b7e02eb2f7fad3080153012dd3e3f84df34d006c89bc2c89b7b3d370334800170008482d3dbf339c62f249064eb48ab24ca17588026ba515d487
30 DIST apache-tomcat-7.0.82-src.tar.gz 4697342 SHA256 3c6ff0bf2770b169493b25b97ee7502d44bee286176ecd187caaebf1f4e2fcf7 SHA512 fc92388d81316de0246df4074c417ffa341eab55308c0694e9ea71c5497c863b42019cd1f38628ff640114c501a06c4e9c428cb2b6f1bc1c16fb337a286718db WHIRLPOOL aef92cb2cf82c87a1b20ef7eedb30aae052882e99e74b9c33500b3a30f5c32df7a4dd23e3c79d3031ff7f0dd8abf9e2b3e061805a3b32f3e78b6b7c52db9d3c1
31 -DIST apache-tomcat-8.0.45-src.tar.gz 4978313 SHA256 450fd2890b12e56692cb203f95651f9a873dce056b7b4362e142bc817032b291 SHA512 80e4281f5b6e4d6bf607179840bc6cb923ea9f57ec8231a451c3b5a1f8938f72ec1097290059afba0ef7b56edeb56d63636849517b69b91c7093cb15ff0eaa04 WHIRLPOOL c893cd5c26637f8881c19353e269145e33fa11e02eb10ef93a41590ad2e1e6c6ffa1b3f6c3c7c318630765f666be07447fd3a21c70c2c381e75c458b60383ea0
32 -DIST apache-tomcat-8.0.46-src.tar.gz 4985079 SHA256 b5b9e560b3f75dd68b3103915c754ac47cf526f26f18cd6e9baba9580be25161 SHA512 9adbea9faf61f782ede1c657e833dea55ad1b4a874a1eb9801eab82ac9999de847e7f08ff7a49b3389b9d0683d185c6d4981f9f8d2f607f68c077a682af508d5 WHIRLPOOL eafb2768555261836b04f12f95ba2755d2a7ef98754a5a009099e377220dff1251c6ad1cbe672764787c485b3f922bf1fda8db663890db36e356e7a5139b83e9
33 DIST apache-tomcat-8.0.47-src.tar.gz 4996505 SHA256 a2e34a707f1d2ab03aae194db2aed7aa525e62ee3cd648e7058bee49ac1b578c SHA512 135de73b8ca7d4003fcecc19a17a8a86ab85fc1054e89638d26e57263249438d8e8aebfca0a2791eaec2bc835baa57e6a05b60e11595aa373fdc03e278b31702 WHIRLPOOL 7add2b564ca9dfac647cd8338ef90229dd61e97d2ad7420f883c98b62760952904ad170f72029153da592a6f2c8c003d7229b4b32a1e870b6e7c2c99d34566c8
34 DIST apache-tomcat-8.5.11-src.tar.gz 4996153 SHA256 81fb94243600d950375c4622f76b39c06c5615b7a8a6f70d387ea249bed1dddf SHA512 d1a9513535773805c26825f8843fa502e044c9f1ccc22176db5418a7a0abb6d1bcff3db401b449a5867065359abbc8277d14085d807fe00c95dd267d9091620d WHIRLPOOL 41ff9daec144c2481d3bb7a49bcd071eb2d21b34c11356a9911a139b404779971c31282f73b7b336b7e02d16156749e8e816dca8d5c727ef871ff0216577398d
35 -DIST apache-tomcat-8.5.20-src.tar.gz 5063310 SHA256 6bc40ae61b77906325bf8bdb2b0767aeb96f4c5a7a9b618aa496db59387d6610 SHA512 dea3095792de76a3a56bd6fd6c9ed5702ca539856d0e07a5de2600f456e7255929d14748a2dc9b3c626b3a67aaac8795ef3f5a6a1351991a0e89443e0c9d0807 WHIRLPOOL 1924f12c5068574424587d5b8b7261efb7496dbc53915d8cb2558b4a643aedecc98823ac7dec238fe7cb1a1874734e05de2dc6b7b28e48ffdae9e8c5c586e895
36 DIST apache-tomcat-8.5.23-src.tar.gz 5086043 SHA256 eaaf35752841356dec976fa6250cd71680b8b5b9c0bdf4df9a86ac38630bcbd4 SHA512 2848331553f2c1bc51a4113960c6fe7e2beddf9146341dbfde1a27e2232802cfc364c8e8b988ae862371ca1a3be34665a56a28be9eadf80f8b317e0e2525cbef WHIRLPOOL 77b35de4ede2beecab71dcd7c5494bded1516deac4b5c2cbd2f48e1ae728cfa41f4193369bd464946869e9ba4565c0e6f1c7ad57578459d3be67159ea8cd9a64
37 DIST apache-tomcat-9.0.1-src.tar.gz 5029499 SHA256 f4da8ef7a03dd7280a9a4b6c66cc9bd34dddc6429c33d9db1a8acfc1596c4e90 SHA512 6116b05f448c24e691c4b56372a41cfd8900adc5e759f2f5026c808de48d65705763236fca46f69321d351f37f5dbc7aa49db8c097b8a3155e367fe21aa0d384 WHIRLPOOL 2e0f05001b9f0d57a241db8ddf0212d3adce2c1b829a03318b5cc1b5a250ae32a50d801e23d9b6a2943c208a478dd00d1f5ae07d1c3c736fbf059554a40caf66
38 DIST jakarta-servletapi-src.tar.gz 65342 SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084 WHIRLPOOL beb0e14920a8623d276c8823e6291aacb4b4d5d0539f5de431ce6f94582df9b260d4e04e0d0b650c59f7ca168f4af9352fffbfc0506b2530464a3bcdcf6ac0d1
39
40 diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.79.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.79.ebuild
41 deleted file mode 100644
42 index 44456ff69fe..00000000000
43 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.79.ebuild
44 +++ /dev/null
45 @@ -1,38 +0,0 @@
46 -# Copyright 1999-2017 Gentoo Foundation
47 -# Distributed under the terms of the GNU General Public License v2
48 -
49 -EAPI="6"
50 -JAVA_PKG_IUSE="source"
51 -
52 -inherit eutils java-pkg-2 java-ant-2
53 -
54 -MY_A="apache-${P}-src"
55 -MY_P="${MY_A/-servlet-api/}"
56 -DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
57 -HOMEPAGE="http://tomcat.apache.org/"
58 -SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
59 -
60 -LICENSE="Apache-2.0"
61 -SLOT="3.0"
62 -KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
63 -IUSE=""
64 -
65 -DEPEND=">=virtual/jdk-1.6"
66 -RDEPEND=">=virtual/jre-1.6"
67 -
68 -S="${WORKDIR}/${MY_P}/"
69 -
70 -src_prepare() {
71 - default
72 -
73 - cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
74 - rm -fR */*/build.xml ||die
75 - java-pkg_clean
76 -
77 - java-pkg-2_src_prepare
78 -}
79 -
80 -src_install() {
81 - java-pkg_dojar "${S}"/output/build/lib/*.jar
82 - use source && java-pkg_dosrc java/javax/servlet/
83 -}
84
85 diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.81.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.81.ebuild
86 deleted file mode 100644
87 index 44456ff69fe..00000000000
88 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.81.ebuild
89 +++ /dev/null
90 @@ -1,38 +0,0 @@
91 -# Copyright 1999-2017 Gentoo Foundation
92 -# Distributed under the terms of the GNU General Public License v2
93 -
94 -EAPI="6"
95 -JAVA_PKG_IUSE="source"
96 -
97 -inherit eutils java-pkg-2 java-ant-2
98 -
99 -MY_A="apache-${P}-src"
100 -MY_P="${MY_A/-servlet-api/}"
101 -DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
102 -HOMEPAGE="http://tomcat.apache.org/"
103 -SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
104 -
105 -LICENSE="Apache-2.0"
106 -SLOT="3.0"
107 -KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
108 -IUSE=""
109 -
110 -DEPEND=">=virtual/jdk-1.6"
111 -RDEPEND=">=virtual/jre-1.6"
112 -
113 -S="${WORKDIR}/${MY_P}/"
114 -
115 -src_prepare() {
116 - default
117 -
118 - cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
119 - rm -fR */*/build.xml ||die
120 - java-pkg_clean
121 -
122 - java-pkg-2_src_prepare
123 -}
124 -
125 -src_install() {
126 - java-pkg_dojar "${S}"/output/build/lib/*.jar
127 - use source && java-pkg_dosrc java/javax/servlet/
128 -}
129
130 diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.45.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.45.ebuild
131 deleted file mode 100644
132 index 5fdc913baf1..00000000000
133 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.45.ebuild
134 +++ /dev/null
135 @@ -1,35 +0,0 @@
136 -# Copyright 1999-2017 Gentoo Foundation
137 -# Distributed under the terms of the GNU General Public License v2
138 -
139 -EAPI="5"
140 -JAVA_PKG_IUSE="source"
141 -
142 -inherit eutils java-pkg-2 java-ant-2
143 -
144 -MY_A="apache-${P}-src"
145 -MY_P="${MY_A/-servlet-api/}"
146 -DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
147 -HOMEPAGE="http://tomcat.apache.org/"
148 -SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
149 -
150 -LICENSE="Apache-2.0"
151 -SLOT="3.1"
152 -KEYWORDS="amd64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
153 -IUSE=""
154 -
155 -DEPEND=">=virtual/jdk-1.7"
156 -RDEPEND=">=virtual/jre-1.7"
157 -
158 -S="${WORKDIR}/${MY_P}/"
159 -
160 -java_prepare() {
161 - cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
162 - rm -fR */*/build.xml
163 - einfo "Removing bundled jars and classes"
164 - find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
165 -}
166 -
167 -src_install() {
168 - java-pkg_dojar "${S}"/output/build/lib/*.jar
169 - use source && java-pkg_dosrc java/javax/servlet/
170 -}
171
172 diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.46.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.46.ebuild
173 deleted file mode 100644
174 index c987d5ccd92..00000000000
175 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.46.ebuild
176 +++ /dev/null
177 @@ -1,35 +0,0 @@
178 -# Copyright 1999-2017 Gentoo Foundation
179 -# Distributed under the terms of the GNU General Public License v2
180 -
181 -EAPI="5"
182 -JAVA_PKG_IUSE="source"
183 -
184 -inherit eutils java-pkg-2 java-ant-2
185 -
186 -MY_A="apache-${P}-src"
187 -MY_P="${MY_A/-servlet-api/}"
188 -DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
189 -HOMEPAGE="https://tomcat.apache.org/"
190 -SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
191 -
192 -LICENSE="Apache-2.0"
193 -SLOT="3.1"
194 -KEYWORDS="amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
195 -IUSE=""
196 -
197 -DEPEND=">=virtual/jdk-1.7"
198 -RDEPEND=">=virtual/jre-1.7"
199 -
200 -S="${WORKDIR}/${MY_P}/"
201 -
202 -java_prepare() {
203 - cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
204 - rm -fR */*/build.xml
205 - einfo "Removing bundled jars and classes"
206 - find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
207 -}
208 -
209 -src_install() {
210 - java-pkg_dojar "${S}"/output/build/lib/*.jar
211 - use source && java-pkg_dosrc java/javax/servlet/
212 -}
213
214 diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.20.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.20.ebuild
215 deleted file mode 100644
216 index 932cd232285..00000000000
217 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.20.ebuild
218 +++ /dev/null
219 @@ -1,39 +0,0 @@
220 -# Copyright 1999-2017 Gentoo Foundation
221 -# Distributed under the terms of the GNU General Public License v2
222 -
223 -EAPI="6"
224 -JAVA_PKG_IUSE="source"
225 -
226 -inherit eutils java-pkg-2 java-ant-2
227 -
228 -MY_A="apache-${P}-src"
229 -MY_P="${MY_A/-servlet-api/}"
230 -DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
231 -HOMEPAGE="http://tomcat.apache.org/"
232 -SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
233 -
234 -LICENSE="Apache-2.0"
235 -SLOT="3.1"
236 -KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
237 -IUSE=""
238 -
239 -DEPEND=">=virtual/jdk-1.7"
240 -RDEPEND=">=virtual/jre-1.7"
241 -
242 -S="${WORKDIR}/${MY_P}/"
243 -
244 -src_prepare() {
245 - default
246 -
247 - cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
248 - rm -fR */*/build.xml
249 - einfo "Removing bundled jars and classes"
250 - find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
251 -
252 - java-pkg-2_src_prepare
253 -}
254 -
255 -src_install() {
256 - java-pkg_dojar "${S}"/output/build/lib/*.jar
257 - use source && java-pkg_dosrc java/javax/servlet/
258 -}