| 1 |
commit: 75dc9ce6341d051342f63e9e021020bf004c60a0 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 21 20:02:14 2020 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 21 20:02:24 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75dc9ce6 |
| 7 |
|
| 8 |
Revert "dev-java/tomcat-servlet-api: removed obsolete versions" |
| 9 |
|
| 10 |
This reverts commit d8743e9b9a454f502711c95b7fa6776ac247ebf1. |
| 11 |
|
| 12 |
Still needed by dev-java/{cdi-api,osgi-compendium,portletapi}. |
| 13 |
|
| 14 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 15 |
|
| 16 |
dev-java/tomcat-servlet-api/Manifest | 2 ++ |
| 17 |
.../tomcat-servlet-api-7.0.103.ebuild | 38 +++++++++++++++++++++ |
| 18 |
.../tomcat-servlet-api-8.5.54.ebuild | 39 ++++++++++++++++++++++ |
| 19 |
3 files changed, 79 insertions(+) |
| 20 |
|
| 21 |
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest |
| 22 |
index efdbf7f1eda..70f693bdfb5 100644 |
| 23 |
--- a/dev-java/tomcat-servlet-api/Manifest |
| 24 |
+++ b/dev-java/tomcat-servlet-api/Manifest |
| 25 |
@@ -1,7 +1,9 @@ |
| 26 |
DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc3871beeddccdb4cfed05ba176581ebb50f52ba867bed8dbc500e97b7348a3a87b9693fb73eb81209df4f31e8c1ced7e30a6af30b SHA512 c455fa3da9da8fcbf1d54ae5dce808f8a4520ccafd627a6b2d1b003c37e8395d8b2a55d5471bf6c196549d082715862b3b8958aef88613293a07fc0160aa5c6e |
| 27 |
DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7 |
| 28 |
DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c |
| 29 |
+DIST apache-tomcat-7.0.103-src.tar.gz 5279592 BLAKE2B a8ab36fb84cf158fcd8b888276576cd523d211ab0f6fe0933f600d1990a8f68076f192177a574987e52440037c0ebefd3edaf3c84fee541afb076c5ad33cce9b SHA512 812fce83c7242ebc16dc2365f0b363f1fb2691cd6a2f19f1209ea467557c42ee2d108c8bef89f23bb4a20c800d0ecdb4afc37567ef8079966b4eec0331a2ef9b |
| 30 |
DIST apache-tomcat-7.0.104-src.tar.gz 5309794 BLAKE2B 0d4d5d668e1131bb533af1d56fe37ee1f5c252c2c4dd987e24aae67484f27805f88750b27248c6acfd0585eacd0d3f2155c723e9a25c8613652101944add2a15 SHA512 788eab3ac343815362decf4c0d5db91f3697cc669e7e051f93bf82905cc52f9b040d00b7e07f7b85bcf470e802418896a678f991e523e08a3ae5a2f212a53257 |
| 31 |
+DIST apache-tomcat-8.5.54-src.tar.gz 5689648 BLAKE2B 7d4c80cb86261bba46b1879d8f2b9218a63cfb069d32dfe72bd5d73baf87887cdff37c5841c44196ded1dbafcfe2d525cb09d8a15905c24600caf107255416cf SHA512 fe4a82fc58aed0df203abf03367f840d7ac498a3ba317eb2b08826e8ab5e705ea13b99f3af1e17878b2cf96271c5d9ff4e7cecf3b2631e061f1b02988449f9e2 |
| 32 |
DIST apache-tomcat-8.5.55-src.tar.gz 5719386 BLAKE2B 4d5d20cf81e0a9aba1fe2b0fc2e9641696a2c7b4bfe1cefd1e86025612484ef06a8171e28722bcde91b671df5bd6e148b22c2fc267828109c6af762fe35f8fdb SHA512 214758bf4dc868c38fd92a19e405f3cd8e47008dee82610f8f7373d92ab5f8800c160a42c96c293f599b702c1c9d2967ca40d3410c1f6a14745edac4739f177d |
| 33 |
DIST apache-tomcat-9.0.34-src.tar.gz 5843244 BLAKE2B e4124c5986b0be26f17cf5e62443fa945ebea6dd713db6a7f96c8e4c7eed7d8e38610763adda928a7099c1574b00e072635576d9d29cc8ae1b98658f0e341acb SHA512 8ac8a916bfe2d3daf679dab9f299bc50f138f3cc9a6e8679a22862d122dea1e5ce3b9101472295398366f5b5d8477097a3cfb536f01136e72ff09d69b2f6c3df |
| 34 |
DIST apache-tomcat-9.0.35-src.tar.gz 5887816 BLAKE2B 8103a50a62aa527861fdc35ce8256d9ff0b7185bfa647e25c30c226f9850e88632e0c1e3575bac3a07513fe9c9777b4ef230275e685f48b0bbc733bc68ff7dad SHA512 8931c0f7c30f50d352879f8dfddc02fa59d7128813399e4eca3994be7cf2448e32e726a3cb8b387a5470ccbfa3fb74d0192c825b5f68bbb9fb6b43a9353cb24a |
| 35 |
|
| 36 |
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.103.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.103.ebuild |
| 37 |
new file mode 100644 |
| 38 |
index 00000000000..0bd7295e539 |
| 39 |
--- /dev/null |
| 40 |
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.103.ebuild |
| 41 |
@@ -0,0 +1,38 @@ |
| 42 |
+# Copyright 1999-2020 Gentoo Authors |
| 43 |
+# Distributed under the terms of the GNU General Public License v2 |
| 44 |
+ |
| 45 |
+EAPI=7 |
| 46 |
+JAVA_PKG_IUSE="source" |
| 47 |
+ |
| 48 |
+inherit eutils java-pkg-2 java-ant-2 |
| 49 |
+ |
| 50 |
+MY_A="apache-${P}-src" |
| 51 |
+MY_P="${MY_A/-servlet-api/}" |
| 52 |
+DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation" |
| 53 |
+HOMEPAGE="https://tomcat.apache.org/" |
| 54 |
+SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz" |
| 55 |
+ |
| 56 |
+LICENSE="Apache-2.0" |
| 57 |
+SLOT="3.0" |
| 58 |
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" |
| 59 |
+IUSE="" |
| 60 |
+ |
| 61 |
+DEPEND=">=virtual/jdk-1.6" |
| 62 |
+RDEPEND=">=virtual/jre-1.6" |
| 63 |
+ |
| 64 |
+S="${WORKDIR}/${MY_P}/" |
| 65 |
+ |
| 66 |
+src_prepare() { |
| 67 |
+ default |
| 68 |
+ |
| 69 |
+ cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml" |
| 70 |
+ rm -fR */*/build.xml ||die |
| 71 |
+ java-pkg_clean |
| 72 |
+ |
| 73 |
+ java-pkg-2_src_prepare |
| 74 |
+} |
| 75 |
+ |
| 76 |
+src_install() { |
| 77 |
+ java-pkg_dojar "${S}"/output/build/lib/*.jar |
| 78 |
+ use source && java-pkg_dosrc java/javax/servlet/ |
| 79 |
+} |
| 80 |
|
| 81 |
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.54.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.54.ebuild |
| 82 |
new file mode 100644 |
| 83 |
index 00000000000..085f83e7999 |
| 84 |
--- /dev/null |
| 85 |
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.54.ebuild |
| 86 |
@@ -0,0 +1,39 @@ |
| 87 |
+# Copyright 1999-2020 Gentoo Authors |
| 88 |
+# Distributed under the terms of the GNU General Public License v2 |
| 89 |
+ |
| 90 |
+EAPI=7 |
| 91 |
+JAVA_PKG_IUSE="source" |
| 92 |
+ |
| 93 |
+inherit eutils java-pkg-2 java-ant-2 |
| 94 |
+ |
| 95 |
+MY_A="apache-${P}-src" |
| 96 |
+MY_P="${MY_A/-servlet-api/}" |
| 97 |
+DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation" |
| 98 |
+HOMEPAGE="https://tomcat.apache.org/" |
| 99 |
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz" |
| 100 |
+ |
| 101 |
+LICENSE="Apache-2.0" |
| 102 |
+SLOT="3.1" |
| 103 |
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" |
| 104 |
+IUSE="" |
| 105 |
+ |
| 106 |
+DEPEND=">=virtual/jdk-1.8" |
| 107 |
+RDEPEND=">=virtual/jre-1.8" |
| 108 |
+ |
| 109 |
+S="${WORKDIR}/${MY_P}/" |
| 110 |
+ |
| 111 |
+src_prepare() { |
| 112 |
+ default |
| 113 |
+ |
| 114 |
+ cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml" |
| 115 |
+ rm -fR */*/build.xml |
| 116 |
+ einfo "Removing bundled jars and classes" |
| 117 |
+ find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} + |
| 118 |
+ |
| 119 |
+ java-pkg-2_src_prepare |
| 120 |
+} |
| 121 |
+ |
| 122 |
+src_install() { |
| 123 |
+ java-pkg_dojar "${S}"/output/build/lib/*.jar |
| 124 |
+ use source && java-pkg_dosrc java/javax/servlet/ |
| 125 |
+} |
Archives