1 |
commit: 27d9fc3eb5395fd1c719cdb644c240cb181c0d6a |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 6 17:20:23 2016 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 6 17:22:31 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27d9fc3e |
7 |
|
8 |
dev-java/tomcat-servlet-api: bump for main versions 8.0, 8.5 and 9.0 |
9 |
|
10 |
Package-Manager: portage-2.3.0 |
11 |
|
12 |
dev-java/tomcat-servlet-api/Manifest | 4 +++- |
13 |
...9.0.0_alpha9.ebuild => tomcat-servlet-api-8.0.37.ebuild} | 13 ++++++------- |
14 |
...-9.0.0_alpha9.ebuild => tomcat-servlet-api-8.5.5.ebuild} | 13 ++++++------- |
15 |
...lpha9.ebuild => tomcat-servlet-api-9.0.0_alpha10.ebuild} | 0 |
16 |
4 files changed, 15 insertions(+), 15 deletions(-) |
17 |
|
18 |
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest |
19 |
index f55eff0..add60f0 100644 |
20 |
--- a/dev-java/tomcat-servlet-api/Manifest |
21 |
+++ b/dev-java/tomcat-servlet-api/Manifest |
22 |
@@ -11,7 +11,9 @@ DIST apache-tomcat-8.0.32-src.tar.gz 4957920 SHA256 b8f7770ae947a0c0aed9b5a6f3e2 |
23 |
DIST apache-tomcat-8.0.33-src.tar.gz 4969308 SHA256 1a141b90111347640df57fe506d9da29ca959e44b5885795df603b621c2ccb4f SHA512 f781c90dd0932082f0d9b154b634f147c909415ebf49242f047d29430e24e16086d392b982e16d13b4d5f848dc98fd6834c0768e1f9c60d99a35d7dad262265d WHIRLPOOL b1ca10a4c0ead57b75bade8f135eb943f4ca291bf85eae75d523b65e9538bd5b25a270a3f27c37d2c7ea6e1e847ed15e9fdcac923ceb8069282189976f9e8727 |
24 |
DIST apache-tomcat-8.0.35-src.tar.gz 4980657 SHA256 420036fde5e1bfe0a3d27299e355ee153b7c547d17c7b52fe4b15a1315d9c4e9 SHA512 c56ba4339fc114cda9a784c7f37be99c82238bbe043f69a3bed2ec86a0bf60325af9105d74cfcffa144636fecc7f4730cee08eca3a22ed035dd5e3e483fa1742 WHIRLPOOL 38d2382eabe19be8b008eb8975ddf95e086b482eb58cb56f566cf4ec7c7628663260a550b611f4db57803e503ab6746aedaac279bff24868c5997eaee3514966 |
25 |
DIST apache-tomcat-8.0.36-src.tar.gz 4988679 SHA256 36db67592adda575fc08dd5f0cd3532934d2edb117028e29bdd9f702bf31ab10 SHA512 192a31eb42afdc345fa5ea5f05b03766e70a67841fca9bd9c76bcd47ae1d505fd3cd1fde6bc64e145add2b6a9e88ecc50ab1a0954942704c139ec3c7a6bf7286 WHIRLPOOL da1bb6570d62caedfe83948f2e850ec7e8bdba36925d1f000067864c98b1bd780aabf2f1cbcb66cb544db292156a98819e9cc6dfa42a345064f09dcc4471a7c3 |
26 |
+DIST apache-tomcat-8.0.37-src.tar.gz 5003508 SHA256 72bfdfeed09f535990d234429ed7b3f1856ee3d0b89168472a40256cc8efcf1d SHA512 cb4da5cf8a056a2a5549914fb405ec66867021da90877415f399b2f4aeb62b776d6d4b1ed176ab53070f7de2525bcde549919f7cbddb2e89945092ae95f914f6 WHIRLPOOL 90218e0b7ab01973ed321ea6bd25f28bfde0534cbe9537d3e931a8ed9ad5eba9592245ff018ddfe241c7ddcc7bd9370b111c3082048f800a5653bb1270fc4ec7 |
27 |
DIST apache-tomcat-8.5.3-src.tar.gz 5001008 SHA256 d0d1ecfd88d733cf3666cc39483ea092627840cd2cfab8fae09f93b7bf05d21d SHA512 7c4da46725c6e34669f538f406e699c235b99b4ec47a289f4fcbf93b49a35082cea3e041bee8a2772a29c240521d8720b2b50b5cda7afe0ec0f2b4f5cb29bda5 WHIRLPOOL 2ad999e8ee068d66164e2a256ee58f47799251fab60cf9af3a67128b131a07116a2faf2da6eef132e13f5df6ed78f1c44ac69bf5615178b63452fbffc62a4852 |
28 |
DIST apache-tomcat-8.5.4-src.tar.gz 5000058 SHA256 bb35d2b37e2ff237e09e389dbfb0a99fa8a71f11c947c20f5bbea375f6f3449d SHA512 65d4d72eb46d75d6985f07c6d630d0b27cafb08f3cf125710b78d29d5737798341d484b1f12ae5cfc7347f9984563213b00a5aaab64f920f65f13a3d6009083d WHIRLPOOL bef3192957e91e4964d84f969961c32a61e4a4b5c8acdfcf56c6f6a87c6f3f4dd4350d099fd9904e07e9e1ba8369fa4e86c54a8e25c26a7c0b6a3518aacd9582 |
29 |
-DIST apache-tomcat-9.0.0.M9-src.tar.gz 5024180 SHA256 aa7e3bc52be5f94ed01c3ecbfe2663452152c996f0104d755cd339a15beb99d4 SHA512 66484a58b97dd5511e6ff3a56db4d290ab7c0dd0c8f661f85b8166905072ac6d5bb6c410aa170457fe09c967175eb881f044421dc75a9561e4609094c6aa0116 WHIRLPOOL 497bdb5dca49f138d4f905ea35a364f07ec5de851096f4b6aa5919bd4f2802ed015d8a762131631bb787434cb63d1ca1047411afba97ad6c55b677873ff241f2 |
30 |
+DIST apache-tomcat-8.5.5-src.tar.gz 5017061 SHA256 28c50366e0b8f16086ab792fbe4c3dba5a716185d0c8c143661b7fed870147c0 SHA512 37b390fe12a356e9621b047d7838027bc33d3c32cb1489957589399f5557e9cf0c788a8a623821e69969983321f233518604629233337355ef7c918ae364f586 WHIRLPOOL b6f79e2acf88aa0980e3726131805b8f5098d887a978ba7d8fb028e261f8ba0fea4da6fafc2f1f4129ff5313011519f7a6cfa827da7bd6778e4ed666ba21a716 |
31 |
+DIST apache-tomcat-9.0.0.M10-src.tar.gz 5046851 SHA256 d1cd106ed13facdc34b7b9416d381df9cd59b49a574585d1afd44ed779a3fe4e SHA512 925ea178448c2d26ec22a70b08ac3e9c55f02a6989759a77eace46abcb4c41ed006253d85253f744ac3b9ac4763babc6ed3f06d53a34e27dd901fef3f5445843 WHIRLPOOL 2f19c21d27767cdcfcfbd2705356d3f6a40918ebe8016bfe6ed268ee36816cbe016f8643d3c55f0d22531754e92a8e1fd17112e2d378f1c17b31b8175442cf2d |
32 |
DIST jakarta-servletapi-src.tar.gz 65342 SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084 WHIRLPOOL beb0e14920a8623d276c8823e6291aacb4b4d5d0539f5de431ce6f94582df9b260d4e04e0d0b650c59f7ca168f4af9352fffbfc0506b2530464a3bcdcf6ac0d1 |
33 |
|
34 |
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.0_alpha9.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.37.ebuild |
35 |
similarity index 73% |
36 |
copy from dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.0_alpha9.ebuild |
37 |
copy to dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.37.ebuild |
38 |
index 225ec0e..7f90a43 100644 |
39 |
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.0_alpha9.ebuild |
40 |
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.37.ebuild |
41 |
@@ -7,20 +7,19 @@ JAVA_PKG_IUSE="source" |
42 |
|
43 |
inherit eutils java-pkg-2 java-ant-2 |
44 |
|
45 |
-MY_PV="${PV/_alpha/.M}" |
46 |
-MY_A="apache-${PN}-${MY_PV}-src" |
47 |
+MY_A="apache-${P}-src" |
48 |
MY_P="${MY_A/-servlet-api/}" |
49 |
-DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.4?/EL API 3.1? implementation" |
50 |
+DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation" |
51 |
HOMEPAGE="http://tomcat.apache.org/" |
52 |
-SRC_URI="mirror://apache/tomcat/tomcat-9/v${MY_PV}/src/${MY_P}.tar.gz" |
53 |
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz" |
54 |
|
55 |
LICENSE="Apache-2.0" |
56 |
-SLOT="4.0" |
57 |
+SLOT="3.1" |
58 |
KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" |
59 |
IUSE="" |
60 |
|
61 |
-DEPEND=">=virtual/jdk-1.8" |
62 |
-RDEPEND=">=virtual/jre-1.8" |
63 |
+DEPEND=">=virtual/jdk-1.7" |
64 |
+RDEPEND=">=virtual/jre-1.7" |
65 |
|
66 |
S="${WORKDIR}/${MY_P}/" |
67 |
|
68 |
|
69 |
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.0_alpha9.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.5.ebuild |
70 |
similarity index 73% |
71 |
copy from dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.0_alpha9.ebuild |
72 |
copy to dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.5.ebuild |
73 |
index 225ec0e..7f90a43 100644 |
74 |
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.0_alpha9.ebuild |
75 |
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.5.ebuild |
76 |
@@ -7,20 +7,19 @@ JAVA_PKG_IUSE="source" |
77 |
|
78 |
inherit eutils java-pkg-2 java-ant-2 |
79 |
|
80 |
-MY_PV="${PV/_alpha/.M}" |
81 |
-MY_A="apache-${PN}-${MY_PV}-src" |
82 |
+MY_A="apache-${P}-src" |
83 |
MY_P="${MY_A/-servlet-api/}" |
84 |
-DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.4?/EL API 3.1? implementation" |
85 |
+DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation" |
86 |
HOMEPAGE="http://tomcat.apache.org/" |
87 |
-SRC_URI="mirror://apache/tomcat/tomcat-9/v${MY_PV}/src/${MY_P}.tar.gz" |
88 |
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz" |
89 |
|
90 |
LICENSE="Apache-2.0" |
91 |
-SLOT="4.0" |
92 |
+SLOT="3.1" |
93 |
KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" |
94 |
IUSE="" |
95 |
|
96 |
-DEPEND=">=virtual/jdk-1.8" |
97 |
-RDEPEND=">=virtual/jre-1.8" |
98 |
+DEPEND=">=virtual/jdk-1.7" |
99 |
+RDEPEND=">=virtual/jre-1.7" |
100 |
|
101 |
S="${WORKDIR}/${MY_P}/" |
102 |
|
103 |
|
104 |
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.0_alpha9.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.0_alpha10.ebuild |
105 |
similarity index 100% |
106 |
rename from dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.0_alpha9.ebuild |
107 |
rename to dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.0_alpha10.ebuild |