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, 11 Jan 2019 15:18:49
Message-Id: 1547219912.d028131b181fb2633039b889b9e0c00d9e06d3a5.fordfrog@gentoo
1 commit: d028131b181fb2633039b889b9e0c00d9e06d3a5
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 11 15:04:44 2019 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 11 15:18:32 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d028131b
7
8 dev-java/tomcat-servlet-api: removed obsolete 7.0.x versions
9
10 Package-Manager: Portage-2.3.55, Repoman-2.3.12
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.85.ebuild | 38 ----------------------
15 .../tomcat-servlet-api-7.0.88.ebuild | 38 ----------------------
16 3 files changed, 78 deletions(-)
17
18 diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
19 index e2178fec32e..5d3b0dbf002 100644
20 --- a/dev-java/tomcat-servlet-api/Manifest
21 +++ b/dev-java/tomcat-servlet-api/Manifest
22 @@ -4,8 +4,6 @@ DIST apache-tomcat-5.5.34-src.tar.gz 3720299 BLAKE2B 9ec9171f7fb5aa43a3d7df0d3e0
23 DIST apache-tomcat-6.0.44-src.tar.gz 3447711 BLAKE2B 7baf1fc24a7c9aba7e2ddac63fe0c0975178616bfad8cd625d2910d18ad9b00cd85c98ba4a1ada251119629b96ff464ac623857f6928e3b9465708cdf5bc7513 SHA512 0d6a1539b28fa8ca3442557889d7d21cc523b18136f6998820ba13f41420536aba65ce78bac526002ee1dd86df3cbc80d9f043a3f765d7cf0b79e58e516030be
24 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
25 DIST apache-tomcat-7.0.82-src.tar.gz 4697342 BLAKE2B 1106ed04dc83e64e395de29f01a7752a0578b0c88046eb59614a7cfc0d8a98e3aebb698c8eb56763eea41620d9b42482971c5093304184b1028c6bd8f9770ada SHA512 fc92388d81316de0246df4074c417ffa341eab55308c0694e9ea71c5497c863b42019cd1f38628ff640114c501a06c4e9c428cb2b6f1bc1c16fb337a286718db
26 -DIST apache-tomcat-7.0.85-src.tar.gz 4718223 BLAKE2B 3067709eb143feee5cc1f31cdd8d41c58fb96ed1330560a4064ac3b3eeb030c76ff066c2a2f950d6f2c1576bde214f963f1a12342536a8e2ab8ac179dd166bfb SHA512 f95383b2c77670845cce577161ecf326c3e0f49d456792a53305640289d049b0de80f4b6901bcda52bc4967895f97772591eee525affee1a1d07aac2e60d2044
27 -DIST apache-tomcat-7.0.88-src.tar.gz 4733229 BLAKE2B 2e2009f64ae8f027e93bd7f3cec21f98fbb1f5c741b6525da1638c6188ebe44aa8b43d984abd769385992a997226392c59ec059e408873261a04d9e96a4603c3 SHA512 2ad5c11ec7c5e8e68fba6c0427b0479969a56e7ccb3f0b1ee6c6f139d5f2b718ee9c56f044e982013108ee6e06c43037d0061e539203e95453e9cae7cb38711d
28 DIST apache-tomcat-7.0.90-src.tar.gz 4752747 BLAKE2B 5062ead2756aa8461de5e8387f14838661c082b6e397934fc92c91403f1950d84d79f05b9d4420a973d1b4921515b66c2c847550e1a06d75e722b62d9aa3f8bd SHA512 b32cb6902866ef72337c721d99d77f1a645311bb7694f51b82f7acec500c6197df15fb41be444fc6089652e8c825fb193f1a9de8c1b9b6fabd9d95f784565f6a
29 DIST apache-tomcat-8.0.50-src.tar.gz 5023017 BLAKE2B 862799b7f6a227217c93e1b65aacc49a765b6d11886d0f2278a860c3f4e2b89692cfb724e323d3afe074ad3af3ef8cfd780e4be1ad2f55fee381e5054fbb1941 SHA512 c46efe03cfaadbc2b89063c05c5ec9f315a4eeacdfbf6dd43691c3d23a87d75b23b6679550518d825f8ec7ed853a899ca88cc54c61da9983b025ec7042c3bfff
30 DIST apache-tomcat-8.0.52-src.tar.gz 5039683 BLAKE2B 36318d0ae50fbca3f2a97e0210d0a8da8314f1ef79d0b047971bca30a5b0cc937faf013b5090f6e6b8aec4127b6185dc54ae589f5b57143b62c71c09f8bd5e9d SHA512 6d846213db0b15f9add8d80f30f304afdaf879ab6d7f85d212183a93f4f360ebfeeb079813bdea83cbd13f507504473028bbf8279e89b800b6f150b83086fa56
31
32 diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.85.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.85.ebuild
33 deleted file mode 100644
34 index aeaf64e366f..00000000000
35 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.85.ebuild
36 +++ /dev/null
37 @@ -1,38 +0,0 @@
38 -# Copyright 1999-2018 Gentoo Foundation
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-7.0.88.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.88.ebuild
78 deleted file mode 100644
79 index f0304e00ca2..00000000000
80 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.88.ebuild
81 +++ /dev/null
82 @@ -1,38 +0,0 @@
83 -# Copyright 1999-2018 Gentoo Foundation
84 -# Distributed under the terms of the GNU General Public License v2
85 -
86 -EAPI="6"
87 -JAVA_PKG_IUSE="source"
88 -
89 -inherit eutils java-pkg-2 java-ant-2
90 -
91 -MY_A="apache-${P}-src"
92 -MY_P="${MY_A/-servlet-api/}"
93 -DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
94 -HOMEPAGE="https://tomcat.apache.org/"
95 -SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
96 -
97 -LICENSE="Apache-2.0"
98 -SLOT="3.0"
99 -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
100 -IUSE=""
101 -
102 -DEPEND=">=virtual/jdk-1.6"
103 -RDEPEND=">=virtual/jre-1.6"
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 ||die
112 - java-pkg_clean
113 -
114 - java-pkg-2_src_prepare
115 -}
116 -
117 -src_install() {
118 - java-pkg_dojar "${S}"/output/build/lib/*.jar
119 - use source && java-pkg_dosrc java/javax/servlet/
120 -}