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: Sun, 09 Feb 2020 23:44:20
Message-Id: 1581291833.865079ef4395e5c9da3c7ca818ddd063a4e77830.fordfrog@gentoo
1 commit: 865079ef4395e5c9da3c7ca818ddd063a4e77830
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 9 23:43:53 2020 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 9 23:43:53 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=865079ef
7
8 dev-java/tomcat-servlet-api: dropped 9.0.7
9
10 Package-Manager: Portage-2.3.88, Repoman-2.3.20
11 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
12
13 dev-java/tomcat-servlet-api/Manifest | 1 -
14 .../tomcat-servlet-api-9.0.7.ebuild | 39 ----------------------
15 2 files changed, 40 deletions(-)
16
17 diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
18 index 9e6422a2e08..911cabc69db 100644
19 --- a/dev-java/tomcat-servlet-api/Manifest
20 +++ b/dev-java/tomcat-servlet-api/Manifest
21 @@ -9,4 +9,3 @@ DIST apache-tomcat-8.5.50-src.tar.gz 5646813 BLAKE2B cb9ebc0fca2827f1686c28a462b
22 DIST apache-tomcat-9.0.27-src.tar.gz 5761278 BLAKE2B 7d4a65dfa43e0956a5dbb1dad3bf1aa475e7c503d3192ac24921d7cee9bd85379cd820ce693e8c583a7cab23263b0abfa960968d04d766764e222ba8c5bd97d4 SHA512 3f63cbd49f93e6a9d44ea63b4f787cf498930b82d19eaf60603c126b8800d2894d306c27e42ab73b042f3bba9cfb75b6c939b91b8b9141e4903eb1b88c2a4ec8
23 DIST apache-tomcat-9.0.29-src.tar.gz 5783830 BLAKE2B e724bb6b35e9a466d39e95a8004751e982e50cdf303097fef6af1d6b3feac5442d38e1c30c141dbf91cd4b262954f0d266baab489d4e369e6c4056e101d9e6b5 SHA512 f4ea845ea4f6161ebc43f84b66704357ca507afe534d37f7605ccb7a0dfc22e6fdc53507d9c11108f01c458b937033472b8b5b01ecf50d082d21ef90aa516fdd
24 DIST apache-tomcat-9.0.30-src.tar.gz 5798307 BLAKE2B 27e3f238e25f62860852977140e9ab53e4121d200600e842e7b73cf8baa03dd80b678504531ce252c0fefbcc107999983846d6dcf96866f7616f7ebdcf8bc118 SHA512 5a693c26bc78c504ca9c30cab6356927dbeded199798b558f2efe428a98fd68a88e0c113cc7b710fe3b2109e5ae3a970ff3989f909b95eb782d47d12a2a3a20d
25 -DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2
26
27 diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.7.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.7.ebuild
28 deleted file mode 100644
29 index a0340d723de..00000000000
30 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.7.ebuild
31 +++ /dev/null
32 @@ -1,39 +0,0 @@
33 -# Copyright 1999-2018 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI="6"
37 -JAVA_PKG_IUSE="source"
38 -
39 -inherit eutils java-pkg-2 java-ant-2
40 -
41 -MY_A="apache-${PN}-${PV}-src"
42 -MY_P="${MY_A/-servlet-api/}"
43 -DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.4?/EL API 3.1? implementation"
44 -HOMEPAGE="https://tomcat.apache.org/"
45 -SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
46 -
47 -LICENSE="Apache-2.0"
48 -SLOT="4.0"
49 -KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
50 -IUSE=""
51 -
52 -DEPEND=">=virtual/jdk-1.8"
53 -RDEPEND=">=virtual/jre-1.8"
54 -
55 -S="${WORKDIR}/${MY_P}/"
56 -
57 -src_prepare() {
58 - default
59 -
60 - cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
61 - rm -fR */*/build.xml
62 - einfo "Removing bundled jars and classes"
63 - find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
64 -
65 - java-pkg-2_src_prepare
66 -}
67 -
68 -src_install() {
69 - java-pkg_dojar "${S}"/output/build/lib/*.jar
70 - use source && java-pkg_dosrc java/javax/servlet/
71 -}