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: Tue, 30 Jul 2019 11:39:06
Message-Id: 1564486480.1ab778ce1cf03cc31306edc8b6f82d2e8bf21bd8.fordfrog@gentoo
1 commit: 1ab778ce1cf03cc31306edc8b6f82d2e8bf21bd8
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jul 30 08:41:06 2019 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Tue Jul 30 11:34:40 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ab778ce
7
8 dev-java/tomcat-servlet-api: removed obsolete
9
10 Package-Manager: Portage-2.3.69, Repoman-2.3.16
11 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
12
13 dev-java/tomcat-servlet-api/Manifest | 2 --
14 .../tomcat-servlet-api-8.5.41.ebuild | 39 ----------------------
15 .../tomcat-servlet-api-9.0.20.ebuild | 39 ----------------------
16 3 files changed, 80 deletions(-)
17
18 diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
19 index 9bbc22de9a4..58056bfb85a 100644
20 --- a/dev-java/tomcat-servlet-api/Manifest
21 +++ b/dev-java/tomcat-servlet-api/Manifest
22 @@ -7,9 +7,7 @@ DIST apache-tomcat-7.0.82-src.tar.gz 4697342 BLAKE2B 1106ed04dc83e64e395de29f01a
23 DIST apache-tomcat-7.0.94-src.tar.gz 4966331 BLAKE2B e806baa91ebe4672fb238d6fd461b2055ff90db822b7edb2ad4432334d45cf2c2286639bc12f83987972a47129493bef4ba6ec77e544a93e000282a2d24ae9e8 SHA512 5e8d2fab7145af5677170299bec0ae5ea5fd20b7a539738678a420581f9b53a95a6fbb1caffb54c7222d97edfe8ff34ce6dbb7ba62adb1a61f2bfa6b15c43139
24 DIST apache-tomcat-8.0.53-src.tar.gz 5057041 BLAKE2B 3a50d2f61baecb5244909972384e36478c69e7592dd35119d8b7b974273c57a4855082f309146ed160144dbdcced3236fd586b047970bd8558bbe7b7e002e9fd SHA512 0b56bc723277b2888896ab34ec3e49cb56bac94ddf1a9b96bd023982e2ffabd5317f63b3c0971afdc8cd7a6364197409df461d22151dbaab3a2be7daf6858b9e
25 DIST apache-tomcat-8.5.23-src.tar.gz 5086043 BLAKE2B 9bcad0d465aff6da1ba4a846042491bc8d5963283ed1d2530a26ab48289d14e8b85834d24ca476c95a75c1a5f51ee3ecd71c190b9609983cce56b56bc046b6d3 SHA512 2848331553f2c1bc51a4113960c6fe7e2beddf9146341dbfde1a27e2232802cfc364c8e8b988ae862371ca1a3be34665a56a28be9eadf80f8b317e0e2525cbef
26 -DIST apache-tomcat-8.5.41-src.tar.gz 5285992 BLAKE2B 8055591319c475cda9e8124107fef94f31837095ecfcbd6388f226d09fbe14825988c956257b90a7eb36068546fd7c2958fb5f63870d8eff30a72d2c8309bb97 SHA512 59f5ffa64e8fb445b86a9413e0bc3aee3ba87a727ad5ed2c5aa1a20653068530e85d59407b2907483341d3721c6d6da52bf41c02138abc1b1ec97395b9ee727f
27 DIST apache-tomcat-8.5.42-src.tar.gz 5293083 BLAKE2B 4439b6a894aaa8d8db041ff25d3614271d895155d86250e25dfffc8355452d7c230bf81c22f4b75dcdb5cb528af489a8dcad6c93561a89a2aa8cea5173792331 SHA512 e06f3a0cacde6317a1f10f95a17cb7a460c81e3437a68f53da94aafdcbd528e29ed612bd0ffc5f2a3641417558348c4c0e66c1ae937bf709f9f74f79a339ad05
28 -DIST apache-tomcat-9.0.20-src.tar.gz 5702073 BLAKE2B 80170a2b6bdb525f186814458f78211cdd7717178d5cb816b39a0c83b637434f276884c9da42e12ef04e1f43261ef36cf0508178157f5ea43a96289d2de27ecb SHA512 3635212ff28ca491243ae0f0edf0572ca82f583286296f302c5d02f93917d218e9601cbf90cb022c2f2b6b4f17c3460d74aee19b13caff9d12222ee028ee09dd
29 DIST apache-tomcat-9.0.21-src.tar.gz 5717051 BLAKE2B 004c5256e72c62e885a9d9040396d144d9fa73789a9699eb38210212f4ca6fa5f98c4b092f6fa2165166fd8cccc892eabcaee7a21570645ee057b0b61d3e1942 SHA512 6df978bbe9bb3a327d784d81a46affa4cfe5d370c2b847e102d25a792752ba487ebae329d1763ed7459cb3d49098c3d0cf6b01155536a04c17c4ffdf9e9a774f
30 DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2
31 DIST jakarta-servletapi-src.tar.gz 65342 BLAKE2B 03674ca65e0cc509b04a6255d5dd20d26aa5053ed54588e9ba655330c56c9c523c5b382804aee9816cb9aa2ac19cccc1ad288ed06b2af85ba535854bc72bed73 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084
32
33 diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.41.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.41.ebuild
34 deleted file mode 100644
35 index 640c06837c8..00000000000
36 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.41.ebuild
37 +++ /dev/null
38 @@ -1,39 +0,0 @@
39 -# Copyright 1999-2019 Gentoo Authors
40 -# Distributed under the terms of the GNU General Public License v2
41 -
42 -EAPI="6"
43 -JAVA_PKG_IUSE="source"
44 -
45 -inherit eutils java-pkg-2 java-ant-2
46 -
47 -MY_A="apache-${P}-src"
48 -MY_P="${MY_A/-servlet-api/}"
49 -DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
50 -HOMEPAGE="https://tomcat.apache.org/"
51 -SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
52 -
53 -LICENSE="Apache-2.0"
54 -SLOT="3.1"
55 -KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
56 -IUSE=""
57 -
58 -DEPEND=">=virtual/jdk-1.7"
59 -RDEPEND=">=virtual/jre-1.7"
60 -
61 -S="${WORKDIR}/${MY_P}/"
62 -
63 -src_prepare() {
64 - default
65 -
66 - cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
67 - rm -fR */*/build.xml
68 - einfo "Removing bundled jars and classes"
69 - find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
70 -
71 - java-pkg-2_src_prepare
72 -}
73 -
74 -src_install() {
75 - java-pkg_dojar "${S}"/output/build/lib/*.jar
76 - use source && java-pkg_dosrc java/javax/servlet/
77 -}
78
79 diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.20.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.20.ebuild
80 deleted file mode 100644
81 index d66f7a81553..00000000000
82 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.20.ebuild
83 +++ /dev/null
84 @@ -1,39 +0,0 @@
85 -# Copyright 1999-2019 Gentoo Authors
86 -# Distributed under the terms of the GNU General Public License v2
87 -
88 -EAPI="6"
89 -JAVA_PKG_IUSE="source"
90 -
91 -inherit eutils java-pkg-2 java-ant-2
92 -
93 -MY_A="apache-${PN}-${PV}-src"
94 -MY_P="${MY_A/-servlet-api/}"
95 -DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.4?/EL API 3.1? implementation"
96 -HOMEPAGE="https://tomcat.apache.org/"
97 -SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
98 -
99 -LICENSE="Apache-2.0"
100 -SLOT="4.0"
101 -KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
102 -IUSE=""
103 -
104 -DEPEND=">=virtual/jdk-1.8"
105 -RDEPEND=">=virtual/jre-1.8"
106 -
107 -S="${WORKDIR}/${MY_P}/"
108 -
109 -src_prepare() {
110 - default
111 -
112 - cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
113 - rm -fR */*/build.xml
114 - einfo "Removing bundled jars and classes"
115 - find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
116 -
117 - java-pkg-2_src_prepare
118 -}
119 -
120 -src_install() {
121 - java-pkg_dojar "${S}"/output/build/lib/*.jar
122 - use source && java-pkg_dosrc java/javax/servlet/
123 -}