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: Sat, 20 Apr 2019 23:26:41
Message-Id: 1555685459.a9faf9bcd7a23a1d16ac966e304fc9b041b291ae.fordfrog@gentoo
1 commit: a9faf9bcd7a23a1d16ac966e304fc9b041b291ae
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 19 14:50:18 2019 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 19 14:50:59 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9faf9bc
7
8 dev-java/tomcat-servlet-api-{7.0.92,8.5.38,9.0.{8,16}}: removed obsolete
9
10 Package-Manager: Portage-2.3.64, Repoman-2.3.12
11 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
12
13 dev-java/tomcat-servlet-api/Manifest | 4 ---
14 .../tomcat-servlet-api-7.0.92.ebuild | 38 ---------------------
15 .../tomcat-servlet-api-8.5.38.ebuild | 39 ----------------------
16 .../tomcat-servlet-api-9.0.16.ebuild | 39 ----------------------
17 .../tomcat-servlet-api-9.0.8.ebuild | 39 ----------------------
18 5 files changed, 159 deletions(-)
19
20 diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
21 index ab3c9b809b0..9457927e679 100644
22 --- a/dev-java/tomcat-servlet-api/Manifest
23 +++ b/dev-java/tomcat-servlet-api/Manifest
24 @@ -4,14 +4,10 @@ DIST apache-tomcat-5.5.34-src.tar.gz 3720299 BLAKE2B 9ec9171f7fb5aa43a3d7df0d3e0
25 DIST apache-tomcat-6.0.44-src.tar.gz 3447711 BLAKE2B 7baf1fc24a7c9aba7e2ddac63fe0c0975178616bfad8cd625d2910d18ad9b00cd85c98ba4a1ada251119629b96ff464ac623857f6928e3b9465708cdf5bc7513 SHA512 0d6a1539b28fa8ca3442557889d7d21cc523b18136f6998820ba13f41420536aba65ce78bac526002ee1dd86df3cbc80d9f043a3f765d7cf0b79e58e516030be
26 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
27 DIST apache-tomcat-7.0.82-src.tar.gz 4697342 BLAKE2B 1106ed04dc83e64e395de29f01a7752a0578b0c88046eb59614a7cfc0d8a98e3aebb698c8eb56763eea41620d9b42482971c5093304184b1028c6bd8f9770ada SHA512 fc92388d81316de0246df4074c417ffa341eab55308c0694e9ea71c5497c863b42019cd1f38628ff640114c501a06c4e9c428cb2b6f1bc1c16fb337a286718db
28 -DIST apache-tomcat-7.0.92-src.tar.gz 4778943 BLAKE2B d11b01219a25c303ce791d965908c79cd48b5c97e1f0bed81ae60e0fcae3c4b23906f652eaf1d2922db7a57e68ee9f5a09ef017b7f1b89ed6c2ab81a477a810e SHA512 8cbcaf6d8dcda5ad8bd667582a39e91c1feaa4cc7216cafc23b9f5cf005cce9af24473c1c9d573f4da26c88ea68520a113dc0a7e2a50823f3ba3bb1510ec9e0a
29 DIST apache-tomcat-7.0.93-src.tar.gz 4786577 BLAKE2B 8b72418c98369e0e104c5f51e9d822c287487b5d3b66a4a6d005535b33a35a6cbc50c49b48100555bfaba0c6c983ea11dcdf381d2fba80a77fc17ac0df20efaa SHA512 5f9b08827aeae58f371496c34ce1ae5692bd5403e1a9a7a91b283ece3289356dbd85d48fcb71958aaeeb42cd65bb70fcf34cbe2db3901475cfb812370766f3fc
30 DIST apache-tomcat-8.0.53-src.tar.gz 5057041 BLAKE2B 3a50d2f61baecb5244909972384e36478c69e7592dd35119d8b7b974273c57a4855082f309146ed160144dbdcced3236fd586b047970bd8558bbe7b7e002e9fd SHA512 0b56bc723277b2888896ab34ec3e49cb56bac94ddf1a9b96bd023982e2ffabd5317f63b3c0971afdc8cd7a6364197409df461d22151dbaab3a2be7daf6858b9e
31 DIST apache-tomcat-8.5.23-src.tar.gz 5086043 BLAKE2B 9bcad0d465aff6da1ba4a846042491bc8d5963283ed1d2530a26ab48289d14e8b85834d24ca476c95a75c1a5f51ee3ecd71c190b9609983cce56b56bc046b6d3 SHA512 2848331553f2c1bc51a4113960c6fe7e2beddf9146341dbfde1a27e2232802cfc364c8e8b988ae862371ca1a3be34665a56a28be9eadf80f8b317e0e2525cbef
32 -DIST apache-tomcat-8.5.38-src.tar.gz 5253678 BLAKE2B b2ecc732128934a3afa314ddc569b1b3d330ccb12b99b0ce4b12e1952347ac57cafb3a5637595997a0c9e77752ae41665e637c826c3b9ae9925799124e735480 SHA512 b84d96fa972a9d24957ef047cdce0fb49de3d365401b07990eaa5bad8f3c87a6b1ad1eac077c4be595ee291daef68720381fe63461815de47664275b486ceeee
33 DIST apache-tomcat-8.5.39-src.tar.gz 5264067 BLAKE2B 8cd672529660783d3310beae356c32a9392f550ae72f2cdbd60f23c3b532e3adb19a295737fb39e9a2990b14edeff51cedf1f936f32f844e496e751913f2a859 SHA512 ba591290be49a01cec38300c6321b634e3ca7417074b55103afc887b9af3eda942d302aee5f1648e7fa60b5231cd7d83428846e2b55a4964f5cc98c27a844f8d
34 -DIST apache-tomcat-9.0.16-src.tar.gz 5654943 BLAKE2B a412457c2d34367301b4335a3a4bf46a647f8e60440be751874e1eaad400a0832b64fcae4c9f81585a4afbddafd75f2929bc78c12eb05b20539b11de686dfecc SHA512 60fbdefbddaa6fac4bc9d0ca4c1d9a119dd53063fd4574c474daf5f346fddc9cb7fd174f1be189e965d5ae4670710347d84fcf443c7df01faac9a1b84ecb33ce
35 DIST apache-tomcat-9.0.17-src.tar.gz 5670728 BLAKE2B 15f8518ec073a935dec6afdd3a8f9885e7867a0aa033024024bd72b7887011ca169c776f2a4d886d93a73a478f9dcad5f87c31b3a30a88ca913309c51e0f0ec7 SHA512 b5763dae05598c0a4d3638ba02c0627219de20406bddaab86ae3262299f2d9bbda1a5db612cad9fb8a54b2888e9ce1c4be67613d855cfd92b4cee5b85e226602
36 DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2
37 -DIST apache-tomcat-9.0.8-src.tar.gz 5115250 BLAKE2B 8eaf0aa963711f90278d6d20986f4ba583c64e9e2b1f0b82ccc676a854a2078fe29c3b691d49af529074c9eea02ba78802cc9a4bb5cd7a3e561f6dfcb342c50b SHA512 22a3c9a2c9f2fa87b218ec5deb50248af201e83111bbeb7fcfbb7dde5aba3e2d61b53bc40500b3e364a9fb94b576ad8a4683979534274af0f3bcdfb86aa045e7
38 DIST jakarta-servletapi-src.tar.gz 65342 BLAKE2B 03674ca65e0cc509b04a6255d5dd20d26aa5053ed54588e9ba655330c56c9c523c5b382804aee9816cb9aa2ac19cccc1ad288ed06b2af85ba535854bc72bed73 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084
39
40 diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.92.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.92.ebuild
41 deleted file mode 100644
42 index 412dd425bf5..00000000000
43 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.92.ebuild
44 +++ /dev/null
45 @@ -1,38 +0,0 @@
46 -# Copyright 1999-2019 Gentoo Authors
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="https://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-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-8.5.38.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.38.ebuild
86 deleted file mode 100644
87 index 640c06837c8..00000000000
88 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.38.ebuild
89 +++ /dev/null
90 @@ -1,39 +0,0 @@
91 -# Copyright 1999-2019 Gentoo Authors
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.1/JSP API 2.3/EL API 3.0 implementation"
102 -HOMEPAGE="https://tomcat.apache.org/"
103 -SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
104 -
105 -LICENSE="Apache-2.0"
106 -SLOT="3.1"
107 -KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
108 -IUSE=""
109 -
110 -DEPEND=">=virtual/jdk-1.7"
111 -RDEPEND=">=virtual/jre-1.7"
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
120 - einfo "Removing bundled jars and classes"
121 - find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
122 -
123 - java-pkg-2_src_prepare
124 -}
125 -
126 -src_install() {
127 - java-pkg_dojar "${S}"/output/build/lib/*.jar
128 - use source && java-pkg_dosrc java/javax/servlet/
129 -}
130
131 diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.16.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.16.ebuild
132 deleted file mode 100644
133 index d66f7a81553..00000000000
134 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.16.ebuild
135 +++ /dev/null
136 @@ -1,39 +0,0 @@
137 -# Copyright 1999-2019 Gentoo Authors
138 -# Distributed under the terms of the GNU General Public License v2
139 -
140 -EAPI="6"
141 -JAVA_PKG_IUSE="source"
142 -
143 -inherit eutils java-pkg-2 java-ant-2
144 -
145 -MY_A="apache-${PN}-${PV}-src"
146 -MY_P="${MY_A/-servlet-api/}"
147 -DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.4?/EL API 3.1? implementation"
148 -HOMEPAGE="https://tomcat.apache.org/"
149 -SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
150 -
151 -LICENSE="Apache-2.0"
152 -SLOT="4.0"
153 -KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
154 -IUSE=""
155 -
156 -DEPEND=">=virtual/jdk-1.8"
157 -RDEPEND=">=virtual/jre-1.8"
158 -
159 -S="${WORKDIR}/${MY_P}/"
160 -
161 -src_prepare() {
162 - default
163 -
164 - cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
165 - rm -fR */*/build.xml
166 - einfo "Removing bundled jars and classes"
167 - find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
168 -
169 - java-pkg-2_src_prepare
170 -}
171 -
172 -src_install() {
173 - java-pkg_dojar "${S}"/output/build/lib/*.jar
174 - use source && java-pkg_dosrc java/javax/servlet/
175 -}
176
177 diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.8.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.8.ebuild
178 deleted file mode 100644
179 index d66f7a81553..00000000000
180 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.8.ebuild
181 +++ /dev/null
182 @@ -1,39 +0,0 @@
183 -# Copyright 1999-2019 Gentoo Authors
184 -# Distributed under the terms of the GNU General Public License v2
185 -
186 -EAPI="6"
187 -JAVA_PKG_IUSE="source"
188 -
189 -inherit eutils java-pkg-2 java-ant-2
190 -
191 -MY_A="apache-${PN}-${PV}-src"
192 -MY_P="${MY_A/-servlet-api/}"
193 -DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.4?/EL API 3.1? implementation"
194 -HOMEPAGE="https://tomcat.apache.org/"
195 -SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
196 -
197 -LICENSE="Apache-2.0"
198 -SLOT="4.0"
199 -KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
200 -IUSE=""
201 -
202 -DEPEND=">=virtual/jdk-1.8"
203 -RDEPEND=">=virtual/jre-1.8"
204 -
205 -S="${WORKDIR}/${MY_P}/"
206 -
207 -src_prepare() {
208 - default
209 -
210 - cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
211 - rm -fR */*/build.xml
212 - einfo "Removing bundled jars and classes"
213 - find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
214 -
215 - java-pkg-2_src_prepare
216 -}
217 -
218 -src_install() {
219 - java-pkg_dojar "${S}"/output/build/lib/*.jar
220 - use source && java-pkg_dosrc java/javax/servlet/
221 -}