| 1 |
commit: 3b96d51478a1cfb295247cb1e61ba09c264a11b4 |
| 2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 30 09:06:33 2019 +0000 |
| 4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 30 11:34:40 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b96d514 |
| 7 |
|
| 8 |
profiles/package.mask: updated www-server/tomcat masks |
| 9 |
|
| 10 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-java/tomcat-servlet-api/Manifest | 1 + |
| 13 |
.../tomcat-servlet-api-9.0.22.ebuild | 39 ++++++++++++++++++++++ |
| 14 |
profiles/package.mask | 8 ++--- |
| 15 |
3 files changed, 44 insertions(+), 4 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest |
| 18 |
index d64280c935e..59dd56f9834 100644 |
| 19 |
--- a/dev-java/tomcat-servlet-api/Manifest |
| 20 |
+++ b/dev-java/tomcat-servlet-api/Manifest |
| 21 |
@@ -10,5 +10,6 @@ DIST apache-tomcat-8.5.23-src.tar.gz 5086043 BLAKE2B 9bcad0d465aff6da1ba4a846042 |
| 22 |
DIST apache-tomcat-8.5.42-src.tar.gz 5293083 BLAKE2B 4439b6a894aaa8d8db041ff25d3614271d895155d86250e25dfffc8355452d7c230bf81c22f4b75dcdb5cb528af489a8dcad6c93561a89a2aa8cea5173792331 SHA512 e06f3a0cacde6317a1f10f95a17cb7a460c81e3437a68f53da94aafdcbd528e29ed612bd0ffc5f2a3641417558348c4c0e66c1ae937bf709f9f74f79a339ad05 |
| 23 |
DIST apache-tomcat-8.5.43-src.tar.gz 5283886 BLAKE2B 2d76e66eedf4de474d439289a9a491e5c490e2373bc91ae30113b8f3c624255339d24149b58fba640aaf3131ab3c9a449930049d26928627e1b7910f0cddd40f SHA512 f6a0439dbfd3f233bd1eb395d37466ba2cce32cd456d067fb2bb45099ac173dec7e42e7fbfab2cb50c0fce2e9dba1f1afe6c8d65877525cb13cb116489cf27a7 |
| 24 |
DIST apache-tomcat-9.0.21-src.tar.gz 5717051 BLAKE2B 004c5256e72c62e885a9d9040396d144d9fa73789a9699eb38210212f4ca6fa5f98c4b092f6fa2165166fd8cccc892eabcaee7a21570645ee057b0b61d3e1942 SHA512 6df978bbe9bb3a327d784d81a46affa4cfe5d370c2b847e102d25a792752ba487ebae329d1763ed7459cb3d49098c3d0cf6b01155536a04c17c4ffdf9e9a774f |
| 25 |
+DIST apache-tomcat-9.0.22-src.tar.gz 5722896 BLAKE2B 1a006840e870ec01455285b324405e3d1ab7214daf9ea929be749a05149d6b84bcccf34787ba791a31be0d2bb295ede0dddff5053adef885080b31bc39e24ac1 SHA512 b3806caaef24821fb4b96fb1af86e0c04381d9e8943a9f94064e028e623f57b6f2ba056e62f1997bbca934fb929ee92ffecd0d0192dd08d59e2f7dde6848c5cf |
| 26 |
DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2 |
| 27 |
DIST jakarta-servletapi-src.tar.gz 65342 BLAKE2B 03674ca65e0cc509b04a6255d5dd20d26aa5053ed54588e9ba655330c56c9c523c5b382804aee9816cb9aa2ac19cccc1ad288ed06b2af85ba535854bc72bed73 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084 |
| 28 |
|
| 29 |
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.22.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.22.ebuild |
| 30 |
new file mode 100644 |
| 31 |
index 00000000000..e35055493b7 |
| 32 |
--- /dev/null |
| 33 |
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.22.ebuild |
| 34 |
@@ -0,0 +1,39 @@ |
| 35 |
+# Copyright 1999-2019 Gentoo Authors |
| 36 |
+# Distributed under the terms of the GNU General Public License v2 |
| 37 |
+ |
| 38 |
+EAPI="6" |
| 39 |
+JAVA_PKG_IUSE="source" |
| 40 |
+ |
| 41 |
+inherit eutils java-pkg-2 java-ant-2 |
| 42 |
+ |
| 43 |
+MY_A="apache-${PN}-${PV}-src" |
| 44 |
+MY_P="${MY_A/-servlet-api/}" |
| 45 |
+DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.4?/EL API 3.1? implementation" |
| 46 |
+HOMEPAGE="https://tomcat.apache.org/" |
| 47 |
+SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz" |
| 48 |
+ |
| 49 |
+LICENSE="Apache-2.0" |
| 50 |
+SLOT="4.0" |
| 51 |
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" |
| 52 |
+IUSE="" |
| 53 |
+ |
| 54 |
+DEPEND=">=virtual/jdk-1.8" |
| 55 |
+RDEPEND=">=virtual/jre-1.8" |
| 56 |
+ |
| 57 |
+S="${WORKDIR}/${MY_P}/" |
| 58 |
+ |
| 59 |
+src_prepare() { |
| 60 |
+ default |
| 61 |
+ |
| 62 |
+ cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml" |
| 63 |
+ rm -fR */*/build.xml |
| 64 |
+ einfo "Removing bundled jars and classes" |
| 65 |
+ find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} + |
| 66 |
+ |
| 67 |
+ java-pkg-2_src_prepare |
| 68 |
+} |
| 69 |
+ |
| 70 |
+src_install() { |
| 71 |
+ java-pkg_dojar "${S}"/output/build/lib/*.jar |
| 72 |
+ use source && java-pkg_dosrc java/javax/servlet/ |
| 73 |
+} |
| 74 |
|
| 75 |
diff --git a/profiles/package.mask b/profiles/package.mask |
| 76 |
index c557e176654..9b51db7d47e 100644 |
| 77 |
--- a/profiles/package.mask |
| 78 |
+++ b/profiles/package.mask |
| 79 |
@@ -29,6 +29,10 @@ |
| 80 |
|
| 81 |
#--- END OF EXAMPLES --- |
| 82 |
|
| 83 |
+# Miroslav Šulc <fordfrog@g.o> (2019-07-30) |
| 84 |
+# Depends on >=virtual/{jdk,jre}-11 which is masked |
| 85 |
+=www-servers/tomcat-9.0.22 |
| 86 |
+ |
| 87 |
# Michał Górny <mgorny@g.o> (30 Jul 2019) |
| 88 |
# Obsolete virtual that was created back when dev-python/dnspython |
| 89 |
# needed separate slots for py2 & py3. The versions needing it are long |
| 90 |
@@ -241,10 +245,6 @@ x11-plugins/gkrellflynn |
| 91 |
# Unfixed bug, dead upstream, not relevant enough |
| 92 |
sys-fs/pytagsfs |
| 93 |
|
| 94 |
-# Miroslav Šulc <fordfrog@g.o> (2019-05-15) |
| 95 |
-# Depends on >=virtual/{jdk,jre}-11 which is masked |
| 96 |
-=www-servers/tomcat-9.0.20 |
| 97 |
- |
| 98 |
# Andreas K. Hüttel <dilfridge@g.o> (2019-05-11) |
| 99 |
# Perl 5.24 will be removed soon. Please upgrade. |
| 100 |
<dev-lang/perl-5.26.2 |
Archives