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: Fri, 28 Feb 2020 18:55:43
Message-Id: 1582916115.89fb384d129f14b4e3791be49247d957526bb901.fordfrog@gentoo
1 commit: 89fb384d129f14b4e3791be49247d957526bb901
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 28 18:55:15 2020 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Fri Feb 28 18:55:15 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89fb384d
7
8 dev-java/tomcat-servlet-api: removed obsolete
9
10 Package-Manager: Portage-2.3.89, Repoman-2.3.20
11 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
12
13 dev-java/tomcat-servlet-api/Manifest | 2 --
14 .../tomcat-servlet-api-7.0.96.ebuild | 38 ---------------------
15 .../tomcat-servlet-api-9.0.27.ebuild | 39 ----------------------
16 3 files changed, 79 deletions(-)
17
18 diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
19 index f4948be0f82..ba643cb9c37 100644
20 --- a/dev-java/tomcat-servlet-api/Manifest
21 +++ b/dev-java/tomcat-servlet-api/Manifest
22 @@ -2,8 +2,6 @@ DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc387
23 DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7
24 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
25 DIST apache-tomcat-7.0.100-src.tar.gz 5265444 BLAKE2B 9c706e6a50e13cd8f542669e2d80f8940816976cfb84f62c3e17bbe6f0cc6d76d6fcdd18ec69e706ce27552aa66041833f6ae7bba8e671e187de3246e90a25c5 SHA512 53ef64c64263d0f25d72ed179bd7b7beed3f73cd63010988ba740ff7328b00a5ec09fe1d4575188ecacf258c891e022a0f1ae07d2957d9830a56881170bb1a57
26 -DIST apache-tomcat-7.0.96-src.tar.gz 4983881 BLAKE2B d5b828b7a4e8a7a5ce793a15421fbd6b12b55918aa7c15bc8209b4c762d7f422a7315e4cbe9b4ae2da754b6d8493bc11ae6a5c99f11a1ac3b23473e05fa26c83 SHA512 5797e66fb9ce558340e08d3a4ccd372d912707aabd6177318781925dd35055902a0ecc3e50e677d76b0feea547cc8fc038bb83ae5de65d28680cb4c9582f60c0
27 DIST apache-tomcat-8.5.47-src.tar.gz 5607118 BLAKE2B 3c326056f674032424d298c7581243a24dd01fae39b1ce7069b60e1bcf3d825de954164f643e887618c43c87d691bc41f942e73bf86b254b4c7dca9c68ce7cce SHA512 1513fdaf7751ee263d878cdfc05329bc4ee50e2f3aeea68e1d173a5f4d555ec59a43050222f013758f704967730dd25a64337cf1ba4365ab53b8730af87b4051
28 DIST apache-tomcat-8.5.51-src.tar.gz 5661227 BLAKE2B 711de5678903941a5261693972906f2d0fca2c9d3219e62d3186e5d71a2e3cb4da0a5028e62790a26dad2d244246c2f41c74f18e17d52ec0af070f0d5842ca3f SHA512 8529d2e7d83a863fe88ed4ee8ec29b673e5df4bea53231412c0d89e2384d3939b9d1f29350a4ca46966ab5d4a0d3178ed5d2caa50aa766092a3ab8f28dd27592
29 -DIST apache-tomcat-9.0.27-src.tar.gz 5761278 BLAKE2B 7d4a65dfa43e0956a5dbb1dad3bf1aa475e7c503d3192ac24921d7cee9bd85379cd820ce693e8c583a7cab23263b0abfa960968d04d766764e222ba8c5bd97d4 SHA512 3f63cbd49f93e6a9d44ea63b4f787cf498930b82d19eaf60603c126b8800d2894d306c27e42ab73b042f3bba9cfb75b6c939b91b8b9141e4903eb1b88c2a4ec8
30 DIST apache-tomcat-9.0.31-src.tar.gz 5812430 BLAKE2B 7ef0f989860b046b4ddbacde50013284a623eb9d81e2c3465b0e04ec9c934a5319293677919ab758243a352fc60cb6691b51f946d8c5a36360b9108dafc5dfe3 SHA512 a0ba9e46a3d2a4cf708e6e29b4647c041495e45865ce5c679c9dcfee77181373a2d3034222701d0f15d5c7e71e6aa3cc7db236c66ba069b3e3660a948b44342f
31
32 diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.96.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.96.ebuild
33 deleted file mode 100644
34 index 9dead90b5a9..00000000000
35 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.96.ebuild
36 +++ /dev/null
37 @@ -1,38 +0,0 @@
38 -# Copyright 1999-2019 Gentoo Authors
39 -# Distributed under the terms of the GNU General Public License v2
40 -
41 -EAPI="6"
42 -JAVA_PKG_IUSE="source"
43 -
44 -inherit eutils java-pkg-2 java-ant-2
45 -
46 -MY_A="apache-${P}-src"
47 -MY_P="${MY_A/-servlet-api/}"
48 -DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
49 -HOMEPAGE="https://tomcat.apache.org/"
50 -SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
51 -
52 -LICENSE="Apache-2.0"
53 -SLOT="3.0"
54 -KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
55 -IUSE=""
56 -
57 -DEPEND=">=virtual/jdk-1.6"
58 -RDEPEND=">=virtual/jre-1.6"
59 -
60 -S="${WORKDIR}/${MY_P}/"
61 -
62 -src_prepare() {
63 - default
64 -
65 - cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
66 - rm -fR */*/build.xml ||die
67 - java-pkg_clean
68 -
69 - java-pkg-2_src_prepare
70 -}
71 -
72 -src_install() {
73 - java-pkg_dojar "${S}"/output/build/lib/*.jar
74 - use source && java-pkg_dosrc java/javax/servlet/
75 -}
76
77 diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.27.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.27.ebuild
78 deleted file mode 100644
79 index 2fcbc10f1d8..00000000000
80 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.27.ebuild
81 +++ /dev/null
82 @@ -1,39 +0,0 @@
83 -# Copyright 1999-2019 Gentoo Authors
84 -# Distributed under the terms of the GNU General Public License v2
85 -
86 -EAPI=7
87 -JAVA_PKG_IUSE="source"
88 -
89 -inherit eutils java-pkg-2 java-ant-2
90 -
91 -MY_A="apache-${PN}-${PV}-src"
92 -MY_P="${MY_A/-servlet-api/}"
93 -DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation"
94 -HOMEPAGE="https://tomcat.apache.org/"
95 -SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
96 -
97 -LICENSE="Apache-2.0"
98 -SLOT="4.0"
99 -KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
100 -IUSE=""
101 -
102 -DEPEND=">=virtual/jdk-1.8"
103 -RDEPEND=">=virtual/jre-1.8"
104 -
105 -S="${WORKDIR}/${MY_P}/"
106 -
107 -src_prepare() {
108 - default
109 -
110 - cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
111 - rm -fR */*/build.xml
112 - einfo "Removing bundled jars and classes"
113 - find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
114 -
115 - java-pkg-2_src_prepare
116 -}
117 -
118 -src_install() {
119 - java-pkg_dojar "${S}"/output/build/lib/*.jar
120 - use source && java-pkg_dosrc java/javax/servlet/
121 -}