1 |
commit: d61403ef5858ee0634ca41f9f3b0ec23d4253ce8 |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 13 17:21:15 2018 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 13 17:23:37 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d61403ef |
7 |
|
8 |
dev-java/tomcat-servlet-api: version bump for versions 8.5.x and 9.0.x |
9 |
|
10 |
dev-java/tomcat-servlet-api/Manifest | 2 ++ |
11 |
.../tomcat-servlet-api-8.5.28.ebuild | 39 ++++++++++++++++++++++ |
12 |
.../tomcat-servlet-api-9.0.5.ebuild | 39 ++++++++++++++++++++++ |
13 |
3 files changed, 80 insertions(+) |
14 |
|
15 |
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest |
16 |
index 3558cdcb568..6f66227cd31 100644 |
17 |
--- a/dev-java/tomcat-servlet-api/Manifest |
18 |
+++ b/dev-java/tomcat-servlet-api/Manifest |
19 |
@@ -12,5 +12,7 @@ DIST apache-tomcat-8.5.11-src.tar.gz 4996153 BLAKE2B c529fc37a12c14c942f4be23751 |
20 |
DIST apache-tomcat-8.5.23-src.tar.gz 5086043 BLAKE2B 9bcad0d465aff6da1ba4a846042491bc8d5963283ed1d2530a26ab48289d14e8b85834d24ca476c95a75c1a5f51ee3ecd71c190b9609983cce56b56bc046b6d3 SHA512 2848331553f2c1bc51a4113960c6fe7e2beddf9146341dbfde1a27e2232802cfc364c8e8b988ae862371ca1a3be34665a56a28be9eadf80f8b317e0e2525cbef |
21 |
DIST apache-tomcat-8.5.24-src.tar.gz 5101516 BLAKE2B c19c46cca562f0c4c4733608ec007dd423f9a8ed0595bfb835554a7d08be06b791933e4beacbb0fe472589feae82f7d1a46934c0fb68930343cb2f4589bf6530 SHA512 f4ef9a66f2cafb3207c5a38c0f88efc1189e72f02fa88ef2a1b3626a03a57d0ba505b099f6185d747d5ab858aa3f8f3446ae60789312a900ec443eac45233efc |
22 |
DIST apache-tomcat-8.5.27-src.tar.gz 5123614 BLAKE2B 0051a7b5a9d3529a012338e0b12ed5fca218fc6740a0c576d3195a9c7848a78d93d0a6151541e314d82723de1b533b28024eeb231e33b21c38a2c4f702007415 SHA512 d3cac3d618283f0c26f861df67223fcb889da750f5e42563ec2ebc17d72169a7639d05d4d42fe403f4e49052962da09bc4b312b012c31309d8a096036baec8ab |
23 |
+DIST apache-tomcat-8.5.28-src.tar.gz 5128929 BLAKE2B fe862a44fe57a50502b95d6f31863567b5596b183355a75fb7b75827a697299878920cc5ca5c24ffcdabae885a893266f40f174c76c32f449bec31e7a1be489b SHA512 55970e8babc1fde783e6e9f67a221012cae88e871391aa751e3c87c0fc7e58cd45662f025dc286dd529caced317dada48bb65786f87b44abbc9ce16f0d8fb0b5 |
24 |
DIST apache-tomcat-9.0.4-src.tar.gz 5073991 BLAKE2B 7efffbba395d78d5ab051dd2bdb7a1491cb04159421bec17deebcb901bbca5cfec67a651f8e1fcd9a394ba3e0650fc61e7da039f0f979ae60a87f477bc4bc3b8 SHA512 bb8777f6fff861a53381b15a4196053abd9cc01e080f0511032f69eb6f57f5c6ed0eafd8a94155f19a4654bce4fad39e0fcaa2e5473cb269bceeb46a2ea43557 |
25 |
+DIST apache-tomcat-9.0.5-src.tar.gz 5077379 BLAKE2B db345767f6c35557054c33d789fc40b1d2071501130bec57df41bb3fdf6f8be5260c0faed317b9fe6fa40474f9de1f29c6a71039eb0b7d07fee4ee0109ac16e4 SHA512 4d0b24dcf26b94f4280382f64bcdeb74f24b69b86b1410ad40d4a0284d6787809485f7c2501b66126d778a73a5c3eb155856ac6d3b3e2a477d1742d8588c1e84 |
26 |
DIST jakarta-servletapi-src.tar.gz 65342 BLAKE2B 03674ca65e0cc509b04a6255d5dd20d26aa5053ed54588e9ba655330c56c9c523c5b382804aee9816cb9aa2ac19cccc1ad288ed06b2af85ba535854bc72bed73 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084 |
27 |
|
28 |
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.28.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.28.ebuild |
29 |
new file mode 100644 |
30 |
index 00000000000..ee8c1d72fb5 |
31 |
--- /dev/null |
32 |
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.28.ebuild |
33 |
@@ -0,0 +1,39 @@ |
34 |
+# Copyright 1999-2018 Gentoo Foundation |
35 |
+# Distributed under the terms of the GNU General Public License v2 |
36 |
+ |
37 |
+EAPI="6" |
38 |
+JAVA_PKG_IUSE="source" |
39 |
+ |
40 |
+inherit eutils java-pkg-2 java-ant-2 |
41 |
+ |
42 |
+MY_A="apache-${P}-src" |
43 |
+MY_P="${MY_A/-servlet-api/}" |
44 |
+DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation" |
45 |
+HOMEPAGE="https://tomcat.apache.org/" |
46 |
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz" |
47 |
+ |
48 |
+LICENSE="Apache-2.0" |
49 |
+SLOT="3.1" |
50 |
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" |
51 |
+IUSE="" |
52 |
+ |
53 |
+DEPEND=">=virtual/jdk-1.7" |
54 |
+RDEPEND=">=virtual/jre-1.7" |
55 |
+ |
56 |
+S="${WORKDIR}/${MY_P}/" |
57 |
+ |
58 |
+src_prepare() { |
59 |
+ default |
60 |
+ |
61 |
+ cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml" |
62 |
+ rm -fR */*/build.xml |
63 |
+ einfo "Removing bundled jars and classes" |
64 |
+ find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} + |
65 |
+ |
66 |
+ java-pkg-2_src_prepare |
67 |
+} |
68 |
+ |
69 |
+src_install() { |
70 |
+ java-pkg_dojar "${S}"/output/build/lib/*.jar |
71 |
+ use source && java-pkg_dosrc java/javax/servlet/ |
72 |
+} |
73 |
|
74 |
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.5.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.5.ebuild |
75 |
new file mode 100644 |
76 |
index 00000000000..16548ef959d |
77 |
--- /dev/null |
78 |
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.5.ebuild |
79 |
@@ -0,0 +1,39 @@ |
80 |
+# Copyright 1999-2018 Gentoo Foundation |
81 |
+# Distributed under the terms of the GNU General Public License v2 |
82 |
+ |
83 |
+EAPI="6" |
84 |
+JAVA_PKG_IUSE="source" |
85 |
+ |
86 |
+inherit eutils java-pkg-2 java-ant-2 |
87 |
+ |
88 |
+MY_A="apache-${PN}-${PV}-src" |
89 |
+MY_P="${MY_A/-servlet-api/}" |
90 |
+DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.4?/EL API 3.1? implementation" |
91 |
+HOMEPAGE="https://tomcat.apache.org/" |
92 |
+SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz" |
93 |
+ |
94 |
+LICENSE="Apache-2.0" |
95 |
+SLOT="4.0" |
96 |
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" |
97 |
+IUSE="" |
98 |
+ |
99 |
+DEPEND=">=virtual/jdk-1.8" |
100 |
+RDEPEND=">=virtual/jre-1.8" |
101 |
+ |
102 |
+S="${WORKDIR}/${MY_P}/" |
103 |
+ |
104 |
+src_prepare() { |
105 |
+ default |
106 |
+ |
107 |
+ cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml" |
108 |
+ rm -fR */*/build.xml |
109 |
+ einfo "Removing bundled jars and classes" |
110 |
+ find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} + |
111 |
+ |
112 |
+ java-pkg-2_src_prepare |
113 |
+} |
114 |
+ |
115 |
+src_install() { |
116 |
+ java-pkg_dojar "${S}"/output/build/lib/*.jar |
117 |
+ use source && java-pkg_dosrc java/javax/servlet/ |
118 |
+} |