| 1 |
commit: 60be1f3ed23678f28fb84532cabe8ee33420ea4a |
| 2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 15 16:57:46 2018 +0000 |
| 4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 15 16:59:58 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60be1f3e |
| 7 |
|
| 8 |
/dev-java/tomcat-servlet-api: version bump for main versions 7.0.x and 8.0.x |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 11 |
|
| 12 |
dev-java/tomcat-servlet-api/Manifest | 2 ++ |
| 13 |
.../tomcat-servlet-api-7.0.85.ebuild | 38 ++++++++++++++++++++++ |
| 14 |
.../tomcat-servlet-api-8.0.50.ebuild | 35 ++++++++++++++++++++ |
| 15 |
3 files changed, 75 insertions(+) |
| 16 |
|
| 17 |
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest |
| 18 |
index 6f66227cd31..57fdedc2036 100644 |
| 19 |
--- a/dev-java/tomcat-servlet-api/Manifest |
| 20 |
+++ b/dev-java/tomcat-servlet-api/Manifest |
| 21 |
@@ -6,8 +6,10 @@ DIST apache-tomcat-6.0.45-src.tar.gz 3494054 BLAKE2B 5dc7ac1c941b3b307ff6ccc53b5 |
| 22 |
DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c |
| 23 |
DIST apache-tomcat-7.0.82-src.tar.gz 4697342 BLAKE2B 1106ed04dc83e64e395de29f01a7752a0578b0c88046eb59614a7cfc0d8a98e3aebb698c8eb56763eea41620d9b42482971c5093304184b1028c6bd8f9770ada SHA512 fc92388d81316de0246df4074c417ffa341eab55308c0694e9ea71c5497c863b42019cd1f38628ff640114c501a06c4e9c428cb2b6f1bc1c16fb337a286718db |
| 24 |
DIST apache-tomcat-7.0.84-src.tar.gz 4713409 BLAKE2B 3dc7766db1492413bbd3f878a2da7392dd4cfd1ca4c3e8a236e380cdfbc0c4ff075665d39871026e61f0bc88e0a84f372fbcef6914af9dc99e6dda05bafc6e48 SHA512 ca6b3f17f56a0b1befafd2efbfa07cbe094fb4ab022a3b5d704d249e551b44c6ef0d9691bd1b7c48ccda957efb43045209d11ca1a4aa0a7875e516e3a233cd74 |
| 25 |
+DIST apache-tomcat-7.0.85-src.tar.gz 4718223 BLAKE2B 3067709eb143feee5cc1f31cdd8d41c58fb96ed1330560a4064ac3b3eeb030c76ff066c2a2f950d6f2c1576bde214f963f1a12342536a8e2ab8ac179dd166bfb SHA512 f95383b2c77670845cce577161ecf326c3e0f49d456792a53305640289d049b0de80f4b6901bcda52bc4967895f97772591eee525affee1a1d07aac2e60d2044 |
| 26 |
DIST apache-tomcat-8.0.48-src.tar.gz 5009969 BLAKE2B 4b1db654d74b02f5fd589590197561496ecfb9b219e445fd18f2e967c78fb95f7fc71a21a6ed9ab5f8c6cee448b74a1729eb3627bcf1a59e2d2748c9c80cc76c SHA512 c56aaa7335c4ef221b2e5de7a7d4946ae1221127f977da5f46a97b062d909abc918b0e6ceb887d98ea5f5b38a26bbe9a3de481972492be593636f6f7e6ef7841 |
| 27 |
DIST apache-tomcat-8.0.49-src.tar.gz 5017328 BLAKE2B a3494c73fc6b9ffecfe7b09380f9fb3a632e167861f876ac827848e6ae5fd41dc9d3f8a0da9d484edd87b88532de05809c8019941d3a2639e925066ff0a8cc87 SHA512 36ae75d37874430ea6b567d8415a9249f104b57afdd8689621f659f6a2c0b229f207e63cdcdfacb1eabd13af567295ff1335cb052abbefe46efdccc20f2d5a73 |
| 28 |
+DIST apache-tomcat-8.0.50-src.tar.gz 5023017 BLAKE2B 862799b7f6a227217c93e1b65aacc49a765b6d11886d0f2278a860c3f4e2b89692cfb724e323d3afe074ad3af3ef8cfd780e4be1ad2f55fee381e5054fbb1941 SHA512 c46efe03cfaadbc2b89063c05c5ec9f315a4eeacdfbf6dd43691c3d23a87d75b23b6679550518d825f8ec7ed853a899ca88cc54c61da9983b025ec7042c3bfff |
| 29 |
DIST apache-tomcat-8.5.11-src.tar.gz 4996153 BLAKE2B c529fc37a12c14c942f4be23751acc0b7fe91de0c84ef3ad7c5a451499a86572d36fd5973dc60bfc97d07cb7d82b4e9a2d36d55eb31cccf2f6b15b2b3fb5d7c7 SHA512 d1a9513535773805c26825f8843fa502e044c9f1ccc22176db5418a7a0abb6d1bcff3db401b449a5867065359abbc8277d14085d807fe00c95dd267d9091620d |
| 30 |
DIST apache-tomcat-8.5.23-src.tar.gz 5086043 BLAKE2B 9bcad0d465aff6da1ba4a846042491bc8d5963283ed1d2530a26ab48289d14e8b85834d24ca476c95a75c1a5f51ee3ecd71c190b9609983cce56b56bc046b6d3 SHA512 2848331553f2c1bc51a4113960c6fe7e2beddf9146341dbfde1a27e2232802cfc364c8e8b988ae862371ca1a3be34665a56a28be9eadf80f8b317e0e2525cbef |
| 31 |
DIST apache-tomcat-8.5.24-src.tar.gz 5101516 BLAKE2B c19c46cca562f0c4c4733608ec007dd423f9a8ed0595bfb835554a7d08be06b791933e4beacbb0fe472589feae82f7d1a46934c0fb68930343cb2f4589bf6530 SHA512 f4ef9a66f2cafb3207c5a38c0f88efc1189e72f02fa88ef2a1b3626a03a57d0ba505b099f6185d747d5ab858aa3f8f3446ae60789312a900ec443eac45233efc |
| 32 |
|
| 33 |
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 |
| 34 |
new file mode 100644 |
| 35 |
index 00000000000..b0fc5f672cf |
| 36 |
--- /dev/null |
| 37 |
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.85.ebuild |
| 38 |
@@ -0,0 +1,38 @@ |
| 39 |
+# Copyright 1999-2018 Gentoo Foundation |
| 40 |
+# Distributed under the terms of the GNU General Public License v2 |
| 41 |
+ |
| 42 |
+EAPI="6" |
| 43 |
+JAVA_PKG_IUSE="source" |
| 44 |
+ |
| 45 |
+inherit eutils java-pkg-2 java-ant-2 |
| 46 |
+ |
| 47 |
+MY_A="apache-${P}-src" |
| 48 |
+MY_P="${MY_A/-servlet-api/}" |
| 49 |
+DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation" |
| 50 |
+HOMEPAGE="https://tomcat.apache.org/" |
| 51 |
+SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz" |
| 52 |
+ |
| 53 |
+LICENSE="Apache-2.0" |
| 54 |
+SLOT="3.0" |
| 55 |
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" |
| 56 |
+IUSE="" |
| 57 |
+ |
| 58 |
+DEPEND=">=virtual/jdk-1.6" |
| 59 |
+RDEPEND=">=virtual/jre-1.6" |
| 60 |
+ |
| 61 |
+S="${WORKDIR}/${MY_P}/" |
| 62 |
+ |
| 63 |
+src_prepare() { |
| 64 |
+ default |
| 65 |
+ |
| 66 |
+ cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml" |
| 67 |
+ rm -fR */*/build.xml ||die |
| 68 |
+ java-pkg_clean |
| 69 |
+ |
| 70 |
+ java-pkg-2_src_prepare |
| 71 |
+} |
| 72 |
+ |
| 73 |
+src_install() { |
| 74 |
+ java-pkg_dojar "${S}"/output/build/lib/*.jar |
| 75 |
+ use source && java-pkg_dosrc java/javax/servlet/ |
| 76 |
+} |
| 77 |
|
| 78 |
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.50.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.50.ebuild |
| 79 |
new file mode 100644 |
| 80 |
index 00000000000..71c284a0ed2 |
| 81 |
--- /dev/null |
| 82 |
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.50.ebuild |
| 83 |
@@ -0,0 +1,35 @@ |
| 84 |
+# Copyright 1999-2018 Gentoo Foundation |
| 85 |
+# Distributed under the terms of the GNU General Public License v2 |
| 86 |
+ |
| 87 |
+EAPI="5" |
| 88 |
+JAVA_PKG_IUSE="source" |
| 89 |
+ |
| 90 |
+inherit eutils java-pkg-2 java-ant-2 |
| 91 |
+ |
| 92 |
+MY_A="apache-${P}-src" |
| 93 |
+MY_P="${MY_A/-servlet-api/}" |
| 94 |
+DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation" |
| 95 |
+HOMEPAGE="https://tomcat.apache.org/" |
| 96 |
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz" |
| 97 |
+ |
| 98 |
+LICENSE="Apache-2.0" |
| 99 |
+SLOT="3.1" |
| 100 |
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" |
| 101 |
+IUSE="" |
| 102 |
+ |
| 103 |
+DEPEND=">=virtual/jdk-1.7" |
| 104 |
+RDEPEND=">=virtual/jre-1.7" |
| 105 |
+ |
| 106 |
+S="${WORKDIR}/${MY_P}/" |
| 107 |
+ |
| 108 |
+java_prepare() { |
| 109 |
+ cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml" |
| 110 |
+ rm -fR */*/build.xml |
| 111 |
+ einfo "Removing bundled jars and classes" |
| 112 |
+ find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} + |
| 113 |
+} |
| 114 |
+ |
| 115 |
+src_install() { |
| 116 |
+ java-pkg_dojar "${S}"/output/build/lib/*.jar |
| 117 |
+ use source && java-pkg_dosrc java/javax/servlet/ |
| 118 |
+} |
Archives