1 |
commit: 48ac1540787ad049b3cfb639fa0b753d22afea7b |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jul 2 07:19:26 2020 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jul 2 07:19:26 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48ac1540 |
7 |
|
8 |
dev-java/tomcat-servlet-api: removed obsolete {8.5.54,9.0.3[45]} |
9 |
|
10 |
Bug: https://bugs.gentoo.org/729668 |
11 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
12 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
13 |
|
14 |
dev-java/tomcat-servlet-api/Manifest | 3 -- |
15 |
.../tomcat-servlet-api-8.5.54.ebuild | 39 ---------------------- |
16 |
.../tomcat-servlet-api-9.0.34.ebuild | 39 ---------------------- |
17 |
.../tomcat-servlet-api-9.0.35.ebuild | 39 ---------------------- |
18 |
4 files changed, 120 deletions(-) |
19 |
|
20 |
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest |
21 |
index 52e93b6d0a9..8a7b8087fc5 100644 |
22 |
--- a/dev-java/tomcat-servlet-api/Manifest |
23 |
+++ b/dev-java/tomcat-servlet-api/Manifest |
24 |
@@ -3,8 +3,5 @@ DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e |
25 |
DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c |
26 |
DIST apache-tomcat-7.0.103-src.tar.gz 5279592 BLAKE2B a8ab36fb84cf158fcd8b888276576cd523d211ab0f6fe0933f600d1990a8f68076f192177a574987e52440037c0ebefd3edaf3c84fee541afb076c5ad33cce9b SHA512 812fce83c7242ebc16dc2365f0b363f1fb2691cd6a2f19f1209ea467557c42ee2d108c8bef89f23bb4a20c800d0ecdb4afc37567ef8079966b4eec0331a2ef9b |
27 |
DIST apache-tomcat-7.0.104-src.tar.gz 5309794 BLAKE2B 0d4d5d668e1131bb533af1d56fe37ee1f5c252c2c4dd987e24aae67484f27805f88750b27248c6acfd0585eacd0d3f2155c723e9a25c8613652101944add2a15 SHA512 788eab3ac343815362decf4c0d5db91f3697cc669e7e051f93bf82905cc52f9b040d00b7e07f7b85bcf470e802418896a678f991e523e08a3ae5a2f212a53257 |
28 |
-DIST apache-tomcat-8.5.54-src.tar.gz 5689648 BLAKE2B 7d4c80cb86261bba46b1879d8f2b9218a63cfb069d32dfe72bd5d73baf87887cdff37c5841c44196ded1dbafcfe2d525cb09d8a15905c24600caf107255416cf SHA512 fe4a82fc58aed0df203abf03367f840d7ac498a3ba317eb2b08826e8ab5e705ea13b99f3af1e17878b2cf96271c5d9ff4e7cecf3b2631e061f1b02988449f9e2 |
29 |
DIST apache-tomcat-8.5.56-src.tar.gz 5724546 BLAKE2B 623dc2d1f6808f012f19fdd0d914c4bb200e8328ab6b6855666c1db1704e198d069ff74d227bf51e8376c20daf0640002e5d6907edadfde294d8c62a64d55f83 SHA512 75529e567a7be48f2c1034f3eeada571478d0babb63fb2d368061573d7e64d5fc0a937304e2e2ffa956b5d8a403936c1543a93ee78b258b532939fb9ce80ef3d |
30 |
-DIST apache-tomcat-9.0.34-src.tar.gz 5843244 BLAKE2B e4124c5986b0be26f17cf5e62443fa945ebea6dd713db6a7f96c8e4c7eed7d8e38610763adda928a7099c1574b00e072635576d9d29cc8ae1b98658f0e341acb SHA512 8ac8a916bfe2d3daf679dab9f299bc50f138f3cc9a6e8679a22862d122dea1e5ce3b9101472295398366f5b5d8477097a3cfb536f01136e72ff09d69b2f6c3df |
31 |
-DIST apache-tomcat-9.0.35-src.tar.gz 5887816 BLAKE2B 8103a50a62aa527861fdc35ce8256d9ff0b7185bfa647e25c30c226f9850e88632e0c1e3575bac3a07513fe9c9777b4ef230275e685f48b0bbc733bc68ff7dad SHA512 8931c0f7c30f50d352879f8dfddc02fa59d7128813399e4eca3994be7cf2448e32e726a3cb8b387a5470ccbfa3fb74d0192c825b5f68bbb9fb6b43a9353cb24a |
32 |
DIST apache-tomcat-9.0.36-src.tar.gz 5890912 BLAKE2B 18962c7d4dcd75a04476acd306002977bf039d832aa1ed5551ffcaa0612e612e6b11db6d80cea149b9fb5df9d0f76284d55a1745760df8f4fa7449999e095c61 SHA512 f8263594bc679f75cecf5bcf4ad8e8ccfea42ad8e90eaeb7004c63875c6b700b0f863d68f1cdd932ebc7b303bdfb86d70afe88686e576c8ea7ccd9574c74e25b |
33 |
|
34 |
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.54.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.54.ebuild |
35 |
deleted file mode 100644 |
36 |
index 085f83e7999..00000000000 |
37 |
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.54.ebuild |
38 |
+++ /dev/null |
39 |
@@ -1,39 +0,0 @@ |
40 |
-# Copyright 1999-2020 Gentoo Authors |
41 |
-# Distributed under the terms of the GNU General Public License v2 |
42 |
- |
43 |
-EAPI=7 |
44 |
-JAVA_PKG_IUSE="source" |
45 |
- |
46 |
-inherit eutils java-pkg-2 java-ant-2 |
47 |
- |
48 |
-MY_A="apache-${P}-src" |
49 |
-MY_P="${MY_A/-servlet-api/}" |
50 |
-DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation" |
51 |
-HOMEPAGE="https://tomcat.apache.org/" |
52 |
-SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz" |
53 |
- |
54 |
-LICENSE="Apache-2.0" |
55 |
-SLOT="3.1" |
56 |
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" |
57 |
-IUSE="" |
58 |
- |
59 |
-DEPEND=">=virtual/jdk-1.8" |
60 |
-RDEPEND=">=virtual/jre-1.8" |
61 |
- |
62 |
-S="${WORKDIR}/${MY_P}/" |
63 |
- |
64 |
-src_prepare() { |
65 |
- default |
66 |
- |
67 |
- cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml" |
68 |
- rm -fR */*/build.xml |
69 |
- einfo "Removing bundled jars and classes" |
70 |
- find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} + |
71 |
- |
72 |
- java-pkg-2_src_prepare |
73 |
-} |
74 |
- |
75 |
-src_install() { |
76 |
- java-pkg_dojar "${S}"/output/build/lib/*.jar |
77 |
- use source && java-pkg_dosrc java/javax/servlet/ |
78 |
-} |
79 |
|
80 |
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.34.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.34.ebuild |
81 |
deleted file mode 100644 |
82 |
index 146f9bc7ea9..00000000000 |
83 |
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.34.ebuild |
84 |
+++ /dev/null |
85 |
@@ -1,39 +0,0 @@ |
86 |
-# Copyright 1999-2020 Gentoo Authors |
87 |
-# Distributed under the terms of the GNU General Public License v2 |
88 |
- |
89 |
-EAPI=7 |
90 |
-JAVA_PKG_IUSE="source" |
91 |
- |
92 |
-inherit eutils java-pkg-2 java-ant-2 |
93 |
- |
94 |
-MY_A="apache-${PN}-${PV}-src" |
95 |
-MY_P="${MY_A/-servlet-api/}" |
96 |
-DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation" |
97 |
-HOMEPAGE="https://tomcat.apache.org/" |
98 |
-SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz" |
99 |
- |
100 |
-LICENSE="Apache-2.0" |
101 |
-SLOT="4.0" |
102 |
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" |
103 |
-IUSE="" |
104 |
- |
105 |
-DEPEND=">=virtual/jdk-1.8" |
106 |
-RDEPEND=">=virtual/jre-1.8" |
107 |
- |
108 |
-S="${WORKDIR}/${MY_P}/" |
109 |
- |
110 |
-src_prepare() { |
111 |
- default |
112 |
- |
113 |
- cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml" |
114 |
- rm -fR */*/build.xml |
115 |
- einfo "Removing bundled jars and classes" |
116 |
- find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} + |
117 |
- |
118 |
- java-pkg-2_src_prepare |
119 |
-} |
120 |
- |
121 |
-src_install() { |
122 |
- java-pkg_dojar "${S}"/output/build/lib/*.jar |
123 |
- use source && java-pkg_dosrc java/javax/servlet/ |
124 |
-} |
125 |
|
126 |
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.35.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.35.ebuild |
127 |
deleted file mode 100644 |
128 |
index 9ddac4eebd9..00000000000 |
129 |
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.35.ebuild |
130 |
+++ /dev/null |
131 |
@@ -1,39 +0,0 @@ |
132 |
-# Copyright 1999-2020 Gentoo Authors |
133 |
-# Distributed under the terms of the GNU General Public License v2 |
134 |
- |
135 |
-EAPI=7 |
136 |
-JAVA_PKG_IUSE="source" |
137 |
- |
138 |
-inherit eutils java-pkg-2 java-ant-2 |
139 |
- |
140 |
-MY_A="apache-${PN}-${PV}-src" |
141 |
-MY_P="${MY_A/-servlet-api/}" |
142 |
-DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation" |
143 |
-HOMEPAGE="https://tomcat.apache.org/" |
144 |
-SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz" |
145 |
- |
146 |
-LICENSE="Apache-2.0" |
147 |
-SLOT="4.0" |
148 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" |
149 |
-IUSE="" |
150 |
- |
151 |
-DEPEND=">=virtual/jdk-1.8" |
152 |
-RDEPEND=">=virtual/jre-1.8" |
153 |
- |
154 |
-S="${WORKDIR}/${MY_P}/" |
155 |
- |
156 |
-src_prepare() { |
157 |
- default |
158 |
- |
159 |
- cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml" |
160 |
- rm -fR */*/build.xml |
161 |
- einfo "Removing bundled jars and classes" |
162 |
- find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} + |
163 |
- |
164 |
- java-pkg-2_src_prepare |
165 |
-} |
166 |
- |
167 |
-src_install() { |
168 |
- java-pkg_dojar "${S}"/output/build/lib/*.jar |
169 |
- use source && java-pkg_dosrc java/javax/servlet/ |
170 |
-} |