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, 22 Dec 2020 13:14:30
Message-Id: 1608642856.b2c3ac2ea1175381588956bebe44ab269600b823.fordfrog@gentoo
1 commit: b2c3ac2ea1175381588956bebe44ab269600b823
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 22 13:14:16 2020 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 22 13:14:16 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2c3ac2e
7
8 dev-java/tomcat-servlet-api: removed obsolete 8.5.59 & 9.0.38
9
10 Package-Manager: Portage-3.0.12, Repoman-3.0.2
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.59.ebuild | 39 ----------------------
15 .../tomcat-servlet-api-9.0.38.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 43ca41f08e7..08356ec855c 100644
20 --- a/dev-java/tomcat-servlet-api/Manifest
21 +++ b/dev-java/tomcat-servlet-api/Manifest
22 @@ -3,9 +3,7 @@ DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e
23 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
24 DIST apache-tomcat-7.0.106-src.tar.gz 5302091 BLAKE2B f60975ef5570501b03e71645969170c44450f2b56f37688001ad1b4dce3a394f6800e9b28a8fabf59241116345fb7e2a287441f3eace020bc5c0203d57630c91 SHA512 5ce5a5af93c58e69c4758c2c0dedeadeceb6be920421b9d3b3d071d32fc8eb59ba8312c98d037b8434fe43d57a9f720ad8790de29a26ed2959f6c761fe1fd573
25 DIST apache-tomcat-7.0.107-src.tar.gz 5312698 BLAKE2B 1f2712ddce6aa604692aaf6a6c706469d3dbcb2266a99e62346c15b8347fff573608440473be8e20b8632a431f8838dd29f24f6bf630a13d262c444be68e0d2c SHA512 820923697c487367786c595d3aeaa58981d25b56529c6739b9388ad771f3264e6995f7659805cc5b2ef9456dbd42bad92ad2cfa3c7f741920a5b7bff2cc1bb1b
26 -DIST apache-tomcat-8.5.59-src.tar.gz 5787634 BLAKE2B 8ca1aa8b4d12d0e73c0d7937e906530037168ac349b196e172935332e632b1e9ab15379f532cb8fb1b2f853d01567332af9c031393882c833dcea65f9e626b09 SHA512 bed80e86c4dc972fd6ad414a804ed2bffc797e22b0a5e0e6e93c8540fb87cffb2fd2f1f8d97873a3ee24397f7961a8fdeb6756c542a532e4b73468bccec6e626
27 DIST apache-tomcat-8.5.60-src.tar.gz 5837412 BLAKE2B 0c2200412900f7f6d318051333b15b8c6236e00f6194c21fc45bb95b565c4146e2682b879f3a293de3ab65524013f786a7f69dd7e91f1c4cc903179075253cc4 SHA512 43222e5d04b3de400429d6f1792d418172b6ff15dcc17e392cd66a5444d740a323b9c426a9f39678b3460452545fda4d784f56961d5ea56b9c0e1ca466d49040
28 DIST apache-tomcat-8.5.61-src.tar.gz 5840559 BLAKE2B 18e1505b6b7d8e1a024d9f834d33ef105a16e6fc1f9e80abd3e6e88b2326597b9973e13c2ebc030a1db4a2d4dc5572d195b9f61db6cb7bf51e97cbfaa121678a SHA512 fd6bb5926b5e7cf44f359c93dadc4edd87fa5f2e26fb0fb3a9bc0a5c89ae4d844d66872055e1b441392cf03d7690aca3429b66afd8334319784f089f821d8c22
29 -DIST apache-tomcat-9.0.38-src.tar.gz 5948083 BLAKE2B ac076684f10a51bf0e0b5b0dbf18ee476ec900bead0089010de7b4a7d380a1e18035eaa0d0f661c863aa53491e51f719c2a5985e4791bcc9dada4c421db39fe7 SHA512 13c79abed71ead564b108ec8a046e78374611acd906f4b6e775ac0427446117192be6b25f29894e625e2dc13f79abbc97bc52b32120ce5701cbe0f5ae05bc57b
30 DIST apache-tomcat-9.0.40-src.tar.gz 6017562 BLAKE2B 1c90511911363bb3b154124382f6401851c3a0e7925e06cc8f2b4f02a7b4c1c59bc75007a8b387f06742cbeca7f840b6860d84dc7c6fdb1e7774b22dbca6082f SHA512 61b8e191315cee2bc0437013dbe7d1fb3451182e0b316fb377581c7d47a59cefb7f2ff30d96a2d6326a99c86f4151b26d1ef76bda5029b30d81c8297a0b362fb
31 DIST apache-tomcat-9.0.41-src.tar.gz 6022059 BLAKE2B 6e97390aec956c16f271e57a2fa8805b6f49f593434f0dff8d82e14bc9abc199b00a7523dbb8da335a7ffa9dfee6790430c30f8b0ee90bcd133694c8da42197f SHA512 094e7cbd2519a4b812a2ca865f92802ece3385a20826c5e29b5f7cda8b9265d01ede6f598999f8aa2f1b04bcaca2e67e3f0132781b3f22007356df49ab6b1838
32
33 diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.59.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.59.ebuild
34 deleted file mode 100644
35 index 05c60361600..00000000000
36 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.59.ebuild
37 +++ /dev/null
38 @@ -1,39 +0,0 @@
39 -# Copyright 1999-2020 Gentoo Authors
40 -# Distributed under the terms of the GNU General Public License v2
41 -
42 -EAPI=7
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 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
56 -IUSE=""
57 -
58 -DEPEND=">=virtual/jdk-1.8"
59 -RDEPEND=">=virtual/jre-1.8"
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.38.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.38.ebuild
80 deleted file mode 100644
81 index 03712ddc01a..00000000000
82 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.38.ebuild
83 +++ /dev/null
84 @@ -1,39 +0,0 @@
85 -# Copyright 1999-2020 Gentoo Authors
86 -# Distributed under the terms of the GNU General Public License v2
87 -
88 -EAPI=7
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.3/EL API 3.0 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 ~arm ~arm64 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 -}