[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: bd8636277c8eab76b2b99f6b5e3722d9139f1505
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Fri Jun  7 05:44:45 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Jun  7 06:38:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd863627

www-servers/tomcat: drop 9.0.88-r1

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/36868
Signed-off-by: Miroslav Šulc  gentoo.org>

 www-servers/tomcat/Manifest|   2 -
 .../files/tomcat-9.0.37-fix-build-rewrite.patch|  11 --
 www-servers/tomcat/tomcat-9.0.88-r1.ebuild | 168 -
 3 files changed, 181 deletions(-)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 0337e14c3fcf..e0144b71cd34 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -4,8 +4,6 @@ DIST apache-tomcat-10.1.23-src.tar.gz 6248107 BLAKE2B 
f14a652b4cbcd27dcecefbea35
 DIST apache-tomcat-10.1.23-src.tar.gz.asc 833 BLAKE2B 
c1cd63d86406e53a093c7d0325d6ede04bf8b051a23c4b2ff54d20818a583d16aa78b25e02678148eeb6320639e7366bf8851ea983e56ef81e473e6767bd6ab5
 SHA512 
67d35953ee8ebf685ee441467cc0e0d1fcf760651525e6e34c7ad09e8a4a75b26c0b044fcb7781a1661d1edac24ea92c1881a6728571f14e21d29411d9839c80
 DIST apache-tomcat-10.1.24-src.tar.gz 6230916 BLAKE2B 
ac2329499d9afa37a62ad00b5ca4954e4221d72623fd821ffd3ca0037209723acba38d03f52033f0ea7e2951c9803f3ab94cd0910ed520424693f03fd2efe5c8
 SHA512 
cd3113dfaf2dd14aacf8d3c2bf39fb7142665421f981ad668edd228bb0a8fe8c35ea8921930e6fe06d10c9c078f774641901efc1e5312d3b7ef52a3006bacd5f
 DIST apache-tomcat-10.1.24-src.tar.gz.asc 833 BLAKE2B 
aa1a6b3698b80f16ed567153d42655b425597bacc2cc1aee7a73e8cb20db22c57d827d2400df045a828d1cca017ffc5af1c941b9c0f94369fcf7d52458061b01
 SHA512 
cedc2128b2877bb4470d06df9618c403c49f488eb5006b3561f39b98b2ff7539819b931813c9af484f62a57a582e36730ed25e8f30a8743631b4d72bca4be386
-DIST apache-tomcat-9.0.88-src.tar.gz 6327717 BLAKE2B 
e79db61e3a8e368124ff151de2d25daf11a65fce9e93a38648d88c2dcdb99524fc34f84832cb02fe8aeda58a84bbc0273613db50c6f85a79d525f9a9227b740e
 SHA512 
bcd568ad5ea4baee23eebd0566c672417c1c9005d6e97dd66edbad8fd82a8a1b5ff9a2867dd2bf5e04f2c056ea3debd67cbe4132e3ef8929ca30c4529b45e6ed
-DIST apache-tomcat-9.0.88-src.tar.gz.asc 833 BLAKE2B 
034081347d89b4e10b6296e0fbe8a17189ee27a71593848fdb70cc29a41291ca1edf21d4cc11d674c710505ae93d43a2f5dd08695d6dcfb4776843cc9970edf8
 SHA512 
608835f309d98099b0c852c553b9116611b44f389efbee85aaac27598546e584daab180acff3b05c00623456354e2719715d9ae24bd3940de39e7bbb48d3e018
 DIST apache-tomcat-9.0.89-src.tar.gz 6319184 BLAKE2B 
a3c9539fe25a5ca87820214a7b7b8376c05383d940bfa19f7811f3fb5e90e2bd392f46c3f1a08a8949256bde5855bd479ac3754245dc953aa78e5f73e23f8849
 SHA512 
c2e8e45a98cd30764b507bb997c7cf1b8e337be9c6d1833bb5f916a5d86d96cb095f430884d0a248cdc3b510beb11e227cc160f8402ba5b2e3952399a44461d1
 DIST apache-tomcat-9.0.89-src.tar.gz.asc 833 BLAKE2B 
7629f94f4d036a6fc307bc6d157758eb5291a0b854bed20f0341ef0dffda8cff4722d4e47c2ad5f7e8d331ab0563532d53596859dcd990a75809f0432862f63a
 SHA512 
5cf7dc5890f928acb43d2401e196166cfbd473236a27afde9fed621e0eefd3b9b59abe3ad8ac4e77086752e67afd0d60af9003e84f5cb2e66a58e6dee89b7366
 DIST biz.aQute.bnd-7.0.0.jar 16567341 BLAKE2B 
329b3b750e917ad513a1f767f63b96b1d0b10177a0f3c079bbf07e02aff77607e1f869bae09d09709d8cfef27cd802585e7f332e2a3e3f0ee1c31a4890e53fce
 SHA512 
42b2e43f3e437c7b06f0d168eaf5ee499a4c517b1a01bec67fd6df92d01d037dd9088e0d5b013dfa1839f9dee35bf74903c1af7204712bf4aa72412e071ac503

diff --git a/www-servers/tomcat/files/tomcat-9.0.37-fix-build-rewrite.patch 
b/www-servers/tomcat/files/tomcat-9.0.37-fix-build-rewrite.patch
deleted file mode 100644
index e324b7602ec8..
--- a/www-servers/tomcat/files/tomcat-9.0.37-fix-build-rewrite.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/build.xml
-+++ b/build.xml
-@@ -2716,7 +2716,7 @@ Read the Building page on the Apache Tomcat 
documentation site for details on ho
-   
- 
-   
--
-+
- 
- 
-   

diff --git a/www-servers/tomcat/tomcat-9.0.88-r1.ebuild 
b/www-servers/tomcat/tomcat-9.0.88-r1.ebuild
deleted file mode 100644
index 416b71be8c5d..
--- a/www-servers/tomcat/tomcat-9.0.88-r1.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 prefix verify-sig
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 
Container"
-HOMEPAGE="https://tomcat.apache.org/;
-SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
-   verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 
1)/v${PV}/src/${MY_P}.tar.gz.asc )"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="9"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="extra-webapps"
-

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: 4f2800b8ea16152c0eeb32dd270f3b2598b25f17
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Mon Mar  4 13:25:20 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Apr  4 07:48:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f2800b8

www-servers/tomcat: add 9.0.87-r2, unbundle bnd

- adds here document "build.properties" for configuration
- reduces the -build.xml.patch by using build.properties
- adds tomcat-9.0.87-gentoo-bnd.patch re-adding the unbundled parts
- removes the src_unpack() section
- removes -Dbnd.jar from EANT_EXTRA_ARGS
- updates eclipse-ecj 4.15 -> 4.20
- drops REWRITE_CLASSPATH, allows to drop -9.0.37-fix-build-rewrite.patch
- drops EANT_NEED_TOOLS
- removes the src_configure() section
- simplifies MY_P
- shortens verify-sig string by using MY_P
- unkeyword 9.0.87-r2 for ~x86

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../tomcat/files/tomcat-9.0.87-build.xml.patch |  30 
 .../tomcat/files/tomcat-9.0.87-gentoo-bnd.patch|  35 +
 www-servers/tomcat/tomcat-9.0.87-r2.ebuild | 169 +
 3 files changed, 234 insertions(+)

diff --git a/www-servers/tomcat/files/tomcat-9.0.87-build.xml.patch 
b/www-servers/tomcat/files/tomcat-9.0.87-build.xml.patch
new file mode 100644
index ..354cfeaa190e
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-9.0.87-build.xml.patch
@@ -0,0 +1,30 @@
+1. we don't need commons-daemon
+2. jdt.jar is eclipse-ecj.jar which we provide as a separate package
+3. javadoc would fail without network access
+--- a/build.xml
 b/build.xml
+@@ -1451,7 +1451,6 @@
+   
+ 
+-
+ 
+ 
+ 
+@@ -1512,7 +1511,6 @@
+ 
+   
+ 
+-
+ 
+ 
+ 
+@@ -2358,8 +2356,6 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
+   
+   
+   
+-  https://docs.oracle.com/javase/8/docs/api/"/>
+-  https://javaee.github.io/javaee-spec/javadocs/"/>
+   
+ 
+ 

diff --git a/www-servers/tomcat/files/tomcat-9.0.87-gentoo-bnd.patch 
b/www-servers/tomcat/files/tomcat-9.0.87-gentoo-bnd.patch
new file mode 100644
index ..1d9ef0b0d0e8
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-9.0.87-gentoo-bnd.patch
@@ -0,0 +1,35 @@
+Gentoo's dev-java/bnd is unbundled. We're adding the parts here:
+--- a/build.xml
 b/build.xml
+@@ -225,7 +225,16 @@
+ 
+   
+   
++
+ 
++
++
++
++
++
++
++
++
+ 
+ 
+ 
+@@ -3924,6 +3933,14 @@ Read the Building page on the Apache Tomcat 
documentation site for details on ho
+ 
+ 
+   
++  
++  
++  
++  
++  
++  
++  
++  
+ 
+ 
+ 

diff --git a/www-servers/tomcat/tomcat-9.0.87-r2.ebuild 
b/www-servers/tomcat/tomcat-9.0.87-r2.ebuild
new file mode 100644
index ..6a5810add4af
--- /dev/null
+++ b/www-servers/tomcat/tomcat-9.0.87-r2.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 prefix verify-sig
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 
Container"
+HOMEPAGE="https://tomcat.apache.org/;
+SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
+   verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 
1)/v${PV}/src/${MY_P}.tar.gz.asc )"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="9"
+KEYWORDS="~amd64 ~arm ~arm64 ~amd64-linux ~x86-linux"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.20"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+   dev-java/jax-rpc-api:0
+   dev-java/wsdl4j:0"
+RDEPEND="${COMMON_DEP}
+   acct-group/tomcat
+   acct-user/tomcat
+   >=virtual/jre-1.8:*"
+DEPEND="${COMMON_DEP}
+   app-admin/pwgen
+   >=dev-java/ant-1.10.14-r3:0
+   dev-java/bnd-annotation:0
+   dev-java/bnd-ant:0
+   dev-java/bnd-util:0
+   dev-java/bndlib:0
+   dev-java/libg:0
+   dev-java/osgi-cmpn:8
+   dev-java/osgi-core:0
+   dev-java/slf4j-api:0
+   >=virtual/jdk-17:*
+   test? (
+   >=dev-java/ant-1.10.14-r3:0[junit]
+   dev-java/easymock:3.2
+   )"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+PATCHES=(
+   "${FILESDIR}/tomcat-9.0.87-build.xml.patch"
+   "${FILESDIR}/tomcat-9.0.87-gentoo-bnd.patch"
+)
+
+src_prepare() {
+   default #780585
+   java-pkg-2_src_prepare
+   java-pkg_clean
+
+   cat > build.properties <<-EOF || die
+   execute.download=false
+   exist=true # skip target="downloadfile-2"
+   ant.jar=$(java-pkg_getjar 

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: e51332997766dd0cc01d73353bafc5d03be4ffcf
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Thu Mar 23 00:18:59 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Mar 23 05:45:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5133299

www-servers/tomcat: drop 8.5.85, 9.0.71-r1, 10.1.5

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 www-servers/tomcat/Manifest|   8 -
 .../tomcat/files/tomcat-10.1.0-build.xml.patch | 347 -
 .../tomcat/files/tomcat-8.5.66-build.xml.patch | 266 
 .../tomcat/files/tomcat-9.0.62-build.xml.patch | 319 ---
 www-servers/tomcat/tomcat-10.1.5.ebuild| 202 
 www-servers/tomcat/tomcat-8.5.85.ebuild| 171 --
 www-servers/tomcat/tomcat-9.0.71-r1.ebuild | 202 
 7 files changed, 1515 deletions(-)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 5e3a9b45c64a..f151356c5731 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,16 +1,8 @@
-DIST apache-tomcat-10.1.5-src.tar.gz 6066163 BLAKE2B 
96c03f053b8585cfc466e7bf870a85d82e5637169028d0bca43508480f14834ebccf2ddf68744b29510fa93cc8fd0994c72a61d0949da0d4e6b095da87704d0d
 SHA512 
d52cf7fd4c4982b7934cd14000e540998cf2599a730083c7647d57939993f3522b6d208a82cdfcb0f7ffc084d9d2ea2b27104203398a61bb765667d97fc13c02
-DIST apache-tomcat-10.1.5-src.tar.gz.asc 849 BLAKE2B 
6b733488772bea88ea6a6710651bf60a83c78187463850f0216ca5152f0698648ab8ba37f86480916caa816792095a1f434bc84d5706ae9e6f6ed882b8b29d4b
 SHA512 
600580fb89620937c103fa5581669b9ab7cb359db32b0d1d2cd81e9dc41cec6e3df7e852baa3564ed94e4af30d506453e6761fa20ff8fd37d7c4dafa33aac712
 DIST apache-tomcat-10.1.7-src.tar.gz 6075723 BLAKE2B 
ef00c3c43a6cd6c68b09930fd7dc8f822b49f5cec3a0c2b3dad1cb20e5f37ff17f35dfd48c5a8537dedbb9c3887620b6e0ec29272a002df46aa8fa0e5ccbaaa7
 SHA512 
3daeb5cb3650382224ba4b5cf830c7288531b7f565fdde4a8acca1ee66bebbbfafb4790a6ce50b965e176e9669203e90342e61d42d1656fd12f656d9394c3283
 DIST apache-tomcat-10.1.7-src.tar.gz.asc 849 BLAKE2B 
79d5d6885dd3304999a3ec1e16ffeca95df0b0b135ad6733b932b745e248bfd84be06f7eb70588167e7a8b74c4fa1db93cfba99dee10b8ebc00b7ce46226e128
 SHA512 
ae5c9238ea33743ed40dc74e47e6441f52437322376df94b770dd00e354dc67851cedeb2b4b1148262bdb12b15f7ded49d0f5ee050d451006fa81c5c86b20768
-DIST apache-tomcat-8.5.85-src.tar.gz 6035271 BLAKE2B 
06180fe34c3bd70678dd82d44e2cfc7cf4ed367523b35f3cdaab6c15a5a586522584c8338a990543b5452073ae3ed8a60fad9a159ddfd63adcbaaac35a5a4528
 SHA512 
1500c87a4f3f5302ff28f7592c1bdd66190095b04a1fac349bf421d117c0ace7b109bfb7943795375bcdf76c810df8f588150ccfb5843ccdf10c394b11754736
-DIST apache-tomcat-8.5.85-src.tar.gz.asc 849 BLAKE2B 
ead4de7a2fe01f67b2c3fd61d4c85d87e5142f2bd0ba933d70d8e5a8935e6bd97fff14bd4d4ddeee27edd7683971d241e6d14126fee01e789914a394ee0faf47
 SHA512 
e7c3cb19cff697154d159986748680d66bae22a12bc272a09d64b39ed681d60ce9d7ff9ba9c2f45744b6ac81b675a87af6c7df3eecd7079b98749063fbe579a5
 DIST apache-tomcat-8.5.87-src.tar.gz 6041463 BLAKE2B 
2b41e324be028b9bf4db3fcd32a45ad6a84644535c20c5a46c7850c8b0ee054130a7fa5091009928b71c8ece2f24f49530845727cc3f1b6d5907de07d7ad3703
 SHA512 
cd15fc27c781a0835ec5c35726832f51abfc8bba9b647e690b3dadb7141b5c96b5014f0d6ebf46277d43cf10e2839ef0229dccf87c0449f2004ae90041ef10b6
 DIST apache-tomcat-8.5.87-src.tar.gz.asc 849 BLAKE2B 
05a5911b344b5ffdcb392189b64dc4c4d31d000a8b653338780e74ab569a3b024a13b491ba4946bbf68b5955af65df05bfe7b4795a120977f1b26a2bcff0c96d
 SHA512 
fb56af00d3f9302251e65a08d852992192137eeed0eecf100bcfafb778e01dfb92fc024f47ef41ca71f01eebb3622fcaa53fcb776403939313502039080a2b4c
-DIST apache-tomcat-9.0.71-src.tar.gz 6222516 BLAKE2B 
41b4ea0006e813a1be885cd48cb76e7debde4794e79b88e1110d505b179ac7c45b516265fd0e2f90cd20f0cac6ec7d04577ba1b3384570531902e00a7f599f0a
 SHA512 
0c62a5e526178e39c68717223ce2cb4a31096e5765b718639e4ba4bbf3d70ba28238cd1bb5cf74747f718b35baf98de32c7ee8a7ebd445c6191700070c1ca930
-DIST apache-tomcat-9.0.71-src.tar.gz.asc 833 BLAKE2B 
137f8f2ba0ec727e478291bd82000f0eb3bb411c5e27916892424cbfc49e75e52d0f14da732946d1e8e5cf06493392b604952b5bfea3288753a4fc53fd90b743
 SHA512 
398c4782de8339c332381156dd36f05f2006f8c5a78bd78ee32ef05fbb1ab121a21020b3726020282e632bdc14f98cf2828f329c229801d63a06d55cab8f3c80
 DIST apache-tomcat-9.0.73-src.tar.gz 6229040 BLAKE2B 
97b1348e532eea75c4d0723c314cc24a9c13bd4a948a8eea4d1ee1c5121472f2fedec7d30c240b2617a51ef57898fbd96c254f9d84c9e943ebe808f1dba4cf16
 SHA512 
1691a0087ceaf2100ce17fe9b9a973d079c39b20effbe0c0d68f92d2684a681e001b0c2b8bde40c289754ac02ba02f9eb4dfac617fccb8f451c96dfdd4741237
 DIST apache-tomcat-9.0.73-src.tar.gz.asc 833 BLAKE2B 
0d9e81e16e356aded1f02dc02833f24875584794358591b70a2fe54d67d116c7305dc5a477d158395afe3b72b2958c2dc0e102a893b8ef504a3f24acec14ba41
 SHA512 

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: 3338a7205f699f0e4de85779f5c29a8d4c51991f
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Feb 26 08:02:00 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Feb 26 08:02:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3338a720

www-servers/tomcat: bump to 8.5.86

in this version we do not provide external packages for servlet, el and jsp 
apis anymore
switched from glassfish-xmlrpc-api to jax-rpc-api
this version again provides tomcat-dbcp.jar

Closes: https://bugs.gentoo.org/144276
Signed-off-by: Miroslav Šulc  gentoo.org>

 www-servers/tomcat/Manifest|   2 +
 .../tomcat/files/tomcat-8.5.86-build.xml.patch | 113 +++
 www-servers/tomcat/tomcat-8.5.86.ebuild| 158 +
 3 files changed, 273 insertions(+)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 5b400b7546de..25b05656fda8 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -4,6 +4,8 @@ DIST apache-tomcat-10.1.6-src.tar.gz 6073924 BLAKE2B 
debc363395becd96a856a03ffd5
 DIST apache-tomcat-10.1.6-src.tar.gz.asc 849 BLAKE2B 
71f512c0def69b9c23d4440a988f1f889c57c55e731fc00080a6c919c13360ad2b8a7bbdc65b0e632b5e4b66eb96e58301d720fb433b3b3b50e107de17fd6fe6
 SHA512 
51d560236ebdc9f9c6e77e6ac98306ec8e9e3079efda7f0a2b6cb0cc3256571881acd891668d606d873d0b5a1be3ba3cd5a095d44cba6e852f1cd5fd8e1e9d41
 DIST apache-tomcat-8.5.85-src.tar.gz 6035271 BLAKE2B 
06180fe34c3bd70678dd82d44e2cfc7cf4ed367523b35f3cdaab6c15a5a586522584c8338a990543b5452073ae3ed8a60fad9a159ddfd63adcbaaac35a5a4528
 SHA512 
1500c87a4f3f5302ff28f7592c1bdd66190095b04a1fac349bf421d117c0ace7b109bfb7943795375bcdf76c810df8f588150ccfb5843ccdf10c394b11754736
 DIST apache-tomcat-8.5.85-src.tar.gz.asc 849 BLAKE2B 
ead4de7a2fe01f67b2c3fd61d4c85d87e5142f2bd0ba933d70d8e5a8935e6bd97fff14bd4d4ddeee27edd7683971d241e6d14126fee01e789914a394ee0faf47
 SHA512 
e7c3cb19cff697154d159986748680d66bae22a12bc272a09d64b39ed681d60ce9d7ff9ba9c2f45744b6ac81b675a87af6c7df3eecd7079b98749063fbe579a5
+DIST apache-tomcat-8.5.86-src.tar.gz 6038952 BLAKE2B 
b57a203fb2e215f0a07485d5ae70398e0e2d56b37cd7172f33680c8b57faa97929904349ee93b3d975cb24ac2c9e2d15240d59d4a3295d0a7deb96b8069269ef
 SHA512 
fbc57d314fb8885e9986a26515b6536f2bffdb3476af71417eb9dab1623f36ea80da431bc1dc8874aa99dd6575919a0d3a828d84a87404a73ed22de601097e12
+DIST apache-tomcat-8.5.86-src.tar.gz.asc 849 BLAKE2B 
ff388f97a189c9b45eaac42a1e670c8cddf52903421f053ec1df0518937f3c8b0bc650009cc93bb0a7440aa0607f955bbc219d80a34ab050851554b5736f3235
 SHA512 
85e961b6569e6c8421b83246653c86a53843232dc7a3eb5d466e6f11fb4b4f1a5dcee43403a43c8950774395acf7f576f7184c7dfa84084f08ff9a203b6104fd
 DIST apache-tomcat-9.0.71-src.tar.gz 6222516 BLAKE2B 
41b4ea0006e813a1be885cd48cb76e7debde4794e79b88e1110d505b179ac7c45b516265fd0e2f90cd20f0cac6ec7d04577ba1b3384570531902e00a7f599f0a
 SHA512 
0c62a5e526178e39c68717223ce2cb4a31096e5765b718639e4ba4bbf3d70ba28238cd1bb5cf74747f718b35baf98de32c7ee8a7ebd445c6191700070c1ca930
 DIST apache-tomcat-9.0.71-src.tar.gz.asc 833 BLAKE2B 
137f8f2ba0ec727e478291bd82000f0eb3bb411c5e27916892424cbfc49e75e52d0f14da732946d1e8e5cf06493392b604952b5bfea3288753a4fc53fd90b743
 SHA512 
398c4782de8339c332381156dd36f05f2006f8c5a78bd78ee32ef05fbb1ab121a21020b3726020282e632bdc14f98cf2828f329c229801d63a06d55cab8f3c80
 DIST apache-tomcat-9.0.72-src.tar.gz 6227773 BLAKE2B 
f784df0dd40539f38343942d818f3735521fbd3c978a3fa9c1c4cb7a4a46b71a23bdd55530b2ba6ae4a6ae89bf651a1c73fea0380e485097eb77cc75ac4d7075
 SHA512 
5dfcf1b4ce90b41164170eada109b9c4357ca979f88dc89548284164b482c5d87788d93188de20b68ae346e870ab01525a980be3f8ee72af27e83f82d3a1

diff --git a/www-servers/tomcat/files/tomcat-8.5.86-build.xml.patch 
b/www-servers/tomcat/files/tomcat-8.5.86-build.xml.patch
new file mode 100644
index ..e3589ce3
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.5.86-build.xml.patch
@@ -0,0 +1,113 @@
+diff --git a/build.xml b/build.xml
+index d407be0..7c69a1b 100644
+--- a/build.xml
 b/build.xml
+@@ -1148,9 +1148,9 @@
+ 
+   
+-
++
+ 
+ 
+   
+@@ -1210,7 +1210,9 @@
+ 
+   
+ 
++
+ 
+ 
+ 
+@@ -1719,7 +1721,7 @@
+   
+-
++
++
++
+   
+ 
+   
+ 
+ 
++
+ 
+ 
+ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -2020,8 +2026,10 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
+   
+   
+   
++
+   
+ 
+ 
+@@ -2933,6 +2941,7 @@ asf.ldap.username=${release.asfusername}
+   description="Download components necessary to compile" >
+ 
+ 
++
+ 
++
+   
+ 
+   https://tomcat.apache.org/;
+SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz
+   verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 
1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="8.5"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux 

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: 5d9a5678a347f381a6b41b16e29c7d3ee0fcc99b
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Feb 26 07:40:18 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Feb 26 07:40:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d9a5678

www-servers/tomcat: bump to 9.0.72

in this version we do not provide external packages for servlet, el and jsp 
apis anymore
switched from glassfish-xmlrpc-api to jax-rpc-api
this version again provides tomcat-dbcp.jar

Bug: https://bugs.gentoo.org/144276
Signed-off-by: Miroslav Šulc  gentoo.org>

 www-servers/tomcat/Manifest|   2 +
 .../tomcat/files/tomcat-9.0.72-build.xml.patch |  99 +++
 www-servers/tomcat/tomcat-9.0.72.ebuild| 190 +
 3 files changed, 291 insertions(+)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 16c39c24c145..5b400b7546de 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -6,6 +6,8 @@ DIST apache-tomcat-8.5.85-src.tar.gz 6035271 BLAKE2B 
06180fe34c3bd70678dd82d44e2
 DIST apache-tomcat-8.5.85-src.tar.gz.asc 849 BLAKE2B 
ead4de7a2fe01f67b2c3fd61d4c85d87e5142f2bd0ba933d70d8e5a8935e6bd97fff14bd4d4ddeee27edd7683971d241e6d14126fee01e789914a394ee0faf47
 SHA512 
e7c3cb19cff697154d159986748680d66bae22a12bc272a09d64b39ed681d60ce9d7ff9ba9c2f45744b6ac81b675a87af6c7df3eecd7079b98749063fbe579a5
 DIST apache-tomcat-9.0.71-src.tar.gz 6222516 BLAKE2B 
41b4ea0006e813a1be885cd48cb76e7debde4794e79b88e1110d505b179ac7c45b516265fd0e2f90cd20f0cac6ec7d04577ba1b3384570531902e00a7f599f0a
 SHA512 
0c62a5e526178e39c68717223ce2cb4a31096e5765b718639e4ba4bbf3d70ba28238cd1bb5cf74747f718b35baf98de32c7ee8a7ebd445c6191700070c1ca930
 DIST apache-tomcat-9.0.71-src.tar.gz.asc 833 BLAKE2B 
137f8f2ba0ec727e478291bd82000f0eb3bb411c5e27916892424cbfc49e75e52d0f14da732946d1e8e5cf06493392b604952b5bfea3288753a4fc53fd90b743
 SHA512 
398c4782de8339c332381156dd36f05f2006f8c5a78bd78ee32ef05fbb1ab121a21020b3726020282e632bdc14f98cf2828f329c229801d63a06d55cab8f3c80
+DIST apache-tomcat-9.0.72-src.tar.gz 6227773 BLAKE2B 
f784df0dd40539f38343942d818f3735521fbd3c978a3fa9c1c4cb7a4a46b71a23bdd55530b2ba6ae4a6ae89bf651a1c73fea0380e485097eb77cc75ac4d7075
 SHA512 
5dfcf1b4ce90b41164170eada109b9c4357ca979f88dc89548284164b482c5d87788d93188de20b68ae346e870ab01525a980be3f8ee72af27e83f82d3a1
+DIST apache-tomcat-9.0.72-src.tar.gz.asc 833 BLAKE2B 
f79bd955a01d846427a454d9a50f9a614e16757edf79bf7b9498e79356944085b0f39bd8e1a1181e7152e042a06ce310ccf7da3549b8b16acee2eaf4ba56
 SHA512 
4e8afa0ae0d7eded96f33d2391c018bac7dbf44754cbf98bc965fd0d3c2c3fbbac9c68304066e93cb4e9e36bc8bcf2f8378f5b357df360582df0aae239b61585
 DIST biz.aQute.bnd-6.3.1.jar 16703723 BLAKE2B 
97cc171a926be326abe95695e795ccb575bc6ca770b4c4df7764bdedbd6dfcf5643673484f50cc34f845f27d03ddf8a971c1c502b3b63db2541266c2b35e8e23
 SHA512 
59d3a50575ea8fcfc5f5c2178f7d40248c987c77ae8afeb0a8c9ec397ce9e4ceae277ba3b26dafc245bd2185bbafeaef219dd1af0988921631b6a8fe0cbd0abf
 DIST biz.aQute.bnd-6.4.0.jar 16303123 BLAKE2B 
73cdeb9e63c04b41db26f91efc3b01fdfd7c8796d6b1f556c77f90bcdbe048f374b5164b885689f3e62ca45b8ca8b97fce70e1fa13d807d2f76869155c8ba7f5
 SHA512 
b113177f97894b0ed5cfbc38f96c995d6425e981ec8c7b27d99044793ff77dd2450367ad9ee977f443fba349fe1d68fc26f3aaa737eba0a402abcf29716b2e85
 DIST biz.aQute.bndlib-6.3.1.jar 3183076 BLAKE2B 
73bef88e8f3c8015d259ac36b953672ed9cb0aa5d9dfca3361033a7f37646bb65bbea8be4ef1fb425518e85ec8a9cc63032815671ece5f956b754ecf555dc174
 SHA512 
7c3f7bc0280beb1b15182c558ef23f431719c046da8473545efe9aeec935776ebf6682cabbb7e7f53dcf2ccca168d8df35859be77121dab04340a5ec7e993608

diff --git a/www-servers/tomcat/files/tomcat-9.0.72-build.xml.patch 
b/www-servers/tomcat/files/tomcat-9.0.72-build.xml.patch
new file mode 100644
index ..985d5d4f94fb
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-9.0.72-build.xml.patch
@@ -0,0 +1,99 @@
+diff --git a/build.xml b/build.xml
+index b420c2a..abecfde 100644
+--- a/build.xml
 b/build.xml
+@@ -1436,9 +1436,9 @@
+ 
+   
+-
++
+ 
+ 
+   
+@@ -1498,7 +1498,9 @@
+ 
+   
+ 
++
+ 
+ 
+ 
+@@ -2154,11 +2156,12 @@
+ 
+ 
+ 
++
+ 
+ 
+ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -2319,8 +2322,10 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
+   
+   
+   
++
+   
+ 
+ 
+@@ -3234,6 +3239,7 @@ asf.ldap.username=${release.asfusername}
+   depends="setup-bnd">
+ 
+ 
++
+ 
++
+ 
++
++
+   
+ 
+   https://tomcat.apache.org/;
+SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
+   
https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
+   
https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}
+   verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: 136ca3e04560e5842f7e1b185e1e2a44f5bb36c1
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Feb 26 07:23:29 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Feb 26 07:23:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=136ca3e0

www-servers/tomcat: bump to 10.1.6

in this version we do not provide external packages for servlet, el and jsp 
apis anymore
switched from glassfish-xmlrpc-api to jax-rpc-api
this version again provides tomcat-dbcp.jar

Bug: https://bugs.gentoo.org/144276
Signed-off-by: Miroslav Šulc  gentoo.org>

 www-servers/tomcat/Manifest|   4 +
 .../tomcat/files/tomcat-10.1.6-build.xml.patch | 122 +
 www-servers/tomcat/tomcat-10.1.6.ebuild| 190 +
 3 files changed, 316 insertions(+)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 2595f74b916d..16c39c24c145 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,8 +1,12 @@
 DIST apache-tomcat-10.1.5-src.tar.gz 6066163 BLAKE2B 
96c03f053b8585cfc466e7bf870a85d82e5637169028d0bca43508480f14834ebccf2ddf68744b29510fa93cc8fd0994c72a61d0949da0d4e6b095da87704d0d
 SHA512 
d52cf7fd4c4982b7934cd14000e540998cf2599a730083c7647d57939993f3522b6d208a82cdfcb0f7ffc084d9d2ea2b27104203398a61bb765667d97fc13c02
 DIST apache-tomcat-10.1.5-src.tar.gz.asc 849 BLAKE2B 
6b733488772bea88ea6a6710651bf60a83c78187463850f0216ca5152f0698648ab8ba37f86480916caa816792095a1f434bc84d5706ae9e6f6ed882b8b29d4b
 SHA512 
600580fb89620937c103fa5581669b9ab7cb359db32b0d1d2cd81e9dc41cec6e3df7e852baa3564ed94e4af30d506453e6761fa20ff8fd37d7c4dafa33aac712
+DIST apache-tomcat-10.1.6-src.tar.gz 6073924 BLAKE2B 
debc363395becd96a856a03ffd5846e786c27781318b9c08c428498a010dc77e334e6fd15ffea1545dc15b1c226fdd73f24d15f70361b39d37316c48a0c5e66e
 SHA512 
54df5784fbbe9c29b5569783c836e1490a6c08610ffe3c98123cc8bee8b483fcb73f46a15487dc5a6c9c7926ba63bab79e1794b07c00c22798ea0984e56f12f5
+DIST apache-tomcat-10.1.6-src.tar.gz.asc 849 BLAKE2B 
71f512c0def69b9c23d4440a988f1f889c57c55e731fc00080a6c919c13360ad2b8a7bbdc65b0e632b5e4b66eb96e58301d720fb433b3b3b50e107de17fd6fe6
 SHA512 
51d560236ebdc9f9c6e77e6ac98306ec8e9e3079efda7f0a2b6cb0cc3256571881acd891668d606d873d0b5a1be3ba3cd5a095d44cba6e852f1cd5fd8e1e9d41
 DIST apache-tomcat-8.5.85-src.tar.gz 6035271 BLAKE2B 
06180fe34c3bd70678dd82d44e2cfc7cf4ed367523b35f3cdaab6c15a5a586522584c8338a990543b5452073ae3ed8a60fad9a159ddfd63adcbaaac35a5a4528
 SHA512 
1500c87a4f3f5302ff28f7592c1bdd66190095b04a1fac349bf421d117c0ace7b109bfb7943795375bcdf76c810df8f588150ccfb5843ccdf10c394b11754736
 DIST apache-tomcat-8.5.85-src.tar.gz.asc 849 BLAKE2B 
ead4de7a2fe01f67b2c3fd61d4c85d87e5142f2bd0ba933d70d8e5a8935e6bd97fff14bd4d4ddeee27edd7683971d241e6d14126fee01e789914a394ee0faf47
 SHA512 
e7c3cb19cff697154d159986748680d66bae22a12bc272a09d64b39ed681d60ce9d7ff9ba9c2f45744b6ac81b675a87af6c7df3eecd7079b98749063fbe579a5
 DIST apache-tomcat-9.0.71-src.tar.gz 6222516 BLAKE2B 
41b4ea0006e813a1be885cd48cb76e7debde4794e79b88e1110d505b179ac7c45b516265fd0e2f90cd20f0cac6ec7d04577ba1b3384570531902e00a7f599f0a
 SHA512 
0c62a5e526178e39c68717223ce2cb4a31096e5765b718639e4ba4bbf3d70ba28238cd1bb5cf74747f718b35baf98de32c7ee8a7ebd445c6191700070c1ca930
 DIST apache-tomcat-9.0.71-src.tar.gz.asc 833 BLAKE2B 
137f8f2ba0ec727e478291bd82000f0eb3bb411c5e27916892424cbfc49e75e52d0f14da732946d1e8e5cf06493392b604952b5bfea3288753a4fc53fd90b743
 SHA512 
398c4782de8339c332381156dd36f05f2006f8c5a78bd78ee32ef05fbb1ab121a21020b3726020282e632bdc14f98cf2828f329c229801d63a06d55cab8f3c80
 DIST biz.aQute.bnd-6.3.1.jar 16703723 BLAKE2B 
97cc171a926be326abe95695e795ccb575bc6ca770b4c4df7764bdedbd6dfcf5643673484f50cc34f845f27d03ddf8a971c1c502b3b63db2541266c2b35e8e23
 SHA512 
59d3a50575ea8fcfc5f5c2178f7d40248c987c77ae8afeb0a8c9ec397ce9e4ceae277ba3b26dafc245bd2185bbafeaef219dd1af0988921631b6a8fe0cbd0abf
+DIST biz.aQute.bnd-6.4.0.jar 16303123 BLAKE2B 
73cdeb9e63c04b41db26f91efc3b01fdfd7c8796d6b1f556c77f90bcdbe048f374b5164b885689f3e62ca45b8ca8b97fce70e1fa13d807d2f76869155c8ba7f5
 SHA512 
b113177f97894b0ed5cfbc38f96c995d6425e981ec8c7b27d99044793ff77dd2450367ad9ee977f443fba349fe1d68fc26f3aaa737eba0a402abcf29716b2e85
 DIST biz.aQute.bndlib-6.3.1.jar 3183076 BLAKE2B 
73bef88e8f3c8015d259ac36b953672ed9cb0aa5d9dfca3361033a7f37646bb65bbea8be4ef1fb425518e85ec8a9cc63032815671ece5f956b754ecf555dc174
 SHA512 
7c3f7bc0280beb1b15182c558ef23f431719c046da8473545efe9aeec935776ebf6682cabbb7e7f53dcf2ccca168d8df35859be77121dab04340a5ec7e993608
+DIST biz.aQute.bndlib-6.4.0.jar 3200265 BLAKE2B 
c8b8c1d0ff398e2a701edc4431cd8d65671a5e5daa0ef04be6b02eabb570768e0202640c15ce1290a5ae21bb31700a89f2822826851d7dc026267cb31da9f1ef
 SHA512 
15a20751d879291c31b6530cb0d51652bf5bb33bf944ed703369eada439df6464190c01e2872ea6e7535209abd0b4692ea8980499d4b43edfffcc5729633c85d

diff --git a/www-servers/tomcat/files/tomcat-10.1.6-build.xml.patch 

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: e0fd275f730f28d281fa0db8ee8fc878469e656d
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Sep 28 04:32:58 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Sep 28 04:33:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0fd275f

www-servers/tomcat: bump to 10.0.26

Signed-off-by: Miroslav Šulc  gentoo.org>

 www-servers/tomcat/Manifest|   1 +
 .../tomcat/files/tomcat-10.0.26-build.xml.patch| 347 +
 www-servers/tomcat/tomcat-10.0.26.ebuild   | 198 
 3 files changed, 546 insertions(+)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 7c69381c5902..68b87e6c8b76 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,4 +1,5 @@
 DIST apache-tomcat-10.0.23-src.tar.gz 6136614 BLAKE2B 
4eaf963187b9a754ed459d7f85e6f7d329927b949bb4a390a602cdc6651aa037aeec559c511ddb9880b6ec4d7cd97b96d82da341509370e412e1b21b799d8c2e
 SHA512 
19ec026bae75318e9ffbe2e619ad2e12ec116382ea88a1064696275afb3fd13e6f08efe497dde79689bfc828f76e27d114ad3a9284b79c8d956a6a85bdac6360
+DIST apache-tomcat-10.0.26-src.tar.gz 6153701 BLAKE2B 
fb16f83cf71dc97f21739c3714d2d3d201aa6b6b4242c351fabfc04ee767e59b6e376c7c8984dcda12d6942835221c55d4451b2d0a1245a2dbb73636c93da47c
 SHA512 
f66387a3ca67b6b3df8504c4ae089e8f30e389811a8d0b7d2241e115b8cf712a38f3d0fea938cef7fa9745f412aa70ad47840e40e2385fbd1435b636e93b45b4
 DIST apache-tomcat-10.1.0-src.tar.gz 6060833 BLAKE2B 
49f36131c1e809b298ac915e671b9f4df55b55c2ba34d21ee3fdeb8759ddaf53a6780b177e8049446079d91186c52669969f30762ddf776d9f8615e527d5a975
 SHA512 
08323eec0403473fa97f419d7911980c3dfe7b1607a64741bbe972a737dfa70ea04ea80ca9ab28bf72bdde9d24cf8f7161eeb8b194204c777d1628d00c78611c
 DIST apache-tomcat-8.5.82-src.tar.gz 6011553 BLAKE2B 
ea34c0485877ace8c84144f0e75f370c0ac461b5b725d97a07e27014b7a14b1ab88fad4230d4fae60190d7bff3836f691615b57b9f085797477acc69560a57ce
 SHA512 
3e0a0a808fb78493930ce8832731eba4ab3cc440387c3b5226ff6e4ac2faf5fd70eff1560d840d34f14a8acfd7e60fc8b7f638f3dbe0c0ed4569dc4271a9c3f2
 DIST apache-tomcat-9.0.65-src.tar.gz 6195265 BLAKE2B 
13ca956b58e9f1831700f67d1fa8883f6471ab6b700b2af169bf284552658a4e9ad4130451b36976af4dd366cc987e228e0b0f98e688cccf577c626dfc78aae7
 SHA512 
3ff344370cc36f5bed389ed198054783a4f5bc86476a751cda280618457a06bae38c1e764b0c110c2f68efe2d34243a4e24596e8b90e8fbd171bf584a22fd3bc

diff --git a/www-servers/tomcat/files/tomcat-10.0.26-build.xml.patch 
b/www-servers/tomcat/files/tomcat-10.0.26-build.xml.patch
new file mode 100644
index ..aff5333f0833
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-10.0.26-build.xml.patch
@@ -0,0 +1,347 @@
+diff --git a/build.xml b/build.xml
+index 774e25e..2684b10 100644
+--- a/build.xml
 b/build.xml
+@@ -1041,6 +1041,7 @@
+   addOSGi="true" />
+ 
+ 
++
+ 
++
+ 
++
+ 
+ 
+ 
+ 
+-
++  addOSGi="true" /> -->
+ 
+ 
+ 
+-
++
+ 
+ 
+   
+@@ -1477,7 +1480,7 @@
+ 
+   
+ 
+-
++
+ 
+ 
+ 
+@@ -1488,7 +1491,7 @@
+ 
+   
+ 
+-
++
+ 
+ 
+ 
+@@ -1517,7 +1520,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+ 
++
+ 
+ 
+ 
++
+ 
+ 
+ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -2172,13 +2178,13 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
+   additionalparam="-breakiterator -notimestamp -html5"
+   source="${compile.release}"
+   maxmemory="512m"
+-  failonerror="true"
+-  failonwarning="true">
++  failonerror="true">
+   
+ 
+ 
+   
+ 
++
+ 
++  failonerror="true">
+   
+ 
+ 
+@@ -2277,8 +2280,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
+   charset="UTF-8"
+   additionalparam="-breakiterator -notimestamp -html5"
+   maxmemory="512m"
+-  failonerror="true"
+-  failonwarning="true">
++  failonerror="true">
+   
+ 
+ 
+@@ -2297,20 +2299,23 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
+   additionalparam="-breakiterator -notimestamp -html5"
+   source="${compile.release}"
+   maxmemory="512m"
+-  failonerror="true"
+   failonwarning="true">
+   
+ 
+ 
+   
+   
++
+   
+   
++
+   
+ 
+ 
+@@ -3275,7 +3280,7 @@ asf.ldap.username=${release.asfusername}
+   
+ 
+   
++  description="Download additional components for the tests">
+ 
+ 
+   
+@@ -3403,7 +3408,7 @@ asf.ldap.username=${release.asfusername}
+   
+ 
+   
++  description="Download additional components for a distribution">
+ 
+ 
+   
+@@ -3458,13 +3463,13 @@ asf.ldap.username=${release.asfusername}
+ 
+   
+ 
+-  
++  
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+   
+@@ -3586,7 +3591,7 

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: 4ef3aa395edf71f6659df4813a424d47359e1db6
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Jun 17 07:04:03 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Jun 17 07:06:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ef3aa39

www-servers/tomcat: removed obsolete 8.5.65, 9.0.45 & 10.0.5

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 www-servers/tomcat/Manifest|   3 -
 .../tomcat/files/tomcat-8.5.65-build.xml.patch | 266 ---
 .../tomcat/files/tomcat-9.0.45-build.xml.patch | 284 -
 www-servers/tomcat/tomcat-10.0.5.ebuild| 192 --
 www-servers/tomcat/tomcat-8.5.65.ebuild| 159 
 www-servers/tomcat/tomcat-9.0.45.ebuild| 187 --
 6 files changed, 1091 deletions(-)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index f982863a11b..5325e3686e5 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,9 +1,6 @@
-DIST apache-tomcat-10.0.5-src.tar.gz 5976090 BLAKE2B 
5441bec39ddaa74a7a4b39e48ecb524f6edb230760272678e6bf8d0a26b4a39e9a6c276b591d5d7962d8cae7d211486d65a334f363931d7cd8750a902c8aaf98
 SHA512 
177e497b2355b260fc59cfcfb8b1fc2fabf5fe5a0f5705b5feee2c330881545aad359a746074c9fb180acb54035d0c2f25b23daac84202788178a256e48f0c9f
 DIST apache-tomcat-10.0.6-src.tar.gz 5987333 BLAKE2B 
b955d3708555c5530ebccaf9c6e8c344a679666bdd45361980d722d2cb48b618a03dc2514f973c182c2c1eaf96852e5a5eadad89575ee1bf524213211191a6a4
 SHA512 
229e8767b8f53f6b5c0e28f13a1daffd6fb8307a5239ae28ee1522087d881e4c9e3f1a0d39bfc852d5e54166dbb8a0a1577210a325845815c7281c4babc0b100
 DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 
56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703
 SHA512 
ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
-DIST apache-tomcat-8.5.65-src.tar.gz 5874743 BLAKE2B 
8a605b0fe5026315aa0a5463d42c01eac164c91737cc81f8df4e174075783a829ddd30a8fc9f5129cf1f83a98d85fa33cb7ec9223f365de0ad91ecffb319d187
 SHA512 
df6ea4e8e04fe1f787ef105cb3e453516ad25d32ad3d559c86997b44492c9a1e93e8c22c88ba2203dcfefc14404f7d1bb28a9e2e20d44ba85adf8c374a4456fa
 DIST apache-tomcat-8.5.66-src.tar.gz 5879748 BLAKE2B 
bfef20872bd19ffa2bb34b98a1da875fdd5f232e681458f0aef093b7eecd63a95c1cd26130f54251f149249e639d0da250e43314d2a86b8ee9b48b675f0d
 SHA512 
322fda683197898f873feb375791092d33c90aac08a54889fabab0f59ecbc7b27784f027b37008c6893fdbf8ca7973b73268f42673d7e8df762419b5a536593b
-DIST apache-tomcat-9.0.45-src.tar.gz 6055044 BLAKE2B 
66ca4ee2c0a3bbd1f73d7257c55105e28d1619c8e533f945438cdb283cb8ccdceada163698641b034b5e43b513fcdd16e331c4c11ea300501276a5247f8ef682
 SHA512 
e3edfd6ab9e3ddf6a15f63a4e11f5237e03d7cacdec11805f4a901bd325c0edeca1ee0b62bee92d53e521af0a9d5a7b10ce12a8262a57fd7faa69d93ca1c066e
 DIST apache-tomcat-9.0.46-src.tar.gz 6068533 BLAKE2B 
400814281aedd588c008a1363199f8602e856870d4c39d536b13f8a357c2390d2db689940f4a6971ec74a84e8e400174e72610e0d64a220de41f2dff419dda3c
 SHA512 
dc380e23aa87273c6ba32e79659e768c551b07812635c2f1c62d2c34b493b1d3d51b4548fec5014fdb36f8461fc90942aa7917874ddf3d6f5c5345d8ca02dfc1
 DIST biz.aQute.bnd-5.1.1.jar 16088761 BLAKE2B 
59906cc39ea27ef20cbf82de1ba78096f34dc417da6dc5c28e21f6e92c0625efecf14cec6c5faf0ab17551c31a6c87a24614c2ac75ac902cfea30199ecc0d39f
 SHA512 
8092b083e7b86e75bf27233964763b88bee74d8ae141c85e387c1cc8bd0cbf3a54be27afea29931fb3ae950700a515fd4a28cfe8e7f26cbaaec506aa06357a37
 DIST biz.aQute.bndlib-5.1.1.jar 3652944 BLAKE2B 
dad9f9835fb407a36e0eae4b65fa2fda147e06ab3f3211a2ed2f1631aeccd6d14d198c325793cb1ce9a57b719a836db230d0452715744ba5a4a6c2983c17916b
 SHA512 
d7da056ba541ae0862159bf5e38e1a5351b2ab5388c88733b46601c2d7dab8970f16af00df186a6cb67fbe81ef53f2c8402db9d28a8c6819dadf60a1df40879b

diff --git a/www-servers/tomcat/files/tomcat-8.5.65-build.xml.patch 
b/www-servers/tomcat/files/tomcat-8.5.65-build.xml.patch
deleted file mode 100644
index 66411238a3d..000
--- a/www-servers/tomcat/files/tomcat-8.5.65-build.xml.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 19be6ed..c1557cd 100644
 a/build.xml
-+++ b/build.xml
-@@ -772,25 +772,28 @@
-   manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
- 
- 
-+
- 
-+
- 
-+
- 
- 
- 
- 
--
-+  filesId="files.tomcat-dbcp" /> -->
- 
- 
- 
--
-+
- 
- 
-   
-@@ -1161,7 +1164,7 @@
- 
-   
- 
--
-+
- 
- 
- 
-@@ -1204,7 +1207,7 @@
- 
-   
- 
--  
-+  
- 
- 
- 
-   
- 
--  
-+  
- 
- 
- 
- 
-+
- 
- 
- 
- 
-   
-   
-+
-   
-   
-+
-   
- 
- 
-@@ -2828,7 +2839,7 @@ skip.installer property in build.properties" />
-   
- 
-   
-+   

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: 8d21415f0cc27c9d0b85653c11ea3b3c6de2b304
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu May 13 11:21:56 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu May 13 11:21:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d21415f

www-servers/tomcat: bump to 9.0.46

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 www-servers/tomcat/Manifest|   1 +
 .../tomcat/files/tomcat-9.0.46-build.xml.patch | 284 +
 www-servers/tomcat/tomcat-9.0.46.ebuild| 187 ++
 3 files changed, 472 insertions(+)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index c946a7933a3..4b1a34d93b2 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -4,5 +4,6 @@ DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 
56583caea6879bf8ca5cc02a88
 DIST apache-tomcat-8.5.65-src.tar.gz 5874743 BLAKE2B 
8a605b0fe5026315aa0a5463d42c01eac164c91737cc81f8df4e174075783a829ddd30a8fc9f5129cf1f83a98d85fa33cb7ec9223f365de0ad91ecffb319d187
 SHA512 
df6ea4e8e04fe1f787ef105cb3e453516ad25d32ad3d559c86997b44492c9a1e93e8c22c88ba2203dcfefc14404f7d1bb28a9e2e20d44ba85adf8c374a4456fa
 DIST apache-tomcat-8.5.66-src.tar.gz 5879748 BLAKE2B 
bfef20872bd19ffa2bb34b98a1da875fdd5f232e681458f0aef093b7eecd63a95c1cd26130f54251f149249e639d0da250e43314d2a86b8ee9b48b675f0d
 SHA512 
322fda683197898f873feb375791092d33c90aac08a54889fabab0f59ecbc7b27784f027b37008c6893fdbf8ca7973b73268f42673d7e8df762419b5a536593b
 DIST apache-tomcat-9.0.45-src.tar.gz 6055044 BLAKE2B 
66ca4ee2c0a3bbd1f73d7257c55105e28d1619c8e533f945438cdb283cb8ccdceada163698641b034b5e43b513fcdd16e331c4c11ea300501276a5247f8ef682
 SHA512 
e3edfd6ab9e3ddf6a15f63a4e11f5237e03d7cacdec11805f4a901bd325c0edeca1ee0b62bee92d53e521af0a9d5a7b10ce12a8262a57fd7faa69d93ca1c066e
+DIST apache-tomcat-9.0.46-src.tar.gz 6068533 BLAKE2B 
400814281aedd588c008a1363199f8602e856870d4c39d536b13f8a357c2390d2db689940f4a6971ec74a84e8e400174e72610e0d64a220de41f2dff419dda3c
 SHA512 
dc380e23aa87273c6ba32e79659e768c551b07812635c2f1c62d2c34b493b1d3d51b4548fec5014fdb36f8461fc90942aa7917874ddf3d6f5c5345d8ca02dfc1
 DIST biz.aQute.bnd-5.1.1.jar 16088761 BLAKE2B 
59906cc39ea27ef20cbf82de1ba78096f34dc417da6dc5c28e21f6e92c0625efecf14cec6c5faf0ab17551c31a6c87a24614c2ac75ac902cfea30199ecc0d39f
 SHA512 
8092b083e7b86e75bf27233964763b88bee74d8ae141c85e387c1cc8bd0cbf3a54be27afea29931fb3ae950700a515fd4a28cfe8e7f26cbaaec506aa06357a37
 DIST biz.aQute.bndlib-5.1.1.jar 3652944 BLAKE2B 
dad9f9835fb407a36e0eae4b65fa2fda147e06ab3f3211a2ed2f1631aeccd6d14d198c325793cb1ce9a57b719a836db230d0452715744ba5a4a6c2983c17916b
 SHA512 
d7da056ba541ae0862159bf5e38e1a5351b2ab5388c88733b46601c2d7dab8970f16af00df186a6cb67fbe81ef53f2c8402db9d28a8c6819dadf60a1df40879b

diff --git a/www-servers/tomcat/files/tomcat-9.0.46-build.xml.patch 
b/www-servers/tomcat/files/tomcat-9.0.46-build.xml.patch
new file mode 100644
index 000..3fa9cf82546
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-9.0.46-build.xml.patch
@@ -0,0 +1,284 @@
+diff --git a/build.xml b/build.xml
+index 89feb96..c4f1d25 100644
+--- a/build.xml
 b/build.xml
+@@ -1033,6 +1033,7 @@
+   addOSGi="true" />
+ 
+ 
++
+ 
++
+ 
++
+ 
+ 
+ 
+ 
+-
++  addOSGi="true" /> -->
+ 
+ 
+ 
+-
++
+ 
+ 
+   
+@@ -1469,7 +1472,7 @@
+ 
+   
+ 
+-
++
+ 
+ 
+ 
+@@ -1512,7 +1515,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+ 
++
+ 
+ 
+ 
++
+ 
+ 
+ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -2251,6 +2257,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
+ 
+   
+ 
++
+ 
+   
+   
++
+   
+   
++
+   
+ 
+ 
+@@ -3156,7 +3168,7 @@ skip.installer property in build.properties" />
+ 
+   
++  depends="setup-bnd" unless="noget">
+ 
+ 
+ 
+@@ -3200,7 +3212,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download additional components for the tests" 
unless="noget">
+ 
+ 
+   
+@@ -3287,7 +3299,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download additional components for a distribution" 
unless="noget">
+ 
+ 
+   
+@@ -3342,13 +3354,13 @@ skip.installer property in build.properties" />
+ 
+   
+ 
+-  
++  
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+   
+@@ -3470,7 +3482,7 @@ skip.installer property in build.properties" />
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+@@ -3487,7 +3499,7 @@ skip.installer property in build.properties" />
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+@@ -3512,7 +3524,7 @@ skip.installer property in build.properties" />
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+@@ -3528,7 +3540,7 @@ skip.installer 

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: ee9938162cb051d3f21b10236ef18adfc80900e3
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri May  7 14:31:11 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri May  7 14:31:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee993816

www-servers/tomcat: removed obsolete

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 www-servers/tomcat/Manifest|   3 -
 .../tomcat/files/tomcat-8.5.57-build.xml.patch | 266 ---
 .../tomcat/files/tomcat-9.0.40-build.xml.patch | 284 -
 www-servers/tomcat/tomcat-10.0.4.ebuild| 192 --
 www-servers/tomcat/tomcat-8.5.64.ebuild| 159 
 www-servers/tomcat/tomcat-9.0.44.ebuild| 187 --
 6 files changed, 1091 deletions(-)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 713cb24b7e0..ba78b7d40d9 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,10 +1,7 @@
-DIST apache-tomcat-10.0.4-src.tar.gz 5964416 BLAKE2B 
23332b90316cedd1916b59b1b31b1c16e34c193ba61660c7c8e41e3b983a35873660eaf8e3f004d5663f0ede2dc39b81997a73ee726ff73d6c6392582163
 SHA512 
677b978afd51fe1756b486c9d5576b9fa03b5b775c462263237aef6d17f36d7e718cfb5e46a49da942b1bf6681b166a4af781138f55d89a019bf12b48eb22882
 DIST apache-tomcat-10.0.5-src.tar.gz 5976090 BLAKE2B 
5441bec39ddaa74a7a4b39e48ecb524f6edb230760272678e6bf8d0a26b4a39e9a6c276b591d5d7962d8cae7d211486d65a334f363931d7cd8750a902c8aaf98
 SHA512 
177e497b2355b260fc59cfcfb8b1fc2fabf5fe5a0f5705b5feee2c330881545aad359a746074c9fb180acb54035d0c2f25b23daac84202788178a256e48f0c9f
 DIST apache-tomcat-7.0.108-src.tar.gz 5313375 BLAKE2B 
200a1ccbc39a572ca7e4f7805bf3d27e0bd645156d8886b0fcbee5e64279a4d2f4e2ad847d67a70e1c65a8d88fa5bd4757a0066ceff367fe92914e22cc809aa5
 SHA512 
bdd957ca5b3b7dd152efa6406dbb6397ed62661ec44c83b6a8f6e9e3c33362c51ff5e0451a57d6aa3874cd745811f2afe78d08825ddaba8e29cb38ef922c48e2
 DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 
56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703
 SHA512 
ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
-DIST apache-tomcat-8.5.64-src.tar.gz 5863485 BLAKE2B 
c297c0803c74a969e96b99c379bcd050d6e08cb1036d69b5c49c64311d6f17695754631738130a76def849da6c2de70a49d4452b24ee34c5720d9474f8d4d41b
 SHA512 
ffcc8e97b56730e7e15daa8c4ce628547afcf0bb008bb8d8142ae684c963ed6a366c1dfdbaaca9080201c3c1bcda60c759b76447dd72493f0ec922a034b75f08
 DIST apache-tomcat-8.5.65-src.tar.gz 5874743 BLAKE2B 
8a605b0fe5026315aa0a5463d42c01eac164c91737cc81f8df4e174075783a829ddd30a8fc9f5129cf1f83a98d85fa33cb7ec9223f365de0ad91ecffb319d187
 SHA512 
df6ea4e8e04fe1f787ef105cb3e453516ad25d32ad3d559c86997b44492c9a1e93e8c22c88ba2203dcfefc14404f7d1bb28a9e2e20d44ba85adf8c374a4456fa
-DIST apache-tomcat-9.0.44-src.tar.gz 6047722 BLAKE2B 
fda3081d66c9018a49e5a07bfb5d54b133fe51dff69b692480065d8d9a4877ce5b5b152e33f6d4cfaf28940ec6b556c9a2455c8fda56ea0552e4d1f83f0f9cbe
 SHA512 
68f6a6edecc0469e21cf062cd4b5aacd2df4903fe98aea052acfc9f725268490d5a6917ac1565f26e15a513afa09814014aed267dc1b5aa92733a51ef52b305f
 DIST apache-tomcat-9.0.45-src.tar.gz 6055044 BLAKE2B 
66ca4ee2c0a3bbd1f73d7257c55105e28d1619c8e533f945438cdb283cb8ccdceada163698641b034b5e43b513fcdd16e331c4c11ea300501276a5247f8ef682
 SHA512 
e3edfd6ab9e3ddf6a15f63a4e11f5237e03d7cacdec11805f4a901bd325c0edeca1ee0b62bee92d53e521af0a9d5a7b10ce12a8262a57fd7faa69d93ca1c066e
 DIST biz.aQute.bnd-5.1.1.jar 16088761 BLAKE2B 
59906cc39ea27ef20cbf82de1ba78096f34dc417da6dc5c28e21f6e92c0625efecf14cec6c5faf0ab17551c31a6c87a24614c2ac75ac902cfea30199ecc0d39f
 SHA512 
8092b083e7b86e75bf27233964763b88bee74d8ae141c85e387c1cc8bd0cbf3a54be27afea29931fb3ae950700a515fd4a28cfe8e7f26cbaaec506aa06357a37
 DIST biz.aQute.bndlib-5.1.1.jar 3652944 BLAKE2B 
dad9f9835fb407a36e0eae4b65fa2fda147e06ab3f3211a2ed2f1631aeccd6d14d198c325793cb1ce9a57b719a836db230d0452715744ba5a4a6c2983c17916b
 SHA512 
d7da056ba541ae0862159bf5e38e1a5351b2ab5388c88733b46601c2d7dab8970f16af00df186a6cb67fbe81ef53f2c8402db9d28a8c6819dadf60a1df40879b

diff --git a/www-servers/tomcat/files/tomcat-8.5.57-build.xml.patch 
b/www-servers/tomcat/files/tomcat-8.5.57-build.xml.patch
deleted file mode 100644
index c01699945e0..000
--- a/www-servers/tomcat/files/tomcat-8.5.57-build.xml.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 348487c..d0b8b81 100644
 a/build.xml
-+++ b/build.xml
-@@ -762,25 +762,28 @@
-   manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
- 
- 
-+
- 
-+
- 
-+
- 
- 
- 
- 
--
-+  filesId="files.tomcat-dbcp" /> -->
- 
- 
- 
--
-+
- 
- 
-   
-@@ -1158,7 +1161,7 @@
- 
-   
- 
--
-+
- 
- 
- 

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: 71b2ce1d92c9c9001cfff8c73d1d48df0a1fcf9e
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Feb  4 10:07:48 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Feb  4 10:07:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71b2ce1d

www-servers/tomcat: bump to 9.0.43

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Miroslav Šulc  gentoo.org>

 www-servers/tomcat/Manifest|   1 +
 .../files/tomcat-9.0.43-insufficient-ecj.patch |  32 
 www-servers/tomcat/tomcat-9.0.43.ebuild| 187 +
 3 files changed, 220 insertions(+)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 9cf6e8133dd..445c595920a 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -2,5 +2,6 @@ DIST apache-tomcat-7.0.107-src.tar.gz 5312698 BLAKE2B 
1f2712ddce6aa604692aaf6a6c
 DIST apache-tomcat-8.5.61-src.tar.gz 5840559 BLAKE2B 
18e1505b6b7d8e1a024d9f834d33ef105a16e6fc1f9e80abd3e6e88b2326597b9973e13c2ebc030a1db4a2d4dc5572d195b9f61db6cb7bf51e97cbfaa121678a
 SHA512 
fd6bb5926b5e7cf44f359c93dadc4edd87fa5f2e26fb0fb3a9bc0a5c89ae4d844d66872055e1b441392cf03d7690aca3429b66afd8334319784f089f821d8c22
 DIST apache-tomcat-8.5.63-src.tar.gz 5853051 BLAKE2B 
d007d9922d54578bdebcbbaec3e7c0ffcafdce913e52fdd93d5c174c9d1304980b5eb7f126e957c5975a59dfb126857dcc87ef3ca5e479e44cd7910b6183e469
 SHA512 
d78a140117844675239e834a0890641c0ef0d6fc3c89eb4512536fece2c128f088edfdea15f79ba7a31e0478431f155230f8f60a57bfea0aed191298a95310c4
 DIST apache-tomcat-9.0.41-src.tar.gz 6022059 BLAKE2B 
6e97390aec956c16f271e57a2fa8805b6f49f593434f0dff8d82e14bc9abc199b00a7523dbb8da335a7ffa9dfee6790430c30f8b0ee90bcd133694c8da42197f
 SHA512 
094e7cbd2519a4b812a2ca865f92802ece3385a20826c5e29b5f7cda8b9265d01ede6f598999f8aa2f1b04bcaca2e67e3f0132781b3f22007356df49ab6b1838
+DIST apache-tomcat-9.0.43-src.tar.gz 6042010 BLAKE2B 
78c0e7d711dd826ba93b12db6a96929ddeeb0df189a12e907c51f02baa08d84757915b8744b5ebd027892ff2823b955d7b1c3c749ab54b588686dfd8d3157640
 SHA512 
8c23f8a371b3ffbc1ab4d5f24be08ecf2c9e6ba466ef36ef97e075bd0f12b1ffc93f63b9ff1def9953b3f791319c7c355a76e7a54061a21d25be37a5dc22da26
 DIST biz.aQute.bnd-5.1.1.jar 16088761 BLAKE2B 
59906cc39ea27ef20cbf82de1ba78096f34dc417da6dc5c28e21f6e92c0625efecf14cec6c5faf0ab17551c31a6c87a24614c2ac75ac902cfea30199ecc0d39f
 SHA512 
8092b083e7b86e75bf27233964763b88bee74d8ae141c85e387c1cc8bd0cbf3a54be27afea29931fb3ae950700a515fd4a28cfe8e7f26cbaaec506aa06357a37
 DIST biz.aQute.bndlib-5.1.1.jar 3652944 BLAKE2B 
dad9f9835fb407a36e0eae4b65fa2fda147e06ab3f3211a2ed2f1631aeccd6d14d198c325793cb1ce9a57b719a836db230d0452715744ba5a4a6c2983c17916b
 SHA512 
d7da056ba541ae0862159bf5e38e1a5351b2ab5388c88733b46601c2d7dab8970f16af00df186a6cb67fbe81ef53f2c8402db9d28a8c6819dadf60a1df40879b

diff --git a/www-servers/tomcat/files/tomcat-9.0.43-insufficient-ecj.patch 
b/www-servers/tomcat/files/tomcat-9.0.43-insufficient-ecj.patch
new file mode 100644
index 000..49276c775be
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-9.0.43-insufficient-ecj.patch
@@ -0,0 +1,32 @@
+diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java 
b/java/org/apache/jasper/compiler/JDTCompiler.java
+index ebc00f6..df22856 100644
+--- a/java/org/apache/jasper/compiler/JDTCompiler.java
 b/java/org/apache/jasper/compiler/JDTCompiler.java
+@@ -306,9 +306,9 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
+ } else if(opt.equals("13")) {
+ settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_13);
+ } else if(opt.equals("14")) {
+-settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_14);
++settings.put(CompilerOptions.OPTION_Source, "14");
+ } else if(opt.equals("15")) {
+-settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_15);
++settings.put(CompilerOptions.OPTION_Source, "15");
+ } else if(opt.equals("16")) {
+ // Constant not available in latest ECJ version shipped with
+ // Tomcat. May be supported in a snapshot build.
+@@ -364,11 +364,11 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
+ settings.put(CompilerOptions.OPTION_TargetPlatform, 
CompilerOptions.VERSION_13);
+ settings.put(CompilerOptions.OPTION_Compliance, 
CompilerOptions.VERSION_13);
+ } else if(opt.equals("14")) {
+-settings.put(CompilerOptions.OPTION_TargetPlatform, 
CompilerOptions.VERSION_14);
+-settings.put(CompilerOptions.OPTION_Compliance, 
CompilerOptions.VERSION_14);
++settings.put(CompilerOptions.OPTION_TargetPlatform, "14");
++settings.put(CompilerOptions.OPTION_Compliance, "14");
+ } else if(opt.equals("15")) {
+-

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: 05c4d8c2c1e0ecb46c767d177642fede37eefde1
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Mon Jul 20 08:45:35 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Jul 20 08:45:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05c4d8c2

www-servers/tomcat: fixed building of javadoc for 8.5.57 and 9.0.37

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../tomcat/files/tomcat-8.5.57-build.xml.patch | 48 -
 .../tomcat/files/tomcat-9.0.37-build.xml.patch | 50 --
 www-servers/tomcat/tomcat-8.5.57.ebuild|  7 ++-
 3 files changed, 61 insertions(+), 44 deletions(-)

diff --git a/www-servers/tomcat/files/tomcat-8.5.57-build.xml.patch 
b/www-servers/tomcat/files/tomcat-8.5.57-build.xml.patch
index 2eb3329b3ce..c01699945e0 100644
--- a/www-servers/tomcat/files/tomcat-8.5.57-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-8.5.57-build.xml.patch
@@ -1,5 +1,5 @@
 diff --git a/build.xml b/build.xml
-index 348487c..04e40fa 100644
+index 348487c..d0b8b81 100644
 --- a/build.xml
 +++ b/build.xml
 @@ -762,25 +762,28 @@
@@ -106,14 +106,14 @@ index 348487c..04e40fa 100644
  
  

-@@ -1874,6 +1879,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
- 
-   
+@@ -1895,6 +1900,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
+ 
+   
+ 
 +


++
+   
+ 
+ 
+@@ -2759,7 +2770,7 @@ skip.installer property in build.properties" />

  

  
-@@ -2795,7 +2804,7 @@ skip.installer property in build.properties" />
+@@ -2795,7 +2806,7 @@ skip.installer property in build.properties" />

  


-@@ -2873,7 +2882,7 @@ skip.installer property in build.properties" />
+@@ -2873,7 +2884,7 @@ skip.installer property in build.properties" />

  


-@@ -2928,13 +2937,13 @@ skip.installer property in build.properties" />
+@@ -2928,13 +2939,13 @@ skip.installer property in build.properties" />
  

  
@@ -177,7 +183,7 @@ index 348487c..04e40fa 100644
  
  

-@@ -3056,7 +3065,7 @@ skip.installer property in build.properties" />
+@@ -3056,7 +3067,7 @@ skip.installer property in build.properties" />
  

  
@@ -186,7 +192,7 @@ index 348487c..04e40fa 100644
  
  
  
-@@ -3073,7 +3082,7 @@ skip.installer property in build.properties" />
+@@ -3073,7 +3084,7 @@ skip.installer property in build.properties" />
  

  
@@ -195,7 +201,7 @@ index 348487c..04e40fa 100644
  
  
  
-@@ -3098,7 +3107,7 @@ skip.installer property in build.properties" />
+@@ -3098,7 +3109,7 @@ skip.installer property in build.properties" />
  

  
@@ -204,7 +210,7 @@ index 348487c..04e40fa 100644
  
  
  
-@@ -3114,7 +3123,7 @@ skip.installer property in build.properties" />
+@@ -3114,7 +3125,7 @@ skip.installer property in build.properties" />
  

  
@@ -213,7 +219,7 @@ index 348487c..04e40fa 100644
  
  
  
-@@ -3138,7 +3147,7 @@ skip.installer property in build.properties" />
+@@ -3138,7 +3149,7 @@ skip.installer property in build.properties" />
  

  
@@ -222,7 +228,7 @@ index 348487c..04e40fa 100644
  
  
  
-@@ -3153,7 +3162,7 @@ skip.installer property in build.properties" />
+@@ -3153,7 +3164,7 @@ skip.installer property in build.properties" />
  

  
@@ -231,7 +237,7 @@ index 348487c..04e40fa 100644
  
  
  
-@@ -3181,7 +3190,7 @@ skip.installer property in build.properties" />
+@@ -3181,7 +3192,7 @@ skip.installer property in build.properties" />
  

  
@@ -240,7 +246,7 @@ index 348487c..04e40fa 100644
  

  
-@@ -3192,7 +3201,7 @@ skip.installer property in build.properties" />
+@@ -3192,7 +3203,7 @@ skip.installer property in build.properties" />
  

  
@@ -249,7 +255,7 @@ index 348487c..04e40fa 100644
  
  

-@@ -3203,7 +3212,7 @@ skip.installer property in build.properties" />
+@@ -3203,7 +3214,7 @@ skip.installer property in build.properties" />
  

  
  Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-@@ -1877,6 +1883,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
- 
-   
+@@ -1898,6 +1904,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
+ 
+   
+ 
 +


++
+   
+ 
+ 
+@@ -2756,7 +2768,7 @@ skip.installer property in build.properties" />

  

  
-@@ -2811,7 +2821,7 @@ skip.installer property in build.properties" />
+@@ -2811,7 +2823,7 @@ skip.installer property in build.properties" />

  


-@@ -2889,7 +2899,7 @@ skip.installer property in build.properties" />
+@@ -2889,7 +2901,7 @@ skip.installer property in build.properties" />

  


-@@ -2944,13 +2954,13 @@ skip.installer property in 

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: 9ad6505d0f6be0dc01ae0e77136db16abda0b634
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Jul 14 16:38:28 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Jul 14 16:41:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ad6505d

www-servers/tomcat: removed vulnerable 9.0.36

Bug: https://bugs.gentoo.org/732128
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Miroslav Šulc  gentoo.org>

 www-servers/tomcat/Manifest|   3 -
 .../tomcat/files/tomcat-9.0.27-build.xml.patch | 278 -
 www-servers/tomcat/tomcat-9.0.36.ebuild| 181 --
 3 files changed, 462 deletions(-)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 66343952a79..7601189318c 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -2,9 +2,6 @@ DIST apache-tomcat-7.0.104-src.tar.gz 5309794 BLAKE2B 
0d4d5d668e1131bb533af1d56f
 DIST apache-tomcat-7.0.105-src.tar.gz 5312024 BLAKE2B 
0eaad66c6dcc3e2f6a2d8e142a7832cbd413724cab8b10f00e87d5535f4f20d5ba4712794e09444a8b3e0cf23f036da7c6923f038a6a11714682b129ed4ac5dd
 SHA512 
249e039775e833d75b631cec26132b42e4aed25491a29f2349fa41b81737688b0a2e453072d8e3c5fc28763a9d1922f59da7529378ce8fd472eca7bbc73a6bd2
 DIST apache-tomcat-8.5.56-src.tar.gz 5724546 BLAKE2B 
623dc2d1f6808f012f19fdd0d914c4bb200e8328ab6b6855666c1db1704e198d069ff74d227bf51e8376c20daf0640002e5d6907edadfde294d8c62a64d55f83
 SHA512 
75529e567a7be48f2c1034f3eeada571478d0babb63fb2d368061573d7e64d5fc0a937304e2e2ffa956b5d8a403936c1543a93ee78b258b532939fb9ce80ef3d
 DIST apache-tomcat-8.5.57-src.tar.gz 5730658 BLAKE2B 
f9bd2e159abc6af62c8681c38ea4eae8155f95df11f7c244e45018929189ef6b6a37a11e84119c3ddcb134a8ab58773add19cbab7506bb87c43b0039899fde60
 SHA512 
8bf4334b190c36900b708ee7097097e513f2d4572f119173bee732c76b5b660350fe516e58ac867250c2ef7a1371b55c116d3a1abd18323ceb92337f1dcb0f60
-DIST apache-tomcat-9.0.36-src.tar.gz 5890912 BLAKE2B 
18962c7d4dcd75a04476acd306002977bf039d832aa1ed5551ffcaa0612e612e6b11db6d80cea149b9fb5df9d0f76284d55a1745760df8f4fa744e095c61
 SHA512 
f8263594bc679f75cecf5bcf4ad8e8ccfea42ad8e90eaeb7004c63875c6b700b0f863d68f1cdd932ebc7b303bdfb86d70afe88686e576c8ea7ccd9574c74e25b
 DIST apache-tomcat-9.0.37-src.tar.gz 5894559 BLAKE2B 
63148418ef96e90f212ce8a00dc6a274a8da2a1aa8a53ad0f6d3960efc8e876dd2812f425c0f21c73ee291752c5fd3bc8025eed46d18d31ae72e8bbe6dc1ba10
 SHA512 
6e819fe255c467b0081e91c17a53fa383fe84d922492c62d7dd93cabf00e22ab30872ecaa298a9b12977b8c7518f36c8429091b24c9fb5200db64e80e853ce98
-DIST biz.aQute.bnd-4.1.0.jar 9263260 BLAKE2B 
e251a9d8b653f3e815e6c2f7774d64f1d594f3ce4b2f77956c806698df4d873310067cece68663324b11fcef8d90796b087abb289dbe2a13164a9038da4a6260
 SHA512 
f5d230358840f4909e35de40343fb7ee50a2d4d4691691f5ea896cfe212a086ad4859e0ee6ed4c315211223663b2fb2c07af7ea88786cedbcd4f891e5a4589ef
 DIST biz.aQute.bnd-5.1.1.jar 16088761 BLAKE2B 
59906cc39ea27ef20cbf82de1ba78096f34dc417da6dc5c28e21f6e92c0625efecf14cec6c5faf0ab17551c31a6c87a24614c2ac75ac902cfea30199ecc0d39f
 SHA512 
8092b083e7b86e75bf27233964763b88bee74d8ae141c85e387c1cc8bd0cbf3a54be27afea29931fb3ae950700a515fd4a28cfe8e7f26cbaaec506aa06357a37
-DIST biz.aQute.bndlib-4.1.0.jar 2897463 BLAKE2B 
c29a55e07cc103919dca1e938722bf94b107e2989a4a8ae887998152a93b641a659a5209129b992432bcb2673dd4b56ec9a929627530a631db10666f2177c0e4
 SHA512 
2acccbb323f3d740506e89a74c5affab85e628f9062ee0d799ccd09efe0b55436d8887a46d7d94ad636a2c793632635974f1bbb045e4789391937222c8d00d30
 DIST biz.aQute.bndlib-5.1.1.jar 3652944 BLAKE2B 
dad9f9835fb407a36e0eae4b65fa2fda147e06ab3f3211a2ed2f1631aeccd6d14d198c325793cb1ce9a57b719a836db230d0452715744ba5a4a6c2983c17916b
 SHA512 
d7da056ba541ae0862159bf5e38e1a5351b2ab5388c88733b46601c2d7dab8970f16af00df186a6cb67fbe81ef53f2c8402db9d28a8c6819dadf60a1df40879b

diff --git a/www-servers/tomcat/files/tomcat-9.0.27-build.xml.patch 
b/www-servers/tomcat/files/tomcat-9.0.27-build.xml.patch
deleted file mode 100644
index 05c8ffa1f99..000
--- a/www-servers/tomcat/files/tomcat-9.0.27-build.xml.patch
+++ /dev/null
@@ -1,278 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 020531c..a71f6ee 100644
 a/build.xml
-+++ b/build.xml
-@@ -754,6 +754,7 @@
-   addOSGi="true" />
- 
- 
-+
- 
-+
- 
-+
- 
- 
- 
- 
--
-+  addOSGi="true" /> -->
- 
- 
- 
--
-+
- 
- 
-   
-@@ -1188,7 +1191,7 @@
- 
-   
- 
--
-+
- 
- 
- 
-@@ -1231,7 +1234,7 @@
- 
-   
- 
--  
-+  
- 
- 
- 
-   
- 
--  
-+  
- 
- 
- 
- 
-+
- 
- 
- 
-+
- 
- 
- Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-@@ -1844,6 +1850,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
- 
-   
-+
- 
-   
-   
-+
-   
-   
-   https://docs.oracle.com/javase/8/docs/api/"/>
-@@ -2714,7 +2724,7 @@ skip.installer property in 

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: 6758214878199b5ad3164652aaef9dbe3109cf20
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Jul  7 10:21:51 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Jul  7 10:22:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67582148

www-servers/tomcat: bump to 9.0.37

added workaround for broken build.xml after rewrite

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Miroslav Šulc  gentoo.org>

 www-servers/tomcat/Manifest|   3 +
 .../tomcat/files/tomcat-9.0.37-build.xml.patch | 278 +
 .../files/tomcat-9.0.37-fix-build-rewrite.patch|  13 +
 www-servers/tomcat/tomcat-9.0.37.ebuild| 187 ++
 4 files changed, 481 insertions(+)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 2deaef8fd5c..cf037a1cd9f 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -2,5 +2,8 @@ DIST apache-tomcat-7.0.104-src.tar.gz 5309794 BLAKE2B 
0d4d5d668e1131bb533af1d56f
 DIST apache-tomcat-8.5.56-src.tar.gz 5724546 BLAKE2B 
623dc2d1f6808f012f19fdd0d914c4bb200e8328ab6b6855666c1db1704e198d069ff74d227bf51e8376c20daf0640002e5d6907edadfde294d8c62a64d55f83
 SHA512 
75529e567a7be48f2c1034f3eeada571478d0babb63fb2d368061573d7e64d5fc0a937304e2e2ffa956b5d8a403936c1543a93ee78b258b532939fb9ce80ef3d
 DIST apache-tomcat-8.5.57-src.tar.gz 5730658 BLAKE2B 
f9bd2e159abc6af62c8681c38ea4eae8155f95df11f7c244e45018929189ef6b6a37a11e84119c3ddcb134a8ab58773add19cbab7506bb87c43b0039899fde60
 SHA512 
8bf4334b190c36900b708ee7097097e513f2d4572f119173bee732c76b5b660350fe516e58ac867250c2ef7a1371b55c116d3a1abd18323ceb92337f1dcb0f60
 DIST apache-tomcat-9.0.36-src.tar.gz 5890912 BLAKE2B 
18962c7d4dcd75a04476acd306002977bf039d832aa1ed5551ffcaa0612e612e6b11db6d80cea149b9fb5df9d0f76284d55a1745760df8f4fa744e095c61
 SHA512 
f8263594bc679f75cecf5bcf4ad8e8ccfea42ad8e90eaeb7004c63875c6b700b0f863d68f1cdd932ebc7b303bdfb86d70afe88686e576c8ea7ccd9574c74e25b
+DIST apache-tomcat-9.0.37-src.tar.gz 5894559 BLAKE2B 
63148418ef96e90f212ce8a00dc6a274a8da2a1aa8a53ad0f6d3960efc8e876dd2812f425c0f21c73ee291752c5fd3bc8025eed46d18d31ae72e8bbe6dc1ba10
 SHA512 
6e819fe255c467b0081e91c17a53fa383fe84d922492c62d7dd93cabf00e22ab30872ecaa298a9b12977b8c7518f36c8429091b24c9fb5200db64e80e853ce98
 DIST biz.aQute.bnd-4.1.0.jar 9263260 BLAKE2B 
e251a9d8b653f3e815e6c2f7774d64f1d594f3ce4b2f77956c806698df4d873310067cece68663324b11fcef8d90796b087abb289dbe2a13164a9038da4a6260
 SHA512 
f5d230358840f4909e35de40343fb7ee50a2d4d4691691f5ea896cfe212a086ad4859e0ee6ed4c315211223663b2fb2c07af7ea88786cedbcd4f891e5a4589ef
+DIST biz.aQute.bnd-5.1.1.jar 16088761 BLAKE2B 
59906cc39ea27ef20cbf82de1ba78096f34dc417da6dc5c28e21f6e92c0625efecf14cec6c5faf0ab17551c31a6c87a24614c2ac75ac902cfea30199ecc0d39f
 SHA512 
8092b083e7b86e75bf27233964763b88bee74d8ae141c85e387c1cc8bd0cbf3a54be27afea29931fb3ae950700a515fd4a28cfe8e7f26cbaaec506aa06357a37
 DIST biz.aQute.bndlib-4.1.0.jar 2897463 BLAKE2B 
c29a55e07cc103919dca1e938722bf94b107e2989a4a8ae887998152a93b641a659a5209129b992432bcb2673dd4b56ec9a929627530a631db10666f2177c0e4
 SHA512 
2acccbb323f3d740506e89a74c5affab85e628f9062ee0d799ccd09efe0b55436d8887a46d7d94ad636a2c793632635974f1bbb045e4789391937222c8d00d30
+DIST biz.aQute.bndlib-5.1.1.jar 3652944 BLAKE2B 
dad9f9835fb407a36e0eae4b65fa2fda147e06ab3f3211a2ed2f1631aeccd6d14d198c325793cb1ce9a57b719a836db230d0452715744ba5a4a6c2983c17916b
 SHA512 
d7da056ba541ae0862159bf5e38e1a5351b2ab5388c88733b46601c2d7dab8970f16af00df186a6cb67fbe81ef53f2c8402db9d28a8c6819dadf60a1df40879b

diff --git a/www-servers/tomcat/files/tomcat-9.0.37-build.xml.patch 
b/www-servers/tomcat/files/tomcat-9.0.37-build.xml.patch
new file mode 100644
index 000..92540986e9c
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-9.0.37-build.xml.patch
@@ -0,0 +1,278 @@
+diff --git a/build.xml b/build.xml
+index 8e02cb5..e07b2d7 100644
+--- a/build.xml
 b/build.xml
+@@ -760,6 +760,7 @@
+   addOSGi="true" />
+ 
+ 
++
+ 
++
+ 
++
+ 
+ 
+ 
+ 
+-
++  addOSGi="true" /> -->
+ 
+ 
+ 
+-
++
+ 
+ 
+   
+@@ -1201,7 +1204,7 @@
+ 
+   
+ 
+-
++
+ 
+ 
+ 
+@@ -1244,7 +1247,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+ 
++
+ 
+ 
+ 
++
+ 
+ 
+ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -1877,6 +1883,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
+ 
+   
++
+ 
+   
+   
++
+   
+   
+   https://docs.oracle.com/javase/8/docs/api/"/>
+@@ -2756,7 +2766,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download components necessary to compile" 
unless="noget" >
+ 
+ 
+ 
+@@ -2811,7 +2821,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download additional 

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: 96b0481565c1b8b1cc409b871417384eb944b748
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Apr 30 09:13:29 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Apr 30 09:13:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96b04815

www-servers/tomcat: removed obsolete 7.0.100 and 8.5.51

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Miroslav Šulc  gentoo.org>

 www-servers/tomcat/Manifest|   2 -
 .../tomcat/files/tomcat-7.0.94-build.xml.patch | 163 -
 www-servers/tomcat/tomcat-7.0.100.ebuild   | 146 --
 www-servers/tomcat/tomcat-8.5.51.ebuild| 158 
 4 files changed, 469 deletions(-)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index ce3c02e..50232614a86 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,6 +1,4 @@
-DIST apache-tomcat-7.0.100-src.tar.gz 5265444 BLAKE2B 
9c706e6a50e13cd8f542669e2d80f8940816976cfb84f62c3e17bbe6f0cc6d76d6fcdd18ec69e706ce27552aa66041833f6ae7bba8e671e187de3246e90a25c5
 SHA512 
53ef64c64263d0f25d72ed179bd7b7beed3f73cd63010988ba740ff7328b00a5ec09fe1d4575188ecacf258c891e022a0f1ae07d2957d9830a56881170bb1a57
 DIST apache-tomcat-7.0.103-src.tar.gz 5279592 BLAKE2B 
a8ab36fb84cf158fcd8b888276576cd523d211ab0f6fe0933f600d1990a8f68076f192177a574987e52440037c0ebefd3edaf3c84fee541afb076c5ad33cce9b
 SHA512 
812fce83c7242ebc16dc2365f0b363f1fb2691cd6a2f19f1209ea467557c42ee2d108c8bef89f23bb4a20c800d0ecdb4afc37567ef8079966b4eec0331a2ef9b
-DIST apache-tomcat-8.5.51-src.tar.gz 5661227 BLAKE2B 
711de5678903941a5261693972906f2d0fca2c9d3219e62d3186e5d71a2e3cb4da0a5028e62790a26dad2d244246c2f41c74f18e17d52ec0af070f0d5842ca3f
 SHA512 
8529d2e7d83a863fe88ed4ee8ec29b673e5df4bea53231412c0d89e2384d3939b9d1f29350a4ca46966ab5d4a0d3178ed5d2caa50aa766092a3ab8f28dd27592
 DIST apache-tomcat-8.5.53-src.tar.gz 5676477 BLAKE2B 
284ddc3b3d491a57aac31fc59a9c7d80bdb11efb410ab53eea5d3a0a754507203de287eff0a621d02bfea581b45b860598c8ab95d529ad18790fe381f5518cca
 SHA512 
d78613042a9e4caa5b5eeebd2589383ef10312698e535e2c8f82e40c7b3d793ea6cac50f346316a84f4b47ad330f82c7a4f0e4a3d2f0d449f1d4dad9c6d5e267
 DIST apache-tomcat-8.5.54-src.tar.gz 5689648 BLAKE2B 
7d4c80cb86261bba46b1879d8f2b9218a63cfb069d32dfe72bd5d73baf87887cdff37c5841c44196ded1dbafcfe2d525cb09d8a15905c24600caf107255416cf
 SHA512 
fe4a82fc58aed0df203abf03367f840d7ac498a3ba317eb2b08826e8ab5e705ea13b99f3af1e17878b2cf96271c5d9ff4e7cecf3b2631e061f1b02988449f9e2
 DIST apache-tomcat-9.0.33-src.tar.gz 5831264 BLAKE2B 
7ef5b28dfc4f24003075012cfe6403060dfc908386577ea3dbab3d7a4eca1d22cdcaab3f821079a90d9407030bedf657f5abd9829d643f699ba875b7b702f0a3
 SHA512 
73ffb36dc7331bf9e455b599b128c51da8f90222bd3cb296e211d266c18964bf66004524725acd6d3e29099d2fdc3180892c228b2a00b06544455240bf05c9b0

diff --git a/www-servers/tomcat/files/tomcat-7.0.94-build.xml.patch 
b/www-servers/tomcat/files/tomcat-7.0.94-build.xml.patch
deleted file mode 100644
index 832ce0be4a2..000
--- a/www-servers/tomcat/files/tomcat-7.0.94-build.xml.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 92d8b92..790d8fd 100644
 a/build.xml
-+++ b/build.xml
-@@ -685,12 +685,14 @@
-   
- 
- 
-+
- 
-   
- 
-@@ -741,26 +743,32 @@
-   manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
- 
- 
-+
- 
- 
-+
- 
- 
-+
- 
- 
- 
- 
- 
--
-+  filesId="files.tomcat-dbcp" /> -->
- 
- 
- 
--
-+
- 
- 
-   
-@@ -1083,7 +1091,7 @@
- 
-   
- 
--
-+
- 
- 
- 
-@@ -1728,7 +1736,7 @@
- 
-   
-+  description="Prepare to build web services extras package" 
unless="noget">
- 
- 
-   
-@@ -1925,11 +1933,12 @@
- 
- 
- 
-+
- 
- 
- Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-@@ -1941,6 +1950,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
- description="Create the Tomcat javadoc" >
- 
-+
- 
- 
-   
-+
-   
-   http://docs.oracle.com/javase/7/docs/api/"/>
-   http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
-@@ -2658,7 +2671,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
-   
- 
-   
-+  description="Download components necessary to compile" 
unless="noget" >
- 
- 
- 
-@@ -2683,7 +2696,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
-   
- 
-   
-+  description="Download additional components for the tests" 
unless="noget">
- 
- 
-   
-@@ -2747,7 +2760,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
-   
- 
-   
-+  description="Download additional components for a distribution" 
unless="noget">
- 
- 
-   

diff --git a/www-servers/tomcat/tomcat-7.0.100.ebuild 

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: c819430774cee0183fba70c187c3244d883c2b45
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Feb  9 23:38:05 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Feb  9 23:38:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8194307

www-servers/tomcat: dropping 9.0.7 + dropping to unstable

Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Miroslav Šulc  gentoo.org>

 www-servers/tomcat/Manifest|   1 -
 .../tomcat/files/tomcat-9.0.4-build.xml.patch  | 256 -
 www-servers/tomcat/tomcat-9.0.7.ebuild | 157 -
 3 files changed, 414 deletions(-)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 07d17aa1390..bd849bc0f4b 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -2,6 +2,5 @@ DIST apache-tomcat-7.0.96-src.tar.gz 4983881 BLAKE2B 
d5b828b7a4e8a7a5ce793a15421
 DIST apache-tomcat-7.0.99-src.tar.gz 5242549 BLAKE2B 
e24933364bae6ddd2b7aeec342f3bfe0293533e2513a34ec6e9b5b6da7ecc3c2fb1d88c1b49f470532d8db821a0b8f0821698d8ec52a6d88a7769cd86912a8bc
 SHA512 
3148879d4a893167b9e60fd1ee6972fc9be8a5be97016ad1d86117c0cb681ac40702680bd21562a284f78aac327f0388e99af458cf1868a3b0ad5e31899b23c0
 DIST apache-tomcat-8.5.47-src.tar.gz 5607118 BLAKE2B 
3c326056f674032424d298c7581243a24dd01fae39b1ce7069b60e1bcf3d825de954164f643e887618c43c87d691bc41f942e73bf86b254b4c7dca9c68ce7cce
 SHA512 
1513fdaf7751ee263d878cdfc05329bc4ee50e2f3aeea68e1d173a5f4d555ec59a43050222f013758f704967730dd25a64337cf1ba4365ab53b8730af87b4051
 DIST apache-tomcat-9.0.27-src.tar.gz 5761278 BLAKE2B 
7d4a65dfa43e0956a5dbb1dad3bf1aa475e7c503d3192ac24921d7cee9bd85379cd820ce693e8c583a7cab23263b0abfa960968d04d766764e222ba8c5bd97d4
 SHA512 
3f63cbd49f93e6a9d44ea63b4f787cf498930b82d19eaf60603c126b8800d2894d306c27e42ab73b042f3bba9cfb75b6c939b91b8b9141e4903eb1b88c2a4ec8
-DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B 
b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798
 SHA512 
cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2
 DIST biz.aQute.bnd-4.1.0.jar 9263260 BLAKE2B 
e251a9d8b653f3e815e6c2f7774d64f1d594f3ce4b2f77956c806698df4d873310067cece68663324b11fcef8d90796b087abb289dbe2a13164a9038da4a6260
 SHA512 
f5d230358840f4909e35de40343fb7ee50a2d4d4691691f5ea896cfe212a086ad4859e0ee6ed4c315211223663b2fb2c07af7ea88786cedbcd4f891e5a4589ef
 DIST biz.aQute.bndlib-4.1.0.jar 2897463 BLAKE2B 
c29a55e07cc103919dca1e938722bf94b107e2989a4a8ae887998152a93b641a659a5209129b992432bcb2673dd4b56ec9a929627530a631db10666f2177c0e4
 SHA512 
2acccbb323f3d740506e89a74c5affab85e628f9062ee0d799ccd09efe0b55436d8887a46d7d94ad636a2c793632635974f1bbb045e4789391937222c8d00d30

diff --git a/www-servers/tomcat/files/tomcat-9.0.4-build.xml.patch 
b/www-servers/tomcat/files/tomcat-9.0.4-build.xml.patch
deleted file mode 100644
index feb5f126a37..000
--- a/www-servers/tomcat/files/tomcat-9.0.4-build.xml.patch
+++ /dev/null
@@ -1,256 +0,0 @@
 a/build.xml
-+++ b/build.xml
-@@ -719,24 +719,30 @@
-   manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
- 
- 
-+
- 
- 
-+
- 
- 
-+
- 
- 
- 
--
-+
- 
- 
-   
-@@ -1074,7 +1080,7 @@
- 
-   
- 
--
-+
- 
- 
- 
-@@ -1108,7 +1114,7 @@
- 
-   
- 
--  
-+  
- 
- 
- 
-   
- 
--  
-+  
- 
- 
- 
- 
-+
- 
- 
- 
-+
- 
- 
- Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-@@ -1766,6 +1775,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
- 
-   
-+
- 
- 
-   
-+
-   
-   http://docs.oracle.com/javase/8/docs/api/"/>
-   http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
-@@ -2617,7 +2630,7 @@ skip.installer property in build.properties" />
-   
- 
-   
-+  description="Download (and build) components necessary to compile" 
unless="noget">
- 
- 
- 
-@@ -2637,7 +2650,7 @@ skip.installer property in build.properties" />
-   
- 
-   
-+  description="Download additional components for the tests" 
unless="noget">
- 
- 
-   
-@@ -2694,7 +2707,7 @@ skip.installer property in build.properties" />
-   
- 
-   
-+  description="Download additional components for a distribution" 
unless="noget">
- 
- 
-   
-@@ -2734,18 +2747,18 @@ skip.installer property in build.properties" />
- 
-   
- 
--  
-+  
- 
- 
-   
- 
--  
-+  
- 
- 
-   
- 
--  
-+  
- 
- 
- 
-@@ -2757,7 +2770,7 @@ skip.installer property in build.properties" />
- 
-   
- 
--  
-+  
- 
- 
- 
-@@ -2776,7 +2789,7 @@ skip.installer property in build.properties" />
- 
-   
- 
--  
-+  
- 
- 
- 
-@@ -2787,7 +2800,7 @@ skip.installer property in 

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: 5cfb2e279a82b0c9cde5606c4d8fc4146f2780d4
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Oct 16 10:50:32 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Oct 16 10:50:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cfb2e27

www-servers/tomcat-9.0.27: bump

Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Miroslav Šulc  gentoo.org>

 www-servers/tomcat/Manifest|   1 +
 .../tomcat/files/tomcat-9.0.27-build.xml.patch | 278 +
 www-servers/tomcat/tomcat-9.0.27.ebuild| 182 ++
 3 files changed, 461 insertions(+)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 8b56f4c6158..1587040752e 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -5,6 +5,7 @@ DIST apache-tomcat-8.5.46-src.tar.gz 5599021 BLAKE2B 
3755f15612e63ac06cbfa097f15
 DIST apache-tomcat-8.5.47-src.tar.gz 5607118 BLAKE2B 
3c326056f674032424d298c7581243a24dd01fae39b1ce7069b60e1bcf3d825de954164f643e887618c43c87d691bc41f942e73bf86b254b4c7dca9c68ce7cce
 SHA512 
1513fdaf7751ee263d878cdfc05329bc4ee50e2f3aeea68e1d173a5f4d555ec59a43050222f013758f704967730dd25a64337cf1ba4365ab53b8730af87b4051
 DIST apache-tomcat-9.0.24-src.tar.gz 5746934 BLAKE2B 
fe0ff76fd8b3caa2860c0798d66f0dfff1e907ca02d10913c768d8513b207ef11e8fe885cd7578348136b8d007e08ccc2044952198259ffcdb2d58acf9fbb8b6
 SHA512 
de11d0e992cce08edb83474bd4cab04857e3e2bf63ef334c8c9f3ad053edcc76691e831cc95b8c489b820773a6fa5d2755837b470d73471f9587bb7062d75a31
 DIST apache-tomcat-9.0.26-src.tar.gz 5750303 BLAKE2B 
582acae0f24cab5fdd44c085b36e771508020d124f9329036b3bf0698da1fb2cda69d6f4254eeaca00ce3c34c3740fe69c077637107167fface60b9fa74c8869
 SHA512 
8f430439c66f5a43c7a35bc99edd11549100be28b17fb44e17ec432f72e1797cdebd641a7f19c1d918635e51c164ecd1c9d1399a63abfce05d9a8c37db381837
+DIST apache-tomcat-9.0.27-src.tar.gz 5761278 BLAKE2B 
7d4a65dfa43e0956a5dbb1dad3bf1aa475e7c503d3192ac24921d7cee9bd85379cd820ce693e8c583a7cab23263b0abfa960968d04d766764e222ba8c5bd97d4
 SHA512 
3f63cbd49f93e6a9d44ea63b4f787cf498930b82d19eaf60603c126b8800d2894d306c27e42ab73b042f3bba9cfb75b6c939b91b8b9141e4903eb1b88c2a4ec8
 DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B 
b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798
 SHA512 
cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2
 DIST biz.aQute.bnd-4.1.0.jar 9263260 BLAKE2B 
e251a9d8b653f3e815e6c2f7774d64f1d594f3ce4b2f77956c806698df4d873310067cece68663324b11fcef8d90796b087abb289dbe2a13164a9038da4a6260
 SHA512 
f5d230358840f4909e35de40343fb7ee50a2d4d4691691f5ea896cfe212a086ad4859e0ee6ed4c315211223663b2fb2c07af7ea88786cedbcd4f891e5a4589ef
 DIST biz.aQute.bndlib-4.1.0.jar 2897463 BLAKE2B 
c29a55e07cc103919dca1e938722bf94b107e2989a4a8ae887998152a93b641a659a5209129b992432bcb2673dd4b56ec9a929627530a631db10666f2177c0e4
 SHA512 
2acccbb323f3d740506e89a74c5affab85e628f9062ee0d799ccd09efe0b55436d8887a46d7d94ad636a2c793632635974f1bbb045e4789391937222c8d00d30

diff --git a/www-servers/tomcat/files/tomcat-9.0.27-build.xml.patch 
b/www-servers/tomcat/files/tomcat-9.0.27-build.xml.patch
new file mode 100644
index 000..05c8ffa1f99
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-9.0.27-build.xml.patch
@@ -0,0 +1,278 @@
+diff --git a/build.xml b/build.xml
+index 020531c..a71f6ee 100644
+--- a/build.xml
 b/build.xml
+@@ -754,6 +754,7 @@
+   addOSGi="true" />
+ 
+ 
++
+ 
++
+ 
++
+ 
+ 
+ 
+ 
+-
++  addOSGi="true" /> -->
+ 
+ 
+ 
+-
++
+ 
+ 
+   
+@@ -1188,7 +1191,7 @@
+ 
+   
+ 
+-
++
+ 
+ 
+ 
+@@ -1231,7 +1234,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+ 
++
+ 
+ 
+ 
++
+ 
+ 
+ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -1844,6 +1850,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
+ 
+   
++
+ 
+   
+   
++
+   
+   
+   https://docs.oracle.com/javase/8/docs/api/"/>
+@@ -2714,7 +2724,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download components necessary to compile" 
unless="noget" >
+ 
+ 
+ 
+@@ -2769,7 +2779,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download additional components for the tests" 
unless="noget">
+ 
+ 
+   
+@@ -2847,7 +2857,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download additional components for a distribution" 
unless="noget">
+ 
+ 
+   
+@@ -2902,13 +2912,13 @@ skip.installer property in build.properties" />
+ 
+   
+ 
+-  
++  
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+   
+@@ -3030,7 +3040,7 @@ 

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: 06b19bca9cd1beac25172338cd89d897e5a49a56
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Oct 16 09:37:36 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Oct 16 09:37:58 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06b19bca

www-servers/tomcat-8.5.47: bump

Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Miroslav Šulc  gentoo.org>

 www-servers/tomcat/Manifest|   1 +
 .../tomcat/files/tomcat-8.5.47-build.xml.patch | 259 +
 www-servers/tomcat/tomcat-8.5.47.ebuild| 159 +
 3 files changed, 419 insertions(+)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 29f5215855e..8b56f4c6158 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -2,6 +2,7 @@ DIST apache-tomcat-7.0.96-src.tar.gz 4983881 BLAKE2B 
d5b828b7a4e8a7a5ce793a15421
 DIST apache-tomcat-8.5.43-src.tar.gz 5283886 BLAKE2B 
2d76e66eedf4de474d439289a9a491e5c490e2373bc91ae30113b8f3c624255339d24149b58fba640aaf3131ab3c9a449930049d26928627e1b7910f0cddd40f
 SHA512 
f6a0439dbfd3f233bd1eb395d37466ba2cce32cd456d067fb2bb45099ac173dec7e42e7fbfab2cb50c0fce2e9dba1f1afe6c8d65877525cb13cb116489cf27a7
 DIST apache-tomcat-8.5.45-src.tar.gz 5324847 BLAKE2B 
5ef3388b9324bb04772543c03686057b3035f5a5f40009d0aa1ec34fe18d04af87527bcc9ae0566f41faf64de8ce191f8ea4e2ed2869da569777621aad227d6c
 SHA512 
1fe94b9d5ccf63d2c5fc3dd7a47dabade160ed2882848e0a41422b5a67215d53e8265535ee8e645157d56c4eba9093722982684be6668064648b0782fc48927a
 DIST apache-tomcat-8.5.46-src.tar.gz 5599021 BLAKE2B 
3755f15612e63ac06cbfa097f1531dc36542ba559a6ef60230b133e45d14bb4c4c54d4dcc8b05b9996f54ac253fb1630f6a6e900ee00e4af0a9200f83455a952
 SHA512 
02e93cc6fb4226e81b03ae60f479e15b438b1c68c1a4104200db9cc473939b92d66eea12f0783727b06f643d11ebe3da2a81c80cbe486ed497a3280e8cdb2e62
+DIST apache-tomcat-8.5.47-src.tar.gz 5607118 BLAKE2B 
3c326056f674032424d298c7581243a24dd01fae39b1ce7069b60e1bcf3d825de954164f643e887618c43c87d691bc41f942e73bf86b254b4c7dca9c68ce7cce
 SHA512 
1513fdaf7751ee263d878cdfc05329bc4ee50e2f3aeea68e1d173a5f4d555ec59a43050222f013758f704967730dd25a64337cf1ba4365ab53b8730af87b4051
 DIST apache-tomcat-9.0.24-src.tar.gz 5746934 BLAKE2B 
fe0ff76fd8b3caa2860c0798d66f0dfff1e907ca02d10913c768d8513b207ef11e8fe885cd7578348136b8d007e08ccc2044952198259ffcdb2d58acf9fbb8b6
 SHA512 
de11d0e992cce08edb83474bd4cab04857e3e2bf63ef334c8c9f3ad053edcc76691e831cc95b8c489b820773a6fa5d2755837b470d73471f9587bb7062d75a31
 DIST apache-tomcat-9.0.26-src.tar.gz 5750303 BLAKE2B 
582acae0f24cab5fdd44c085b36e771508020d124f9329036b3bf0698da1fb2cda69d6f4254eeaca00ce3c34c3740fe69c077637107167fface60b9fa74c8869
 SHA512 
8f430439c66f5a43c7a35bc99edd11549100be28b17fb44e17ec432f72e1797cdebd641a7f19c1d918635e51c164ecd1c9d1399a63abfce05d9a8c37db381837
 DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B 
b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798
 SHA512 
cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2

diff --git a/www-servers/tomcat/files/tomcat-8.5.47-build.xml.patch 
b/www-servers/tomcat/files/tomcat-8.5.47-build.xml.patch
new file mode 100644
index 000..ffbd0701611
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.5.47-build.xml.patch
@@ -0,0 +1,259 @@
+diff --git a/build.xml b/build.xml
+index c274aab..ed1c3e5 100644
+--- a/build.xml
 b/build.xml
+@@ -739,24 +739,29 @@
+   manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+ 
++
+ 
++
+ 
+ 
++
+ 
+ 
+ 
+ 
+ 
+-
++  filesId="files.tomcat-dbcp" /> -->
+ 
+ 
+ 
+-
++
+ 
+ 
+   
+@@ -1134,7 +1139,7 @@
+ 
+   
+ 
+-
++
+ 
+ 
+ 
+@@ -1177,7 +1182,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+ 
++
+ 
+ 
+ 
+ 
+   
+   
++
+   
+   
+   https://docs.oracle.com/javase/7/docs/api/"/>
+@@ -2728,7 +2739,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download components necessary to compile" 
unless="noget" >
+ 
+ 
+ 
+@@ -2764,7 +2775,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download additional components for the tests" 
unless="noget">
+ 
+ 
+   
+@@ -2842,7 +2853,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download additional components for a distribution" 
unless="noget">
+ 
+ 
+   
+@@ -2897,13 +2908,13 @@ skip.installer property in build.properties" />
+ 
+   
+ 
+-  
++  
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+   
+@@ -3025,7 +3036,7 @@ skip.installer property in build.properties" />
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+@@ -3042,7 +3053,7 @@ 

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: 49cedcf6e1892b53574cd49ec75a2628e4066e5f
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Oct 16 08:38:21 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Oct 16 08:38:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49cedcf6

www-servers/tomcat-8.0.53: removed (eol 2018-06-30)

Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Miroslav Šulc  gentoo.org>

 www-servers/tomcat/Manifest|   1 -
 .../tomcat/files/tomcat-8.0.53-build.xml.patch | 270 -
 www-servers/tomcat/tomcat-8.0.53.ebuild| 159 
 3 files changed, 430 deletions(-)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 0d062f0dfdd..29f5215855e 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,5 +1,4 @@
 DIST apache-tomcat-7.0.96-src.tar.gz 4983881 BLAKE2B 
d5b828b7a4e8a7a5ce793a15421fbd6b12b55918aa7c15bc8209b4c762d7f422a7315e4cbe9b4ae2da754b6d8493bc11ae6a5c99f11a1ac3b23473e05fa26c83
 SHA512 
5797e66fb9ce558340e08d3a4ccd372d912707aabd6177318781925dd35055902a0ecc3e50e677d76b0feea547cc8fc038bb83ae5de65d28680cb4c9582f60c0
-DIST apache-tomcat-8.0.53-src.tar.gz 5057041 BLAKE2B 
3a50d2f61baecb5244909972384e36478c69e7592dd35119d8b7b974273c57a4855082f309146ed160144dbdcced3236fd586b047970bd8558bbe7b7e002e9fd
 SHA512 
0b56bc723277b296ab34ec3e49cb56bac94ddf1a9b96bd023982e2ffabd5317f63b3c0971afdc8cd7a6364197409df461d22151dbaab3a2be7daf6858b9e
 DIST apache-tomcat-8.5.43-src.tar.gz 5283886 BLAKE2B 
2d76e66eedf4de474d439289a9a491e5c490e2373bc91ae30113b8f3c624255339d24149b58fba640aaf3131ab3c9a449930049d26928627e1b7910f0cddd40f
 SHA512 
f6a0439dbfd3f233bd1eb395d37466ba2cce32cd456d067fb2bb45099ac173dec7e42e7fbfab2cb50c0fce2e9dba1f1afe6c8d65877525cb13cb116489cf27a7
 DIST apache-tomcat-8.5.45-src.tar.gz 5324847 BLAKE2B 
5ef3388b9324bb04772543c03686057b3035f5a5f40009d0aa1ec34fe18d04af87527bcc9ae0566f41faf64de8ce191f8ea4e2ed2869da569777621aad227d6c
 SHA512 
1fe94b9d5ccf63d2c5fc3dd7a47dabade160ed2882848e0a41422b5a67215d53e8265535ee8e645157d56c4eba9093722982684be6668064648b0782fc48927a
 DIST apache-tomcat-8.5.46-src.tar.gz 5599021 BLAKE2B 
3755f15612e63ac06cbfa097f1531dc36542ba559a6ef60230b133e45d14bb4c4c54d4dcc8b05b9996f54ac253fb1630f6a6e900ee00e4af0a9200f83455a952
 SHA512 
02e93cc6fb4226e81b03ae60f479e15b438b1c68c1a4104200db9cc473939b92d66eea12f0783727b06f643d11ebe3da2a81c80cbe486ed497a3280e8cdb2e62

diff --git a/www-servers/tomcat/files/tomcat-8.0.53-build.xml.patch 
b/www-servers/tomcat/files/tomcat-8.0.53-build.xml.patch
deleted file mode 100644
index eb12467b66f..000
--- a/www-servers/tomcat/files/tomcat-8.0.53-build.xml.patch
+++ /dev/null
@@ -1,270 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 5ee1d86..ade4446 100644
 a/build.xml
-+++ b/build.xml
-@@ -723,24 +723,29 @@
-   manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
- 
- 
-+
- 
-+
- 
- 
-+
- 
- 
- 
--
-+
- 
- 
-   
-@@ -1072,7 +1077,7 @@
- 
-   
- 
--
-+
- 
- 
- 
-@@ -1108,7 +1113,7 @@
- 
-   
- 
--  
-+  
- 
- 
- 
-   
- 
--  
-+  
- 
- 
- 
- 
-+
- 
- 
- 
-+
- 
- 
- Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-@@ -1984,6 +1992,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
- 
-   
-+
- 
- 
-   
-+
-   
-   http://docs.oracle.com/javase/7/docs/api/"/>
-   https://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
-@@ -2821,7 +2833,7 @@ skip.installer property in build.properties" />
-   
- 
-   
-+  description="Download (and build) components necessary to compile" 
unless="noget">
- 
- 
- 
-@@ -2847,7 +2859,7 @@ skip.installer property in build.properties" />
-   
- 
-   
-+  description="Download additional components for the tests" 
unless="noget">
- 
- 
-   
-@@ -2925,7 +2937,7 @@ skip.installer property in build.properties" />
-   
- 
-   
-+  description="Download additional components for a distribution" 
unless="noget">
- 
- 
-   
-@@ -2980,13 +2992,13 @@ skip.installer property in build.properties" />
- 
-   
- 
--  
-+  
- 
- 
-   
- 
--  
-+  
- 
- 
-   
-@@ -3108,7 +3120,7 @@ skip.installer property in build.properties" />
- 
-   
- 
--  
-+  
- 
- 
- 
-@@ -3125,7 +3137,7 @@ skip.installer property in build.properties" />
- 
-   
- 
--  
-+  
- 
- 
- 
-@@ -3150,7 +3162,7 @@ skip.installer property in build.properties" />
- 
-   
- 
--  
-+  
- 
- 
- 
-@@ -3166,7 +3178,7 @@ skip.installer property in build.properties" />
- 
-   
- 
--  
-+  
- 
- 
- 
-@@ -3190,7 +3202,7 @@ skip.installer property in build.properties" />
- 
-   
- 
--  
-+  
- 
- 
- 
-@@ -3205,7 +3217,7 @@ skip.installer property in 

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: 8d86dd5d09b15e451f253dabf3f102d04ed17382
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Jun 12 09:47:55 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Jun 12 09:48:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d86dd5d

www-servers/tomcat-{7.0.93,8.5.{39,40},9.0.1{7,9}}: removed obsolete

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Miroslav Šulc  gentoo.org>

 www-servers/tomcat/Manifest|   5 -
 .../tomcat/files/tomcat-7.0.84-build.xml.patch | 159 -
 .../tomcat/files/tomcat-8.5.39-build.xml.patch | 247 ---
 .../tomcat/files/tomcat-9.0.17-build.xml.patch | 265 -
 www-servers/tomcat/tomcat-7.0.93.ebuild| 147 
 www-servers/tomcat/tomcat-8.5.39.ebuild| 159 -
 www-servers/tomcat/tomcat-8.5.40.ebuild| 159 -
 www-servers/tomcat/tomcat-9.0.17.ebuild| 182 --
 www-servers/tomcat/tomcat-9.0.19.ebuild| 182 --
 9 files changed, 1505 deletions(-)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index b34fa2b4ad3..799e57f2541 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,11 +1,6 @@
-DIST apache-tomcat-7.0.93-src.tar.gz 4786577 BLAKE2B 
8b72418c98369e0e104c5f51e9d822c287487b5d3b66a4a6d005535b33a35a6cbc50c49b48100555bfaba0c6c983ea11dcdf381d2fba80a77fc17ac0df20efaa
 SHA512 
5f9b08827aeae58f371496c34ce1ae5692bd5403e1a9a7a91b283ece3289356dbd85d48fcb71958aaeeb42cd65bb70fcf34cbe2db3901475cfb812370766f3fc
 DIST apache-tomcat-7.0.94-src.tar.gz 4966331 BLAKE2B 
e806baa91ebe4672fb238d6fd461b2055ff90db822b7edb2ad4432334d45cf2c2286639bc12f83987972a47129493bef4ba6ec77e544a93e000282a2d24ae9e8
 SHA512 
5e8d2fab7145af5677170299bec0ae5ea5fd20b7a539738678a420581f9b53a95a6fbb1caffb54c7222d97edfe8ff34ce6dbb7ba62adb1a61f2bfa6b15c43139
 DIST apache-tomcat-8.0.53-src.tar.gz 5057041 BLAKE2B 
3a50d2f61baecb5244909972384e36478c69e7592dd35119d8b7b974273c57a4855082f309146ed160144dbdcced3236fd586b047970bd8558bbe7b7e002e9fd
 SHA512 
0b56bc723277b296ab34ec3e49cb56bac94ddf1a9b96bd023982e2ffabd5317f63b3c0971afdc8cd7a6364197409df461d22151dbaab3a2be7daf6858b9e
-DIST apache-tomcat-8.5.39-src.tar.gz 5264067 BLAKE2B 
8cd672529660783d3310beae356c32a9392f550ae72f2cdbd60f23c3b532e3adb19a295737fb39e9a2990b14edeff51cedf1f936f32f844e496e751913f2a859
 SHA512 
ba591290be49a01cec38300c6321b634e3ca7417074b55103afc887b9af3eda942d302aee5f1648e7fa60b5231cd7d83428846e2b55a4964f5cc98c27a844f8d
-DIST apache-tomcat-8.5.40-src.tar.gz 5274830 BLAKE2B 
d96044fecd8f3bd5b971e9bfed79fd7768845f5e760140513c6701f34e0217edfb7718b669e38c3de8554fca5c5af08660c423a266909dab5b0fa089e24c107a
 SHA512 
aef81900ef0af98122d19ef467b06569b46e084c50c14673872b82517b9b61569a2df70f5763bb30100edf73eb73bcf1c81bcb1106018c81ad96f4a019f72ae2
 DIST apache-tomcat-8.5.41-src.tar.gz 5285992 BLAKE2B 
8055591319c475cda9e8124107fef94f31837095ecfcbd6388f226d09fbe14825988c956257b90a7eb36068546fd7c2958fb5f63870d8eff30a72d2c8309bb97
 SHA512 
59f5ffa64e8fb445b86a9413e0bc3aee3ba87a727ad5ed2c5aa1a20653068530e85d59407b2907483341d3721c6d6da52bf41c02138abc1b1ec97395b9ee727f
-DIST apache-tomcat-9.0.17-src.tar.gz 5670728 BLAKE2B 
15f8518ec073a935dec6afdd3a8f9885e7867a0aa033024024bd72b7887011ca169c776f2a4d886d93a73a478f9dcad5f87c31b3a30a88ca913309c51e0f0ec7
 SHA512 
b5763dae05598c0a4d3638ba02c0627219de20406bddaab86ae3262299f2d9bbda1a5db612cad9fb8a54b2888e9ce1c4be67613d855cfd92b4cee5b85e226602
-DIST apache-tomcat-9.0.19-src.tar.gz 5692733 BLAKE2B 
771d8afd50e9032edda09abb5d03e16663a7475d36ee9a5561cd54fbc948169c145ea95bc16ebc690280e5327a5a9868e56a29bd08acb6c10c34fc4e7bf94cc7
 SHA512 
0461ab9a4e5f021636957b5bc8fbe45714488837e53ca2df4bf9faab5c620270c3041859e034135ccc6e2914ae70e4e38cf4b4353cb17b543ed3dc3a7628fba1
 DIST apache-tomcat-9.0.20-src.tar.gz 5702073 BLAKE2B 
80170a2b6bdb525f186814458f78211cdd7717178d5cb816b39a0c83b637434f276884c9da42e12ef04e1f43261ef36cf0508178157f5ea43a96289d2de27ecb
 SHA512 
3635212ff28ca491243ae0f0edf0572ca82f583286296f302c5d02f93917d218e9601cbf90cb022c2f2b6b4f17c3460d74aee19b13caff9d1ee028ee09dd
 DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B 
b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798
 SHA512 
cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2
 DIST biz.aQute.bnd-4.1.0.jar 9263260 BLAKE2B 
e251a9d8b653f3e815e6c2f7774d64f1d594f3ce4b2f77956c806698df4d873310067cece68663324b11fcef8d90796b087abb289dbe2a13164a9038da4a6260
 SHA512 
f5d230358840f4909e35de40343fb7ee50a2d4d4691691f5ea896cfe212a086ad4859e0ee6ed4c315211223663b2fb2c07af7ea88786cedbcd4f891e5a4589ef

diff --git a/www-servers/tomcat/files/tomcat-7.0.84-build.xml.patch 
b/www-servers/tomcat/files/tomcat-7.0.84-build.xml.patch

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: 0ffb639856248f401e5a0425c6279445ccd4982f
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Apr 19 14:47:34 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Apr 19 14:50:58 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ffb6398

www-servers/tomcat-9.0.16: removed obsolete

Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Miroslav Šulc  gentoo.org>

 www-servers/tomcat/Manifest|   1 -
 .../tomcat/files/tomcat-9.0.16-build.xml.patch | 265 -
 www-servers/tomcat/tomcat-9.0.16.ebuild| 182 --
 3 files changed, 448 deletions(-)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 03598b47525..dac737d170a 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,7 +1,6 @@
 DIST apache-tomcat-7.0.93-src.tar.gz 4786577 BLAKE2B 
8b72418c98369e0e104c5f51e9d822c287487b5d3b66a4a6d005535b33a35a6cbc50c49b48100555bfaba0c6c983ea11dcdf381d2fba80a77fc17ac0df20efaa
 SHA512 
5f9b08827aeae58f371496c34ce1ae5692bd5403e1a9a7a91b283ece3289356dbd85d48fcb71958aaeeb42cd65bb70fcf34cbe2db3901475cfb812370766f3fc
 DIST apache-tomcat-8.0.53-src.tar.gz 5057041 BLAKE2B 
3a50d2f61baecb5244909972384e36478c69e7592dd35119d8b7b974273c57a4855082f309146ed160144dbdcced3236fd586b047970bd8558bbe7b7e002e9fd
 SHA512 
0b56bc723277b296ab34ec3e49cb56bac94ddf1a9b96bd023982e2ffabd5317f63b3c0971afdc8cd7a6364197409df461d22151dbaab3a2be7daf6858b9e
 DIST apache-tomcat-8.5.39-src.tar.gz 5264067 BLAKE2B 
8cd672529660783d3310beae356c32a9392f550ae72f2cdbd60f23c3b532e3adb19a295737fb39e9a2990b14edeff51cedf1f936f32f844e496e751913f2a859
 SHA512 
ba591290be49a01cec38300c6321b634e3ca7417074b55103afc887b9af3eda942d302aee5f1648e7fa60b5231cd7d83428846e2b55a4964f5cc98c27a844f8d
-DIST apache-tomcat-9.0.16-src.tar.gz 5654943 BLAKE2B 
a412457c2d34367301b4335a3a4bf46a647f8e60440be751874e1eaad400a0832b64fcae4c9f81585a4afbddafd75f2929bc78c12eb05b20539b11de686dfecc
 SHA512 
60fbdefbddaa6fac4bc9d0ca4c1d9a119dd53063fd4574c474daf5f346fddc9cb7fd174f1be189e965d5ae4670710347d84fcf443c7df01faac9a1b84ecb33ce
 DIST apache-tomcat-9.0.17-src.tar.gz 5670728 BLAKE2B 
15f8518ec073a935dec6afdd3a8f9885e7867a0aa033024024bd72b7887011ca169c776f2a4d886d93a73a478f9dcad5f87c31b3a30a88ca913309c51e0f0ec7
 SHA512 
b5763dae05598c0a4d3638ba02c0627219de20406bddaab86ae3262299f2d9bbda1a5db612cad9fb8a54b2888e9ce1c4be67613d855cfd92b4cee5b85e226602
 DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B 
b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798
 SHA512 
cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2
 DIST biz.aQute.bnd-4.1.0.jar 9263260 BLAKE2B 
e251a9d8b653f3e815e6c2f7774d64f1d594f3ce4b2f77956c806698df4d873310067cece68663324b11fcef8d90796b087abb289dbe2a13164a9038da4a6260
 SHA512 
f5d230358840f4909e35de40343fb7ee50a2d4d4691691f5ea896cfe212a086ad4859e0ee6ed4c315211223663b2fb2c07af7ea88786cedbcd4f891e5a4589ef

diff --git a/www-servers/tomcat/files/tomcat-9.0.16-build.xml.patch 
b/www-servers/tomcat/files/tomcat-9.0.16-build.xml.patch
deleted file mode 100644
index 8712be138e0..000
--- a/www-servers/tomcat/files/tomcat-9.0.16-build.xml.patch
+++ /dev/null
@@ -1,265 +0,0 @@
-diff --git a/build.xml b/build.xml
-index e5c5076..72231a6 100644
 a/build.xml
-+++ b/build.xml
-@@ -742,6 +742,7 @@
-   addOSGi="true" />
- 
- 
-+
- 
-+
- 
-+
- 
- 
--
-+
- 
- 
-   
-@@ -1176,7 +1179,7 @@
- 
-   
- 
--
-+
- 
- 
- 
-@@ -1212,7 +1215,7 @@
- 
-   
- 
--  
-+  
- 
- 
- 
-   
- 
--  
-+  
- 
- 
- 
- 
-+
- 
- 
- 
-+
- 
- 
- Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-@@ -1799,6 +1805,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
- 
-   
-+
- 
- 
-   
-+
-   
-   http://docs.oracle.com/javase/8/docs/api/"/>
-   https://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
-@@ -2616,7 +2626,7 @@ skip.installer property in build.properties" />
-   
- 
-   
-+  description="Download (and build) components necessary to compile" 
unless="noget">
- 
- 
- 
-@@ -2671,7 +2681,7 @@ skip.installer property in build.properties" />
-   
- 
-   
-+  description="Download additional components for the tests" 
unless="noget">
- 
- 
-   
-@@ -2749,7 +2759,7 @@ skip.installer property in build.properties" />
-   
- 
-   
-+  description="Download additional components for a distribution" 
unless="noget">
- 
- 
-   
-@@ -2804,13 +2814,13 @@ skip.installer property in build.properties" />
- 
-   
- 
--  
-+  
- 
- 
-   
- 
--  
-+  
- 
- 
-   
-@@ -2932,7 +2942,7 @@ skip.installer property in build.properties" />

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: 0ae393727741e9f4bbb1a092fa442158d15b370c
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Apr 19 15:33:19 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Apr 19 15:44:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ae39372

www-servers/tomcat-8.5.40: bump

Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Miroslav Šulc  gentoo.org>

 www-servers/tomcat/Manifest|   1 +
 .../tomcat/files/tomcat-8.5.40-build.xml.patch | 259 +
 www-servers/tomcat/tomcat-8.5.40.ebuild| 159 +
 3 files changed, 419 insertions(+)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index af2df86dea4..98c5a5f5467 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -2,6 +2,7 @@ DIST apache-tomcat-7.0.93-src.tar.gz 4786577 BLAKE2B 
8b72418c98369e0e104c5f51e9d
 DIST apache-tomcat-7.0.94-src.tar.gz 4966331 BLAKE2B 
e806baa91ebe4672fb238d6fd461b2055ff90db822b7edb2ad4432334d45cf2c2286639bc12f83987972a47129493bef4ba6ec77e544a93e000282a2d24ae9e8
 SHA512 
5e8d2fab7145af5677170299bec0ae5ea5fd20b7a539738678a420581f9b53a95a6fbb1caffb54c7222d97edfe8ff34ce6dbb7ba62adb1a61f2bfa6b15c43139
 DIST apache-tomcat-8.0.53-src.tar.gz 5057041 BLAKE2B 
3a50d2f61baecb5244909972384e36478c69e7592dd35119d8b7b974273c57a4855082f309146ed160144dbdcced3236fd586b047970bd8558bbe7b7e002e9fd
 SHA512 
0b56bc723277b296ab34ec3e49cb56bac94ddf1a9b96bd023982e2ffabd5317f63b3c0971afdc8cd7a6364197409df461d22151dbaab3a2be7daf6858b9e
 DIST apache-tomcat-8.5.39-src.tar.gz 5264067 BLAKE2B 
8cd672529660783d3310beae356c32a9392f550ae72f2cdbd60f23c3b532e3adb19a295737fb39e9a2990b14edeff51cedf1f936f32f844e496e751913f2a859
 SHA512 
ba591290be49a01cec38300c6321b634e3ca7417074b55103afc887b9af3eda942d302aee5f1648e7fa60b5231cd7d83428846e2b55a4964f5cc98c27a844f8d
+DIST apache-tomcat-8.5.40-src.tar.gz 5274830 BLAKE2B 
d96044fecd8f3bd5b971e9bfed79fd7768845f5e760140513c6701f34e0217edfb7718b669e38c3de8554fca5c5af08660c423a266909dab5b0fa089e24c107a
 SHA512 
aef81900ef0af98122d19ef467b06569b46e084c50c14673872b82517b9b61569a2df70f5763bb30100edf73eb73bcf1c81bcb1106018c81ad96f4a019f72ae2
 DIST apache-tomcat-9.0.17-src.tar.gz 5670728 BLAKE2B 
15f8518ec073a935dec6afdd3a8f9885e7867a0aa033024024bd72b7887011ca169c776f2a4d886d93a73a478f9dcad5f87c31b3a30a88ca913309c51e0f0ec7
 SHA512 
b5763dae05598c0a4d3638ba02c0627219de20406bddaab86ae3262299f2d9bbda1a5db612cad9fb8a54b2888e9ce1c4be67613d855cfd92b4cee5b85e226602
 DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B 
b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798
 SHA512 
cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2
 DIST biz.aQute.bnd-4.1.0.jar 9263260 BLAKE2B 
e251a9d8b653f3e815e6c2f7774d64f1d594f3ce4b2f77956c806698df4d873310067cece68663324b11fcef8d90796b087abb289dbe2a13164a9038da4a6260
 SHA512 
f5d230358840f4909e35de40343fb7ee50a2d4d4691691f5ea896cfe212a086ad4859e0ee6ed4c315211223663b2fb2c07af7ea88786cedbcd4f891e5a4589ef

diff --git a/www-servers/tomcat/files/tomcat-8.5.40-build.xml.patch 
b/www-servers/tomcat/files/tomcat-8.5.40-build.xml.patch
new file mode 100644
index 000..e049d77141e
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.5.40-build.xml.patch
@@ -0,0 +1,259 @@
+diff --git a/build.xml b/build.xml
+index 179802b..49ac8c0 100644
+--- a/build.xml
 b/build.xml
+@@ -727,24 +727,29 @@
+   manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+ 
++
+ 
++
+ 
+ 
++
+ 
+ 
+ 
+ 
+ 
+-
++  filesId="files.tomcat-dbcp" /> -->
+ 
+ 
+ 
+-
++
+ 
+ 
+   
+@@ -1092,7 +1097,7 @@
+ 
+   
+ 
+-
++
+ 
+ 
+ 
+@@ -1128,7 +1133,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+ 
++
+ 
+ 
+ 
+ 
+ 
+   
++
+   
+   http://docs.oracle.com/javase/7/docs/api/"/>
+   http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2629,7 +2640,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download components necessary to compile" 
unless="noget" >
+ 
+ 
+ 
+@@ -2655,7 +2666,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download additional components for the tests" 
unless="noget">
+ 
+ 
+   
+@@ -2733,7 +2744,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download additional components for a distribution" 
unless="noget">
+ 
+ 
+   
+@@ -2788,13 +2799,13 @@ skip.installer property in build.properties" />
+ 
+   
+ 
+-  
++  
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+   
+@@ -2916,7 +2927,7 @@ skip.installer property in build.properties" />
+ 
+   
+ 

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: cc79fc4dd2b8958d02032bc1bf537d318e013021
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Apr 19 15:44:32 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Apr 19 15:45:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc79fc4d

www-servers/tomcat-9.0.19: bump

Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Miroslav Šulc  gentoo.org>

 www-servers/tomcat/Manifest|   1 +
 .../tomcat/files/tomcat-9.0.19-build.xml.patch | 278 +
 www-servers/tomcat/tomcat-9.0.19.ebuild| 182 ++
 3 files changed, 461 insertions(+)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 98c5a5f5467..fece6ff50f4 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -4,6 +4,7 @@ DIST apache-tomcat-8.0.53-src.tar.gz 5057041 BLAKE2B 
3a50d2f61baecb5244909972384
 DIST apache-tomcat-8.5.39-src.tar.gz 5264067 BLAKE2B 
8cd672529660783d3310beae356c32a9392f550ae72f2cdbd60f23c3b532e3adb19a295737fb39e9a2990b14edeff51cedf1f936f32f844e496e751913f2a859
 SHA512 
ba591290be49a01cec38300c6321b634e3ca7417074b55103afc887b9af3eda942d302aee5f1648e7fa60b5231cd7d83428846e2b55a4964f5cc98c27a844f8d
 DIST apache-tomcat-8.5.40-src.tar.gz 5274830 BLAKE2B 
d96044fecd8f3bd5b971e9bfed79fd7768845f5e760140513c6701f34e0217edfb7718b669e38c3de8554fca5c5af08660c423a266909dab5b0fa089e24c107a
 SHA512 
aef81900ef0af98122d19ef467b06569b46e084c50c14673872b82517b9b61569a2df70f5763bb30100edf73eb73bcf1c81bcb1106018c81ad96f4a019f72ae2
 DIST apache-tomcat-9.0.17-src.tar.gz 5670728 BLAKE2B 
15f8518ec073a935dec6afdd3a8f9885e7867a0aa033024024bd72b7887011ca169c776f2a4d886d93a73a478f9dcad5f87c31b3a30a88ca913309c51e0f0ec7
 SHA512 
b5763dae05598c0a4d3638ba02c0627219de20406bddaab86ae3262299f2d9bbda1a5db612cad9fb8a54b2888e9ce1c4be67613d855cfd92b4cee5b85e226602
+DIST apache-tomcat-9.0.19-src.tar.gz 5692733 BLAKE2B 
771d8afd50e9032edda09abb5d03e16663a7475d36ee9a5561cd54fbc948169c145ea95bc16ebc690280e5327a5a9868e56a29bd08acb6c10c34fc4e7bf94cc7
 SHA512 
0461ab9a4e5f021636957b5bc8fbe45714488837e53ca2df4bf9faab5c620270c3041859e034135ccc6e2914ae70e4e38cf4b4353cb17b543ed3dc3a7628fba1
 DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B 
b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798
 SHA512 
cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2
 DIST biz.aQute.bnd-4.1.0.jar 9263260 BLAKE2B 
e251a9d8b653f3e815e6c2f7774d64f1d594f3ce4b2f77956c806698df4d873310067cece68663324b11fcef8d90796b087abb289dbe2a13164a9038da4a6260
 SHA512 
f5d230358840f4909e35de40343fb7ee50a2d4d4691691f5ea896cfe212a086ad4859e0ee6ed4c315211223663b2fb2c07af7ea88786cedbcd4f891e5a4589ef
 DIST biz.aQute.bndlib-4.1.0.jar 2897463 BLAKE2B 
c29a55e07cc103919dca1e938722bf94b107e2989a4a8ae887998152a93b641a659a5209129b992432bcb2673dd4b56ec9a929627530a631db10666f2177c0e4
 SHA512 
2acccbb323f3d740506e89a74c5affab85e628f9062ee0d799ccd09efe0b55436d8887a46d7d94ad636a2c793632635974f1bbb045e4789391937222c8d00d30

diff --git a/www-servers/tomcat/files/tomcat-9.0.19-build.xml.patch 
b/www-servers/tomcat/files/tomcat-9.0.19-build.xml.patch
new file mode 100644
index 000..a4bcbeb949b
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-9.0.19-build.xml.patch
@@ -0,0 +1,278 @@
+diff --git a/build.xml b/build.xml
+index b3b299f..40bf4f8 100644
+--- a/build.xml
 b/build.xml
+@@ -752,6 +752,7 @@
+   addOSGi="true" />
+ 
+ 
++
+ 
++
+ 
++
+ 
+ 
+ 
+ 
+-
++  addOSGi="true" /> -->
+ 
+ 
+ 
+-
++
+ 
+ 
+   
+@@ -1186,7 +1189,7 @@
+ 
+   
+ 
+-
++
+ 
+ 
+ 
+@@ -1222,7 +1225,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+ 
++
+ 
+ 
+ 
++
+ 
+ 
+ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -1863,6 +1869,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
+ 
+   
++
+ 
+ 
+   
++
+   
+   http://docs.oracle.com/javase/8/docs/api/"/>
+   https://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2686,7 +2696,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download components necessary to compile" 
unless="noget" >
+ 
+ 
+ 
+@@ -2741,7 +2751,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download additional components for the tests" 
unless="noget">
+ 
+ 
+   
+@@ -2819,7 +2829,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download additional components for a distribution" 
unless="noget">
+ 
+ 
+   
+@@ -2874,13 +2884,13 @@ skip.installer property in build.properties" />
+ 
+   
+ 
+-  
++  
+ 

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: ad227ffe791b7f75d7218055d090e231b954f954
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Apr 19 15:19:57 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Apr 19 15:19:57 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad227ffe

www-servers/tomcat-7.0.94: bump

Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Miroslav Šulc  gentoo.org>

 www-servers/tomcat/Manifest|   1 +
 .../tomcat/files/tomcat-7.0.94-build.xml.patch | 163 +
 www-servers/tomcat/tomcat-7.0.94.ebuild| 147 +++
 3 files changed, 311 insertions(+)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index dac737d170a..af2df86dea4 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,4 +1,5 @@
 DIST apache-tomcat-7.0.93-src.tar.gz 4786577 BLAKE2B 
8b72418c98369e0e104c5f51e9d822c287487b5d3b66a4a6d005535b33a35a6cbc50c49b48100555bfaba0c6c983ea11dcdf381d2fba80a77fc17ac0df20efaa
 SHA512 
5f9b08827aeae58f371496c34ce1ae5692bd5403e1a9a7a91b283ece3289356dbd85d48fcb71958aaeeb42cd65bb70fcf34cbe2db3901475cfb812370766f3fc
+DIST apache-tomcat-7.0.94-src.tar.gz 4966331 BLAKE2B 
e806baa91ebe4672fb238d6fd461b2055ff90db822b7edb2ad4432334d45cf2c2286639bc12f83987972a47129493bef4ba6ec77e544a93e000282a2d24ae9e8
 SHA512 
5e8d2fab7145af5677170299bec0ae5ea5fd20b7a539738678a420581f9b53a95a6fbb1caffb54c7222d97edfe8ff34ce6dbb7ba62adb1a61f2bfa6b15c43139
 DIST apache-tomcat-8.0.53-src.tar.gz 5057041 BLAKE2B 
3a50d2f61baecb5244909972384e36478c69e7592dd35119d8b7b974273c57a4855082f309146ed160144dbdcced3236fd586b047970bd8558bbe7b7e002e9fd
 SHA512 
0b56bc723277b296ab34ec3e49cb56bac94ddf1a9b96bd023982e2ffabd5317f63b3c0971afdc8cd7a6364197409df461d22151dbaab3a2be7daf6858b9e
 DIST apache-tomcat-8.5.39-src.tar.gz 5264067 BLAKE2B 
8cd672529660783d3310beae356c32a9392f550ae72f2cdbd60f23c3b532e3adb19a295737fb39e9a2990b14edeff51cedf1f936f32f844e496e751913f2a859
 SHA512 
ba591290be49a01cec38300c6321b634e3ca7417074b55103afc887b9af3eda942d302aee5f1648e7fa60b5231cd7d83428846e2b55a4964f5cc98c27a844f8d
 DIST apache-tomcat-9.0.17-src.tar.gz 5670728 BLAKE2B 
15f8518ec073a935dec6afdd3a8f9885e7867a0aa033024024bd72b7887011ca169c776f2a4d886d93a73a478f9dcad5f87c31b3a30a88ca913309c51e0f0ec7
 SHA512 
b5763dae05598c0a4d3638ba02c0627219de20406bddaab86ae3262299f2d9bbda1a5db612cad9fb8a54b2888e9ce1c4be67613d855cfd92b4cee5b85e226602

diff --git a/www-servers/tomcat/files/tomcat-7.0.94-build.xml.patch 
b/www-servers/tomcat/files/tomcat-7.0.94-build.xml.patch
new file mode 100644
index 000..832ce0be4a2
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-7.0.94-build.xml.patch
@@ -0,0 +1,163 @@
+diff --git a/build.xml b/build.xml
+index 92d8b92..790d8fd 100644
+--- a/build.xml
 b/build.xml
+@@ -685,12 +685,14 @@
+   
+ 
+ 
++
+ 
+   
+ 
+@@ -741,26 +743,32 @@
+   manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+ 
++
+ 
+ 
++
+ 
+ 
++
+ 
+ 
+ 
+ 
+ 
+-
++  filesId="files.tomcat-dbcp" /> -->
+ 
+ 
+ 
+-
++
+ 
+ 
+   
+@@ -1083,7 +1091,7 @@
+ 
+   
+ 
+-
++
+ 
+ 
+ 
+@@ -1728,7 +1736,7 @@
+ 
+   
++  description="Prepare to build web services extras package" 
unless="noget">
+ 
+ 
+   
+@@ -1925,11 +1933,12 @@
+ 
+ 
+ 
++
+ 
+ 
+ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -1941,6 +1950,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
+ description="Create the Tomcat javadoc" >
+ 
++
+ 
+ 
+   
++
+   
+   http://docs.oracle.com/javase/7/docs/api/"/>
+   http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2658,7 +2671,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
+   
+ 
+   
++  description="Download components necessary to compile" 
unless="noget" >
+ 
+ 
+ 
+@@ -2683,7 +2696,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
+   
+ 
+   
++  description="Download additional components for the tests" 
unless="noget">
+ 
+ 
+   
+@@ -2747,7 +2760,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
+   
+ 
+   
++  description="Download additional components for a distribution" 
unless="noget">
+ 
+ 
+   

diff --git a/www-servers/tomcat/tomcat-7.0.94.ebuild 
b/www-servers/tomcat/tomcat-7.0.94.ebuild
new file mode 100644
index 000..b94ae21e1ef
--- /dev/null
+++ b/www-servers/tomcat/tomcat-7.0.94.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: be689f6ddbdafdcac9255b1e5ef193daf75ebf84
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Mar 20 16:42:20 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Mar 20 16:49:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be689f6d

www-servers/tomcat-8.5.39: bump

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Miroslav Šulc  gentoo.org>

 www-servers/tomcat/Manifest|   1 +
 .../tomcat/files/tomcat-8.5.39-build.xml.patch | 247 +
 www-servers/tomcat/tomcat-8.5.39.ebuild| 159 +
 3 files changed, 407 insertions(+)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 0a94acd84cd..cb67bf28c1b 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -2,6 +2,7 @@ DIST apache-tomcat-7.0.92-src.tar.gz 4778943 BLAKE2B 
d11b01219a25c303ce791d96590
 DIST apache-tomcat-7.0.93-src.tar.gz 4786577 BLAKE2B 
8b72418c98369e0e104c5f51e9d822c287487b5d3b66a4a6d005535b33a35a6cbc50c49b48100555bfaba0c6c983ea11dcdf381d2fba80a77fc17ac0df20efaa
 SHA512 
5f9b08827aeae58f371496c34ce1ae5692bd5403e1a9a7a91b283ece3289356dbd85d48fcb71958aaeeb42cd65bb70fcf34cbe2db3901475cfb812370766f3fc
 DIST apache-tomcat-8.0.53-src.tar.gz 5057041 BLAKE2B 
3a50d2f61baecb5244909972384e36478c69e7592dd35119d8b7b974273c57a4855082f309146ed160144dbdcced3236fd586b047970bd8558bbe7b7e002e9fd
 SHA512 
0b56bc723277b296ab34ec3e49cb56bac94ddf1a9b96bd023982e2ffabd5317f63b3c0971afdc8cd7a6364197409df461d22151dbaab3a2be7daf6858b9e
 DIST apache-tomcat-8.5.38-src.tar.gz 5253678 BLAKE2B 
b2ecc732128934a3afa314ddc569b1b3d330ccb12b99b0ce4b12e1952347ac57cafb3a5637595997a0c9e77752ae41665e637c826c3b9ae9925799124e735480
 SHA512 
b84d96fa972a9d24957ef047cdce0fb49de3d365401b07990eaa5bad8f3c87a6b1ad1eac077c4be595ee291daef68720381fe63461815de47664275b486c
+DIST apache-tomcat-8.5.39-src.tar.gz 5264067 BLAKE2B 
8cd672529660783d3310beae356c32a9392f550ae72f2cdbd60f23c3b532e3adb19a295737fb39e9a2990b14edeff51cedf1f936f32f844e496e751913f2a859
 SHA512 
ba591290be49a01cec38300c6321b634e3ca7417074b55103afc887b9af3eda942d302aee5f1648e7fa60b5231cd7d83428846e2b55a4964f5cc98c27a844f8d
 DIST apache-tomcat-9.0.14-src.tar.gz 5472704 BLAKE2B 
ee533afd733dacbe4a20baadb4c5dc9fa7620d695c1c57b1662894945731f978508b45ef0d8169068c13ba862804868f12d3e494873643589b9f57bc9ec0a342
 SHA512 
46119f6ae9003b7a178dd5158c1eae3b5116461e73c5d78cd763bff82b80f282ff08cee5175cf850d3f209af900677e93bab31c556035a6eaf6aae86a5d42fc6
 DIST apache-tomcat-9.0.16-src.tar.gz 5654943 BLAKE2B 
a412457c2d34367301b4335a3a4bf46a647f8e60440be751874e1eaad400a0832b64fcae4c9f81585a4afbddafd75f2929bc78c12eb05b20539b11de686dfecc
 SHA512 
60fbdefbddaa6fac4bc9d0ca4c1d9a119dd53063fd4574c474daf5f346fddc9cb7fd174f1be189e965d5ae4670710347d84fcf443c7df01faac9a1b84ecb33ce
 DIST apache-tomcat-9.0.17-src.tar.gz 5670728 BLAKE2B 
15f8518ec073a935dec6afdd3a8f9885e7867a0aa033024024bd72b7887011ca169c776f2a4d886d93a73a478f9dcad5f87c31b3a30a88ca913309c51e0f0ec7
 SHA512 
b5763dae05598c0a4d3638ba02c0627219de20406bddaab86ae3262299f2d9bbda1a5db612cad9fb8a54b2888e9ce1c4be67613d855cfd92b4cee5b85e226602

diff --git a/www-servers/tomcat/files/tomcat-8.5.39-build.xml.patch 
b/www-servers/tomcat/files/tomcat-8.5.39-build.xml.patch
new file mode 100644
index 000..4b9bc77170a
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.5.39-build.xml.patch
@@ -0,0 +1,247 @@
+diff --git a/build.xml b/build.xml
+index 8f5f5c5..cebfcfa 100644
+--- a/build.xml
 b/build.xml
+@@ -722,24 +722,29 @@
+   manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+ 
++
+ 
++
+ 
+ 
++
+ 
+ 
+ 
+-
++
+ 
+ 
+   
+@@ -1087,7 +1092,7 @@
+ 
+   
+ 
+-
++
+ 
+ 
+ 
+@@ -1123,7 +1128,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+ 
++
+ 
+ 
+ 
+ 
+ 
+   
++
+   
+   http://docs.oracle.com/javase/7/docs/api/"/>
+   http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2617,7 +2628,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download components necessary to compile" 
unless="noget" >
+ 
+ 
+ 
+@@ -2643,7 +2654,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download additional components for the tests" 
unless="noget">
+ 
+ 
+   
+@@ -2721,7 +2732,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download additional components for a distribution" 
unless="noget">
+ 
+ 
+   
+@@ -2776,13 +2787,13 @@ skip.installer property in build.properties" />
+ 
+   
+ 
+-  
++  
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+   
+@@ -2904,7 +2915,7 @@ skip.installer property in build.properties" />
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+@@ -2921,7 +2932,7 @@ skip.installer 

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: f9b7bac665fce52432f29320d1cc4aa9074c5683
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Mar 20 16:47:31 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Mar 20 16:49:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9b7bac6

www-servers/tomcat-9.0.14: removed obsolete

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Miroslav Šulc  gentoo.org>

 www-servers/tomcat/Manifest|   1 -
 .../tomcat/files/tomcat-9.0.14-build.xml.patch | 265 -
 www-servers/tomcat/tomcat-9.0.14.ebuild| 180 --
 3 files changed, 446 deletions(-)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index cb67bf28c1b..76d30bbf913 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -3,7 +3,6 @@ DIST apache-tomcat-7.0.93-src.tar.gz 4786577 BLAKE2B 
8b72418c98369e0e104c5f51e9d
 DIST apache-tomcat-8.0.53-src.tar.gz 5057041 BLAKE2B 
3a50d2f61baecb5244909972384e36478c69e7592dd35119d8b7b974273c57a4855082f309146ed160144dbdcced3236fd586b047970bd8558bbe7b7e002e9fd
 SHA512 
0b56bc723277b296ab34ec3e49cb56bac94ddf1a9b96bd023982e2ffabd5317f63b3c0971afdc8cd7a6364197409df461d22151dbaab3a2be7daf6858b9e
 DIST apache-tomcat-8.5.38-src.tar.gz 5253678 BLAKE2B 
b2ecc732128934a3afa314ddc569b1b3d330ccb12b99b0ce4b12e1952347ac57cafb3a5637595997a0c9e77752ae41665e637c826c3b9ae9925799124e735480
 SHA512 
b84d96fa972a9d24957ef047cdce0fb49de3d365401b07990eaa5bad8f3c87a6b1ad1eac077c4be595ee291daef68720381fe63461815de47664275b486c
 DIST apache-tomcat-8.5.39-src.tar.gz 5264067 BLAKE2B 
8cd672529660783d3310beae356c32a9392f550ae72f2cdbd60f23c3b532e3adb19a295737fb39e9a2990b14edeff51cedf1f936f32f844e496e751913f2a859
 SHA512 
ba591290be49a01cec38300c6321b634e3ca7417074b55103afc887b9af3eda942d302aee5f1648e7fa60b5231cd7d83428846e2b55a4964f5cc98c27a844f8d
-DIST apache-tomcat-9.0.14-src.tar.gz 5472704 BLAKE2B 
ee533afd733dacbe4a20baadb4c5dc9fa7620d695c1c57b1662894945731f978508b45ef0d8169068c13ba862804868f12d3e494873643589b9f57bc9ec0a342
 SHA512 
46119f6ae9003b7a178dd5158c1eae3b5116461e73c5d78cd763bff82b80f282ff08cee5175cf850d3f209af900677e93bab31c556035a6eaf6aae86a5d42fc6
 DIST apache-tomcat-9.0.16-src.tar.gz 5654943 BLAKE2B 
a412457c2d34367301b4335a3a4bf46a647f8e60440be751874e1eaad400a0832b64fcae4c9f81585a4afbddafd75f2929bc78c12eb05b20539b11de686dfecc
 SHA512 
60fbdefbddaa6fac4bc9d0ca4c1d9a119dd53063fd4574c474daf5f346fddc9cb7fd174f1be189e965d5ae4670710347d84fcf443c7df01faac9a1b84ecb33ce
 DIST apache-tomcat-9.0.17-src.tar.gz 5670728 BLAKE2B 
15f8518ec073a935dec6afdd3a8f9885e7867a0aa033024024bd72b7887011ca169c776f2a4d886d93a73a478f9dcad5f87c31b3a30a88ca913309c51e0f0ec7
 SHA512 
b5763dae05598c0a4d3638ba02c0627219de20406bddaab86ae3262299f2d9bbda1a5db612cad9fb8a54b2888e9ce1c4be67613d855cfd92b4cee5b85e226602
 DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B 
b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798
 SHA512 
cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2

diff --git a/www-servers/tomcat/files/tomcat-9.0.14-build.xml.patch 
b/www-servers/tomcat/files/tomcat-9.0.14-build.xml.patch
deleted file mode 100644
index c3f3e71c0eb..000
--- a/www-servers/tomcat/files/tomcat-9.0.14-build.xml.patch
+++ /dev/null
@@ -1,265 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 971f912..1e43ae0 100644
 a/build.xml
-+++ b/build.xml
-@@ -769,6 +769,7 @@
-   addOSGi="true" />
- 
- 
-+
- 
-+
- 
-+
- 
- 
--
-+
- 
- 
-   
-@@ -1193,7 +1196,7 @@
- 
-   
- 
--
-+
- 
- 
- 
-@@ -1229,7 +1232,7 @@
- 
-   
- 
--  
-+  
- 
- 
- 
-   
- 
--  
-+  
- 
- 
- 
- 
-+
- 
- 
- 
-+
- 
- 
- Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-@@ -1898,6 +1904,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
- 
-   
-+
- 
- 
-   
-+
-   
-   http://docs.oracle.com/javase/8/docs/api/"/>
-   https://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
-@@ -2727,7 +2737,7 @@ skip.installer property in build.properties" />
-   
- 
-   
-+  description="Download (and build) components necessary to compile" 
unless="noget">
- 
- 
- 
-@@ -2763,7 +2773,7 @@ skip.installer property in build.properties" />
-  
- 
-   
-+  description="Download additional components for the tests" 
unless="noget">
- 
- 
-   
-@@ -2841,7 +2851,7 @@ skip.installer property in build.properties" />
-   
- 
-   
-+  description="Download additional components for a distribution" 
unless="noget">
- 
- 
-   
-@@ -2896,13 +2906,13 @@ skip.installer property in build.properties" />
- 
-   
- 
--  
-+  
- 
- 
-   
- 
--  
-+  

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: 781530295e86640ef036289df5fb8940951316d2
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Mar 19 19:04:46 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Mar 19 19:04:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78153029

www-servers/tomcat-9.0.17: bump

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Miroslav Šulc  gentoo.org>

 www-servers/tomcat/Manifest|   1 +
 .../tomcat/files/tomcat-9.0.17-build.xml.patch | 265 +
 www-servers/tomcat/tomcat-9.0.17.ebuild| 182 ++
 3 files changed, 448 insertions(+)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index ac9b0360ab6..fcc126ea670 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -5,6 +5,7 @@ DIST apache-tomcat-8.5.37-src.tar.gz 5233414 BLAKE2B 
1848180c3e0a3f4559e5c232bea
 DIST apache-tomcat-8.5.38-src.tar.gz 5253678 BLAKE2B 
b2ecc732128934a3afa314ddc569b1b3d330ccb12b99b0ce4b12e1952347ac57cafb3a5637595997a0c9e77752ae41665e637c826c3b9ae9925799124e735480
 SHA512 
b84d96fa972a9d24957ef047cdce0fb49de3d365401b07990eaa5bad8f3c87a6b1ad1eac077c4be595ee291daef68720381fe63461815de47664275b486c
 DIST apache-tomcat-9.0.14-src.tar.gz 5472704 BLAKE2B 
ee533afd733dacbe4a20baadb4c5dc9fa7620d695c1c57b1662894945731f978508b45ef0d8169068c13ba862804868f12d3e494873643589b9f57bc9ec0a342
 SHA512 
46119f6ae9003b7a178dd5158c1eae3b5116461e73c5d78cd763bff82b80f282ff08cee5175cf850d3f209af900677e93bab31c556035a6eaf6aae86a5d42fc6
 DIST apache-tomcat-9.0.16-src.tar.gz 5654943 BLAKE2B 
a412457c2d34367301b4335a3a4bf46a647f8e60440be751874e1eaad400a0832b64fcae4c9f81585a4afbddafd75f2929bc78c12eb05b20539b11de686dfecc
 SHA512 
60fbdefbddaa6fac4bc9d0ca4c1d9a119dd53063fd4574c474daf5f346fddc9cb7fd174f1be189e965d5ae4670710347d84fcf443c7df01faac9a1b84ecb33ce
+DIST apache-tomcat-9.0.17-src.tar.gz 5670728 BLAKE2B 
15f8518ec073a935dec6afdd3a8f9885e7867a0aa033024024bd72b7887011ca169c776f2a4d886d93a73a478f9dcad5f87c31b3a30a88ca913309c51e0f0ec7
 SHA512 
b5763dae05598c0a4d3638ba02c0627219de20406bddaab86ae3262299f2d9bbda1a5db612cad9fb8a54b2888e9ce1c4be67613d855cfd92b4cee5b85e226602
 DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B 
b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798
 SHA512 
cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2
 DIST biz.aQute.bnd-4.1.0.jar 9263260 BLAKE2B 
e251a9d8b653f3e815e6c2f7774d64f1d594f3ce4b2f77956c806698df4d873310067cece68663324b11fcef8d90796b087abb289dbe2a13164a9038da4a6260
 SHA512 
f5d230358840f4909e35de40343fb7ee50a2d4d4691691f5ea896cfe212a086ad4859e0ee6ed4c315211223663b2fb2c07af7ea88786cedbcd4f891e5a4589ef
 DIST biz.aQute.bndlib-4.1.0.jar 2897463 BLAKE2B 
c29a55e07cc103919dca1e938722bf94b107e2989a4a8ae887998152a93b641a659a5209129b992432bcb2673dd4b56ec9a929627530a631db10666f2177c0e4
 SHA512 
2acccbb323f3d740506e89a74c5affab85e628f9062ee0d799ccd09efe0b55436d8887a46d7d94ad636a2c793632635974f1bbb045e4789391937222c8d00d30

diff --git a/www-servers/tomcat/files/tomcat-9.0.17-build.xml.patch 
b/www-servers/tomcat/files/tomcat-9.0.17-build.xml.patch
new file mode 100644
index 000..b86841762a0
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-9.0.17-build.xml.patch
@@ -0,0 +1,265 @@
+diff --git a/build.xml b/build.xml
+index 54507d1..9c0bf6d 100644
+--- a/build.xml
 b/build.xml
+@@ -742,6 +742,7 @@
+   addOSGi="true" />
+ 
+ 
++
+ 
++
+ 
++
+ 
+ 
+-
++
+ 
+ 
+   
+@@ -1176,7 +1179,7 @@
+ 
+   
+ 
+-
++
+ 
+ 
+ 
+@@ -1212,7 +1215,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+ 
++
+ 
+ 
+ 
++
+ 
+ 
+ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -1799,6 +1805,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
+ 
+   
++
+ 
+ 
+   
++
+   
+   http://docs.oracle.com/javase/8/docs/api/"/>
+   https://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2616,7 +2626,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download components necessary to compile" 
unless="noget" >
+ 
+ 
+ 
+@@ -2671,7 +2681,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download additional components for the tests" 
unless="noget">
+ 
+ 
+   
+@@ -2749,7 +2759,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download additional components for a distribution" 
unless="noget">
+ 
+ 
+   
+@@ -2804,13 +2814,13 @@ skip.installer property in build.properties" />
+ 
+   
+ 
+-  
++  
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+   
+@@ -2932,7 +2942,7 

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: 086c30feff1ad160251723ec92ba4844e3cceb27
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Feb 10 14:10:48 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Feb 10 14:10:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=086c30fe

www-servers/tomcat-9.0.16: bump

Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Miroslav Šulc  gentoo.org>

 www-servers/tomcat/Manifest|   1 +
 .../tomcat/files/tomcat-9.0.16-build.xml.patch | 265 +
 www-servers/tomcat/tomcat-9.0.16.ebuild| 182 ++
 3 files changed, 448 insertions(+)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index eb08c4a869f..fccc93a948a 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -4,6 +4,7 @@ DIST apache-tomcat-8.0.53-src.tar.gz 5057041 BLAKE2B 
3a50d2f61baecb5244909972384
 DIST apache-tomcat-8.5.31-src.tar.gz 5154531 BLAKE2B 
cce0388e5c8c5fb5fcb3dba3b5961dc21d9f19d9a2f6177660a41410bddf241f73dda1e52c3875e28cfa13041c85a458a92c9a23c509b645f042cfa472081fde
 SHA512 
659137ef4809af329ae4dd6f5825a603c1408ef3e48153abe7480a722e7f4bebef68a64af9cbef4a4ad9a7e8da76494f825035bbadbb983a097525f476f32f33
 DIST apache-tomcat-8.5.37-src.tar.gz 5233414 BLAKE2B 
1848180c3e0a3f4559e5c232bea8bad6d05f09d9c4f2f9f903178012b7b8837d395a5ac73c8ac0504fbd3d1df3c2dc785022e1c97da4441cfdcf8b790170ff7c
 SHA512 
29ddbf7bfef19441a8a043020b5f1149d12590dac8120012a2167b6892e3db7c644990e49ba14cc4b4c7339faed65f010a7b24d660db0fb8adde34f032099cec
 DIST apache-tomcat-9.0.14-src.tar.gz 5472704 BLAKE2B 
ee533afd733dacbe4a20baadb4c5dc9fa7620d695c1c57b1662894945731f978508b45ef0d8169068c13ba862804868f12d3e494873643589b9f57bc9ec0a342
 SHA512 
46119f6ae9003b7a178dd5158c1eae3b5116461e73c5d78cd763bff82b80f282ff08cee5175cf850d3f209af900677e93bab31c556035a6eaf6aae86a5d42fc6
+DIST apache-tomcat-9.0.16-src.tar.gz 5654943 BLAKE2B 
a412457c2d34367301b4335a3a4bf46a647f8e60440be751874e1eaad400a0832b64fcae4c9f81585a4afbddafd75f2929bc78c12eb05b20539b11de686dfecc
 SHA512 
60fbdefbddaa6fac4bc9d0ca4c1d9a119dd53063fd4574c474daf5f346fddc9cb7fd174f1be189e965d5ae4670710347d84fcf443c7df01faac9a1b84ecb33ce
 DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B 
b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798
 SHA512 
cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2
 DIST biz.aQute.bnd-4.1.0.jar 9263260 BLAKE2B 
e251a9d8b653f3e815e6c2f7774d64f1d594f3ce4b2f77956c806698df4d873310067cece68663324b11fcef8d90796b087abb289dbe2a13164a9038da4a6260
 SHA512 
f5d230358840f4909e35de40343fb7ee50a2d4d4691691f5ea896cfe212a086ad4859e0ee6ed4c315211223663b2fb2c07af7ea88786cedbcd4f891e5a4589ef
 DIST biz.aQute.bndlib-4.1.0.jar 2897463 BLAKE2B 
c29a55e07cc103919dca1e938722bf94b107e2989a4a8ae887998152a93b641a659a5209129b992432bcb2673dd4b56ec9a929627530a631db10666f2177c0e4
 SHA512 
2acccbb323f3d740506e89a74c5affab85e628f9062ee0d799ccd09efe0b55436d8887a46d7d94ad636a2c793632635974f1bbb045e4789391937222c8d00d30

diff --git a/www-servers/tomcat/files/tomcat-9.0.16-build.xml.patch 
b/www-servers/tomcat/files/tomcat-9.0.16-build.xml.patch
new file mode 100644
index 000..8712be138e0
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-9.0.16-build.xml.patch
@@ -0,0 +1,265 @@
+diff --git a/build.xml b/build.xml
+index e5c5076..72231a6 100644
+--- a/build.xml
 b/build.xml
+@@ -742,6 +742,7 @@
+   addOSGi="true" />
+ 
+ 
++
+ 
++
+ 
++
+ 
+ 
+-
++
+ 
+ 
+   
+@@ -1176,7 +1179,7 @@
+ 
+   
+ 
+-
++
+ 
+ 
+ 
+@@ -1212,7 +1215,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+ 
++
+ 
+ 
+ 
++
+ 
+ 
+ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -1799,6 +1805,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
+ 
+   
++
+ 
+ 
+   
++
+   
+   http://docs.oracle.com/javase/8/docs/api/"/>
+   https://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2616,7 +2626,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download (and build) components necessary to compile" 
unless="noget">
+ 
+ 
+ 
+@@ -2671,7 +2681,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download additional components for the tests" 
unless="noget">
+ 
+ 
+   
+@@ -2749,7 +2759,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download additional components for a distribution" 
unless="noget">
+ 
+ 
+   
+@@ -2804,13 +2814,13 @@ skip.installer property in build.properties" />
+ 
+   
+ 
+-  
++  
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+   
+@@ 

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: dfdf571a02a8a4393bf38d2958cb2b568735d879
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Jan 23 12:30:29 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Jan 23 12:49:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfdf571a

www-servers/tomcat-8.0.53: bump

Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Miroslav Šulc  gentoo.org>

 www-servers/tomcat/Manifest|   1 +
 .../tomcat/files/tomcat-8.0.53-build.xml.patch | 270 +
 www-servers/tomcat/tomcat-8.0.53.ebuild| 159 
 3 files changed, 430 insertions(+)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index cd173bd0a25..f8fabd0b378 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,5 +1,6 @@
 DIST apache-tomcat-7.0.90-src.tar.gz 4752747 BLAKE2B 
5062ead2756aa8461de5e8387f14838661c082b6e397934fc92c91403f1950d84d79f05b9d4420a973d1b4921515b66c2c847550e1a06d75e722b62d9aa3f8bd
 SHA512 
b32cb6902866ef72337c721d99d77f1a645311bb7694f51b82f7acec500c6197df15fb41be444fc6089652e8c825fb193f1a9de8c1b9b6fabd9d95f784565f6a
 DIST apache-tomcat-7.0.92-src.tar.gz 4778943 BLAKE2B 
d11b01219a25c303ce791d965908c79cd48b5c97e1f0bed81ae60e0fcae3c4b23906f652eaf1d2922db7a57e68ee9f5a09ef017b7f1b89ed6c2ab81a477a810e
 SHA512 
8cbcaf6d8dcda5ad8bd667582a39e91c1feaa4cc7216cafc23b9f5cf005cce9af24473c1c9d573f4da26c88ea68520a113dc0a7e2a50823f3ba3bb1510ec9e0a
 DIST apache-tomcat-8.0.52-src.tar.gz 5039683 BLAKE2B 
36318d0ae50fbca3f2a97e0210d0a8da8314f1ef79d0b047971bca30a5b0cc937faf013b5090f6e6b8aec4127b6185dc54ae589f5b57143b62c71c09f8bd5e9d
 SHA512 
6d846213db0b15f9add8d80f30f304afdaf879ab6d7f85d212183a93f4f360ebfeeb079813bdea83cbd13f507504473028bbf8279e89b800b6f150b83086fa56
+DIST apache-tomcat-8.0.53-src.tar.gz 5057041 BLAKE2B 
3a50d2f61baecb5244909972384e36478c69e7592dd35119d8b7b974273c57a4855082f309146ed160144dbdcced3236fd586b047970bd8558bbe7b7e002e9fd
 SHA512 
0b56bc723277b296ab34ec3e49cb56bac94ddf1a9b96bd023982e2ffabd5317f63b3c0971afdc8cd7a6364197409df461d22151dbaab3a2be7daf6858b9e
 DIST apache-tomcat-8.5.31-src.tar.gz 5154531 BLAKE2B 
cce0388e5c8c5fb5fcb3dba3b5961dc21d9f19d9a2f6177660a41410bddf241f73dda1e52c3875e28cfa13041c85a458a92c9a23c509b645f042cfa472081fde
 SHA512 
659137ef4809af329ae4dd6f5825a603c1408ef3e48153abe7480a722e7f4bebef68a64af9cbef4a4ad9a7e8da76494f825035bbadbb983a097525f476f32f33
 DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B 
b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798
 SHA512 
cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2

diff --git a/www-servers/tomcat/files/tomcat-8.0.53-build.xml.patch 
b/www-servers/tomcat/files/tomcat-8.0.53-build.xml.patch
new file mode 100644
index 000..eb12467b66f
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.0.53-build.xml.patch
@@ -0,0 +1,270 @@
+diff --git a/build.xml b/build.xml
+index 5ee1d86..ade4446 100644
+--- a/build.xml
 b/build.xml
+@@ -723,24 +723,29 @@
+   manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+ 
++
+ 
++
+ 
+ 
++
+ 
+ 
+ 
+-
++
+ 
+ 
+   
+@@ -1072,7 +1077,7 @@
+ 
+   
+ 
+-
++
+ 
+ 
+ 
+@@ -1108,7 +1113,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+ 
++
+ 
+ 
+ 
++
+ 
+ 
+ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -1984,6 +1992,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
+ 
+   
++
+ 
+ 
+   
++
+   
+   http://docs.oracle.com/javase/7/docs/api/"/>
+   https://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2821,7 +2833,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download (and build) components necessary to compile" 
unless="noget">
+ 
+ 
+ 
+@@ -2847,7 +2859,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download additional components for the tests" 
unless="noget">
+ 
+ 
+   
+@@ -2925,7 +2937,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download additional components for a distribution" 
unless="noget">
+ 
+ 
+   
+@@ -2980,13 +2992,13 @@ skip.installer property in build.properties" />
+ 
+   
+ 
+-  
++  
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+   
+@@ -3108,7 +3120,7 @@ skip.installer property in build.properties" />
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+@@ -3125,7 +3137,7 @@ skip.installer property in build.properties" />
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+@@ -3150,7 +3162,7 @@ skip.installer property in build.properties" />
+ 
+   
+ 
+-  
++  
+ 
+ 
+

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: e976224a98d374714bf21108b29dcffdd26a03a7
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Feb 13 17:22:48 2018 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Feb 13 17:23:41 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e976224a

www-servers/tomcat: version bump for slot 8.5 and 9

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 www-servers/tomcat/Manifest|   2 +
 .../tomcat/files/tomcat-8.5.28-build.xml.patch | 258 +
 .../tomcat/files/tomcat-9.0.5-build.xml.patch  | 258 +
 www-servers/tomcat/tomcat-8.5.28.ebuild| 157 +
 www-servers/tomcat/tomcat-9.0.5.ebuild | 157 +
 5 files changed, 832 insertions(+)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index d464d1d02c2..7dff47cf2b3 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -4,4 +4,6 @@ DIST apache-tomcat-8.0.48-src.tar.gz 5009969 BLAKE2B 
4b1db654d74b02f5fd589590197
 DIST apache-tomcat-8.0.49-src.tar.gz 5017328 BLAKE2B 
a3494c73fc6b9ffecfe7b09380f9fb3a632e167861f876ac827848e6ae5fd41dc9d3f8a0da9d484edd87b88532de05809c8019941d3a2639e925066ff0a8cc87
 SHA512 
36ae75d37874430ea6b567d8415a9249f104b57afdd8689621f659f6a2c0b229f207e63cdcdfacb1eabd13af567295ff1335cb052abbefe46efdccc20f2d5a73
 DIST apache-tomcat-8.5.24-src.tar.gz 5101516 BLAKE2B 
c19c46cca562f0c4c4733608ec007dd423f9a8ed0595bfb835554a7d08be06b791933e4beacbb0fe472589feae82f7d1a46934c0fb68930343cb2f4589bf6530
 SHA512 
f4ef9a66f2cafb3207c5a38c0f88efc1189e72f02fa88ef2a1b3626a03a57d0ba505b099f6185d747d5ab858aa3f8f3446ae60789312a900ec443eac45233efc
 DIST apache-tomcat-8.5.27-src.tar.gz 5123614 BLAKE2B 
0051a7b5a9d3529a012338e0b12ed5fca218fc6740a0c576d3195a9c7848a78d93d0a6151541e314d82723de1b533b28024eeb231e33b21c38a2c4f702007415
 SHA512 
d3cac3d618283f0c26f861df67223fcb889da750f5e42563ec2ebc17d72169a7639d05d4d42fe403f4e49052962da09bc4b312b012c31309d8a096036baec8ab
+DIST apache-tomcat-8.5.28-src.tar.gz 5128929 BLAKE2B 
fe862a44fe57a50502b95d6f31863567b5596b183355a75fb7b75827a697299878920cc5ca5c24ffcdabae885a893266f40f174c76c32f449bec31e7a1be489b
 SHA512 
55970e8babc1fde783e6e9f67a221012cae88e871391aa751e3c87c0fc7e58cd45662f025dc286dd529caced317dada48bb65786f87b44abbc9ce16f0d8fb0b5
 DIST apache-tomcat-9.0.4-src.tar.gz 5073991 BLAKE2B 
7efffbba395d78d5ab051dd2bdb7a1491cb04159421bec17deebcb901bbca5cfec67a651f8e1fcd9a394ba3e0650fc61e7da039f0f979ae60a87f477bc4bc3b8
 SHA512 
bb8777f6fff861a53381b15a4196053abd9cc01e080f0511032f69eb6f57f5c6ed0eafd8a94155f19a4654bce4fad39e0fcaa2e5473cb269bceeb46a2ea43557
+DIST apache-tomcat-9.0.5-src.tar.gz 5077379 BLAKE2B 
db345767f6c35557054c33d789fc40b1d2071501130bec57df41bb3fdf6f8be5260c0faed317b9fe6fa40474f9de1f29c6a71039eb0b7d07fee4ee0109ac16e4
 SHA512 
4d0b24dcf26b94f4280382f64bcdeb74f24b69b86b1410ad40d4a0284d6787809485f7c2501b66126d778a73a5c3eb155856ac6d3b3e2a477d1742d8588c1e84

diff --git a/www-servers/tomcat/files/tomcat-8.5.28-build.xml.patch 
b/www-servers/tomcat/files/tomcat-8.5.28-build.xml.patch
new file mode 100644
index 000..e08dd17c6cc
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.5.28-build.xml.patch
@@ -0,0 +1,258 @@
+diff --git a/build.xml b/build.xml
+index 2b3c7cf..b8e57e0 100644
+--- a/build.xml
 b/build.xml
+@@ -717,24 +717,29 @@
+   manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+ 
++
+ 
++
+ 
+ 
++
+ 
+ 
+ 
+-
++
+ 
+ 
+   
+@@ -1072,7 +1077,7 @@
+ 
+   
+ 
+-
++
+ 
+ 
+ 
+@@ -1106,7 +,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+ 
++
+ 
+ 
+ 
++
+ 
+ 
+ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -1764,6 +1772,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
+ 
+   
++
+ 
+ 
+   
++
+   
+   http://docs.oracle.com/javase/7/docs/api/"/>
+   http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2617,7 +2629,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download (and build) components necessary to compile" 
unless="noget">
+ 
+ 
+ 
+@@ -2637,7 +2649,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download additional components for the tests" 
unless="noget">
+ 
+ 
+   
+@@ -2694,7 +2706,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download additional components for a distribution" 
unless="noget">
+ 
+ 
+   
+@@ -2734,18 +2746,18 @@ skip.installer property in build.properties" />
+ 
+   
+ 
+-  
++  
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+@@ -2757,7 +2769,7 @@ skip.installer property in build.properties" />
+ 
+   
+ 
+-  
++  
+ 
+ 

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: 0ef8f7bf8438ad24f113764fc2572a117f1ef5ad
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Feb 13 14:23:57 2018 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Feb 13 17:23:28 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ef8f7bf

www-servers/tomcat: cleaned old versions of tomcat

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 www-servers/tomcat/Manifest|   2 -
 .../tomcat/files/tomcat-8.0.47-build.xml.patch | 258 -
 .../tomcat/files/tomcat-8.5.23-build.xml.patch | 249 
 www-servers/tomcat/tomcat-8.0.47.ebuild| 157 -
 www-servers/tomcat/tomcat-8.5.23.ebuild| 157 -
 5 files changed, 823 deletions(-)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 18f8fa8c5e0..d464d1d02c2 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,9 +1,7 @@
 DIST apache-tomcat-7.0.82-src.tar.gz 4697342 BLAKE2B 
1106ed04dc83e64e395de29f01a7752a0578b0c88046eb59614a7cfc0d8a98e3aebb698c8eb56763eea41620d9b42482971c5093304184b1028c6bd8f9770ada
 SHA512 
fc92388d81316de0246df4074c417ffa341eab55308c0694e9ea71c5497c863b42019cd1f38628ff640114c501a06c4e9c428cb2b6f1bc1c16fb337a286718db
 DIST apache-tomcat-7.0.84-src.tar.gz 4713409 BLAKE2B 
3dc7766db1492413bbd3f878a2da7392dd4cfd1ca4c3e8a236e380cdfbc0c4ff075665d39871026e61f0bc88e0a84f372fbcef6914af9dc99e6dda05bafc6e48
 SHA512 
ca6b3f17f56a0b1befafd2efbfa07cbe094fb4ab022a3b5d704d249e551b44c6ef0d9691bd1b7c48ccda957efb43045209d11ca1a4aa0a7875e516e3a233cd74
-DIST apache-tomcat-8.0.47-src.tar.gz 4996505 BLAKE2B 
8024ec5248fed57bf1841a320fc23fa8a7a99b2352ea9635f3d4dc903bd363f3a15adc47f48250a4d732ab9c1724443bcb602b459b6ede2e7908051a5c3fdea5
 SHA512 
135de73b8ca7d4003fcecc19a17a8a86ab85fc1054e89638d26e57263249438d8e8aebfca0a2791eaec2bc835baa57e6a05b60e11595aa373fdc03e278b31702
 DIST apache-tomcat-8.0.48-src.tar.gz 5009969 BLAKE2B 
4b1db654d74b02f5fd589590197561496ecfb9b219e445fd18f2e967c78fb95f7fc71a21a6ed9ab5f8c6cee448b74a1729eb3627bcf1a59e2d2748c9c80cc76c
 SHA512 
c56aaa7335c4ef221b2e5de7a7d4946ae1221127f977da5f46a97b062d909abc918b0e6ceb887d98ea5f5b38a26bbe9a3de481972492be593636f6f7e6ef7841
 DIST apache-tomcat-8.0.49-src.tar.gz 5017328 BLAKE2B 
a3494c73fc6b9ffecfe7b09380f9fb3a632e167861f876ac827848e6ae5fd41dc9d3f8a0da9d484edd87b88532de05809c8019941d3a2639e925066ff0a8cc87
 SHA512 
36ae75d37874430ea6b567d8415a9249f104b57afdd8689621f659f6a2c0b229f207e63cdcdfacb1eabd13af567295ff1335cb052abbefe46efdccc20f2d5a73
-DIST apache-tomcat-8.5.23-src.tar.gz 5086043 BLAKE2B 
9bcad0d465aff6da1ba4a846042491bc8d5963283ed1d2530a26ab48289d14e8b85834d24ca476c95a75c1a5f51ee3ecd71c190b9609983cce56b56bc046b6d3
 SHA512 
2848331553f2c1bc51a4113960c6fe7e2beddf9146341dbfde1a27e2232802cfc364c8e8b988ae862371ca1a3be34665a56a28be9eadf80f8b317e0e2525cbef
 DIST apache-tomcat-8.5.24-src.tar.gz 5101516 BLAKE2B 
c19c46cca562f0c4c4733608ec007dd423f9a8ed0595bfb835554a7d08be06b791933e4beacbb0fe472589feae82f7d1a46934c0fb68930343cb2f4589bf6530
 SHA512 
f4ef9a66f2cafb3207c5a38c0f88efc1189e72f02fa88ef2a1b3626a03a57d0ba505b099f6185d747d5ab858aa3f8f3446ae60789312a900ec443eac45233efc
 DIST apache-tomcat-8.5.27-src.tar.gz 5123614 BLAKE2B 
0051a7b5a9d3529a012338e0b12ed5fca218fc6740a0c576d3195a9c7848a78d93d0a6151541e314d82723de1b533b28024eeb231e33b21c38a2c4f702007415
 SHA512 
d3cac3d618283f0c26f861df67223fcb889da750f5e42563ec2ebc17d72169a7639d05d4d42fe403f4e49052962da09bc4b312b012c31309d8a096036baec8ab
 DIST apache-tomcat-9.0.4-src.tar.gz 5073991 BLAKE2B 
7efffbba395d78d5ab051dd2bdb7a1491cb04159421bec17deebcb901bbca5cfec67a651f8e1fcd9a394ba3e0650fc61e7da039f0f979ae60a87f477bc4bc3b8
 SHA512 
bb8777f6fff861a53381b15a4196053abd9cc01e080f0511032f69eb6f57f5c6ed0eafd8a94155f19a4654bce4fad39e0fcaa2e5473cb269bceeb46a2ea43557

diff --git a/www-servers/tomcat/files/tomcat-8.0.47-build.xml.patch 
b/www-servers/tomcat/files/tomcat-8.0.47-build.xml.patch
deleted file mode 100644
index b0862aef305..000
--- a/www-servers/tomcat/files/tomcat-8.0.47-build.xml.patch
+++ /dev/null
@@ -1,258 +0,0 @@
-diff --git a/apache-tomcat-8.0.47-src/build.xml 
b/apache-tomcat-8.0.47-src/build.xml
-index 6b4465a..ab4008d 100644
 a/apache-tomcat-8.0.47-src/build.xml
-+++ b/apache-tomcat-8.0.47-src/build.xml
-@@ -715,24 +715,29 @@
-   manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
- 
- 
-+
- 
-+
- 
- 
-+
- 
- 
- 
--
-+
- 
- 
-   
-@@ -1067,7 +1072,7 @@
- 
-   
- 
--
-+
- 
- 
- 
-@@ -1101,7 +1106,7 @@
- 
-   
- 
--  
-+  
- 
- 
- 
-   
- 
--  
-+  
- 
- 
- 
- 
-+
- 
- 
- 
- 
- 
-   
-+
-   
-   http://docs.oracle.com/javase/7/docs/api/"/>
-   http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
-@@ -2781,7 +2792,7 @@ skip.installer property in build.properties" />
-   
- 
- 

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: a1e5f304f2d1565cf670ee352eb1a7397b88b51f
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Feb  4 09:31:28 2018 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Feb  4 09:32:11 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1e5f304

www-servers/tomcat: version bump for slots 7, 8 and 8.5

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 www-servers/tomcat/Manifest|   3 +
 .../tomcat/files/tomcat-7.0.84-build.xml.patch | 161 +
 .../tomcat/files/tomcat-8.0.49-build.xml.patch | 267 +
 .../tomcat/files/tomcat-8.5.27-build.xml.patch | 258 
 www-servers/tomcat/tomcat-7.0.84.ebuild| 146 +++
 www-servers/tomcat/tomcat-8.0.49.ebuild| 157 
 www-servers/tomcat/tomcat-8.5.27.ebuild| 157 
 7 files changed, 1149 insertions(+)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 98013508714..18f8fa8c5e0 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,6 +1,9 @@
 DIST apache-tomcat-7.0.82-src.tar.gz 4697342 BLAKE2B 
1106ed04dc83e64e395de29f01a7752a0578b0c88046eb59614a7cfc0d8a98e3aebb698c8eb56763eea41620d9b42482971c5093304184b1028c6bd8f9770ada
 SHA512 
fc92388d81316de0246df4074c417ffa341eab55308c0694e9ea71c5497c863b42019cd1f38628ff640114c501a06c4e9c428cb2b6f1bc1c16fb337a286718db
+DIST apache-tomcat-7.0.84-src.tar.gz 4713409 BLAKE2B 
3dc7766db1492413bbd3f878a2da7392dd4cfd1ca4c3e8a236e380cdfbc0c4ff075665d39871026e61f0bc88e0a84f372fbcef6914af9dc99e6dda05bafc6e48
 SHA512 
ca6b3f17f56a0b1befafd2efbfa07cbe094fb4ab022a3b5d704d249e551b44c6ef0d9691bd1b7c48ccda957efb43045209d11ca1a4aa0a7875e516e3a233cd74
 DIST apache-tomcat-8.0.47-src.tar.gz 4996505 BLAKE2B 
8024ec5248fed57bf1841a320fc23fa8a7a99b2352ea9635f3d4dc903bd363f3a15adc47f48250a4d732ab9c1724443bcb602b459b6ede2e7908051a5c3fdea5
 SHA512 
135de73b8ca7d4003fcecc19a17a8a86ab85fc1054e89638d26e57263249438d8e8aebfca0a2791eaec2bc835baa57e6a05b60e11595aa373fdc03e278b31702
 DIST apache-tomcat-8.0.48-src.tar.gz 5009969 BLAKE2B 
4b1db654d74b02f5fd589590197561496ecfb9b219e445fd18f2e967c78fb95f7fc71a21a6ed9ab5f8c6cee448b74a1729eb3627bcf1a59e2d2748c9c80cc76c
 SHA512 
c56aaa7335c4ef221b2e5de7a7d4946ae1221127f977da5f46a97b062d909abc918b0e6ceb887d98ea5f5b38a26bbe9a3de481972492be593636f6f7e6ef7841
+DIST apache-tomcat-8.0.49-src.tar.gz 5017328 BLAKE2B 
a3494c73fc6b9ffecfe7b09380f9fb3a632e167861f876ac827848e6ae5fd41dc9d3f8a0da9d484edd87b88532de05809c8019941d3a2639e925066ff0a8cc87
 SHA512 
36ae75d37874430ea6b567d8415a9249f104b57afdd8689621f659f6a2c0b229f207e63cdcdfacb1eabd13af567295ff1335cb052abbefe46efdccc20f2d5a73
 DIST apache-tomcat-8.5.23-src.tar.gz 5086043 BLAKE2B 
9bcad0d465aff6da1ba4a846042491bc8d5963283ed1d2530a26ab48289d14e8b85834d24ca476c95a75c1a5f51ee3ecd71c190b9609983cce56b56bc046b6d3
 SHA512 
2848331553f2c1bc51a4113960c6fe7e2beddf9146341dbfde1a27e2232802cfc364c8e8b988ae862371ca1a3be34665a56a28be9eadf80f8b317e0e2525cbef
 DIST apache-tomcat-8.5.24-src.tar.gz 5101516 BLAKE2B 
c19c46cca562f0c4c4733608ec007dd423f9a8ed0595bfb835554a7d08be06b791933e4beacbb0fe472589feae82f7d1a46934c0fb68930343cb2f4589bf6530
 SHA512 
f4ef9a66f2cafb3207c5a38c0f88efc1189e72f02fa88ef2a1b3626a03a57d0ba505b099f6185d747d5ab858aa3f8f3446ae60789312a900ec443eac45233efc
+DIST apache-tomcat-8.5.27-src.tar.gz 5123614 BLAKE2B 
0051a7b5a9d3529a012338e0b12ed5fca218fc6740a0c576d3195a9c7848a78d93d0a6151541e314d82723de1b533b28024eeb231e33b21c38a2c4f702007415
 SHA512 
d3cac3d618283f0c26f861df67223fcb889da750f5e42563ec2ebc17d72169a7639d05d4d42fe403f4e49052962da09bc4b312b012c31309d8a096036baec8ab
 DIST apache-tomcat-9.0.4-src.tar.gz 5073991 BLAKE2B 
7efffbba395d78d5ab051dd2bdb7a1491cb04159421bec17deebcb901bbca5cfec67a651f8e1fcd9a394ba3e0650fc61e7da039f0f979ae60a87f477bc4bc3b8
 SHA512 
bb8777f6fff861a53381b15a4196053abd9cc01e080f0511032f69eb6f57f5c6ed0eafd8a94155f19a4654bce4fad39e0fcaa2e5473cb269bceeb46a2ea43557

diff --git a/www-servers/tomcat/files/tomcat-7.0.84-build.xml.patch 
b/www-servers/tomcat/files/tomcat-7.0.84-build.xml.patch
new file mode 100644
index 000..aa40bd1564a
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-7.0.84-build.xml.patch
@@ -0,0 +1,161 @@
+diff --git a/build.xml b/build.xml
+index 3f1229c..13894ed 100644
+--- a/build.xml
 b/build.xml
+@@ -671,12 +671,14 @@
+   
+ 
+ 
++
+ 
+   
+ 
+@@ -733,26 +735,32 @@
+   manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+ 
++
+ 
+ 
++
+ 
+ 
++
+ 
+ 
+ 
+-
++
+ 
+ 
+   
+@@ -1060,14 +1068,15 @@
+ 
+   
+ 
++
+ 
+ 
+-
++
+ 
+ 
+ 
++  description="Prepare to build web services extras package" 
unless="noget">
+ 
+ 
+   
+@@ -1886,11 +1895,12 @@
+ 
+ 
+ 
++
+ 
+ 
+ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -1902,6 +1912,7 

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: 909df428f723a6dd46dad82b08fa967e7778f0ca
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Mon Dec  4 15:01:13 2017 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Dec  4 15:02:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=909df428

www-servers/tomcat: version bump in slot 8.5

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 www-servers/tomcat/Manifest|   1 +
 .../tomcat/files/tomcat-8.5.24-build.xml.patch | 249 +
 www-servers/tomcat/tomcat-8.5.24.ebuild| 157 +
 3 files changed, 407 insertions(+)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 73ab7d6d336..8b09820cea7 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,4 +1,5 @@
 DIST apache-tomcat-7.0.82-src.tar.gz 4697342 SHA256 
3c6ff0bf2770b169493b25b97ee7502d44bee286176ecd187caaebf1f4e2fcf7 SHA512 
fc92388d81316de0246df4074c417ffa341eab55308c0694e9ea71c5497c863b42019cd1f38628ff640114c501a06c4e9c428cb2b6f1bc1c16fb337a286718db
 WHIRLPOOL 
aef92cb2cf82c87a1b20ef7eedb30aae052882e99e74b9c33500b3a30f5c32df7a4dd23e3c79d3031ff7f0dd8abf9e2b3e061805a3b32f3e78b6b7c52db9d3c1
 DIST apache-tomcat-8.0.47-src.tar.gz 4996505 SHA256 
a2e34a707f1d2ab03aae194db2aed7aa525e62ee3cd648e7058bee49ac1b578c SHA512 
135de73b8ca7d4003fcecc19a17a8a86ab85fc1054e89638d26e57263249438d8e8aebfca0a2791eaec2bc835baa57e6a05b60e11595aa373fdc03e278b31702
 WHIRLPOOL 
7add2b564ca9dfac647cd8338ef90229dd61e97d2ad7420f883c98b62760952904ad170f72029153da592a6f2c8c003d7229b4b32a1e870b6e7c2c99d34566c8
 DIST apache-tomcat-8.5.23-src.tar.gz 5086043 SHA256 
eaaf35752841356dec976fa6250cd71680b8b5b9c0bdf4df9a86ac38630bcbd4 SHA512 
2848331553f2c1bc51a4113960c6fe7e2beddf9146341dbfde1a27e2232802cfc364c8e8b988ae862371ca1a3be34665a56a28be9eadf80f8b317e0e2525cbef
 WHIRLPOOL 
77b35de4ede2beecab71dcd7c5494bded1516deac4b5c2cbd2f48e1ae728cfa41f4193369bd464946869e9ba4565c0e6f1c7ad57578459d3be67159ea8cd9a64
+DIST apache-tomcat-8.5.24-src.tar.gz 5101516 BLAKE2B 
c19c46cca562f0c4c4733608ec007dd423f9a8ed0595bfb835554a7d08be06b791933e4beacbb0fe472589feae82f7d1a46934c0fb68930343cb2f4589bf6530
 SHA512 
f4ef9a66f2cafb3207c5a38c0f88efc1189e72f02fa88ef2a1b3626a03a57d0ba505b099f6185d747d5ab858aa3f8f3446ae60789312a900ec443eac45233efc
 DIST apache-tomcat-9.0.1-src.tar.gz 5029499 SHA256 
f4da8ef7a03dd7280a9a4b6c66cc9bd34dddc6429c33d9db1a8acfc1596c4e90 SHA512 
6116b05f448c24e691c4b56372a41cfd8900adc5e759f2f5026c808de48d65705763236fca46f69321d351f37f5dbc7aa49db8c097b8a3155e367fe21aa0d384
 WHIRLPOOL 
2e0f05001b9f0d57a241db8ddf0212d3adce2c1b829a03318b5cc1b5a250ae32a50d801e23d9b6a2943c208a478dd00d1f5ae07d1c3c736fbf059554a40caf66

diff --git a/www-servers/tomcat/files/tomcat-8.5.24-build.xml.patch 
b/www-servers/tomcat/files/tomcat-8.5.24-build.xml.patch
new file mode 100644
index 000..d83440c0c4d
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.5.24-build.xml.patch
@@ -0,0 +1,249 @@
+diff --git a/apache-tomcat-8.5.23-src/build.xml 
b/apache-tomcat-8.5.23-src/build.xml
+index b1b2666..263800c 100644
+--- a/apache-tomcat-8.5.23-src/build.xml
 b/apache-tomcat-8.5.23-src/build.xml
+@@ -714,24 +714,29 @@
+   manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+ 
++
+ 
++
+ 
+ 
++
+ 
+ 
+ 
+-
++
+ 
+ 
+   
+@@ -1072,7 +1077,7 @@
+ 
+   
+ 
+-
++
+ 
+ 
+ 
+@@ -1106,7 +,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+ 
++
+ 
+ 
+ 
+ 
+ 
+   
++
+   
+   http://docs.oracle.com/javase/7/docs/api/"/>
+   http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2607,7 +2618,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download (and build) components necessary to compile" 
unless="noget">
+ 
+ 
+   
+@@ -2641,7 +2652,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download additional components for the tests" 
unless="noget">
+ 
+ 
+   
+@@ -2698,7 +2709,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download additional components for a distribution" 
unless="noget">
+ 
+ 
+   
+@@ -2724,18 +2735,18 @@ skip.installer property in build.properties" />
+ 
+   
+ 
+-  
++  
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+@@ -2747,7 +2758,7 @@ skip.installer property in build.properties" />
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+@@ -2766,7 +2777,7 @@ skip.installer property in build.properties" />
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+@@ -2777,7 +2788,7 @@ skip.installer property in build.properties" />
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+@@ -2795,7 +2806,7 @@ skip.installer property in build.properties" />
+ 
+   
+ 
+-  
++  
+ 
+ 
+  

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: 6333915e8a3430634545f11a091ea983f40c8f6c
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Oct 11 17:04:22 2017 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Oct 11 17:04:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6333915e

www-servers/tomcat: version bump for slot 7

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 www-servers/tomcat/Manifest|   1 +
 .../tomcat/files/tomcat-7.0.82-build.xml.patch | 149 +
 www-servers/tomcat/tomcat-7.0.82.ebuild| 148 
 3 files changed, 298 insertions(+)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index d651261ee21..1e5c7f1d781 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,5 +1,6 @@
 DIST apache-tomcat-7.0.79-src.tar.gz 4682119 SHA256 
b5373951afe41ffd27348bb57cff80bc7d86a5669bdedb0b4bbe1d567009dc32 SHA512 
75c29fd7de8c245502cae4db845a508f320739625d726fe892924b639e7333b76b3446f36cb67b9ad9500e95823b5eadaf056c4cb6bea962a59eb5491696e0b2
 WHIRLPOOL 
5db799cfbd061a199270b0ebb971c4fe43632522a23f590b7a46e021af5c8b0bce4a711e16bd0416b5baa6f2556cf8178bf14abadf4d493ece44c9eb2c4cdae2
 DIST apache-tomcat-7.0.81-src.tar.gz 4689428 SHA256 
fca79afb210cfbc8f9ebcdebdd048ecb7ea370ac0f94040cbcc0287fe5d85e66 SHA512 
25e237aa7189cf9a9617badf8936fd7ec64550bcac3bab2e2afe51d5e199eddfe17e0d6d27ac7ebf3543d1601467fcd8362ddf9a5b708c50b223d7c8d18bbb3b
 WHIRLPOOL 
1016a02b4a30b7e02eb2f7fad3080153012dd3e3f84df34d006c89bc2c89b7b3d370334800170008482d3dbf339c62f249064eb48ab24ca17588026ba515d487
+DIST apache-tomcat-7.0.82-src.tar.gz 4697342 SHA256 
3c6ff0bf2770b169493b25b97ee7502d44bee286176ecd187caaebf1f4e2fcf7 SHA512 
fc92388d81316de0246df4074c417ffa341eab55308c0694e9ea71c5497c863b42019cd1f38628ff640114c501a06c4e9c428cb2b6f1bc1c16fb337a286718db
 WHIRLPOOL 
aef92cb2cf82c87a1b20ef7eedb30aae052882e99e74b9c33500b3a30f5c32df7a4dd23e3c79d3031ff7f0dd8abf9e2b3e061805a3b32f3e78b6b7c52db9d3c1
 DIST apache-tomcat-8.0.45-src.tar.gz 4978313 SHA256 
450fd2890b12e56692cb203f95651f9a873dce056b7b4362e142bc817032b291 SHA512 
80e4281f5b6e4d6bf607179840bc6cb923ea9f57ec8231a451c3b5a1f8938f72ec1097290059afba0ef7b56edeb56d63636849517b69b91c7093cb15ff0eaa04
 WHIRLPOOL 
c893cd5c26637f8881c19353e269145e33fa11e02eb10ef93a41590ad2e1e6c6ffa1b3f6c3c7c318630765f666be07447fd3a21c70c2c381e75c458b60383ea0
 DIST apache-tomcat-8.0.46-src.tar.gz 4985079 SHA256 
b5b9e560b3f75dd68b3103915c754ac47cf526f26f18cd6e9baba9580be25161 SHA512 
9adbea9faf61f782ede1c657e833dea55ad1b4a874a1eb9801eab82acde847e7f08ff7a49b3389b9d0683d185c6d4981f9f8d2f607f68c077a682af508d5
 WHIRLPOOL 
eafb2768555261836b04f12f95ba2755d2a7ef98754a5a009099e377220dff1251c6ad1cbe672764787c485b3f922bf1fda8db663890db36e356e7a5139b83e9
 DIST apache-tomcat-8.0.47-src.tar.gz 4996505 SHA256 
a2e34a707f1d2ab03aae194db2aed7aa525e62ee3cd648e7058bee49ac1b578c SHA512 
135de73b8ca7d4003fcecc19a17a8a86ab85fc1054e89638d26e57263249438d8e8aebfca0a2791eaec2bc835baa57e6a05b60e11595aa373fdc03e278b31702
 WHIRLPOOL 
7add2b564ca9dfac647cd8338ef90229dd61e97d2ad7420f883c98b62760952904ad170f72029153da592a6f2c8c003d7229b4b32a1e870b6e7c2c99d34566c8

diff --git a/www-servers/tomcat/files/tomcat-7.0.82-build.xml.patch 
b/www-servers/tomcat/files/tomcat-7.0.82-build.xml.patch
new file mode 100644
index 000..481591fb6ff
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-7.0.82-build.xml.patch
@@ -0,0 +1,149 @@
+diff -Naur apache-tomcat-7.0.63-src.orig/build.xml 
apache-tomcat-7.0.63-src/build.xml
+--- apache-tomcat-7.0.63-src.orig/build.xml2015-06-30 09:15:44.0 
+0100
 apache-tomcat-7.0.63-src/build.xml 2015-08-22 21:13:12.453038827 +0100
+@@ -660,12 +660,14 @@
+   
+ 
+ 
++
+ 
+   
+ 
+@@ -721,26 +723,32 @@
+   manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+ 
++
+ 
+ 
++
+ 
+ 
++
+ 
+ 
+ 
+ 
++
+ 
+ 
+ 
+@@ -1051,14 +1061,15 @@
+ 
+   
+ 
++
+ 
+ 
+-
++
+ 
+ 
+ 
++  description="Prepare to build web services extras package" 
unless="noget">
+ 
+ 
+   
+@@ -1886,6 +1897,7 @@
+ description="Create the Tomcat javadoc" >
+ 
++
+ 
+ 
+   
++
+   
+   http://docs.oracle.com/javase/7/docs/api/"/>
+   http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2642,7 +2657,7 @@
+   
+ 
+   
++  description="Download (and build) components necessary to compile" 
unless="noget">
+ 
+ 
+   
+@@ -2699,7 +2714,7 @@
+   
+ 
+   
++  description="Download additional components for the tests" 
unless="noget">
+ 
+ 
+   
+@@ -2727,7 +2742,7 @@
+   
+ 
+   
++  description="Download additional components for a distribution" 
unless="noget">
+ 
+ 
+   

diff --git a/www-servers/tomcat/tomcat-7.0.82.ebuild 
b/www-servers/tomcat/tomcat-7.0.82.ebuild
new file mode 100644
index 

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: eaa4b9cb1324fd8779d32ab0a5977319d778cd5c
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Oct 11 15:13:31 2017 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Oct 11 15:13:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaa4b9cb

www-servers/tomcat: version bump for slot 8

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 www-servers/tomcat/Manifest|   1 +
 .../tomcat/files/tomcat-8.0.47-build.xml.patch | 258 +
 www-servers/tomcat/tomcat-8.0.47.ebuild| 157 +
 3 files changed, 416 insertions(+)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 005eb867b9b..d651261ee21 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -2,6 +2,7 @@ DIST apache-tomcat-7.0.79-src.tar.gz 4682119 SHA256 
b5373951afe41ffd27348bb57cff
 DIST apache-tomcat-7.0.81-src.tar.gz 4689428 SHA256 
fca79afb210cfbc8f9ebcdebdd048ecb7ea370ac0f94040cbcc0287fe5d85e66 SHA512 
25e237aa7189cf9a9617badf8936fd7ec64550bcac3bab2e2afe51d5e199eddfe17e0d6d27ac7ebf3543d1601467fcd8362ddf9a5b708c50b223d7c8d18bbb3b
 WHIRLPOOL 
1016a02b4a30b7e02eb2f7fad3080153012dd3e3f84df34d006c89bc2c89b7b3d370334800170008482d3dbf339c62f249064eb48ab24ca17588026ba515d487
 DIST apache-tomcat-8.0.45-src.tar.gz 4978313 SHA256 
450fd2890b12e56692cb203f95651f9a873dce056b7b4362e142bc817032b291 SHA512 
80e4281f5b6e4d6bf607179840bc6cb923ea9f57ec8231a451c3b5a1f8938f72ec1097290059afba0ef7b56edeb56d63636849517b69b91c7093cb15ff0eaa04
 WHIRLPOOL 
c893cd5c26637f8881c19353e269145e33fa11e02eb10ef93a41590ad2e1e6c6ffa1b3f6c3c7c318630765f666be07447fd3a21c70c2c381e75c458b60383ea0
 DIST apache-tomcat-8.0.46-src.tar.gz 4985079 SHA256 
b5b9e560b3f75dd68b3103915c754ac47cf526f26f18cd6e9baba9580be25161 SHA512 
9adbea9faf61f782ede1c657e833dea55ad1b4a874a1eb9801eab82acde847e7f08ff7a49b3389b9d0683d185c6d4981f9f8d2f607f68c077a682af508d5
 WHIRLPOOL 
eafb2768555261836b04f12f95ba2755d2a7ef98754a5a009099e377220dff1251c6ad1cbe672764787c485b3f922bf1fda8db663890db36e356e7a5139b83e9
+DIST apache-tomcat-8.0.47-src.tar.gz 4996505 SHA256 
a2e34a707f1d2ab03aae194db2aed7aa525e62ee3cd648e7058bee49ac1b578c SHA512 
135de73b8ca7d4003fcecc19a17a8a86ab85fc1054e89638d26e57263249438d8e8aebfca0a2791eaec2bc835baa57e6a05b60e11595aa373fdc03e278b31702
 WHIRLPOOL 
7add2b564ca9dfac647cd8338ef90229dd61e97d2ad7420f883c98b62760952904ad170f72029153da592a6f2c8c003d7229b4b32a1e870b6e7c2c99d34566c8
 DIST apache-tomcat-8.5.20-src.tar.gz 5063310 SHA256 
6bc40ae61b77906325bf8bdb2b0767aeb96f4c5a7a9b618aa496db59387d6610 SHA512 
dea3095792de76a3a56bd6fd6c9ed5702ca539856d0e07a5de2600f456e7255929d14748a2dc9b3c626b3a67aaac8795ef3f5a6a1351991a0e89443e0c9d0807
 WHIRLPOOL 
1924f12c5068574424587d5b8b7261efb7496dbc53915d8cb2558b4a643aedecc98823ac7dec238fe7cb1a1874734e05de2dc6b7b28e48ffdae9e8c5c586e895
 DIST apache-tomcat-8.5.23-src.tar.gz 5086043 SHA256 
eaaf35752841356dec976fa6250cd71680b8b5b9c0bdf4df9a86ac38630bcbd4 SHA512 
2848331553f2c1bc51a4113960c6fe7e2beddf9146341dbfde1a27e2232802cfc364c8e8b988ae862371ca1a3be34665a56a28be9eadf80f8b317e0e2525cbef
 WHIRLPOOL 
77b35de4ede2beecab71dcd7c5494bded1516deac4b5c2cbd2f48e1ae728cfa41f4193369bd464946869e9ba4565c0e6f1c7ad57578459d3be67159ea8cd9a64
 DIST apache-tomcat-9.0.1-src.tar.gz 5029499 SHA256 
f4da8ef7a03dd7280a9a4b6c66cc9bd34dddc6429c33d9db1a8acfc1596c4e90 SHA512 
6116b05f448c24e691c4b56372a41cfd8900adc5e759f2f5026c808de48d65705763236fca46f69321d351f37f5dbc7aa49db8c097b8a3155e367fe21aa0d384
 WHIRLPOOL 
2e0f05001b9f0d57a241db8ddf0212d3adce2c1b829a03318b5cc1b5a250ae32a50d801e23d9b6a2943c208a478dd00d1f5ae07d1c3c736fbf059554a40caf66

diff --git a/www-servers/tomcat/files/tomcat-8.0.47-build.xml.patch 
b/www-servers/tomcat/files/tomcat-8.0.47-build.xml.patch
new file mode 100644
index 000..b0862aef305
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.0.47-build.xml.patch
@@ -0,0 +1,258 @@
+diff --git a/apache-tomcat-8.0.47-src/build.xml 
b/apache-tomcat-8.0.47-src/build.xml
+index 6b4465a..ab4008d 100644
+--- a/apache-tomcat-8.0.47-src/build.xml
 b/apache-tomcat-8.0.47-src/build.xml
+@@ -715,24 +715,29 @@
+   manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+ 
++
+ 
++
+ 
+ 
++
+ 
+ 
+ 
+-
++
+ 
+ 
+   
+@@ -1067,7 +1072,7 @@
+ 
+   
+ 
+-
++
+ 
+ 
+ 
+@@ -1101,7 +1106,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+ 
++
+ 
+ 
+ 
+ 
+ 
+   
++
+   
+   http://docs.oracle.com/javase/7/docs/api/"/>
+   http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2781,7 +2792,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download (and build) components necessary to compile" 
unless="noget">
+ 
+ 
+   
+@@ -2815,7 +2826,7 @@ skip.installer property in build.properties" />
+   
+ 

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: 5ef9a24e232e21ed0b4ba3e6f2d253a8109f65d3
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Oct 11 15:03:34 2017 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Oct 11 15:04:08 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ef9a24e

www-servers/tomcat: version bump for slot 8.5

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 www-servers/tomcat/Manifest|   1 +
 .../tomcat/files/tomcat-8.5.23-build.xml.patch | 249 +
 www-servers/tomcat/tomcat-8.5.23.ebuild| 157 +
 3 files changed, 407 insertions(+)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 18dbcb4bc28..005eb867b9b 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -3,4 +3,5 @@ DIST apache-tomcat-7.0.81-src.tar.gz 4689428 SHA256 
fca79afb210cfbc8f9ebcdebdd04
 DIST apache-tomcat-8.0.45-src.tar.gz 4978313 SHA256 
450fd2890b12e56692cb203f95651f9a873dce056b7b4362e142bc817032b291 SHA512 
80e4281f5b6e4d6bf607179840bc6cb923ea9f57ec8231a451c3b5a1f8938f72ec1097290059afba0ef7b56edeb56d63636849517b69b91c7093cb15ff0eaa04
 WHIRLPOOL 
c893cd5c26637f8881c19353e269145e33fa11e02eb10ef93a41590ad2e1e6c6ffa1b3f6c3c7c318630765f666be07447fd3a21c70c2c381e75c458b60383ea0
 DIST apache-tomcat-8.0.46-src.tar.gz 4985079 SHA256 
b5b9e560b3f75dd68b3103915c754ac47cf526f26f18cd6e9baba9580be25161 SHA512 
9adbea9faf61f782ede1c657e833dea55ad1b4a874a1eb9801eab82acde847e7f08ff7a49b3389b9d0683d185c6d4981f9f8d2f607f68c077a682af508d5
 WHIRLPOOL 
eafb2768555261836b04f12f95ba2755d2a7ef98754a5a009099e377220dff1251c6ad1cbe672764787c485b3f922bf1fda8db663890db36e356e7a5139b83e9
 DIST apache-tomcat-8.5.20-src.tar.gz 5063310 SHA256 
6bc40ae61b77906325bf8bdb2b0767aeb96f4c5a7a9b618aa496db59387d6610 SHA512 
dea3095792de76a3a56bd6fd6c9ed5702ca539856d0e07a5de2600f456e7255929d14748a2dc9b3c626b3a67aaac8795ef3f5a6a1351991a0e89443e0c9d0807
 WHIRLPOOL 
1924f12c5068574424587d5b8b7261efb7496dbc53915d8cb2558b4a643aedecc98823ac7dec238fe7cb1a1874734e05de2dc6b7b28e48ffdae9e8c5c586e895
+DIST apache-tomcat-8.5.23-src.tar.gz 5086043 SHA256 
eaaf35752841356dec976fa6250cd71680b8b5b9c0bdf4df9a86ac38630bcbd4 SHA512 
2848331553f2c1bc51a4113960c6fe7e2beddf9146341dbfde1a27e2232802cfc364c8e8b988ae862371ca1a3be34665a56a28be9eadf80f8b317e0e2525cbef
 WHIRLPOOL 
77b35de4ede2beecab71dcd7c5494bded1516deac4b5c2cbd2f48e1ae728cfa41f4193369bd464946869e9ba4565c0e6f1c7ad57578459d3be67159ea8cd9a64
 DIST apache-tomcat-9.0.1-src.tar.gz 5029499 SHA256 
f4da8ef7a03dd7280a9a4b6c66cc9bd34dddc6429c33d9db1a8acfc1596c4e90 SHA512 
6116b05f448c24e691c4b56372a41cfd8900adc5e759f2f5026c808de48d65705763236fca46f69321d351f37f5dbc7aa49db8c097b8a3155e367fe21aa0d384
 WHIRLPOOL 
2e0f05001b9f0d57a241db8ddf0212d3adce2c1b829a03318b5cc1b5a250ae32a50d801e23d9b6a2943c208a478dd00d1f5ae07d1c3c736fbf059554a40caf66

diff --git a/www-servers/tomcat/files/tomcat-8.5.23-build.xml.patch 
b/www-servers/tomcat/files/tomcat-8.5.23-build.xml.patch
new file mode 100644
index 000..d83440c0c4d
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.5.23-build.xml.patch
@@ -0,0 +1,249 @@
+diff --git a/apache-tomcat-8.5.23-src/build.xml 
b/apache-tomcat-8.5.23-src/build.xml
+index b1b2666..263800c 100644
+--- a/apache-tomcat-8.5.23-src/build.xml
 b/apache-tomcat-8.5.23-src/build.xml
+@@ -714,24 +714,29 @@
+   manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+ 
++
+ 
++
+ 
+ 
++
+ 
+ 
+ 
+-
++
+ 
+ 
+   
+@@ -1072,7 +1077,7 @@
+ 
+   
+ 
+-
++
+ 
+ 
+ 
+@@ -1106,7 +,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+ 
++
+ 
+ 
+ 
+ 
+ 
+   
++
+   
+   http://docs.oracle.com/javase/7/docs/api/"/>
+   http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2607,7 +2618,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download (and build) components necessary to compile" 
unless="noget">
+ 
+ 
+   
+@@ -2641,7 +2652,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download additional components for the tests" 
unless="noget">
+ 
+ 
+   
+@@ -2698,7 +2709,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download additional components for a distribution" 
unless="noget">
+ 
+ 
+   
+@@ -2724,18 +2735,18 @@ skip.installer property in build.properties" />
+ 
+   
+ 
+-  
++  
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+@@ -2747,7 +2758,7 @@ skip.installer property in build.properties" />
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+@@ -2766,7 +2777,7 @@ skip.installer property in build.properties" />
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+@@ -2777,7 +2788,7 @@ skip.installer property in build.properties" />

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: 110e461978da1eb8166116fd02ff6b95047dffd0
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Sep 10 06:41:47 2017 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Sep 10 06:41:47 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=110e4619

www-servers/tomcat: removed old version in 8.5 slot

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 www-servers/tomcat/Manifest|   1 -
 .../tomcat/files/tomcat-8.5.16-build.xml.patch | 250 -
 www-servers/tomcat/tomcat-8.5.16.ebuild| 157 -
 3 files changed, 408 deletions(-)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 0c3d6bb41e8..0f5333ff3d2 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -2,6 +2,5 @@ DIST apache-tomcat-7.0.79-src.tar.gz 4682119 SHA256 
b5373951afe41ffd27348bb57cff
 DIST apache-tomcat-7.0.81-src.tar.gz 4689428 SHA256 
fca79afb210cfbc8f9ebcdebdd048ecb7ea370ac0f94040cbcc0287fe5d85e66 SHA512 
25e237aa7189cf9a9617badf8936fd7ec64550bcac3bab2e2afe51d5e199eddfe17e0d6d27ac7ebf3543d1601467fcd8362ddf9a5b708c50b223d7c8d18bbb3b
 WHIRLPOOL 
1016a02b4a30b7e02eb2f7fad3080153012dd3e3f84df34d006c89bc2c89b7b3d370334800170008482d3dbf339c62f249064eb48ab24ca17588026ba515d487
 DIST apache-tomcat-8.0.45-src.tar.gz 4978313 SHA256 
450fd2890b12e56692cb203f95651f9a873dce056b7b4362e142bc817032b291 SHA512 
80e4281f5b6e4d6bf607179840bc6cb923ea9f57ec8231a451c3b5a1f8938f72ec1097290059afba0ef7b56edeb56d63636849517b69b91c7093cb15ff0eaa04
 WHIRLPOOL 
c893cd5c26637f8881c19353e269145e33fa11e02eb10ef93a41590ad2e1e6c6ffa1b3f6c3c7c318630765f666be07447fd3a21c70c2c381e75c458b60383ea0
 DIST apache-tomcat-8.0.46-src.tar.gz 4985079 SHA256 
b5b9e560b3f75dd68b3103915c754ac47cf526f26f18cd6e9baba9580be25161 SHA512 
9adbea9faf61f782ede1c657e833dea55ad1b4a874a1eb9801eab82acde847e7f08ff7a49b3389b9d0683d185c6d4981f9f8d2f607f68c077a682af508d5
 WHIRLPOOL 
eafb2768555261836b04f12f95ba2755d2a7ef98754a5a009099e377220dff1251c6ad1cbe672764787c485b3f922bf1fda8db663890db36e356e7a5139b83e9
-DIST apache-tomcat-8.5.16-src.tar.gz 5054513 SHA256 
0dd3589779bd43624a6027ec5e26262d10128dd46dcd08ed4107b8f453416c23 SHA512 
187f32ebeeca9099f2bf679613dd89198268d361d352550e09db23ef8df483543ec67604c58ddebb8259c46ab510519e8fa75a803d2e86ab815b231ae327222e
 WHIRLPOOL 
d241aed38921a76f75451f7d3c676e97548b843bec724c8c80a6534638cd27095f4ba790cbef56c8913cd6d96e63536855359c5a271aa41c7d3b97e25de26253
 DIST apache-tomcat-8.5.20-src.tar.gz 5063310 SHA256 
6bc40ae61b77906325bf8bdb2b0767aeb96f4c5a7a9b618aa496db59387d6610 SHA512 
dea3095792de76a3a56bd6fd6c9ed5702ca539856d0e07a5de2600f456e7255929d14748a2dc9b3c626b3a67aaac8795ef3f5a6a1351991a0e89443e0c9d0807
 WHIRLPOOL 
1924f12c5068574424587d5b8b7261efb7496dbc53915d8cb2558b4a643aedecc98823ac7dec238fe7cb1a1874734e05de2dc6b7b28e48ffdae9e8c5c586e895
 DIST apache-tomcat-9.0.0.M26-src.tar.gz 5011957 SHA256 
02ba2c9a3a2d78994fc14f2b304c3b3f46615538a48a9193e475b08565cb9b7e SHA512 
8c25932aa244edb46eee26aa837636e78c8104ca6617cb5ba924e0e45c2f9dbcd7d196ddf69ee2f1c1b6053dda818a3b92f8f46c156f3048c46cee919fc22c13
 WHIRLPOOL 
11e00a6e6a5822bd4e357e375b026dd732bf33319e30dde25f11bc1b4617be3ce6d4976870f725e56646e5ffee92acb6fc23f46b53a46ebbf6c53707ea07

diff --git a/www-servers/tomcat/files/tomcat-8.5.16-build.xml.patch 
b/www-servers/tomcat/files/tomcat-8.5.16-build.xml.patch
deleted file mode 100644
index 611c99d7a0e..000
--- a/www-servers/tomcat/files/tomcat-8.5.16-build.xml.patch
+++ /dev/null
@@ -1,250 +0,0 @@
-diff --git a/apache-tomcat-8.5.4-src/build.xml 
b/apache-tomcat-8.5.4-src/build.xml
-index 655e379..b973b7f 100644
 a/apache-tomcat-8.5.4-src/build.xml
-+++ b/apache-tomcat-8.5.4-src/build.xml
-@@ -691,24 +691,29 @@
-   manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
- 
- 
-+
- 
-+
- 
- 
-+
- 
- 
- 
--
-+
- 
- 
-   
-@@ -1049,7 +1054,7 @@
- 
-   
- 
--
-+
- 
- 
- 
-@@ -1083,7 +1088,7 @@
- 
-   
- 
--  
-+  
- 
- 
- 
-   
- 
--  
-+  
- 
- 
- 
- 
-+
- 
-@@ -1579,7 +1585,7 @@
- 
-   
-+  description="Prepare to build web services extras package" 
unless="noget">
- 
- 
-   
-@@ -1727,6 +1733,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
- 
-   
-+
- 
- 
-   
-+
-   
-   http://docs.oracle.com/javase/7/docs/api/"/>
-   http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
-@@ -2574,7 +2584,7 @@ skip.installer property in build.properties" />
-   
- 
-   
-+  description="Download (and build) components necessary to compile" 
unless="noget">
- 
- 
-   
-@@ -2608,7 +2618,7 @@ skip.installer property in build.properties" />
-   
- 
-   
-+  description="Download additional components for the tests" 
unless="noget">
- 
- 
-   
-@@ -2665,7 +2675,7 @@ skip.installer 

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: 96b634bd2d58335c66299b60325ec5d70f608b6f
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Sep 10 06:20:46 2017 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Sep 10 06:20:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96b634bd

www-servers/tomcat: removed old security affected versions

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 www-servers/tomcat/Manifest|   2 -
 .../tomcat/files/tomcat-7.0.77-build.xml.patch | 149 
 .../tomcat/files/tomcat-8.0.43-build.xml.patch | 259 -
 www-servers/tomcat/tomcat-7.0.77.ebuild| 148 
 www-servers/tomcat/tomcat-8.0.43.ebuild| 157 -
 5 files changed, 715 deletions(-)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 195b548a628..0c3d6bb41e8 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,7 +1,5 @@
-DIST apache-tomcat-7.0.77-src.tar.gz 4664884 SHA256 
7db04b3bf8898d9f9facee9c53ae7a2c78f13dfd4d14e931d78cee2d0813cc43 SHA512 
19507de7f499df7269d8f819c30dc8194528555e9d6d430dad4b7ff3dc0c5c865d432eaef75bb2c157170cc5ebf76da5884296bf4e089c118448088a46f5e428
 WHIRLPOOL 
c17fe412d5c1db530287111624dbebfffe100639cd4bbc78be8e7e5b9be130ac23dd2978bbababd2981c1c91c00570f80e05b34e505af9a49646835334867bc6
 DIST apache-tomcat-7.0.79-src.tar.gz 4682119 SHA256 
b5373951afe41ffd27348bb57cff80bc7d86a5669bdedb0b4bbe1d567009dc32 SHA512 
75c29fd7de8c245502cae4db845a508f320739625d726fe892924b639e7333b76b3446f36cb67b9ad9500e95823b5eadaf056c4cb6bea962a59eb5491696e0b2
 WHIRLPOOL 
5db799cfbd061a199270b0ebb971c4fe43632522a23f590b7a46e021af5c8b0bce4a711e16bd0416b5baa6f2556cf8178bf14abadf4d493ece44c9eb2c4cdae2
 DIST apache-tomcat-7.0.81-src.tar.gz 4689428 SHA256 
fca79afb210cfbc8f9ebcdebdd048ecb7ea370ac0f94040cbcc0287fe5d85e66 SHA512 
25e237aa7189cf9a9617badf8936fd7ec64550bcac3bab2e2afe51d5e199eddfe17e0d6d27ac7ebf3543d1601467fcd8362ddf9a5b708c50b223d7c8d18bbb3b
 WHIRLPOOL 
1016a02b4a30b7e02eb2f7fad3080153012dd3e3f84df34d006c89bc2c89b7b3d370334800170008482d3dbf339c62f249064eb48ab24ca17588026ba515d487
-DIST apache-tomcat-8.0.43-src.tar.gz 4962788 SHA256 
5ca1feb8ae5bd637a379ed409300fac0d463a8ec878d60f1ca54d3e7f2013f43 SHA512 
aa15046ba3404c206b7983f42837d30debca69b18b85345d1376a853ad6e9fb5c0cbf42732f835779b10d39e2eae77f6d1688dadc5280b50236bf3432e251e9b
 WHIRLPOOL 
d1517c25b56a2ef4dd41977daf4ab5639b991ce38b6f5279a4e09f9232d73625be623beb678de8b3ec4e718cb50284cbebae67726622699738ad28be6d735414
 DIST apache-tomcat-8.0.45-src.tar.gz 4978313 SHA256 
450fd2890b12e56692cb203f95651f9a873dce056b7b4362e142bc817032b291 SHA512 
80e4281f5b6e4d6bf607179840bc6cb923ea9f57ec8231a451c3b5a1f8938f72ec1097290059afba0ef7b56edeb56d63636849517b69b91c7093cb15ff0eaa04
 WHIRLPOOL 
c893cd5c26637f8881c19353e269145e33fa11e02eb10ef93a41590ad2e1e6c6ffa1b3f6c3c7c318630765f666be07447fd3a21c70c2c381e75c458b60383ea0
 DIST apache-tomcat-8.0.46-src.tar.gz 4985079 SHA256 
b5b9e560b3f75dd68b3103915c754ac47cf526f26f18cd6e9baba9580be25161 SHA512 
9adbea9faf61f782ede1c657e833dea55ad1b4a874a1eb9801eab82acde847e7f08ff7a49b3389b9d0683d185c6d4981f9f8d2f607f68c077a682af508d5
 WHIRLPOOL 
eafb2768555261836b04f12f95ba2755d2a7ef98754a5a009099e377220dff1251c6ad1cbe672764787c485b3f922bf1fda8db663890db36e356e7a5139b83e9
 DIST apache-tomcat-8.5.16-src.tar.gz 5054513 SHA256 
0dd3589779bd43624a6027ec5e26262d10128dd46dcd08ed4107b8f453416c23 SHA512 
187f32ebeeca9099f2bf679613dd89198268d361d352550e09db23ef8df483543ec67604c58ddebb8259c46ab510519e8fa75a803d2e86ab815b231ae327222e
 WHIRLPOOL 
d241aed38921a76f75451f7d3c676e97548b843bec724c8c80a6534638cd27095f4ba790cbef56c8913cd6d96e63536855359c5a271aa41c7d3b97e25de26253

diff --git a/www-servers/tomcat/files/tomcat-7.0.77-build.xml.patch 
b/www-servers/tomcat/files/tomcat-7.0.77-build.xml.patch
deleted file mode 100644
index 481591fb6ff..000
--- a/www-servers/tomcat/files/tomcat-7.0.77-build.xml.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-diff -Naur apache-tomcat-7.0.63-src.orig/build.xml 
apache-tomcat-7.0.63-src/build.xml
 apache-tomcat-7.0.63-src.orig/build.xml2015-06-30 09:15:44.0 
+0100
-+++ apache-tomcat-7.0.63-src/build.xml 2015-08-22 21:13:12.453038827 +0100
-@@ -660,12 +660,14 @@
-   
- 
- 
-+
- 
-   
- 
-@@ -721,26 +723,32 @@
-   manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
- 
- 
-+
- 
- 
-+
- 
- 
-+
- 
- 
- 
- 
-+
- 
- 
- 
-@@ -1051,14 +1061,15 @@
- 
-   
- 
-+
- 
- 
--
-+
- 
- 
- 
-+  description="Prepare to build web services extras package" 
unless="noget">
- 
- 
-   
-@@ -1886,6 +1897,7 @@
- description="Create the Tomcat javadoc" >
- 
-+
- 
- 
-   
-+
-   
-   http://docs.oracle.com/javase/7/docs/api/"/>
-   http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
-@@ -2642,7 +2657,7 @@
- 

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: e4293e3d5dd61dbdaec247f83c3752093e79c966
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Aug 20 13:54:16 2017 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Aug 20 13:54:16 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4293e3d

www-servers/tomcat: bumped for slot 8

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 www-servers/tomcat/Manifest|   1 +
 .../tomcat/files/tomcat-8.0.46-build.xml.patch | 259 +
 www-servers/tomcat/tomcat-8.0.46.ebuild| 157 +
 3 files changed, 417 insertions(+)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index c20a475780f..195b548a628 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -3,6 +3,7 @@ DIST apache-tomcat-7.0.79-src.tar.gz 4682119 SHA256 
b5373951afe41ffd27348bb57cff
 DIST apache-tomcat-7.0.81-src.tar.gz 4689428 SHA256 
fca79afb210cfbc8f9ebcdebdd048ecb7ea370ac0f94040cbcc0287fe5d85e66 SHA512 
25e237aa7189cf9a9617badf8936fd7ec64550bcac3bab2e2afe51d5e199eddfe17e0d6d27ac7ebf3543d1601467fcd8362ddf9a5b708c50b223d7c8d18bbb3b
 WHIRLPOOL 
1016a02b4a30b7e02eb2f7fad3080153012dd3e3f84df34d006c89bc2c89b7b3d370334800170008482d3dbf339c62f249064eb48ab24ca17588026ba515d487
 DIST apache-tomcat-8.0.43-src.tar.gz 4962788 SHA256 
5ca1feb8ae5bd637a379ed409300fac0d463a8ec878d60f1ca54d3e7f2013f43 SHA512 
aa15046ba3404c206b7983f42837d30debca69b18b85345d1376a853ad6e9fb5c0cbf42732f835779b10d39e2eae77f6d1688dadc5280b50236bf3432e251e9b
 WHIRLPOOL 
d1517c25b56a2ef4dd41977daf4ab5639b991ce38b6f5279a4e09f9232d73625be623beb678de8b3ec4e718cb50284cbebae67726622699738ad28be6d735414
 DIST apache-tomcat-8.0.45-src.tar.gz 4978313 SHA256 
450fd2890b12e56692cb203f95651f9a873dce056b7b4362e142bc817032b291 SHA512 
80e4281f5b6e4d6bf607179840bc6cb923ea9f57ec8231a451c3b5a1f8938f72ec1097290059afba0ef7b56edeb56d63636849517b69b91c7093cb15ff0eaa04
 WHIRLPOOL 
c893cd5c26637f8881c19353e269145e33fa11e02eb10ef93a41590ad2e1e6c6ffa1b3f6c3c7c318630765f666be07447fd3a21c70c2c381e75c458b60383ea0
+DIST apache-tomcat-8.0.46-src.tar.gz 4985079 SHA256 
b5b9e560b3f75dd68b3103915c754ac47cf526f26f18cd6e9baba9580be25161 SHA512 
9adbea9faf61f782ede1c657e833dea55ad1b4a874a1eb9801eab82acde847e7f08ff7a49b3389b9d0683d185c6d4981f9f8d2f607f68c077a682af508d5
 WHIRLPOOL 
eafb2768555261836b04f12f95ba2755d2a7ef98754a5a009099e377220dff1251c6ad1cbe672764787c485b3f922bf1fda8db663890db36e356e7a5139b83e9
 DIST apache-tomcat-8.5.16-src.tar.gz 5054513 SHA256 
0dd3589779bd43624a6027ec5e26262d10128dd46dcd08ed4107b8f453416c23 SHA512 
187f32ebeeca9099f2bf679613dd89198268d361d352550e09db23ef8df483543ec67604c58ddebb8259c46ab510519e8fa75a803d2e86ab815b231ae327222e
 WHIRLPOOL 
d241aed38921a76f75451f7d3c676e97548b843bec724c8c80a6534638cd27095f4ba790cbef56c8913cd6d96e63536855359c5a271aa41c7d3b97e25de26253
 DIST apache-tomcat-8.5.20-src.tar.gz 5063310 SHA256 
6bc40ae61b77906325bf8bdb2b0767aeb96f4c5a7a9b618aa496db59387d6610 SHA512 
dea3095792de76a3a56bd6fd6c9ed5702ca539856d0e07a5de2600f456e7255929d14748a2dc9b3c626b3a67aaac8795ef3f5a6a1351991a0e89443e0c9d0807
 WHIRLPOOL 
1924f12c5068574424587d5b8b7261efb7496dbc53915d8cb2558b4a643aedecc98823ac7dec238fe7cb1a1874734e05de2dc6b7b28e48ffdae9e8c5c586e895
 DIST apache-tomcat-9.0.0.M26-src.tar.gz 5011957 SHA256 
02ba2c9a3a2d78994fc14f2b304c3b3f46615538a48a9193e475b08565cb9b7e SHA512 
8c25932aa244edb46eee26aa837636e78c8104ca6617cb5ba924e0e45c2f9dbcd7d196ddf69ee2f1c1b6053dda818a3b92f8f46c156f3048c46cee919fc22c13
 WHIRLPOOL 
11e00a6e6a5822bd4e357e375b026dd732bf33319e30dde25f11bc1b4617be3ce6d4976870f725e56646e5ffee92acb6fc23f46b53a46ebbf6c53707ea07

diff --git a/www-servers/tomcat/files/tomcat-8.0.46-build.xml.patch 
b/www-servers/tomcat/files/tomcat-8.0.46-build.xml.patch
new file mode 100644
index 000..cefd59f55ae
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.0.46-build.xml.patch
@@ -0,0 +1,259 @@
+diff --git a/apache-tomcat-8.0.36-src/build.xml 
b/apache-tomcat-8.0.36-src/build.xml
+index 1ba0dae..81a0a2c 100644
+--- a/apache-tomcat-8.0.36-src/build.xml
 b/apache-tomcat-8.0.36-src/build.xml
+@@ -701,24 +701,29 @@
+   manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+ 
++
+ 
++
+ 
+ 
++
+ 
+ 
+ 
+-
++
+ 
+ 
+   
+@@ -1053,7 +1058,7 @@
+ 
+   
+ 
+-
++
+ 
+ 
+ 
+@@ -1087,7 +1092,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+ 
++
+ 
+@@ -1594,7 +1600,7 @@
+ 
+   
++  description="Prepare to build web services extras package" 
unless="noget">
+ 
+ 
+   
+@@ -1733,7 +1739,7 @@
+ 
+   
++  description="Prepare to build web services extras package" 
unless="noget">
+ 
+ 
+   
+@@ -1928,6 +1934,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
+ 
+   
++
+ 
+ 
+   
++
+   
+   

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: d51d9aa166652f6dfdfdd20e1f225d37c9c61745
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Aug 17 14:01:45 2017 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Aug 17 14:03:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d51d9aa1

www-servers/tomcat: bumped for slot 7

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 www-servers/tomcat/Manifest|   1 +
 .../tomcat/files/tomcat-7.0.81-build.xml.patch | 149 +
 www-servers/tomcat/tomcat-7.0.81.ebuild| 148 
 3 files changed, 298 insertions(+)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index fbd44f47f7f..c20a475780f 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,5 +1,6 @@
 DIST apache-tomcat-7.0.77-src.tar.gz 4664884 SHA256 
7db04b3bf8898d9f9facee9c53ae7a2c78f13dfd4d14e931d78cee2d0813cc43 SHA512 
19507de7f499df7269d8f819c30dc8194528555e9d6d430dad4b7ff3dc0c5c865d432eaef75bb2c157170cc5ebf76da5884296bf4e089c118448088a46f5e428
 WHIRLPOOL 
c17fe412d5c1db530287111624dbebfffe100639cd4bbc78be8e7e5b9be130ac23dd2978bbababd2981c1c91c00570f80e05b34e505af9a49646835334867bc6
 DIST apache-tomcat-7.0.79-src.tar.gz 4682119 SHA256 
b5373951afe41ffd27348bb57cff80bc7d86a5669bdedb0b4bbe1d567009dc32 SHA512 
75c29fd7de8c245502cae4db845a508f320739625d726fe892924b639e7333b76b3446f36cb67b9ad9500e95823b5eadaf056c4cb6bea962a59eb5491696e0b2
 WHIRLPOOL 
5db799cfbd061a199270b0ebb971c4fe43632522a23f590b7a46e021af5c8b0bce4a711e16bd0416b5baa6f2556cf8178bf14abadf4d493ece44c9eb2c4cdae2
+DIST apache-tomcat-7.0.81-src.tar.gz 4689428 SHA256 
fca79afb210cfbc8f9ebcdebdd048ecb7ea370ac0f94040cbcc0287fe5d85e66 SHA512 
25e237aa7189cf9a9617badf8936fd7ec64550bcac3bab2e2afe51d5e199eddfe17e0d6d27ac7ebf3543d1601467fcd8362ddf9a5b708c50b223d7c8d18bbb3b
 WHIRLPOOL 
1016a02b4a30b7e02eb2f7fad3080153012dd3e3f84df34d006c89bc2c89b7b3d370334800170008482d3dbf339c62f249064eb48ab24ca17588026ba515d487
 DIST apache-tomcat-8.0.43-src.tar.gz 4962788 SHA256 
5ca1feb8ae5bd637a379ed409300fac0d463a8ec878d60f1ca54d3e7f2013f43 SHA512 
aa15046ba3404c206b7983f42837d30debca69b18b85345d1376a853ad6e9fb5c0cbf42732f835779b10d39e2eae77f6d1688dadc5280b50236bf3432e251e9b
 WHIRLPOOL 
d1517c25b56a2ef4dd41977daf4ab5639b991ce38b6f5279a4e09f9232d73625be623beb678de8b3ec4e718cb50284cbebae67726622699738ad28be6d735414
 DIST apache-tomcat-8.0.45-src.tar.gz 4978313 SHA256 
450fd2890b12e56692cb203f95651f9a873dce056b7b4362e142bc817032b291 SHA512 
80e4281f5b6e4d6bf607179840bc6cb923ea9f57ec8231a451c3b5a1f8938f72ec1097290059afba0ef7b56edeb56d63636849517b69b91c7093cb15ff0eaa04
 WHIRLPOOL 
c893cd5c26637f8881c19353e269145e33fa11e02eb10ef93a41590ad2e1e6c6ffa1b3f6c3c7c318630765f666be07447fd3a21c70c2c381e75c458b60383ea0
 DIST apache-tomcat-8.5.16-src.tar.gz 5054513 SHA256 
0dd3589779bd43624a6027ec5e26262d10128dd46dcd08ed4107b8f453416c23 SHA512 
187f32ebeeca9099f2bf679613dd89198268d361d352550e09db23ef8df483543ec67604c58ddebb8259c46ab510519e8fa75a803d2e86ab815b231ae327222e
 WHIRLPOOL 
d241aed38921a76f75451f7d3c676e97548b843bec724c8c80a6534638cd27095f4ba790cbef56c8913cd6d96e63536855359c5a271aa41c7d3b97e25de26253

diff --git a/www-servers/tomcat/files/tomcat-7.0.81-build.xml.patch 
b/www-servers/tomcat/files/tomcat-7.0.81-build.xml.patch
new file mode 100644
index 000..481591fb6ff
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-7.0.81-build.xml.patch
@@ -0,0 +1,149 @@
+diff -Naur apache-tomcat-7.0.63-src.orig/build.xml 
apache-tomcat-7.0.63-src/build.xml
+--- apache-tomcat-7.0.63-src.orig/build.xml2015-06-30 09:15:44.0 
+0100
 apache-tomcat-7.0.63-src/build.xml 2015-08-22 21:13:12.453038827 +0100
+@@ -660,12 +660,14 @@
+   
+ 
+ 
++
+ 
+   
+ 
+@@ -721,26 +723,32 @@
+   manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+ 
++
+ 
+ 
++
+ 
+ 
++
+ 
+ 
+ 
+ 
++
+ 
+ 
+ 
+@@ -1051,14 +1061,15 @@
+ 
+   
+ 
++
+ 
+ 
+-
++
+ 
+ 
+ 
++  description="Prepare to build web services extras package" 
unless="noget">
+ 
+ 
+   
+@@ -1886,6 +1897,7 @@
+ description="Create the Tomcat javadoc" >
+ 
++
+ 
+ 
+   
++
+   
+   http://docs.oracle.com/javase/7/docs/api/"/>
+   http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2642,7 +2657,7 @@
+   
+ 
+   
++  description="Download (and build) components necessary to compile" 
unless="noget">
+ 
+ 
+   
+@@ -2699,7 +2714,7 @@
+   
+ 
+   
++  description="Download additional components for the tests" 
unless="noget">
+ 
+ 
+   
+@@ -2727,7 +2742,7 @@
+   
+ 
+   
++  description="Download additional components for a distribution" 
unless="noget">
+ 
+ 
+   

diff --git a/www-servers/tomcat/tomcat-7.0.81.ebuild 
b/www-servers/tomcat/tomcat-7.0.81.ebuild
new file mode 100644
index 

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: 4c8637d765e1916719ccb82954612a892194d3f9
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Aug 10 10:27:15 2017 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Aug 10 10:35:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c8637d7

www-servers/tomcat: bumped for slot 9

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 www-servers/tomcat/Manifest | 2 +-
 ...0.0_alpha22-build.xml.patch => tomcat-9.0.0_alpha26-build.xml.patch} | 0
 .../tomcat/{tomcat-9.0.0_alpha22.ebuild => tomcat-9.0.0_alpha26.ebuild} | 0
 3 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 23bc5c5a6bf..e520ba148f3 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -6,4 +6,4 @@ DIST apache-tomcat-8.5.13-src.tar.gz 5021333 SHA256 
70db8d68f3a702e0997220a91d0c
 DIST apache-tomcat-8.5.14-src.tar.gz 5024579 SHA256 
f52ce43e74b9a8b1930971dc0f7ca6f2fd06f517b02541b71f6b54148dff0955 SHA512 
f51172f2bd079b18c2aa87a4513e128ab729cb9c80ecfe7ba3e817cc944ab310f2ea934655405c7241aa09e551b63ffe4c663b57ed7d38c756dc193e2acb2cea
 WHIRLPOOL 
8cd9f2100a882619455a4eb914e7a1bc7ecae21f7aaf612ba901ac7c60a0920cd2bf9f7aa3b71eef459d6a981193b763b71e3a4f5489dcd2c87382040afe1dbd
 DIST apache-tomcat-8.5.15-src.tar.gz 5028654 SHA256 
941e1e936af46dbe233e41f770e68b09e2ac0d88b6ee01f7b2116a67220cb323 SHA512 
222d53ed53b1b3e18ff42dc0a987627e75de93048d9a36ce08448272f167ed7ab91ac6d44158a2de9f2f960e53c36497841649e941305e583e6b70e13f55c970
 WHIRLPOOL 
c5f63ca2ac4b7f48041db93c15dbd224e09998abaa89c79c22537615935b6ce87a1b4667ddd92ec28bfad9d84c723aed8dc20780d966bdf4b094a87fdfa9
 DIST apache-tomcat-8.5.16-src.tar.gz 5054513 SHA256 
0dd3589779bd43624a6027ec5e26262d10128dd46dcd08ed4107b8f453416c23 SHA512 
187f32ebeeca9099f2bf679613dd89198268d361d352550e09db23ef8df483543ec67604c58ddebb8259c46ab510519e8fa75a803d2e86ab815b231ae327222e
 WHIRLPOOL 
d241aed38921a76f75451f7d3c676e97548b843bec724c8c80a6534638cd27095f4ba790cbef56c8913cd6d96e63536855359c5a271aa41c7d3b97e25de26253
-DIST apache-tomcat-9.0.0.M22-src.tar.gz 4983146 SHA256 
9638d9b68dde1907a8f5b7077786e6b6479b787cf9348edc3bc53979de1b454d SHA512 
d2548cb64d7ff6d5251f00722627da4436879b524914a7892bf0e69a6f3e37e28edac2158084cd54c84747ecc8abfef6679d3e0551a86c7b97c749d2672ce38a
 WHIRLPOOL 
25311053fdf6c1f0fe43c29ea9ca429b24bf3fe984cfbf4b4970cfe1aaedda6c33ca244e3f174fea7195d6b4d844df3f5b80d8ddbb891ea1f1f6defe234d9ed0
+DIST apache-tomcat-9.0.0.M26-src.tar.gz 5011957 SHA256 
02ba2c9a3a2d78994fc14f2b304c3b3f46615538a48a9193e475b08565cb9b7e SHA512 
8c25932aa244edb46eee26aa837636e78c8104ca6617cb5ba924e0e45c2f9dbcd7d196ddf69ee2f1c1b6053dda818a3b92f8f46c156f3048c46cee919fc22c13
 WHIRLPOOL 
11e00a6e6a5822bd4e357e375b026dd732bf33319e30dde25f11bc1b4617be3ce6d4976870f725e56646e5ffee92acb6fc23f46b53a46ebbf6c53707ea07

diff --git a/www-servers/tomcat/files/tomcat-9.0.0_alpha22-build.xml.patch 
b/www-servers/tomcat/files/tomcat-9.0.0_alpha26-build.xml.patch
similarity index 100%
rename from www-servers/tomcat/files/tomcat-9.0.0_alpha22-build.xml.patch
rename to www-servers/tomcat/files/tomcat-9.0.0_alpha26-build.xml.patch

diff --git a/www-servers/tomcat/tomcat-9.0.0_alpha22.ebuild 
b/www-servers/tomcat/tomcat-9.0.0_alpha26.ebuild
similarity index 100%
rename from www-servers/tomcat/tomcat-9.0.0_alpha22.ebuild
rename to www-servers/tomcat/tomcat-9.0.0_alpha26.ebuild

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: ca4a45101e46cf6dc1d7c7e07668495a95a8c1b0
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Jul 15 07:37:35 2017 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Jul 15 07:49:58 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca4a4510

www-servers/tomcat: version bump for slot 9

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 www-servers/tomcat/Manifest | 2 +-
 ...0.0_alpha21-build.xml.patch => tomcat-9.0.0_alpha22-build.xml.patch} | 0
 .../tomcat/{tomcat-9.0.0_alpha21.ebuild => tomcat-9.0.0_alpha22.ebuild} | 0
 3 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index c0bb964ca9d..f8fa2a82a4a 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -4,4 +4,4 @@ DIST apache-tomcat-8.5.13-src.tar.gz 5021333 SHA256 
70db8d68f3a702e0997220a91d0c
 DIST apache-tomcat-8.5.14-src.tar.gz 5024579 SHA256 
f52ce43e74b9a8b1930971dc0f7ca6f2fd06f517b02541b71f6b54148dff0955 SHA512 
f51172f2bd079b18c2aa87a4513e128ab729cb9c80ecfe7ba3e817cc944ab310f2ea934655405c7241aa09e551b63ffe4c663b57ed7d38c756dc193e2acb2cea
 WHIRLPOOL 
8cd9f2100a882619455a4eb914e7a1bc7ecae21f7aaf612ba901ac7c60a0920cd2bf9f7aa3b71eef459d6a981193b763b71e3a4f5489dcd2c87382040afe1dbd
 DIST apache-tomcat-8.5.15-src.tar.gz 5028654 SHA256 
941e1e936af46dbe233e41f770e68b09e2ac0d88b6ee01f7b2116a67220cb323 SHA512 
222d53ed53b1b3e18ff42dc0a987627e75de93048d9a36ce08448272f167ed7ab91ac6d44158a2de9f2f960e53c36497841649e941305e583e6b70e13f55c970
 WHIRLPOOL 
c5f63ca2ac4b7f48041db93c15dbd224e09998abaa89c79c22537615935b6ce87a1b4667ddd92ec28bfad9d84c723aed8dc20780d966bdf4b094a87fdfa9
 DIST apache-tomcat-8.5.16-src.tar.gz 5054513 SHA256 
0dd3589779bd43624a6027ec5e26262d10128dd46dcd08ed4107b8f453416c23 SHA512 
187f32ebeeca9099f2bf679613dd89198268d361d352550e09db23ef8df483543ec67604c58ddebb8259c46ab510519e8fa75a803d2e86ab815b231ae327222e
 WHIRLPOOL 
d241aed38921a76f75451f7d3c676e97548b843bec724c8c80a6534638cd27095f4ba790cbef56c8913cd6d96e63536855359c5a271aa41c7d3b97e25de26253
-DIST apache-tomcat-9.0.0.M21-src.tar.gz 4965516 SHA256 
7e48d6c5e8f93d6f2decdb7c60bb8b807094b05897af6c6500957a7ddcdb49ce SHA512 
1883b18f6daceae46dd10039343a1431db2407b692228cb0df9aa8cc3978d36ba66b0c0a124029956bdf2a07b38e1628cb76c3621baed848e54bfb2ce94164df
 WHIRLPOOL 
f1302d42e596f0eb369e31d4584d5338ca816bf4ffe43f43a2c7866a31ec2ccef6ecd106dc1589af9ba19affdf6128cf1b966169cfc56db44110b60451d2ba78
+DIST apache-tomcat-9.0.0.M22-src.tar.gz 4983146 SHA256 
9638d9b68dde1907a8f5b7077786e6b6479b787cf9348edc3bc53979de1b454d SHA512 
d2548cb64d7ff6d5251f00722627da4436879b524914a7892bf0e69a6f3e37e28edac2158084cd54c84747ecc8abfef6679d3e0551a86c7b97c749d2672ce38a
 WHIRLPOOL 
25311053fdf6c1f0fe43c29ea9ca429b24bf3fe984cfbf4b4970cfe1aaedda6c33ca244e3f174fea7195d6b4d844df3f5b80d8ddbb891ea1f1f6defe234d9ed0

diff --git a/www-servers/tomcat/files/tomcat-9.0.0_alpha21-build.xml.patch 
b/www-servers/tomcat/files/tomcat-9.0.0_alpha22-build.xml.patch
similarity index 100%
rename from www-servers/tomcat/files/tomcat-9.0.0_alpha21-build.xml.patch
rename to www-servers/tomcat/files/tomcat-9.0.0_alpha22-build.xml.patch

diff --git a/www-servers/tomcat/tomcat-9.0.0_alpha21.ebuild 
b/www-servers/tomcat/tomcat-9.0.0_alpha22.ebuild
similarity index 100%
rename from www-servers/tomcat/tomcat-9.0.0_alpha21.ebuild
rename to www-servers/tomcat/tomcat-9.0.0_alpha22.ebuild

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: f1ce8aeaf6655ddc4ce1ea8eb139b4d137ce2eac
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue May 16 08:56:22 2017 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue May 16 08:56:22 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1ce8aea

www-servers/tomcat: version bump in slot 8.5

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 www-servers/tomcat/Manifest|   1 +
 .../tomcat/files/tomcat-8.5.15-build.xml.patch | 250 +
 www-servers/tomcat/tomcat-8.5.15.ebuild| 157 +
 3 files changed, 408 insertions(+)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 4e99c2ce40a..9f5fe387a6c 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -2,4 +2,5 @@ DIST apache-tomcat-7.0.77-src.tar.gz 4664884 SHA256 
7db04b3bf8898d9f9facee9c53ae
 DIST apache-tomcat-8.0.43-src.tar.gz 4962788 SHA256 
5ca1feb8ae5bd637a379ed409300fac0d463a8ec878d60f1ca54d3e7f2013f43 SHA512 
aa15046ba3404c206b7983f42837d30debca69b18b85345d1376a853ad6e9fb5c0cbf42732f835779b10d39e2eae77f6d1688dadc5280b50236bf3432e251e9b
 WHIRLPOOL 
d1517c25b56a2ef4dd41977daf4ab5639b991ce38b6f5279a4e09f9232d73625be623beb678de8b3ec4e718cb50284cbebae67726622699738ad28be6d735414
 DIST apache-tomcat-8.5.13-src.tar.gz 5021333 SHA256 
70db8d68f3a702e0997220a91d0c1ed59de4bbdc32d8482532412c1e31666a0b SHA512 
4855e0b686dcdc10224e3bba804c7c944a8b2f48761dd0e4fca12a59cfc308fd5f26db6a02b3b7c39b595506c920fdf8f19eedb26a8acb7f1580f4e4b597fb5b
 WHIRLPOOL 
6ad3150416e17396c81e6b638e035f55e695388fb2cdfd65a6803195894dee3391aac56243879faa850b2765d29f3ae13c74cefd66c349bd53bf14900e59dea6
 DIST apache-tomcat-8.5.14-src.tar.gz 5024579 SHA256 
f52ce43e74b9a8b1930971dc0f7ca6f2fd06f517b02541b71f6b54148dff0955 SHA512 
f51172f2bd079b18c2aa87a4513e128ab729cb9c80ecfe7ba3e817cc944ab310f2ea934655405c7241aa09e551b63ffe4c663b57ed7d38c756dc193e2acb2cea
 WHIRLPOOL 
8cd9f2100a882619455a4eb914e7a1bc7ecae21f7aaf612ba901ac7c60a0920cd2bf9f7aa3b71eef459d6a981193b763b71e3a4f5489dcd2c87382040afe1dbd
+DIST apache-tomcat-8.5.15-src.tar.gz 5028654 SHA256 
941e1e936af46dbe233e41f770e68b09e2ac0d88b6ee01f7b2116a67220cb323 SHA512 
222d53ed53b1b3e18ff42dc0a987627e75de93048d9a36ce08448272f167ed7ab91ac6d44158a2de9f2f960e53c36497841649e941305e583e6b70e13f55c970
 WHIRLPOOL 
c5f63ca2ac4b7f48041db93c15dbd224e09998abaa89c79c22537615935b6ce87a1b4667ddd92ec28bfad9d84c723aed8dc20780d966bdf4b094a87fdfa9
 DIST apache-tomcat-9.0.0.M21-src.tar.gz 4965516 SHA256 
7e48d6c5e8f93d6f2decdb7c60bb8b807094b05897af6c6500957a7ddcdb49ce SHA512 
1883b18f6daceae46dd10039343a1431db2407b692228cb0df9aa8cc3978d36ba66b0c0a124029956bdf2a07b38e1628cb76c3621baed848e54bfb2ce94164df
 WHIRLPOOL 
f1302d42e596f0eb369e31d4584d5338ca816bf4ffe43f43a2c7866a31ec2ccef6ecd106dc1589af9ba19affdf6128cf1b966169cfc56db44110b60451d2ba78

diff --git a/www-servers/tomcat/files/tomcat-8.5.15-build.xml.patch 
b/www-servers/tomcat/files/tomcat-8.5.15-build.xml.patch
new file mode 100644
index 000..611c99d7a0e
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.5.15-build.xml.patch
@@ -0,0 +1,250 @@
+diff --git a/apache-tomcat-8.5.4-src/build.xml 
b/apache-tomcat-8.5.4-src/build.xml
+index 655e379..b973b7f 100644
+--- a/apache-tomcat-8.5.4-src/build.xml
 b/apache-tomcat-8.5.4-src/build.xml
+@@ -691,24 +691,29 @@
+   manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+ 
++
+ 
++
+ 
+ 
++
+ 
+ 
+ 
+-
++
+ 
+ 
+   
+@@ -1049,7 +1054,7 @@
+ 
+   
+ 
+-
++
+ 
+ 
+ 
+@@ -1083,7 +1088,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+ 
++
+ 
+@@ -1579,7 +1585,7 @@
+ 
+   
++  description="Prepare to build web services extras package" 
unless="noget">
+ 
+ 
+   
+@@ -1727,6 +1733,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
+ 
+   
++
+ 
+ 
+   
++
+   
+   http://docs.oracle.com/javase/7/docs/api/"/>
+   http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2574,7 +2584,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download (and build) components necessary to compile" 
unless="noget">
+ 
+ 
+   
+@@ -2608,7 +2618,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download additional components for the tests" 
unless="noget">
+ 
+ 
+   
+@@ -2665,7 +2675,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download additional components for a distribution" 
unless="noget">
+ 
+ 
+   
+@@ -2691,18 +2701,18 @@ skip.installer property in build.properties" />
+ 
+   
+ 
+-  
++  
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+@@ -2714,7 +2724,7 @@ skip.installer property in build.properties" />

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: b838f3cc8ac93b4bf35471c7c060cb355feb3b34
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Apr 25 10:53:07 2017 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Apr 25 10:53:07 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b838f3cc

www-servers/tomcat: version bump in slot 8.5

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 www-servers/tomcat/Manifest|   1 +
 .../tomcat/files/tomcat-8.5.14-build.xml.patch | 250 +
 www-servers/tomcat/tomcat-8.5.14.ebuild| 157 +
 3 files changed, 408 insertions(+)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index c4e21655348..5a59dd41d62 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -8,5 +8,6 @@ DIST apache-tomcat-8.0.43-src.tar.gz 4962788 SHA256 
5ca1feb8ae5bd637a379ed409300
 DIST apache-tomcat-8.5.11-src.tar.gz 4996153 SHA256 
81fb94243600d950375c4622f76b39c06c5615b7a8a6f70d387ea249bed1dddf SHA512 
d1a9513535773805c26825f8843fa502e044c9f1ccc22176db5418a7a0abb6d1bcff3db401b449a5867065359abbc8277d14085d807fe00c95dd267d9091620d
 WHIRLPOOL 
41ff9daec144c2481d3bb7a49bcd071eb2d21b34c11356a9911a139b404779971c31282f73b7b336b7e02d16156749e8e816dca8d5c727ef871ff0216577398d
 DIST apache-tomcat-8.5.12-src.tar.gz 5009933 SHA256 
af8b7ab3cc3ba17a667fd1fdd943ce5a459e8e887d30902030af7c42e3af2b07 SHA512 
de8e928db261143629e415cb3532fbe762620d0500eca021d9a888671e9a609f82039b14db3d64371076be13e2ca6affc045f62bcd38c1608e968cb07d3e77d1
 WHIRLPOOL 
eb927ed655ee49417203264b5cf45bd39629df2e29387a78d9db43f1c9e6376adad641d779a1243a109695aedcaa0a4a886c7edad523488ab02aef0cf94475a5
 DIST apache-tomcat-8.5.13-src.tar.gz 5021333 SHA256 
70db8d68f3a702e0997220a91d0c1ed59de4bbdc32d8482532412c1e31666a0b SHA512 
4855e0b686dcdc10224e3bba804c7c944a8b2f48761dd0e4fca12a59cfc308fd5f26db6a02b3b7c39b595506c920fdf8f19eedb26a8acb7f1580f4e4b597fb5b
 WHIRLPOOL 
6ad3150416e17396c81e6b638e035f55e695388fb2cdfd65a6803195894dee3391aac56243879faa850b2765d29f3ae13c74cefd66c349bd53bf14900e59dea6
+DIST apache-tomcat-8.5.14-src.tar.gz 5024579 SHA256 
f52ce43e74b9a8b1930971dc0f7ca6f2fd06f517b02541b71f6b54148dff0955 SHA512 
f51172f2bd079b18c2aa87a4513e128ab729cb9c80ecfe7ba3e817cc944ab310f2ea934655405c7241aa09e551b63ffe4c663b57ed7d38c756dc193e2acb2cea
 WHIRLPOOL 
8cd9f2100a882619455a4eb914e7a1bc7ecae21f7aaf612ba901ac7c60a0920cd2bf9f7aa3b71eef459d6a981193b763b71e3a4f5489dcd2c87382040afe1dbd
 DIST apache-tomcat-8.5.9-src.tar.gz 5059352 SHA256 
65b4ed45950263cb4e4ca82a9b469943053eb85656a7568d6e0eb446ab34afe5 SHA512 
85534e88467b298dfbf6d3ec274592da4e73c34ee3f8e84582f95aa7f69959b47076a7fd9e31c705b12e914fefad53ffc954a09c7d7f3da0203752033e70bf17
 WHIRLPOOL 
0dbcbc1bc0c9fdb8ca50dc7d630dc86d92c606a0e554e6fd8f68c1d34682e2581d4b730198161f75e64340c857f251244237ae0dcbc406caa90585236b5d69df
 DIST apache-tomcat-9.0.0.M20-src.tar.gz 4957933 SHA256 
58c6333e2cfdfdee74e7832c421bc63ab32487d9cb0fb7f2f534566b1d2a4564 SHA512 
344ed515d81e7561213538fc40072730ca899c9065e92ef6aae7c22049fc49e7d1bfb6f52615176689b3a412a875e5c867fb38d67b2bd2e7bc3e5108817d5fb1
 WHIRLPOOL 
74d9cd6cc68305df7fe01abb39b24f92e403a76cce7dde77b4f6b2300c62dc1f60fd8dda83e31ecfad336032715d96e7ea1b90352ed0904fd2509ed662665acd

diff --git a/www-servers/tomcat/files/tomcat-8.5.14-build.xml.patch 
b/www-servers/tomcat/files/tomcat-8.5.14-build.xml.patch
new file mode 100644
index 000..611c99d7a0e
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.5.14-build.xml.patch
@@ -0,0 +1,250 @@
+diff --git a/apache-tomcat-8.5.4-src/build.xml 
b/apache-tomcat-8.5.4-src/build.xml
+index 655e379..b973b7f 100644
+--- a/apache-tomcat-8.5.4-src/build.xml
 b/apache-tomcat-8.5.4-src/build.xml
+@@ -691,24 +691,29 @@
+   manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+ 
++
+ 
++
+ 
+ 
++
+ 
+ 
+ 
+-
++
+ 
+ 
+   
+@@ -1049,7 +1054,7 @@
+ 
+   
+ 
+-
++
+ 
+ 
+ 
+@@ -1083,7 +1088,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+ 
++
+ 
+@@ -1579,7 +1585,7 @@
+ 
+   
++  description="Prepare to build web services extras package" 
unless="noget">
+ 
+ 
+   
+@@ -1727,6 +1733,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
+ 
+   
++
+ 
+ 
+   
++
+   
+   http://docs.oracle.com/javase/7/docs/api/"/>
+   http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2574,7 +2584,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download (and build) components necessary to compile" 
unless="noget">
+ 
+ 
+   
+@@ -2608,7 +2618,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download additional components for the tests" 
unless="noget">
+ 
+ 
+   
+@@ -2665,7 +2675,7 @@ skip.installer property in 

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: bebaee790d8046a3f08108c4ac32d3054ff39650
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Mar 14 15:02:22 2017 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Mar 14 15:14:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bebaee79

www-servers/tomcat: version bump in slot 8.5

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 www-servers/tomcat/Manifest|   1 +
 .../tomcat/files/tomcat-8.5.12-build.xml.patch | 250 +
 www-servers/tomcat/tomcat-8.5.12.ebuild| 157 +
 3 files changed, 408 insertions(+)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index d448b71351a..3629bcc393a 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -3,5 +3,6 @@ DIST apache-tomcat-7.0.75-src.tar.gz 4657629 SHA256 
ffa9489ecd9aa0750598e5db0dc3
 DIST apache-tomcat-8.0.39-src.tar.gz 5019148 SHA256 
566bf43a50f42af9c5b46be60f68e571a56c41f8e93647cf9f68e5f93870be96 SHA512 
0f58f2ef0dc047189672107b1f2586731e9455c3e665210d5634f5f5a16b0afd7ef5c35beaf02e22b874d4898ab62d33638785d9f18714893674bc691b0f9330
 WHIRLPOOL 
62baaba90f588c43ea503eb336d1b385b3a00b86686c1e232a836975f10d12241416b688279ffcd60dd42afb9d9660b6385e749c0c4d0877217f7494539f2752
 DIST apache-tomcat-8.0.41-src.tar.gz 4950440 SHA256 
2bbaf50e9c9ffe8d79369c0c16cad04ea256cccde85658d15a011c8f8d1c2b77 SHA512 
6d2d104be33f203a5c45e6d0d8a8631542830462da932f1d11eadfb9927ba82e3fa5245321197e610f55ed34622b50743cb3af4699c7cedfb91b9dd2b35f338d
 WHIRLPOOL 
758104c1e2f7aa5707f8711b6c08c67674c4c9b8702f8da2d48839da1802f158aa158aef6386af27e6c95b430c6060436cafbd7accc48c7bced376c5cef8
 DIST apache-tomcat-8.5.11-src.tar.gz 4996153 SHA256 
81fb94243600d950375c4622f76b39c06c5615b7a8a6f70d387ea249bed1dddf SHA512 
d1a9513535773805c26825f8843fa502e044c9f1ccc22176db5418a7a0abb6d1bcff3db401b449a5867065359abbc8277d14085d807fe00c95dd267d9091620d
 WHIRLPOOL 
41ff9daec144c2481d3bb7a49bcd071eb2d21b34c11356a9911a139b404779971c31282f73b7b336b7e02d16156749e8e816dca8d5c727ef871ff0216577398d
+DIST apache-tomcat-8.5.12-src.tar.gz 5009933 SHA256 
af8b7ab3cc3ba17a667fd1fdd943ce5a459e8e887d30902030af7c42e3af2b07 SHA512 
de8e928db261143629e415cb3532fbe762620d0500eca021d9a888671e9a609f82039b14db3d64371076be13e2ca6affc045f62bcd38c1608e968cb07d3e77d1
 WHIRLPOOL 
eb927ed655ee49417203264b5cf45bd39629df2e29387a78d9db43f1c9e6376adad641d779a1243a109695aedcaa0a4a886c7edad523488ab02aef0cf94475a5
 DIST apache-tomcat-8.5.9-src.tar.gz 5059352 SHA256 
65b4ed45950263cb4e4ca82a9b469943053eb85656a7568d6e0eb446ab34afe5 SHA512 
85534e88467b298dfbf6d3ec274592da4e73c34ee3f8e84582f95aa7f69959b47076a7fd9e31c705b12e914fefad53ffc954a09c7d7f3da0203752033e70bf17
 WHIRLPOOL 
0dbcbc1bc0c9fdb8ca50dc7d630dc86d92c606a0e554e6fd8f68c1d34682e2581d4b730198161f75e64340c857f251244237ae0dcbc406caa90585236b5d69df
 DIST apache-tomcat-9.0.0.M15-src.tar.gz 5075694 SHA256 
c8101177073c2a4aa63cf04ef58226a2768b1cfacb14861d74966881a2791251 SHA512 
76d68ebe49f8d5f3c1dcfc629b901453eda58410d071db1e5c1e339fb6aeda54d1402f00a4056e368ea8495841d462d46d4d62dbedb52dc538dc587fdc4f3757
 WHIRLPOOL 
c098ee812b84ca617b710a154a3505ef0c0fcc9616c69db0e6396e300e2b90a3ed684507e407aaab6efdccbb5ea109b8e3d203f09062d25df7479296a5dfe049

diff --git a/www-servers/tomcat/files/tomcat-8.5.12-build.xml.patch 
b/www-servers/tomcat/files/tomcat-8.5.12-build.xml.patch
new file mode 100644
index 000..611c99d7a0e
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.5.12-build.xml.patch
@@ -0,0 +1,250 @@
+diff --git a/apache-tomcat-8.5.4-src/build.xml 
b/apache-tomcat-8.5.4-src/build.xml
+index 655e379..b973b7f 100644
+--- a/apache-tomcat-8.5.4-src/build.xml
 b/apache-tomcat-8.5.4-src/build.xml
+@@ -691,24 +691,29 @@
+   manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+ 
++
+ 
++
+ 
+ 
++
+ 
+ 
+ 
+-
++
+ 
+ 
+   
+@@ -1049,7 +1054,7 @@
+ 
+   
+ 
+-
++
+ 
+ 
+ 
+@@ -1083,7 +1088,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+ 
++
+ 
+@@ -1579,7 +1585,7 @@
+ 
+   
++  description="Prepare to build web services extras package" 
unless="noget">
+ 
+ 
+   
+@@ -1727,6 +1733,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
+ 
+   
++
+ 
+ 
+   
++
+   
+   http://docs.oracle.com/javase/7/docs/api/"/>
+   http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2574,7 +2584,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download (and build) components necessary to compile" 
unless="noget">
+ 
+ 
+   
+@@ -2608,7 +2618,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download additional components for the tests" 
unless="noget">
+ 
+ 
+   
+@@ -2665,7 +2675,7 @@ skip.installer property in 

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: 6cecf79f7570186cae13fb748a36d820a05f81aa
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Dec  9 14:52:20 2016 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Dec  9 14:53:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cecf79f

www-servers/tomcat: version bumps for version 7.0, 8.5 and 9.0

Package-Manager: portage-2.3.3

 www-servers/tomcat/Manifest|   4 +-
 .../tomcat/files/tomcat-7.0.73-build.xml.patch | 149 +
 ...uild.xml.patch => tomcat-8.5.9-build.xml.patch} |  56 
 patch => tomcat-9.0.0_alpha15-build.xml.patch} |   0
 ...t-9.0.0_alpha13.ebuild => tomcat-7.0.73.ebuild} |  54 
 ...at-9.0.0_alpha13.ebuild => tomcat-8.5.9.ebuild} |  25 ++--
 ..._alpha13.ebuild => tomcat-9.0.0_alpha15.ebuild} |   8 +-
 7 files changed, 224 insertions(+), 72 deletions(-)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index c44a3fe..28bc50a 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -2,6 +2,7 @@ DIST apache-tomcat-7.0.67-src.tar.gz 4624303 SHA256 
0464ebbeec17fb15103cad9f6639
 DIST apache-tomcat-7.0.68-src.tar.gz 4641238 SHA256 
abb5d2cc7e34a18f968ec2535bdeeae919c53fa7feffe4d617db95e12e94b210 SHA512 
dd97205044b03c6466c78bd165509ed9cd37c4d84de34c2170e67c475b28b72bfeda512f14f583c9983c045888d4704cdf7ba7c434f1d4bad9022428b0a0de1c
 WHIRLPOOL 
594cdf5584ea49faebfbea174e67bf85e761365717d56762138d07186c595195df2899a94d897578d1d20201ed4706b51a4d8870d9a6a4ca74c2436ba4283a05
 DIST apache-tomcat-7.0.69-src.tar.gz 4653637 SHA256 
fd29dc7ecd4796a693fdd7fc568ef4fde91debfd22f50a8d7d1676c018cf330b SHA512 
14025071497dd3d1b601958297dcce5f4e4d2ec192ece3484fcdedfe0ca8d5e9a37941e8db857e90716c73484a2415c0aadc9334a292d8a15b5181dda23b05ce
 WHIRLPOOL 
1713fdfcffcc454d9b04cdd108b14cb49daf790f60a607fba22d828183f3f8c1c53d99a225da838d9cadbf5890d81789f0d1c5636ef30afb4e721d1bec4e9667
 DIST apache-tomcat-7.0.70-src.tar.gz 4661050 SHA256 
c15b193a2f3ed22d460fa135dd8719381be0e59eb359c50d5a9c61868251 SHA512 
e7a6108d2c5c5e66ac9c8c55493445d6d8eaf9a3949006e0f3f445d8dbae5a1e8a0e99106545a9048434968c945616377f63af5351765ce340e2df35eb5f1ef1
 WHIRLPOOL 
42ddd71b768f205a981e50ed6daa5b7c0d2342f7bae901f996695224a749bae1973c2859988e6db24d7692f66b868ae2632976983655bde3fdec5efd3cf5126d
+DIST apache-tomcat-7.0.73-src.tar.gz 4674971 SHA256 
e3e236fb551ae9deb85024d8472fd08a76b14380e3ddaa2a1aff1fc670de5d87 SHA512 
4754628c271d0aed3572ac0961c47653c10fcdfd0d13d8d1bc1b5774e961e6327cbb6b11b0e7e2f8eff525e2e60f741da49aeb855bb9d94e84cc87f346cf9ce6
 WHIRLPOOL 
b9e75f53e41f1e9b9767fe8bc603ee5b7db2d3b1b7d2d900d430f4c0b73881a7ad36e0a0bfce773432b73ea8743865e933363ceec037d11d8f1008d8619ac1f1
 DIST apache-tomcat-8.0.32-src.tar.gz 4957920 SHA256 
b8f7770ae947a0c0aed9b5a6f3e2ff18fd27a07f068cc6029f019b5d4c6de560 SHA512 
4c18b9ae77963d96ff59891564c4bc8f6aaba582776c319825e9b944dd8cf10747dfc5b3cbc9cfa2ff10f6d889b404902fecd6b49fdde7b3741f9ba90dc6221c
 WHIRLPOOL 
77be9ea10ffd2e606367d477ba13c717294fe49b65ecef6fdc910e53fa2d987f38a8b299c28a340ea7684a16feb6ca3bd0b5e662e3875af73f4735e1ff623a79
 DIST apache-tomcat-8.0.33-src.tar.gz 4969308 SHA256 
1a141b90111347640df57fe506d9da29ca959e44b5885795df603b621c2ccb4f SHA512 
f781c90dd0932082f0d9b154b634f147c909415ebf49242f047d29430e24e16086d392b982e16d13b4d5f848dc98fd6834c0768e1f9c60d99a35d7dad262265d
 WHIRLPOOL 
b1ca10a4c0ead57b75bade8f135eb943f4ca291bf85eae75d523b65e9538bd5b25a270a3f27c37d2c7ea6e1e847ed15e9fdcac923ceb8069282189976f9e8727
 DIST apache-tomcat-8.0.35-src.tar.gz 4980657 SHA256 
420036fde5e1bfe0a3d27299e355ee153b7c547d17c7b52fe4b15a1315d9c4e9 SHA512 
c56ba4339fc114cda9a784c7f37be99c82238bbe043f69a3bed2ec86a0bf60325af9105d74cfcffa144636fecc7f4730cee08eca3a22ed035dd5e3e483fa1742
 WHIRLPOOL 
38d2382eabe19be8b008eb8975ddf95e086b482eb58cb56f566cf4ec7c7628663260a550b611f4db57803e503ab6746aedaac279bff24868c5997eaee3514966
@@ -14,4 +15,5 @@ DIST apache-tomcat-8.5.4-src.tar.gz 558 SHA256 
bb35d2b37e2ff237e09e389dbfb0a
 DIST apache-tomcat-8.5.5-src.tar.gz 5017061 SHA256 
28c50366e0b8f16086ab792fbe4c3dba5a716185d0c8c143661b7fed870147c0 SHA512 
37b390fe12a356e9621b047d7838027bc33d3c32cb1489957589399f5557e9cf0c788a8a623821e69969983321f23351860462927355ef7c918ae364f586
 WHIRLPOOL 
b6f79e2acf88aa0980e3726131805b8f5098d887a978ba7d8fb028e261f8ba0fea4da6fafc2f1f4129ff5313011519f7a6cfa827da7bd6778e4ed666ba21a716
 DIST apache-tomcat-8.5.6-src.tar.gz 5028904 SHA256 
7690e985544f30bd9cfdec2d0b1088f9cd2f2fbd1575116cb92c79cfed863fc6 SHA512 
3b9d3b6edf4f3832891207d38d9f4a5aed9aa53fad895fccce2f6311d197aa1e0877052ad5fc8239b53cc671e373c8ae3c6d284a8b17bb15bf427bda7111a508
 WHIRLPOOL 
a74bfc20efa0a44433205c514124496d17289f109e7b2cd2ad90f7556c8e4dc235531137f7dfc22085f46f9ed7d026d4e5d8ebd42101c4815acb631008849eb6
 DIST apache-tomcat-8.5.8-src.tar.gz 5051497 SHA256 
ee58ee69d536d7a8f748ed7b334eb2161d3d75664f0c87178b12fe5eebbbe45f SHA512 

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: 8241d64971393e5f8dc1f677159665afc07fcf7a
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Nov 15 15:07:45 2016 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Nov 15 15:07:45 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8241d649

www-servers/tomcat: version bump in slot 8

Package-Manager: portage-2.3.2

 www-servers/tomcat/Manifest|   1 +
 .../tomcat/files/tomcat-8.0.39-build.xml.patch | 259 +
 www-servers/tomcat/tomcat-8.0.39.ebuild| 154 
 3 files changed, 414 insertions(+)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index f1ef5e9..c44a3fe 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -8,6 +8,7 @@ DIST apache-tomcat-8.0.35-src.tar.gz 4980657 SHA256 
420036fde5e1bfe0a3d27299e355
 DIST apache-tomcat-8.0.36-src.tar.gz 4988679 SHA256 
36db67592adda575fc08dd5f0cd3532934d2edb117028e29bdd9f702bf31ab10 SHA512 
192a31eb42afdc345fa5ea5f05b03766e70a67841fca9bd9c76bcd47ae1d505fd3cd1fde6bc64e145add2b6a9e88ecc50ab1a0954942704c139ec3c7a6bf7286
 WHIRLPOOL 
da1bb6570d62caedfe83948f2e850ec7e8bdba36925d1f67864c98b1bd780aabf2f1cbcb66cb544db292156a98819e9cc6dfa42a345064f09dcc4471a7c3
 DIST apache-tomcat-8.0.37-src.tar.gz 5003508 SHA256 
72bfdfeed09f535990d234429ed7b3f1856ee3d0b89168472a40256cc8efcf1d SHA512 
cb4da5cf8a056a2a5549914fb405ec66867021da90877415f399b2f4aeb62b776d6d4b1ed176ab53070f7de2525bcde549919f7cbddb2e89945092ae95f914f6
 WHIRLPOOL 
90218e0b7ab01973ed321ea6bd25f28bfde0534cbe9537d3e931a8ed9ad5eba9592245ff018ddfe241c7ddcc7bd9370b111c3082048f800a5653bb1270fc4ec7
 DIST apache-tomcat-8.0.38-src.tar.gz 5011165 SHA256 
9577c174a686364b5206dc4ae622dddb09c23ceb3d4c252ecf5db7fb38626eea SHA512 
53a4eaaadf3054b0801137a99679947e017f75a8a66924c0476b60e5a6866097dcecde329bdc14f53bbcddaeea48d683b8d4c72982c44354212bdd0278651f2b
 WHIRLPOOL 
400a056d45989aefb7a81e5cd719508a40ea5981834aec03dddcf12bf5e3eb932db841b8c6c7ae4630ad2e8976532aaa8fbc6a854d0023281d5528ebc4b87c5f
+DIST apache-tomcat-8.0.39-src.tar.gz 5019148 SHA256 
566bf43a50f42af9c5b46be60f68e571a56c41f8e93647cf9f68e5f93870be96 SHA512 
0f58f2ef0dc047189672107b1f2586731e9455c3e665210d5634f5f5a16b0afd7ef5c35beaf02e22b874d4898ab62d33638785d9f18714893674bc691b0f9330
 WHIRLPOOL 
62baaba90f588c43ea503eb336d1b385b3a00b86686c1e232a836975f10d12241416b688279ffcd60dd42afb9d9660b6385e749c0c4d0877217f7494539f2752
 DIST apache-tomcat-8.5.3-src.tar.gz 5001008 SHA256 
d0d1ecfd88d733cf3666cc39483ea092627840cd2cfab8fae09f93b7bf05d21d SHA512 
7c4da46725c6e34669f538f406e699c235b99b4ec47a289f4fcbf93b49a35082cea3e041bee8a2772a29c240521d8720b2b50b5cda7afe0ec0f2b4f5cb29bda5
 WHIRLPOOL 
2ad999e8ee068d66164e2a256ee58f47799251fab60cf9af3a67128b131a07116a2faf2da6eef132e13f5df6ed78f1c44ac69bf5615178b63452fbffc62a4852
 DIST apache-tomcat-8.5.4-src.tar.gz 558 SHA256 
bb35d2b37e2ff237e09e389dbfb0a99fa8a71f11c947c20f5bbea375f6f3449d SHA512 
65d4d72eb46d75d6985f07c6d630d0b27cafb08f3cf125710b78d29d5737798341d484b1f12ae5cfc7347f9984563213b00a5aaab64f920f65f13a3d6009083d
 WHIRLPOOL 
bef3192957e91e4964d84f969961c32a61e4a4b5c8acdfcf56c6f6a87c6f3f4dd4350d099fd9904e07e9e1ba8369fa4e86c54a8e25c26a7c0b6a3518aacd9582
 DIST apache-tomcat-8.5.5-src.tar.gz 5017061 SHA256 
28c50366e0b8f16086ab792fbe4c3dba5a716185d0c8c143661b7fed870147c0 SHA512 
37b390fe12a356e9621b047d7838027bc33d3c32cb1489957589399f5557e9cf0c788a8a623821e69969983321f23351860462927355ef7c918ae364f586
 WHIRLPOOL 
b6f79e2acf88aa0980e3726131805b8f5098d887a978ba7d8fb028e261f8ba0fea4da6fafc2f1f4129ff5313011519f7a6cfa827da7bd6778e4ed666ba21a716

diff --git a/www-servers/tomcat/files/tomcat-8.0.39-build.xml.patch 
b/www-servers/tomcat/files/tomcat-8.0.39-build.xml.patch
new file mode 100644
index ..cefd59f
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.0.39-build.xml.patch
@@ -0,0 +1,259 @@
+diff --git a/apache-tomcat-8.0.36-src/build.xml 
b/apache-tomcat-8.0.36-src/build.xml
+index 1ba0dae..81a0a2c 100644
+--- a/apache-tomcat-8.0.36-src/build.xml
 b/apache-tomcat-8.0.36-src/build.xml
+@@ -701,24 +701,29 @@
+   manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+ 
++
+ 
++
+ 
+ 
++
+ 
+ 
+ 
+-
++
+ 
+ 
+   
+@@ -1053,7 +1058,7 @@
+ 
+   
+ 
+-
++
+ 
+ 
+ 
+@@ -1087,7 +1092,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+ 
++
+ 
+@@ -1594,7 +1600,7 @@
+ 
+   
++  description="Prepare to build web services extras package" 
unless="noget">
+ 
+ 
+   
+@@ -1733,7 +1739,7 @@
+ 
+   
++  description="Prepare to build web services extras package" 
unless="noget">
+ 
+ 
+   
+@@ -1928,6 +1934,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
+ 
+   
++
+ 
+ 
+   
++
+   
+   http://docs.oracle.com/javase/7/docs/api/"/>
+   

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: d4250dc209c5a4e856a59a5ca9634a25cc32aa58
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Jun 21 09:43:05 2016 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Jun 21 09:43:05 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4250dc2

www-servers/tomcat: version bump in slot 7

Package-Manager: portage-2.3.0_rc1

 www-servers/tomcat/Manifest|   1 +
 .../tomcat/files/tomcat-7.0.70-build.xml.patch | 149 +
 www-servers/tomcat/tomcat-7.0.70.ebuild| 145 
 3 files changed, 295 insertions(+)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 4c677ff..cbdd234 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,6 +1,7 @@
 DIST apache-tomcat-7.0.67-src.tar.gz 4624303 SHA256 
0464ebbeec17fb15103cad9f6639edc826f4eca246dd58a5cb1c5d46aff58e0a SHA512 
dd299cab7a172860f51bae19e3490432af874b94825de289095647026a91b27cb3544ba85ab1f786bf4696dc59475ca85d051841ebaa221e3b46079e139a6e52
 WHIRLPOOL 
ae7ec13ffd3bd0964496060413924854c5b956dc88b8d0f1de4ac094e8fb5595ccfc7c2eaa7051f082c575253ed9fdadc8833f494281770f8f72b8c64d9b9593
 DIST apache-tomcat-7.0.68-src.tar.gz 4641238 SHA256 
abb5d2cc7e34a18f968ec2535bdeeae919c53fa7feffe4d617db95e12e94b210 SHA512 
dd97205044b03c6466c78bd165509ed9cd37c4d84de34c2170e67c475b28b72bfeda512f14f583c9983c045888d4704cdf7ba7c434f1d4bad9022428b0a0de1c
 WHIRLPOOL 
594cdf5584ea49faebfbea174e67bf85e761365717d56762138d07186c595195df2899a94d897578d1d20201ed4706b51a4d8870d9a6a4ca74c2436ba4283a05
 DIST apache-tomcat-7.0.69-src.tar.gz 4653637 SHA256 
fd29dc7ecd4796a693fdd7fc568ef4fde91debfd22f50a8d7d1676c018cf330b SHA512 
14025071497dd3d1b601958297dcce5f4e4d2ec192ece3484fcdedfe0ca8d5e9a37941e8db857e90716c73484a2415c0aadc9334a292d8a15b5181dda23b05ce
 WHIRLPOOL 
1713fdfcffcc454d9b04cdd108b14cb49daf790f60a607fba22d828183f3f8c1c53d99a225da838d9cadbf5890d81789f0d1c5636ef30afb4e721d1bec4e9667
+DIST apache-tomcat-7.0.70-src.tar.gz 4661050 SHA256 
c15b193a2f3ed22d460fa135dd8719381be0e59eb359c50d5a9c61868251 SHA512 
e7a6108d2c5c5e66ac9c8c55493445d6d8eaf9a3949006e0f3f445d8dbae5a1e8a0e99106545a9048434968c945616377f63af5351765ce340e2df35eb5f1ef1
 WHIRLPOOL 
42ddd71b768f205a981e50ed6daa5b7c0d2342f7bae901f996695224a749bae1973c2859988e6db24d7692f66b868ae2632976983655bde3fdec5efd3cf5126d
 DIST apache-tomcat-8.0.32-src.tar.gz 4957920 SHA256 
b8f7770ae947a0c0aed9b5a6f3e2ff18fd27a07f068cc6029f019b5d4c6de560 SHA512 
4c18b9ae77963d96ff59891564c4bc8f6aaba582776c319825e9b944dd8cf10747dfc5b3cbc9cfa2ff10f6d889b404902fecd6b49fdde7b3741f9ba90dc6221c
 WHIRLPOOL 
77be9ea10ffd2e606367d477ba13c717294fe49b65ecef6fdc910e53fa2d987f38a8b299c28a340ea7684a16feb6ca3bd0b5e662e3875af73f4735e1ff623a79
 DIST apache-tomcat-8.0.33-src.tar.gz 4969308 SHA256 
1a141b90111347640df57fe506d9da29ca959e44b5885795df603b621c2ccb4f SHA512 
f781c90dd0932082f0d9b154b634f147c909415ebf49242f047d29430e24e16086d392b982e16d13b4d5f848dc98fd6834c0768e1f9c60d99a35d7dad262265d
 WHIRLPOOL 
b1ca10a4c0ead57b75bade8f135eb943f4ca291bf85eae75d523b65e9538bd5b25a270a3f27c37d2c7ea6e1e847ed15e9fdcac923ceb8069282189976f9e8727
 DIST apache-tomcat-8.0.35-src.tar.gz 4980657 SHA256 
420036fde5e1bfe0a3d27299e355ee153b7c547d17c7b52fe4b15a1315d9c4e9 SHA512 
c56ba4339fc114cda9a784c7f37be99c82238bbe043f69a3bed2ec86a0bf60325af9105d74cfcffa144636fecc7f4730cee08eca3a22ed035dd5e3e483fa1742
 WHIRLPOOL 
38d2382eabe19be8b008eb8975ddf95e086b482eb58cb56f566cf4ec7c7628663260a550b611f4db57803e503ab6746aedaac279bff24868c5997eaee3514966

diff --git a/www-servers/tomcat/files/tomcat-7.0.70-build.xml.patch 
b/www-servers/tomcat/files/tomcat-7.0.70-build.xml.patch
new file mode 100644
index 000..481591f
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-7.0.70-build.xml.patch
@@ -0,0 +1,149 @@
+diff -Naur apache-tomcat-7.0.63-src.orig/build.xml 
apache-tomcat-7.0.63-src/build.xml
+--- apache-tomcat-7.0.63-src.orig/build.xml2015-06-30 09:15:44.0 
+0100
 apache-tomcat-7.0.63-src/build.xml 2015-08-22 21:13:12.453038827 +0100
+@@ -660,12 +660,14 @@
+   
+ 
+ 
++
+ 
+   
+ 
+@@ -721,26 +723,32 @@
+   manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+ 
++
+ 
+ 
++
+ 
+ 
++
+ 
+ 
+ 
+ 
++
+ 
+ 
+ 
+@@ -1051,14 +1061,15 @@
+ 
+   
+ 
++
+ 
+ 
+-
++
+ 
+ 
+ 
++  description="Prepare to build web services extras package" 
unless="noget">
+ 
+ 
+   
+@@ -1886,6 +1897,7 @@
+ description="Create the Tomcat javadoc" >
+ 
++
+ 
+ 
+   
++
+   
+   http://docs.oracle.com/javase/7/docs/api/"/>
+   http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2642,7 +2657,7 @@
+   
+ 
+   
++  description="Download (and build) components necessary to compile" 
unless="noget">
+ 
+ 
+   
+@@ -2699,7 +2714,7 @@
+   
+ 
+   
++  

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: d223d1e56dc38bf80361c5ec64ea9d65f8cb2d03
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Jun 14 11:50:46 2016 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Jun 14 11:51:19 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d223d1e5

www-servers/tomcat: version bump in slot 9

Package-Manager: portage-2.3.0_rc1

 www-servers/tomcat/Manifest|  2 +-
 .../tomcat-9.0.0_alpha6-processmanifest.patch  | 76 --
 ...l.patch => tomcat-9.0.0_alpha8-build.xml.patch} | 68 ---
 ...alpha6-r1.ebuild => tomcat-9.0.0_alpha8.ebuild} |  4 +-
 4 files changed, 29 insertions(+), 121 deletions(-)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 3eb7012..d103932 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -4,4 +4,4 @@ DIST apache-tomcat-7.0.69-src.tar.gz 4653637 SHA256 
fd29dc7ecd4796a693fdd7fc568e
 DIST apache-tomcat-8.0.32-src.tar.gz 4957920 SHA256 
b8f7770ae947a0c0aed9b5a6f3e2ff18fd27a07f068cc6029f019b5d4c6de560 SHA512 
4c18b9ae77963d96ff59891564c4bc8f6aaba582776c319825e9b944dd8cf10747dfc5b3cbc9cfa2ff10f6d889b404902fecd6b49fdde7b3741f9ba90dc6221c
 WHIRLPOOL 
77be9ea10ffd2e606367d477ba13c717294fe49b65ecef6fdc910e53fa2d987f38a8b299c28a340ea7684a16feb6ca3bd0b5e662e3875af73f4735e1ff623a79
 DIST apache-tomcat-8.0.33-src.tar.gz 4969308 SHA256 
1a141b90111347640df57fe506d9da29ca959e44b5885795df603b621c2ccb4f SHA512 
f781c90dd0932082f0d9b154b634f147c909415ebf49242f047d29430e24e16086d392b982e16d13b4d5f848dc98fd6834c0768e1f9c60d99a35d7dad262265d
 WHIRLPOOL 
b1ca10a4c0ead57b75bade8f135eb943f4ca291bf85eae75d523b65e9538bd5b25a270a3f27c37d2c7ea6e1e847ed15e9fdcac923ceb8069282189976f9e8727
 DIST apache-tomcat-8.0.35-src.tar.gz 4980657 SHA256 
420036fde5e1bfe0a3d27299e355ee153b7c547d17c7b52fe4b15a1315d9c4e9 SHA512 
c56ba4339fc114cda9a784c7f37be99c82238bbe043f69a3bed2ec86a0bf60325af9105d74cfcffa144636fecc7f4730cee08eca3a22ed035dd5e3e483fa1742
 WHIRLPOOL 
38d2382eabe19be8b008eb8975ddf95e086b482eb58cb56f566cf4ec7c7628663260a550b611f4db57803e503ab6746aedaac279bff24868c5997eaee3514966
-DIST apache-tomcat-9.0.0.M6-src.tar.gz 5023823 SHA256 
7217416b1c6470f3653d978bbfdb153693aef74929da21c5823117a168992b2a SHA512 
712a93d71bef2f6dbdd35d32cbf200045bacc1a27426cb9f92e3a645a7f59f3611adebebdc24168de569cea2c64500ea893acfba05670947f53d72abec0988f1
 WHIRLPOOL 
fb98d23ac462cef450d1ed8c88eb8be88a0aad32b24cf1b5c8437e51966bfb3d5222a3368ea54a2f19b0be38118b3148bf7549d2d59f1c8267aaa29246ef1d62
+DIST apache-tomcat-9.0.0.M8-src.tar.gz 5024499 SHA256 
bef36f9ead80188a8859fc1fa9846e77e570c54c99c05388857dc6dd29f526f8 SHA512 
b1778709bddf6b0d1263115a57c743fcb58286b58dda384b06079ddcab8188a63de48efd3f47b6314c92154dd01c7bd1c8858ac2ea82d20a3d90c80899edcf87
 WHIRLPOOL 
8083b108a49ac0e066104a5849fcc6ef6c1355c09d9854d50a4108df769384664d0b37aa0cc85f59361a080e73fb585de36916855e1fcef1a441c4225653aca6

diff --git a/www-servers/tomcat/files/tomcat-9.0.0_alpha6-processmanifest.patch 
b/www-servers/tomcat/files/tomcat-9.0.0_alpha6-processmanifest.patch
deleted file mode 100644
index fa38d5d..000
--- a/www-servers/tomcat/files/tomcat-9.0.0_alpha6-processmanifest.patch
+++ /dev/null
@@ -1,76 +0,0 @@
 tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java  
2016/05/04 11:07:55 1742251
-+++ tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java  
2016/05/17 07:18:38 1744194
-@@ -370,40 +370,42 @@
- }
- 
- Manifest manifest = jar.getManifest();
--Attributes attributes = manifest.getMainAttributes();
--String classPathAttribute = attributes.getValue("Class-Path");
--if (classPathAttribute == null) {
--return;
--}
--String[] classPathEntries = classPathAttribute.split(" ");
--for (String classPathEntry : classPathEntries) {
--classPathEntry = classPathEntry.trim();
--if (classPathEntry.length() == 0) {
--continue;
-+if (manifest != null) {
-+Attributes attributes = manifest.getMainAttributes();
-+String classPathAttribute = attributes.getValue("Class-Path");
-+if (classPathAttribute == null) {
-+return;
- }
--URL jarURL = jar.getJarFileURL();
--URI jarURI;
--try {
--jarURI = jarURL.toURI();
--} catch (URISyntaxException e) {
--if (log.isDebugEnabled()) {
--log.debug(sm.getString("jarScan.invalidUri", jarURL));
-+String[] classPathEntries = classPathAttribute.split(" ");
-+for (String classPathEntry : classPathEntries) {
-+classPathEntry = classPathEntry.trim();
-+if (classPathEntry.length() == 0) {
-+continue;
-+}
-+URL jarURL = jar.getJarFileURL();
-+

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: a7b38fffb499e7639620acd866ba5a249a3c6497
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu May 19 19:58:16 2016 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu May 19 19:58:35 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7b38fff

www-servers/tomcat: backported patch from M7 which fixes NPE in 
StandardJarScanner.processManifest()

Package-Manager: portage-2.3.0_rc1

 .../tomcat-9.0.0_alpha6-processmanifest.patch  | 76 ++
 ...alpha6.ebuild => tomcat-9.0.0_alpha6-r1.ebuild} |  2 +-
 2 files changed, 77 insertions(+), 1 deletion(-)

diff --git a/www-servers/tomcat/files/tomcat-9.0.0_alpha6-processmanifest.patch 
b/www-servers/tomcat/files/tomcat-9.0.0_alpha6-processmanifest.patch
new file mode 100644
index 000..fa38d5d
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-9.0.0_alpha6-processmanifest.patch
@@ -0,0 +1,76 @@
+--- tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java  
2016/05/04 11:07:55 1742251
 tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java  
2016/05/17 07:18:38 1744194
+@@ -370,40 +370,42 @@
+ }
+ 
+ Manifest manifest = jar.getManifest();
+-Attributes attributes = manifest.getMainAttributes();
+-String classPathAttribute = attributes.getValue("Class-Path");
+-if (classPathAttribute == null) {
+-return;
+-}
+-String[] classPathEntries = classPathAttribute.split(" ");
+-for (String classPathEntry : classPathEntries) {
+-classPathEntry = classPathEntry.trim();
+-if (classPathEntry.length() == 0) {
+-continue;
++if (manifest != null) {
++Attributes attributes = manifest.getMainAttributes();
++String classPathAttribute = attributes.getValue("Class-Path");
++if (classPathAttribute == null) {
++return;
+ }
+-URL jarURL = jar.getJarFileURL();
+-URI jarURI;
+-try {
+-jarURI = jarURL.toURI();
+-} catch (URISyntaxException e) {
+-if (log.isDebugEnabled()) {
+-log.debug(sm.getString("jarScan.invalidUri", jarURL));
++String[] classPathEntries = classPathAttribute.split(" ");
++for (String classPathEntry : classPathEntries) {
++classPathEntry = classPathEntry.trim();
++if (classPathEntry.length() == 0) {
++continue;
++}
++URL jarURL = jar.getJarFileURL();
++URI jarURI;
++try {
++jarURI = jarURL.toURI();
++} catch (URISyntaxException e) {
++if (log.isDebugEnabled()) {
++log.debug(sm.getString("jarScan.invalidUri", jarURL));
++}
++continue;
+ }
+-continue;
++/*
++ * Note: Resolving the relative URLs from the manifest has the
++ *   potential to introduce security concerns. However, 
since
++ *   only JARs provided by the container and NOT those 
provided
++ *   by web applications are processed, there should be no
++ *   issues.
++ *   If this feature is ever extended to include JARs 
provided
++ *   by web applications, checks should be added to 
ensure that
++ *   any relative URL does not step outside the web 
application.
++ */
++URI classPathEntryURI = jarURI.resolve(classPathEntry);
++URL classPathEntryURL = classPathEntryURI.toURL();
++classPathUrlsToProcess.add(classPathEntryURL);
+ }
+-/*
+- * Note: Resolving the relative URLs from the manifest has the
+- *   potential to introduce security concerns. However, since
+- *   only JARs provided by the container and NOT those 
provided
+- *   by web applications are processed, there should be no
+- *   issues.
+- *   If this feature is ever extended to include JARs provided
+- *   by web applications, checks should be added to ensure 
that
+- *   any relative URL does not step outside the web 
application.
+- */
+-URI classPathEntryURI = jarURI.resolve(classPathEntry);
+-URL classPathEntryURL = classPathEntryURI.toURL();
+-classPathUrlsToProcess.add(classPathEntryURL);
+ }
+ }
+ 

diff --git a/www-servers/tomcat/tomcat-9.0.0_alpha6.ebuild 
b/www-servers/tomcat/tomcat-9.0.0_alpha6-r1.ebuild
similarity index 98%
rename from www-servers/tomcat/tomcat-9.0.0_alpha6.ebuild
rename to 

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: 75373353b74d669f5fb0cc1a8e3686213d572bd5
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue May 17 09:05:43 2016 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue May 17 09:06:18 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75373353

www-servers/tomcat: version bump

Package-Manager: portage-2.3.0_rc1

 www-servers/tomcat/Manifest | 2 +-
 ...9.0.0_alpha4-build.xml.patch => tomcat-9.0.0_alpha6-build.xml.patch} | 0
 .../tomcat/{tomcat-9.0.0_alpha4.ebuild => tomcat-9.0.0_alpha6.ebuild}   | 0
 3 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 67c6011..31d766f 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -3,4 +3,4 @@ DIST apache-tomcat-7.0.68-src.tar.gz 4641238 SHA256 
abb5d2cc7e34a18f968ec2535bde
 DIST apache-tomcat-7.0.69-src.tar.gz 4653637 SHA256 
fd29dc7ecd4796a693fdd7fc568ef4fde91debfd22f50a8d7d1676c018cf330b SHA512 
14025071497dd3d1b601958297dcce5f4e4d2ec192ece3484fcdedfe0ca8d5e9a37941e8db857e90716c73484a2415c0aadc9334a292d8a15b5181dda23b05ce
 WHIRLPOOL 
1713fdfcffcc454d9b04cdd108b14cb49daf790f60a607fba22d828183f3f8c1c53d99a225da838d9cadbf5890d81789f0d1c5636ef30afb4e721d1bec4e9667
 DIST apache-tomcat-8.0.32-src.tar.gz 4957920 SHA256 
b8f7770ae947a0c0aed9b5a6f3e2ff18fd27a07f068cc6029f019b5d4c6de560 SHA512 
4c18b9ae77963d96ff59891564c4bc8f6aaba582776c319825e9b944dd8cf10747dfc5b3cbc9cfa2ff10f6d889b404902fecd6b49fdde7b3741f9ba90dc6221c
 WHIRLPOOL 
77be9ea10ffd2e606367d477ba13c717294fe49b65ecef6fdc910e53fa2d987f38a8b299c28a340ea7684a16feb6ca3bd0b5e662e3875af73f4735e1ff623a79
 DIST apache-tomcat-8.0.33-src.tar.gz 4969308 SHA256 
1a141b90111347640df57fe506d9da29ca959e44b5885795df603b621c2ccb4f SHA512 
f781c90dd0932082f0d9b154b634f147c909415ebf49242f047d29430e24e16086d392b982e16d13b4d5f848dc98fd6834c0768e1f9c60d99a35d7dad262265d
 WHIRLPOOL 
b1ca10a4c0ead57b75bade8f135eb943f4ca291bf85eae75d523b65e9538bd5b25a270a3f27c37d2c7ea6e1e847ed15e9fdcac923ceb8069282189976f9e8727
-DIST apache-tomcat-9.0.0.M4-src.tar.gz 5007858 SHA256 
bba5122cf7b6fc8d4446ba0784177bd3a6dd2806c0a7493c4cdb2be1ce4921a1 SHA512 
67225852c631095ea3ef633eabb1a21d30209248688231a9681358b46a7a3f4e8635b23035bb2681311986af73cae732fdd7c0a5446489a8360e572308461478
 WHIRLPOOL 
5e8c3099a9aeff370ca8526d7a0b25274241e56d7e250163fc8822c0ceacee7107b5e72ae2ba84e08dbd9bce96621507c60e8a5d1696664efce6e6bdfb5e
+DIST apache-tomcat-9.0.0.M6-src.tar.gz 5023823 SHA256 
7217416b1c6470f3653d978bbfdb153693aef74929da21c5823117a168992b2a SHA512 
712a93d71bef2f6dbdd35d32cbf200045bacc1a27426cb9f92e3a645a7f59f3611adebebdc24168de569cea2c64500ea893acfba05670947f53d72abec0988f1
 WHIRLPOOL 
fb98d23ac462cef450d1ed8c88eb8be88a0aad32b24cf1b5c8437e51966bfb3d5222a3368ea54a2f19b0be38118b3148bf7549d2d59f1c8267aaa29246ef1d62

diff --git a/www-servers/tomcat/files/tomcat-9.0.0_alpha4-build.xml.patch 
b/www-servers/tomcat/files/tomcat-9.0.0_alpha6-build.xml.patch
similarity index 100%
rename from www-servers/tomcat/files/tomcat-9.0.0_alpha4-build.xml.patch
rename to www-servers/tomcat/files/tomcat-9.0.0_alpha6-build.xml.patch

diff --git a/www-servers/tomcat/tomcat-9.0.0_alpha4.ebuild 
b/www-servers/tomcat/tomcat-9.0.0_alpha6.ebuild
similarity index 100%
rename from www-servers/tomcat/tomcat-9.0.0_alpha4.ebuild
rename to www-servers/tomcat/tomcat-9.0.0_alpha6.ebuild

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: 1d7d6ace606a7604d0a6e66c460f23daab1b8c1d
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Mon Apr 18 16:16:12 2016 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Apr 18 16:16:44 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d7d6ace

www-servers/tomcat: version bump

Package-Manager: portage-2.2.28

 www-servers/tomcat/Manifest|   1 +
 .../tomcat/files/tomcat-7.0.69-build.xml.patch | 149 +
 www-servers/tomcat/tomcat-7.0.69.ebuild| 145 
 3 files changed, 295 insertions(+)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 7b44c1e..67c6011 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,5 +1,6 @@
 DIST apache-tomcat-7.0.67-src.tar.gz 4624303 SHA256 
0464ebbeec17fb15103cad9f6639edc826f4eca246dd58a5cb1c5d46aff58e0a SHA512 
dd299cab7a172860f51bae19e3490432af874b94825de289095647026a91b27cb3544ba85ab1f786bf4696dc59475ca85d051841ebaa221e3b46079e139a6e52
 WHIRLPOOL 
ae7ec13ffd3bd0964496060413924854c5b956dc88b8d0f1de4ac094e8fb5595ccfc7c2eaa7051f082c575253ed9fdadc8833f494281770f8f72b8c64d9b9593
 DIST apache-tomcat-7.0.68-src.tar.gz 4641238 SHA256 
abb5d2cc7e34a18f968ec2535bdeeae919c53fa7feffe4d617db95e12e94b210 SHA512 
dd97205044b03c6466c78bd165509ed9cd37c4d84de34c2170e67c475b28b72bfeda512f14f583c9983c045888d4704cdf7ba7c434f1d4bad9022428b0a0de1c
 WHIRLPOOL 
594cdf5584ea49faebfbea174e67bf85e761365717d56762138d07186c595195df2899a94d897578d1d20201ed4706b51a4d8870d9a6a4ca74c2436ba4283a05
+DIST apache-tomcat-7.0.69-src.tar.gz 4653637 SHA256 
fd29dc7ecd4796a693fdd7fc568ef4fde91debfd22f50a8d7d1676c018cf330b SHA512 
14025071497dd3d1b601958297dcce5f4e4d2ec192ece3484fcdedfe0ca8d5e9a37941e8db857e90716c73484a2415c0aadc9334a292d8a15b5181dda23b05ce
 WHIRLPOOL 
1713fdfcffcc454d9b04cdd108b14cb49daf790f60a607fba22d828183f3f8c1c53d99a225da838d9cadbf5890d81789f0d1c5636ef30afb4e721d1bec4e9667
 DIST apache-tomcat-8.0.32-src.tar.gz 4957920 SHA256 
b8f7770ae947a0c0aed9b5a6f3e2ff18fd27a07f068cc6029f019b5d4c6de560 SHA512 
4c18b9ae77963d96ff59891564c4bc8f6aaba582776c319825e9b944dd8cf10747dfc5b3cbc9cfa2ff10f6d889b404902fecd6b49fdde7b3741f9ba90dc6221c
 WHIRLPOOL 
77be9ea10ffd2e606367d477ba13c717294fe49b65ecef6fdc910e53fa2d987f38a8b299c28a340ea7684a16feb6ca3bd0b5e662e3875af73f4735e1ff623a79
 DIST apache-tomcat-8.0.33-src.tar.gz 4969308 SHA256 
1a141b90111347640df57fe506d9da29ca959e44b5885795df603b621c2ccb4f SHA512 
f781c90dd0932082f0d9b154b634f147c909415ebf49242f047d29430e24e16086d392b982e16d13b4d5f848dc98fd6834c0768e1f9c60d99a35d7dad262265d
 WHIRLPOOL 
b1ca10a4c0ead57b75bade8f135eb943f4ca291bf85eae75d523b65e9538bd5b25a270a3f27c37d2c7ea6e1e847ed15e9fdcac923ceb8069282189976f9e8727
 DIST apache-tomcat-9.0.0.M4-src.tar.gz 5007858 SHA256 
bba5122cf7b6fc8d4446ba0784177bd3a6dd2806c0a7493c4cdb2be1ce4921a1 SHA512 
67225852c631095ea3ef633eabb1a21d30209248688231a9681358b46a7a3f4e8635b23035bb2681311986af73cae732fdd7c0a5446489a8360e572308461478
 WHIRLPOOL 
5e8c3099a9aeff370ca8526d7a0b25274241e56d7e250163fc8822c0ceacee7107b5e72ae2ba84e08dbd9bce96621507c60e8a5d1696664efce6e6bdfb5e

diff --git a/www-servers/tomcat/files/tomcat-7.0.69-build.xml.patch 
b/www-servers/tomcat/files/tomcat-7.0.69-build.xml.patch
new file mode 100644
index 000..481591f
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-7.0.69-build.xml.patch
@@ -0,0 +1,149 @@
+diff -Naur apache-tomcat-7.0.63-src.orig/build.xml 
apache-tomcat-7.0.63-src/build.xml
+--- apache-tomcat-7.0.63-src.orig/build.xml2015-06-30 09:15:44.0 
+0100
 apache-tomcat-7.0.63-src/build.xml 2015-08-22 21:13:12.453038827 +0100
+@@ -660,12 +660,14 @@
+   
+ 
+ 
++
+ 
+   
+ 
+@@ -721,26 +723,32 @@
+   manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+ 
++
+ 
+ 
++
+ 
+ 
++
+ 
+ 
+ 
+ 
++
+ 
+ 
+ 
+@@ -1051,14 +1061,15 @@
+ 
+   
+ 
++
+ 
+ 
+-
++
+ 
+ 
+ 
++  description="Prepare to build web services extras package" 
unless="noget">
+ 
+ 
+   
+@@ -1886,6 +1897,7 @@
+ description="Create the Tomcat javadoc" >
+ 
++
+ 
+ 
+   
++
+   
+   http://docs.oracle.com/javase/7/docs/api/"/>
+   http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2642,7 +2657,7 @@
+   
+ 
+   
++  description="Download (and build) components necessary to compile" 
unless="noget">
+ 
+ 
+   
+@@ -2699,7 +2714,7 @@
+   
+ 
+   
++  description="Download additional components for the tests" 
unless="noget">
+ 
+ 
+   
+@@ -2727,7 +2742,7 @@
+   
+ 
+   
++  description="Download additional components for a distribution" 
unless="noget">
+ 
+ 
+   

diff --git a/www-servers/tomcat/tomcat-7.0.69.ebuild 
b/www-servers/tomcat/tomcat-7.0.69.ebuild
new file mode 100644
index 000..268c291
--- /dev/null
+++ 

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: 51d8e462ec13e14f6eaadea009d92a9b486c7394
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Mar 26 10:26:42 2016 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Mar 26 10:28:47 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51d8e462

www-servers/tomcat: version bump

Package-Manager: portage-2.2.28

 www-servers/tomcat/Manifest|   1 +
 .../tomcat/files/tomcat-8.0.33-build.xml.patch | 265 +
 www-servers/tomcat/tomcat-8.0.33.ebuild| 154 
 3 files changed, 420 insertions(+)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 31917ba..7b44c1e 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,4 +1,5 @@
 DIST apache-tomcat-7.0.67-src.tar.gz 4624303 SHA256 
0464ebbeec17fb15103cad9f6639edc826f4eca246dd58a5cb1c5d46aff58e0a SHA512 
dd299cab7a172860f51bae19e3490432af874b94825de289095647026a91b27cb3544ba85ab1f786bf4696dc59475ca85d051841ebaa221e3b46079e139a6e52
 WHIRLPOOL 
ae7ec13ffd3bd0964496060413924854c5b956dc88b8d0f1de4ac094e8fb5595ccfc7c2eaa7051f082c575253ed9fdadc8833f494281770f8f72b8c64d9b9593
 DIST apache-tomcat-7.0.68-src.tar.gz 4641238 SHA256 
abb5d2cc7e34a18f968ec2535bdeeae919c53fa7feffe4d617db95e12e94b210 SHA512 
dd97205044b03c6466c78bd165509ed9cd37c4d84de34c2170e67c475b28b72bfeda512f14f583c9983c045888d4704cdf7ba7c434f1d4bad9022428b0a0de1c
 WHIRLPOOL 
594cdf5584ea49faebfbea174e67bf85e761365717d56762138d07186c595195df2899a94d897578d1d20201ed4706b51a4d8870d9a6a4ca74c2436ba4283a05
 DIST apache-tomcat-8.0.32-src.tar.gz 4957920 SHA256 
b8f7770ae947a0c0aed9b5a6f3e2ff18fd27a07f068cc6029f019b5d4c6de560 SHA512 
4c18b9ae77963d96ff59891564c4bc8f6aaba582776c319825e9b944dd8cf10747dfc5b3cbc9cfa2ff10f6d889b404902fecd6b49fdde7b3741f9ba90dc6221c
 WHIRLPOOL 
77be9ea10ffd2e606367d477ba13c717294fe49b65ecef6fdc910e53fa2d987f38a8b299c28a340ea7684a16feb6ca3bd0b5e662e3875af73f4735e1ff623a79
+DIST apache-tomcat-8.0.33-src.tar.gz 4969308 SHA256 
1a141b90111347640df57fe506d9da29ca959e44b5885795df603b621c2ccb4f SHA512 
f781c90dd0932082f0d9b154b634f147c909415ebf49242f047d29430e24e16086d392b982e16d13b4d5f848dc98fd6834c0768e1f9c60d99a35d7dad262265d
 WHIRLPOOL 
b1ca10a4c0ead57b75bade8f135eb943f4ca291bf85eae75d523b65e9538bd5b25a270a3f27c37d2c7ea6e1e847ed15e9fdcac923ceb8069282189976f9e8727
 DIST apache-tomcat-9.0.0.M4-src.tar.gz 5007858 SHA256 
bba5122cf7b6fc8d4446ba0784177bd3a6dd2806c0a7493c4cdb2be1ce4921a1 SHA512 
67225852c631095ea3ef633eabb1a21d30209248688231a9681358b46a7a3f4e8635b23035bb2681311986af73cae732fdd7c0a5446489a8360e572308461478
 WHIRLPOOL 
5e8c3099a9aeff370ca8526d7a0b25274241e56d7e250163fc8822c0ceacee7107b5e72ae2ba84e08dbd9bce96621507c60e8a5d1696664efce6e6bdfb5e

diff --git a/www-servers/tomcat/files/tomcat-8.0.33-build.xml.patch 
b/www-servers/tomcat/files/tomcat-8.0.33-build.xml.patch
new file mode 100644
index 000..1923d23
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.0.33-build.xml.patch
@@ -0,0 +1,265 @@
+diff -Naur apache-tomcat-8.0.24-src.orig/build.xml 
apache-tomcat-8.0.24-src/build.xml
+--- apache-tomcat-8.0.24-src.orig/build.xml2015-07-01 21:25:21.0 
+0100
 apache-tomcat-8.0.24-src/build.xml 2015-08-22 21:17:05.825564599 +0100
+@@ -697,24 +697,29 @@
+   manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+ 
++
+ 
++
+ 
+ 
++
+ 
+ 
+ 
+-
++
+ 
+ 
+   
+@@ -1049,7 +1054,7 @@
+ 
+   
+ 
+-
++
+ 
+ 
+ 
+@@ -1083,7 +1088,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+ 
++
+ 
+@@ -1542,7 +1548,7 @@
+ 
+   
++  description="Prepare to build web services extras package" 
unless="noget">
+ 
+ 
+   
+@@ -1681,7 +1687,7 @@
+ 
+   
++  description="Prepare to build web services extras package" 
unless="noget">
+ 
+ 
+   
+@@ -1882,6 +1888,7 @@
+ 
+   
++
+ 
++  maxmemory="512m" >
+   
+ 
+ 
+ 
+   
++
+   
+   http://docs.oracle.com/javase/7/docs/api/"/>
+   http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2739,7 +2749,7 @@
+   
+ 
+   
++  description="Download (and build) components necessary to compile" 
unless="noget">
+ 
+ 
+   
+@@ -2773,7 +2783,7 @@
+   
+ 
+   
++  description="Download additional components for the tests" 
unless="noget">
+ 
+ 
+   
+@@ -2819,7 +2829,7 @@
+   
+ 
+   
++  description="Download additional components for a distribution" 
unless="noget">
+ 
+ 
+   
+@@ -2845,18 +2855,18 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+@@ -2868,7 +2878,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+@@ -2887,7 +2897,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+@@ -2898,7 +2908,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+@@ 

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[James Le Cuirot]

commit: e999a4915741e393f49138569e2caa68a1c3eb1c
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Mar 22 21:10:25 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Mar 22 21:15:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e999a491

www-servers/tomcat: Remove masked version 6

Upstream EOL is December 2016. We would rather focus on other things
than support it until then.

Package-Manager: portage-2.2.28

 www-servers/tomcat/Manifest|   2 -
 www-servers/tomcat/files/tomcat-6-sysprop.patch| 109 
 .../tomcat/files/tomcat-6.0.44-build.xml.patch |  71 --
 .../tomcat/files/tomcat-6.0.45-build.xml.patch |  71 --
 www-servers/tomcat/files/tomcat.init   | 105 ---
 www-servers/tomcat/tomcat-6.0.44-r0.ebuild | 144 -
 www-servers/tomcat/tomcat-6.0.44-r2.ebuild | 143 
 www-servers/tomcat/tomcat-6.0.45.ebuild| 143 
 8 files changed, 788 deletions(-)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 26ffc16..31917ba 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,5 +1,3 @@
-DIST apache-tomcat-6.0.44-src.tar.gz 3447711 SHA256 
c6f01526d58f2ba7b9da496e959d9e68cc49183006077704ab91c36ebebf5a4a SHA512 
0d6a1539b28fa8ca3442557889d7d21cc523b18136f6998820ba13f41420536aba65ce78bac526002ee1dd86df3cbc80d9f043a3f765d7cf0b79e58e516030be
 WHIRLPOOL 
c65e704466191a0f98ec777e95dda889599ff6a545e7c013fd04bc0b72e0d0edf4491415f243d6a4de60cf76abe5c13ffbcc6d98f78b51490f7b7b43b24ecb97
-DIST apache-tomcat-6.0.45-src.tar.gz 3494054 SHA256 
d464b3e770197f026bf802d19be0195b941e8c3be7e552dc2f8eb563f9cc010e SHA512 
d300e6b805bb70fc348133467b2aeac728dc0ae44f2fc1f309c3b2971987c1e46b81f156ebd7ddfda38f6746e90af1402c4e16a2d30bc7b081b761c87df8ffab
 WHIRLPOOL 
144678884f75034f1d692619ea8064daf02aee03bcac62fb0b666b5c0283f5abf93414d636c03c94488632cd13081cf00e69a9ddf19f4c8bafd80e7eca5a69da
 DIST apache-tomcat-7.0.67-src.tar.gz 4624303 SHA256 
0464ebbeec17fb15103cad9f6639edc826f4eca246dd58a5cb1c5d46aff58e0a SHA512 
dd299cab7a172860f51bae19e3490432af874b94825de289095647026a91b27cb3544ba85ab1f786bf4696dc59475ca85d051841ebaa221e3b46079e139a6e52
 WHIRLPOOL 
ae7ec13ffd3bd0964496060413924854c5b956dc88b8d0f1de4ac094e8fb5595ccfc7c2eaa7051f082c575253ed9fdadc8833f494281770f8f72b8c64d9b9593
 DIST apache-tomcat-7.0.68-src.tar.gz 4641238 SHA256 
abb5d2cc7e34a18f968ec2535bdeeae919c53fa7feffe4d617db95e12e94b210 SHA512 
dd97205044b03c6466c78bd165509ed9cd37c4d84de34c2170e67c475b28b72bfeda512f14f583c9983c045888d4704cdf7ba7c434f1d4bad9022428b0a0de1c
 WHIRLPOOL 
594cdf5584ea49faebfbea174e67bf85e761365717d56762138d07186c595195df2899a94d897578d1d20201ed4706b51a4d8870d9a6a4ca74c2436ba4283a05
 DIST apache-tomcat-8.0.32-src.tar.gz 4957920 SHA256 
b8f7770ae947a0c0aed9b5a6f3e2ff18fd27a07f068cc6029f019b5d4c6de560 SHA512 
4c18b9ae77963d96ff59891564c4bc8f6aaba582776c319825e9b944dd8cf10747dfc5b3cbc9cfa2ff10f6d889b404902fecd6b49fdde7b3741f9ba90dc6221c
 WHIRLPOOL 
77be9ea10ffd2e606367d477ba13c717294fe49b65ecef6fdc910e53fa2d987f38a8b299c28a340ea7684a16feb6ca3bd0b5e662e3875af73f4735e1ff623a79

diff --git a/www-servers/tomcat/files/tomcat-6-sysprop.patch 
b/www-servers/tomcat/files/tomcat-6-sysprop.patch
deleted file mode 100644
index 033bbc8..000
--- a/www-servers/tomcat/files/tomcat-6-sysprop.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-diff -Naur 
apache-tomcat-6.0.44-src.orig/java/org/apache/catalina/startup/Bootstrap.java 
apache-tomcat-6.0.44-src/java/org/apache/catalina/startup/Bootstrap.java
 
apache-tomcat-6.0.44-src.orig/java/org/apache/catalina/startup/Bootstrap.java   
   2015-05-08 13:22:05.0 +0100
-+++ apache-tomcat-6.0.44-src/java/org/apache/catalina/startup/Bootstrap.java   
2015-08-25 21:34:29.774917427 +0100
-@@ -109,40 +109,18 @@
- String value = CatalinaProperties.getProperty(name + ".loader");
- if ((value == null) || (value.equals("")))
- return parent;
-+
-+value = replace(value);
- 
- ArrayList repositoryLocations = new ArrayList();
- ArrayList repositoryTypes = new ArrayList();
--int i;
-  
- StringTokenizer tokenizer = new StringTokenizer(value, ",");
- while (tokenizer.hasMoreElements()) {
--String repository = tokenizer.nextToken();
--
--// Local repository
--boolean replace = false;
--String before = repository;
--while ((i=repository.indexOf(CATALINA_HOME_TOKEN))>=0) {
--replace=true;
--if (i>0) {
--repository = repository.substring(0,i) + getCatalinaHome() 
--+ repository.substring(i+CATALINA_HOME_TOKEN.length());
--} else {
--repository = getCatalinaHome() 
--+ 

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: e40f84e68f0a9344fe5820a06731c8fa42fdf371
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Mar 17 12:45:52 2016 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Mar 17 12:45:52 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e40f84e6

www-servers/tomcat: version bump

Package-Manager: portage-2.2.28

 www-servers/tomcat/Manifest | 2 +-
 ...9.0.0_alpha3-build.xml.patch => tomcat-9.0.0_alpha4-build.xml.patch} | 0
 .../{tomcat-9.0.0_alpha3-r1.ebuild => tomcat-9.0.0_alpha4.ebuild}   | 0
 3 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index d2754a6..5582656 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -5,4 +5,4 @@ DIST apache-tomcat-7.0.67-src.tar.gz 4624303 SHA256 
0464ebbeec17fb15103cad9f6639
 DIST apache-tomcat-7.0.68-src.tar.gz 4641238 SHA256 
abb5d2cc7e34a18f968ec2535bdeeae919c53fa7feffe4d617db95e12e94b210 SHA512 
dd97205044b03c6466c78bd165509ed9cd37c4d84de34c2170e67c475b28b72bfeda512f14f583c9983c045888d4704cdf7ba7c434f1d4bad9022428b0a0de1c
 WHIRLPOOL 
594cdf5584ea49faebfbea174e67bf85e761365717d56762138d07186c595195df2899a94d897578d1d20201ed4706b51a4d8870d9a6a4ca74c2436ba4283a05
 DIST apache-tomcat-8.0.30-src.tar.gz 4939771 SHA256 
0f79b74f303cce809ea63a85586efb5d4bb67ea53622f1b44ec0f1aa9cf6 SHA512 
cc1546292e6b674e251bf5c92b2f63f9fe96f979753a74991dd6e851f7da44743415c3bfc06525071b89faa35c90abb4129cb76dffdc75945a2ea94c3bb92110
 WHIRLPOOL 
a20d1f1e6a290d174e5f7181655d555a5b39296e4c059fcd4833709e0ee635d9c02cf319be29aef9b5442db0283c8590c6d062d5f6eae09136ccb77c4610a5fc
 DIST apache-tomcat-8.0.32-src.tar.gz 4957920 SHA256 
b8f7770ae947a0c0aed9b5a6f3e2ff18fd27a07f068cc6029f019b5d4c6de560 SHA512 
4c18b9ae77963d96ff59891564c4bc8f6aaba582776c319825e9b944dd8cf10747dfc5b3cbc9cfa2ff10f6d889b404902fecd6b49fdde7b3741f9ba90dc6221c
 WHIRLPOOL 
77be9ea10ffd2e606367d477ba13c717294fe49b65ecef6fdc910e53fa2d987f38a8b299c28a340ea7684a16feb6ca3bd0b5e662e3875af73f4735e1ff623a79
-DIST apache-tomcat-9.0.0.M3-src.tar.gz 4987071 SHA256 
b4d7ed751f556e77fd53fe9d02d69ceba9709e0a44c47f4f59a84e8b5059f5b7 SHA512 
3436e64f5c3c77d041091456bce29c1bb5259d25079ffc87560e5e0e90b422c7ff04b94561a1001ab483100074be8b2c2af5622f36823083423f5b44b0e30b81
 WHIRLPOOL 
79f89ca17fb71293d6e6db741586ac4a481449cac758099569396f6e22ac8255b5554196d9bef7a74c6d49a9f27d0a46012abe687cd04bf874eae397ce48d8a8
+DIST apache-tomcat-9.0.0.M4-src.tar.gz 5007858 SHA256 
bba5122cf7b6fc8d4446ba0784177bd3a6dd2806c0a7493c4cdb2be1ce4921a1 SHA512 
67225852c631095ea3ef633eabb1a21d30209248688231a9681358b46a7a3f4e8635b23035bb2681311986af73cae732fdd7c0a5446489a8360e572308461478
 WHIRLPOOL 
5e8c3099a9aeff370ca8526d7a0b25274241e56d7e250163fc8822c0ceacee7107b5e72ae2ba84e08dbd9bce96621507c60e8a5d1696664efce6e6bdfb5e

diff --git a/www-servers/tomcat/files/tomcat-9.0.0_alpha3-build.xml.patch 
b/www-servers/tomcat/files/tomcat-9.0.0_alpha4-build.xml.patch
similarity index 100%
rename from www-servers/tomcat/files/tomcat-9.0.0_alpha3-build.xml.patch
rename to www-servers/tomcat/files/tomcat-9.0.0_alpha4-build.xml.patch

diff --git a/www-servers/tomcat/tomcat-9.0.0_alpha3-r1.ebuild 
b/www-servers/tomcat/tomcat-9.0.0_alpha4.ebuild
similarity index 100%
rename from www-servers/tomcat/tomcat-9.0.0_alpha3-r1.ebuild
rename to www-servers/tomcat/tomcat-9.0.0_alpha4.ebuild

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: c3c2615ba2deea1d7dd119d306d7d0418d34353f
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Mar 17 12:52:45 2016 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Mar 17 12:52:45 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3c2615b

www-servers/tomcat: removed obsolete ebuild

Package-Manager: portage-2.2.28

 www-servers/tomcat/Manifest|   1 -
 .../tomcat/files/tomcat-7.0.59-build.xml.patch | 107 ---
 www-servers/tomcat/tomcat-7.0.59-r2.ebuild | 147 -
 3 files changed, 255 deletions(-)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 5582656..0321c90 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,6 +1,5 @@
 DIST apache-tomcat-6.0.44-src.tar.gz 3447711 SHA256 
c6f01526d58f2ba7b9da496e959d9e68cc49183006077704ab91c36ebebf5a4a SHA512 
0d6a1539b28fa8ca3442557889d7d21cc523b18136f6998820ba13f41420536aba65ce78bac526002ee1dd86df3cbc80d9f043a3f765d7cf0b79e58e516030be
 WHIRLPOOL 
c65e704466191a0f98ec777e95dda889599ff6a545e7c013fd04bc0b72e0d0edf4491415f243d6a4de60cf76abe5c13ffbcc6d98f78b51490f7b7b43b24ecb97
 DIST apache-tomcat-6.0.45-src.tar.gz 3494054 SHA256 
d464b3e770197f026bf802d19be0195b941e8c3be7e552dc2f8eb563f9cc010e SHA512 
d300e6b805bb70fc348133467b2aeac728dc0ae44f2fc1f309c3b2971987c1e46b81f156ebd7ddfda38f6746e90af1402c4e16a2d30bc7b081b761c87df8ffab
 WHIRLPOOL 
144678884f75034f1d692619ea8064daf02aee03bcac62fb0b666b5c0283f5abf93414d636c03c94488632cd13081cf00e69a9ddf19f4c8bafd80e7eca5a69da
-DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 
3a1dedda4019db87464fca3aeb4e800a538f0baee96d8b14c9d64967b0d2ea44 SHA512 
acc322eee1446dd1bff72910ae9f40a62f88332ee69d6057b3c684e2abf8f28e6df6ab9505900f0b0cf7a5e2e0e80e64b0a790b3b78594ce595ce897706b4bcb
 WHIRLPOOL 
4948964c1746e6ee912ac72c901ba271793610f402bf082455d104e2e8d6dbfa0bf5371d42d48d8ad7c826271fa60d989119a01e700497099022d0cf3564fdff
 DIST apache-tomcat-7.0.67-src.tar.gz 4624303 SHA256 
0464ebbeec17fb15103cad9f6639edc826f4eca246dd58a5cb1c5d46aff58e0a SHA512 
dd299cab7a172860f51bae19e3490432af874b94825de289095647026a91b27cb3544ba85ab1f786bf4696dc59475ca85d051841ebaa221e3b46079e139a6e52
 WHIRLPOOL 
ae7ec13ffd3bd0964496060413924854c5b956dc88b8d0f1de4ac094e8fb5595ccfc7c2eaa7051f082c575253ed9fdadc8833f494281770f8f72b8c64d9b9593
 DIST apache-tomcat-7.0.68-src.tar.gz 4641238 SHA256 
abb5d2cc7e34a18f968ec2535bdeeae919c53fa7feffe4d617db95e12e94b210 SHA512 
dd97205044b03c6466c78bd165509ed9cd37c4d84de34c2170e67c475b28b72bfeda512f14f583c9983c045888d4704cdf7ba7c434f1d4bad9022428b0a0de1c
 WHIRLPOOL 
594cdf5584ea49faebfbea174e67bf85e761365717d56762138d07186c595195df2899a94d897578d1d20201ed4706b51a4d8870d9a6a4ca74c2436ba4283a05
 DIST apache-tomcat-8.0.30-src.tar.gz 4939771 SHA256 
0f79b74f303cce809ea63a85586efb5d4bb67ea53622f1b44ec0f1aa9cf6 SHA512 
cc1546292e6b674e251bf5c92b2f63f9fe96f979753a74991dd6e851f7da44743415c3bfc06525071b89faa35c90abb4129cb76dffdc75945a2ea94c3bb92110
 WHIRLPOOL 
a20d1f1e6a290d174e5f7181655d555a5b39296e4c059fcd4833709e0ee635d9c02cf319be29aef9b5442db0283c8590c6d062d5f6eae09136ccb77c4610a5fc

diff --git a/www-servers/tomcat/files/tomcat-7.0.59-build.xml.patch 
b/www-servers/tomcat/files/tomcat-7.0.59-build.xml.patch
deleted file mode 100644
index 1de630f..000
--- a/www-servers/tomcat/files/tomcat-7.0.59-build.xml.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff --git a/apache-tomcat-7.0.59-src/build.xml 
b/apache-tomcat-7.0.59-src/build.xml
-index 9c4cb10..5067f44 100644
 a/apache-tomcat-7.0.59-src/build.xml
-+++ b/apache-tomcat-7.0.59-src/build.xml
-@@ -701,26 +701,32 @@
-   manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
- 
- 
-+
- 
- 
-+
- 
- 
-+
- 
- 
- 
- 
-+
- 
- 
- 
-@@ -1031,14 +1039,15 @@
- 
-   
- 
-+
- 
- 
--
-+
- 
- 
- 
-+  description="Prepare to build web services extras package" 
unless="noget">
- 
- 
-   
-@@ -2591,7 +2600,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
-   
- 
-   
-+  description="Download (and build) components necessary to compile" 
unless="noget">
- 
- 
-   
-@@ -2648,7 +2657,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
-   
- 
-   
-+  description="Download additional components for the tests" 
unless="noget">
- 
- 
-   
-@@ -2676,7 +2685,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
-   
- 
-   
-+  description="Download additional components for a distribution" 
unless="noget">
- 
- 
-   

diff --git a/www-servers/tomcat/tomcat-7.0.59-r2.ebuild 
b/www-servers/tomcat/tomcat-7.0.59-r2.ebuild
deleted file mode 100644
index af726e3..000
--- a/www-servers/tomcat/tomcat-7.0.59-r2.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the 

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: 64749b6b37119447cc2f15cfc333417dd5044ecb
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Feb 10 14:48:05 2016 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Feb 10 14:48:05 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64749b6b

www-servers/tomcat: version bump

Package-Manager: portage-2.2.27

 www-servers/tomcat/Manifest|   1 +
 .../tomcat/files/tomcat-8.0.32-build.xml.patch | 265 +
 www-servers/tomcat/tomcat-8.0.32.ebuild| 155 
 3 files changed, 421 insertions(+)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 22a9c8a..9b782e8 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -2,4 +2,5 @@ DIST apache-tomcat-6.0.44-src.tar.gz 3447711 SHA256 
c6f01526d58f2ba7b9da496e959d
 DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 
3a1dedda4019db87464fca3aeb4e800a538f0baee96d8b14c9d64967b0d2ea44 SHA512 
acc322eee1446dd1bff72910ae9f40a62f88332ee69d6057b3c684e2abf8f28e6df6ab9505900f0b0cf7a5e2e0e80e64b0a790b3b78594ce595ce897706b4bcb
 WHIRLPOOL 
4948964c1746e6ee912ac72c901ba271793610f402bf082455d104e2e8d6dbfa0bf5371d42d48d8ad7c826271fa60d989119a01e700497099022d0cf3564fdff
 DIST apache-tomcat-7.0.67-src.tar.gz 4624303 SHA256 
0464ebbeec17fb15103cad9f6639edc826f4eca246dd58a5cb1c5d46aff58e0a SHA512 
dd299cab7a172860f51bae19e3490432af874b94825de289095647026a91b27cb3544ba85ab1f786bf4696dc59475ca85d051841ebaa221e3b46079e139a6e52
 WHIRLPOOL 
ae7ec13ffd3bd0964496060413924854c5b956dc88b8d0f1de4ac094e8fb5595ccfc7c2eaa7051f082c575253ed9fdadc8833f494281770f8f72b8c64d9b9593
 DIST apache-tomcat-8.0.30-src.tar.gz 4939771 SHA256 
0f79b74f303cce809ea63a85586efb5d4bb67ea53622f1b44ec0f1aa9cf6 SHA512 
cc1546292e6b674e251bf5c92b2f63f9fe96f979753a74991dd6e851f7da44743415c3bfc06525071b89faa35c90abb4129cb76dffdc75945a2ea94c3bb92110
 WHIRLPOOL 
a20d1f1e6a290d174e5f7181655d555a5b39296e4c059fcd4833709e0ee635d9c02cf319be29aef9b5442db0283c8590c6d062d5f6eae09136ccb77c4610a5fc
+DIST apache-tomcat-8.0.32-src.tar.gz 4957920 SHA256 
b8f7770ae947a0c0aed9b5a6f3e2ff18fd27a07f068cc6029f019b5d4c6de560 SHA512 
4c18b9ae77963d96ff59891564c4bc8f6aaba582776c319825e9b944dd8cf10747dfc5b3cbc9cfa2ff10f6d889b404902fecd6b49fdde7b3741f9ba90dc6221c
 WHIRLPOOL 
77be9ea10ffd2e606367d477ba13c717294fe49b65ecef6fdc910e53fa2d987f38a8b299c28a340ea7684a16feb6ca3bd0b5e662e3875af73f4735e1ff623a79
 DIST apache-tomcat-9.0.0.M3-src.tar.gz 4987071 SHA256 
b4d7ed751f556e77fd53fe9d02d69ceba9709e0a44c47f4f59a84e8b5059f5b7 SHA512 
3436e64f5c3c77d041091456bce29c1bb5259d25079ffc87560e5e0e90b422c7ff04b94561a1001ab483100074be8b2c2af5622f36823083423f5b44b0e30b81
 WHIRLPOOL 
79f89ca17fb71293d6e6db741586ac4a481449cac758099569396f6e22ac8255b5554196d9bef7a74c6d49a9f27d0a46012abe687cd04bf874eae397ce48d8a8

diff --git a/www-servers/tomcat/files/tomcat-8.0.32-build.xml.patch 
b/www-servers/tomcat/files/tomcat-8.0.32-build.xml.patch
new file mode 100644
index 000..1923d23
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.0.32-build.xml.patch
@@ -0,0 +1,265 @@
+diff -Naur apache-tomcat-8.0.24-src.orig/build.xml 
apache-tomcat-8.0.24-src/build.xml
+--- apache-tomcat-8.0.24-src.orig/build.xml2015-07-01 21:25:21.0 
+0100
 apache-tomcat-8.0.24-src/build.xml 2015-08-22 21:17:05.825564599 +0100
+@@ -697,24 +697,29 @@
+   manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+ 
++
+ 
++
+ 
+ 
++
+ 
+ 
+ 
+-
++
+ 
+ 
+   
+@@ -1049,7 +1054,7 @@
+ 
+   
+ 
+-
++
+ 
+ 
+ 
+@@ -1083,7 +1088,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+ 
++
+ 
+@@ -1542,7 +1548,7 @@
+ 
+   
++  description="Prepare to build web services extras package" 
unless="noget">
+ 
+ 
+   
+@@ -1681,7 +1687,7 @@
+ 
+   
++  description="Prepare to build web services extras package" 
unless="noget">
+ 
+ 
+   
+@@ -1882,6 +1888,7 @@
+ 
+   
++
+ 
++  maxmemory="512m" >
+   
+ 
+ 
+ 
+   
++
+   
+   http://docs.oracle.com/javase/7/docs/api/"/>
+   http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2739,7 +2749,7 @@
+   
+ 
+   
++  description="Download (and build) components necessary to compile" 
unless="noget">
+ 
+ 
+   
+@@ -2773,7 +2783,7 @@
+   
+ 
+   
++  description="Download additional components for the tests" 
unless="noget">
+ 
+ 
+   
+@@ -2819,7 +2829,7 @@
+   
+ 
+   
++  description="Download additional components for a distribution" 
unless="noget">
+ 
+ 
+   
+@@ -2845,18 +2855,18 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+@@ -2868,7 +2878,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+@@ -2887,7 +2897,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+   

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: 02872910468d653f2f7dbda69c02f27bd2dc03a8
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Mon Feb  8 11:53:50 2016 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Feb  8 11:54:22 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02872910

www-servers/tomcat: version bump

Package-Manager: portage-2.2.27

 www-servers/tomcat/Manifest|   2 +-
 .../files/tomcat-9.0.0_alpha3-build.xml.patch  | 266 +
 0_alpha1.ebuild => tomcat-9.0.0_alpha3.ebuild} |   0
 3 files changed, 267 insertions(+), 1 deletion(-)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 3e93ba0..96230f4 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -4,4 +4,4 @@ DIST apache-tomcat-7.0.65-src.tar.gz 4600718 SHA256 
38c266a21ff27560ba4c213dd646
 DIST apache-tomcat-7.0.67-src.tar.gz 4624303 SHA256 
0464ebbeec17fb15103cad9f6639edc826f4eca246dd58a5cb1c5d46aff58e0a SHA512 
dd299cab7a172860f51bae19e3490432af874b94825de289095647026a91b27cb3544ba85ab1f786bf4696dc59475ca85d051841ebaa221e3b46079e139a6e52
 WHIRLPOOL 
ae7ec13ffd3bd0964496060413924854c5b956dc88b8d0f1de4ac094e8fb5595ccfc7c2eaa7051f082c575253ed9fdadc8833f494281770f8f72b8c64d9b9593
 DIST apache-tomcat-8.0.28-src.tar.gz 4913153 SHA256 
441a0a0459b6c2dacab3bcf68a9e512b4bb62f7251a27bd15b909ee31b659367 SHA512 
60f9a9f643595cdc87598169b8b66cc1e445445a530cad88d2957e90ca99e7c77be9d3576c7fa3a0e7051166f2a960a1c3bf4103f902d1da122825d41e1154c7
 WHIRLPOOL 
5867ec0c128fe5247c7b874baf05fba9fc9a5663e1c16ecd60bc6ae1e3c411a43f4d8784db5c915fe6c54bc2ec728a01773708738aede30e5abaf1f77072cdcb
 DIST apache-tomcat-8.0.30-src.tar.gz 4939771 SHA256 
0f79b74f303cce809ea63a85586efb5d4bb67ea53622f1b44ec0f1aa9cf6 SHA512 
cc1546292e6b674e251bf5c92b2f63f9fe96f979753a74991dd6e851f7da44743415c3bfc06525071b89faa35c90abb4129cb76dffdc75945a2ea94c3bb92110
 WHIRLPOOL 
a20d1f1e6a290d174e5f7181655d555a5b39296e4c059fcd4833709e0ee635d9c02cf319be29aef9b5442db0283c8590c6d062d5f6eae09136ccb77c4610a5fc
-DIST apache-tomcat-9.0.0.M1-src.tar.gz 4984318 SHA256 
62fb16ed9743916b643a7b406c4b98b8b9b2df15504e9a66d4a609f6d539b34c SHA512 
f47a018e30a0ceb382187de2fef443ea1ef9d6e319ef4f3a027824b7e95fb4b5e9d73531f03357b2a89c5f3baf568ac4cfde83969f9603299dd0cf742c4f6efa
 WHIRLPOOL 
ab796c7484fd2c1d5060998910e1bd1cfb4f478b6740d9d105255b1e1b36fc9118048d0089a873699b978be91adbe7e024afcb3a4fc2d5121b17089998cb9210
+DIST apache-tomcat-9.0.0.M3-src.tar.gz 4987071 SHA256 
b4d7ed751f556e77fd53fe9d02d69ceba9709e0a44c47f4f59a84e8b5059f5b7 SHA512 
3436e64f5c3c77d041091456bce29c1bb5259d25079ffc87560e5e0e90b422c7ff04b94561a1001ab483100074be8b2c2af5622f36823083423f5b44b0e30b81
 WHIRLPOOL 
79f89ca17fb71293d6e6db741586ac4a481449cac758099569396f6e22ac8255b5554196d9bef7a74c6d49a9f27d0a46012abe687cd04bf874eae397ce48d8a8

diff --git a/www-servers/tomcat/files/tomcat-9.0.0_alpha3-build.xml.patch 
b/www-servers/tomcat/files/tomcat-9.0.0_alpha3-build.xml.patch
new file mode 100644
index 000..f5d49c7
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-9.0.0_alpha3-build.xml.patch
@@ -0,0 +1,266 @@
+diff --git a/apache-tomcat-9.0.0.M1-src/build.xml 
b/apache-tomcat-9.0.0.M1-src/build.xml
+index eab0c45..63ac495 100644
+--- a/apache-tomcat-9.0.0.M1-src/build.xml
 b/apache-tomcat-9.0.0.M1-src/build.xml
+@@ -711,24 +711,30 @@
+   manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+ 
++
+ 
+ 
++
+ 
+ 
++
+ 
+ 
+ 
+-
++
+ 
+ 
+   
+@@ -1069,7 +1075,7 @@
+ 
+   
+ 
+-
++
+ 
+ 
+ 
+@@ -1103,7 +1109,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+ 
++
+ 
+@@ -1606,7 +1613,7 @@
+ 
+   
++  description="Prepare to build web services extras package" 
unless="noget">
+ 
+ 
+   
+@@ -1745,7 +1752,7 @@
+ 
+   
++  description="Prepare to build web services extras package" 
unless="noget">
+ 
+ 
+   
+@@ -1940,6 +1947,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
+ 
+   
++
+ 
++  maxmemory="512m" >
+   
+ 
+ 
+ 
+   
++
+   
+   http://docs.oracle.com/javase/7/docs/api/"/>
+   http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2775,7 +2786,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download (and build) components necessary to compile" 
unless="noget">
+ 
+ 
+   
+@@ -2809,7 +2820,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download additional components for the tests" 
unless="noget">
+ 
+ 
+   
+@@ -2866,7 +2877,7 @@ skip.installer property in build.properties" />
+   
+ 
+   
++  description="Download additional components for a distribution" 
unless="noget">
+ 
+ 
+   
+@@ -2892,18 +2903,18 @@ skip.installer property in 

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: 444e0bab566a62d157412f2e2d3f68ed20c0b3f6
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Mon Dec  7 14:02:50 2015 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Dec  7 14:02:50 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=444e0bab

www-servers/tomcat: version bump

Package-Manager: portage-2.2.26

 www-servers/tomcat/Manifest|   1 +
 .../tomcat/files/tomcat-8.0.30-build.xml.patch | 265 +
 www-servers/tomcat/tomcat-8.0.30.ebuild| 155 
 3 files changed, 421 insertions(+)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 5132be6..3d8f978 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -5,4 +5,5 @@ DIST apache-tomcat-7.0.65-src.tar.gz 4600718 SHA256 
38c266a21ff27560ba4c213dd646
 DIST apache-tomcat-8.0.26-src.tar.gz 4904717 SHA256 
3725621a73501a6e09438f177acfab7ce11fabeb2b0380a909273410f3b50b3b SHA512 
70ef253889916bcca309a8f80675c4c588fef1cc5dc0360c45347107fb56fd546a334ca01e1109775410f7642acf6c75d9887f9403ad4c1d0e30f041f9ce34fb
 WHIRLPOOL 
3c29a5418dfefc12157d8656dfa15a2937668f52d18c21f6dd4a278d2bc4c84d5b6d542daf6244040eabeab57cb759a510b7b1d0e41440a2d9ad62586723dafc
 DIST apache-tomcat-8.0.28-src.tar.gz 4913153 SHA256 
441a0a0459b6c2dacab3bcf68a9e512b4bb62f7251a27bd15b909ee31b659367 SHA512 
60f9a9f643595cdc87598169b8b66cc1e445445a530cad88d2957e90ca99e7c77be9d3576c7fa3a0e7051166f2a960a1c3bf4103f902d1da122825d41e1154c7
 WHIRLPOOL 
5867ec0c128fe5247c7b874baf05fba9fc9a5663e1c16ecd60bc6ae1e3c411a43f4d8784db5c915fe6c54bc2ec728a01773708738aede30e5abaf1f77072cdcb
 DIST apache-tomcat-8.0.29-src.tar.gz 499 SHA256 
5cb87ae9afd145d68906e93b825a6a41303d7975bafe3d57530e9a8ec01c7c80 SHA512 
279c971529f0e7513885a0a201753bc94b1ed7a4f035cb33943bf6ae769102630b94144c65236e8b42c666ded7cc843db54c155e8b5cd1ae175b6385d9c2789b
 WHIRLPOOL 
8cfb5402b877be4bd4306cf5d14cf76302b1904e3530de108f262f9bb3de6f1377882fb5a1406e4b2ffc5c239c541f64df55fc98945157edafbd14586deb26bd
+DIST apache-tomcat-8.0.30-src.tar.gz 4939771 SHA256 
0f79b74f303cce809ea63a85586efb5d4bb67ea53622f1b44ec0f1aa9cf6 SHA512 
cc1546292e6b674e251bf5c92b2f63f9fe96f979753a74991dd6e851f7da44743415c3bfc06525071b89faa35c90abb4129cb76dffdc75945a2ea94c3bb92110
 WHIRLPOOL 
a20d1f1e6a290d174e5f7181655d555a5b39296e4c059fcd4833709e0ee635d9c02cf319be29aef9b5442db0283c8590c6d062d5f6eae09136ccb77c4610a5fc
 DIST apache-tomcat-9.0.0.M1-src.tar.gz 4984318 SHA256 
62fb16ed9743916b643a7b406c4b98b8b9b2df15504e9a66d4a609f6d539b34c SHA512 
f47a018e30a0ceb382187de2fef443ea1ef9d6e319ef4f3a027824b7e95fb4b5e9d73531f03357b2a89c5f3baf568ac4cfde83969f9603299dd0cf742c4f6efa
 WHIRLPOOL 
ab796c7484fd2c1d5060998910e1bd1cfb4f478b6740d9d105255b1e1b36fc9118048d0089a873699b978be91adbe7e024afcb3a4fc2d5121b17089998cb9210

diff --git a/www-servers/tomcat/files/tomcat-8.0.30-build.xml.patch 
b/www-servers/tomcat/files/tomcat-8.0.30-build.xml.patch
new file mode 100644
index 000..1923d23
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.0.30-build.xml.patch
@@ -0,0 +1,265 @@
+diff -Naur apache-tomcat-8.0.24-src.orig/build.xml 
apache-tomcat-8.0.24-src/build.xml
+--- apache-tomcat-8.0.24-src.orig/build.xml2015-07-01 21:25:21.0 
+0100
 apache-tomcat-8.0.24-src/build.xml 2015-08-22 21:17:05.825564599 +0100
+@@ -697,24 +697,29 @@
+   manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+ 
++
+ 
++
+ 
+ 
++
+ 
+ 
+ 
+-
++
+ 
+ 
+   
+@@ -1049,7 +1054,7 @@
+ 
+   
+ 
+-
++
+ 
+ 
+ 
+@@ -1083,7 +1088,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+ 
++
+ 
+@@ -1542,7 +1548,7 @@
+ 
+   
++  description="Prepare to build web services extras package" 
unless="noget">
+ 
+ 
+   
+@@ -1681,7 +1687,7 @@
+ 
+   
++  description="Prepare to build web services extras package" 
unless="noget">
+ 
+ 
+   
+@@ -1882,6 +1888,7 @@
+ 
+   
++
+ 
++  maxmemory="512m" >
+   
+ 
+ 
+ 
+   
++
+   
+   http://docs.oracle.com/javase/7/docs/api/"/>
+   http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2739,7 +2749,7 @@
+   
+ 
+   
++  description="Download (and build) components necessary to compile" 
unless="noget">
+ 
+ 
+   
+@@ -2773,7 +2783,7 @@
+   
+ 
+   
++  description="Download additional components for the tests" 
unless="noget">
+ 
+ 
+   
+@@ -2819,7 +2829,7 @@
+   
+ 
+   
++  description="Download additional components for a distribution" 
unless="noget">
+ 
+ 
+   
+@@ -2845,18 +2855,18 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+@@ -2868,7 +2878,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+@@ -2887,7 +2897,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+   

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[James Le Cuirot]

commit: f3b5a325b1abf8a46b40f5455fb1e2f2893038b0
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Oct 25 22:50:45 2015 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Oct 25 22:53:28 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3b5a325

www-servers/tomcat: Remove old

Package-Manager: portage-2.2.20.1

 www-servers/tomcat/Manifest|   2 -
 .../tomcat/files/tomcat-7.0.63-build.xml.patch | 149 
 .../tomcat/files/tomcat-8.0.23-build.xml.patch | 230 --
 .../tomcat/files/tomcat-8.0.24-build.xml.patch | 265 -
 .../tomcat/files/tomcat-8.0.27-build.xml.patch | 265 -
 www-servers/tomcat/tomcat-8.0.23-r2.ebuild | 145 ---
 www-servers/tomcat/tomcat-8.0.27.ebuild| 147 
 www-servers/tomcat/tomcat-8.0.28.ebuild| 147 
 8 files changed, 1350 deletions(-)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index af697ab..6e88e73 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -2,7 +2,5 @@ DIST apache-tomcat-6.0.44-src.tar.gz 3447711 SHA256 
c6f01526d58f2ba7b9da496e959d
 DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 
3a1dedda4019db87464fca3aeb4e800a538f0baee96d8b14c9d64967b0d2ea44 SHA512 
acc322eee1446dd1bff72910ae9f40a62f88332ee69d6057b3c684e2abf8f28e6df6ab9505900f0b0cf7a5e2e0e80e64b0a790b3b78594ce595ce897706b4bcb
 WHIRLPOOL 
4948964c1746e6ee912ac72c901ba271793610f402bf082455d104e2e8d6dbfa0bf5371d42d48d8ad7c826271fa60d989119a01e700497099022d0cf3564fdff
 DIST apache-tomcat-7.0.64-src.tar.gz 4592198 SHA256 
d805dec3b387a244c4285ce1f9fc5028bb836716db52f1b1b5036a97dd9ec4dc SHA512 
180479b0f5b5604597f850676235fab1f3e63051b503cfa3b4da1e6820505dece73f502249b6e032cfaaad18c9e2d4c057c9854ae5cbf088b214b51e0687ed8c
 WHIRLPOOL 
a461d7deae890227052bd83ac97c698821b1f6d6ff97c179b124de9b1b7ccdf1498651a391a03008b840fac730c080682f207db4d44e76d15dba63b266ddee51
 DIST apache-tomcat-7.0.65-src.tar.gz 4600718 SHA256 
38c266a21ff27560ba4c213dd64628a1ed35b22289d37b5d7f250010e963cc39 SHA512 
6eb420a3067783a6ffee781c834dc363d6638d6e79182886594249a0ef810b2ab721f2a44f84b4ea90372a7e2e5171caf49697945d359e9c877a2db640fc3da2
 WHIRLPOOL 
db678b899455ef977d893eec01ba50687c7563646321dbe511be6c55f03859a08778e4f6da14021a9ed051c1f3573edf9d0de527383aaf4ee6114f3a027b281d
-DIST apache-tomcat-8.0.23-src.tar.gz 4868650 SHA256 
6293713e78da9bb803060c8ddff982f8f7aef5a2e4b325340088493ce9957ba4 SHA512 
cc83194b2847fc2db5448d548c7e65a1198cda02726b070f913a762d324152315886fba09532b879e26d15ec57e04057cc30b3a686b2a2307d6447d17f84e16c
 WHIRLPOOL 
b0559a4ef1b4c1f0683e4cce976d31db175d3c4f4d2b809b127e1074d49a6bf764366cc3e91f9a0818afd6de35e662a7aab89866dfd2e61673327c50535bff88
 DIST apache-tomcat-8.0.26-src.tar.gz 4904717 SHA256 
3725621a73501a6e09438f177acfab7ce11fabeb2b0380a909273410f3b50b3b SHA512 
70ef253889916bcca309a8f80675c4c588fef1cc5dc0360c45347107fb56fd546a334ca01e1109775410f7642acf6c75d9887f9403ad4c1d0e30f041f9ce34fb
 WHIRLPOOL 
3c29a5418dfefc12157d8656dfa15a2937668f52d18c21f6dd4a278d2bc4c84d5b6d542daf6244040eabeab57cb759a510b7b1d0e41440a2d9ad62586723dafc
-DIST apache-tomcat-8.0.27-src.tar.gz 4911212 SHA256 
149b203c55c08d3ef1e823e8f0f771362bee75ea95db693757e53ddc9fba8fae SHA512 
dfb504b37bf991c03b58b50af833d2d84d3f36a1eb5c4290a0eb8abee92811e78798ea69ba21ed72e82abbf8e27f9c2e74fe5989a31e49ee8cecb8530ce3c93a
 WHIRLPOOL 
5dbb965aacbe5c178a4d2dcdf9719821498b3694fd909fe276d8dad7fb96b8c402fcf8d21b6e9b125b55d1c39408cbcb2ce85789c0eb3204d1d9aae5ea1cde3d
 DIST apache-tomcat-8.0.28-src.tar.gz 4913153 SHA256 
441a0a0459b6c2dacab3bcf68a9e512b4bb62f7251a27bd15b909ee31b659367 SHA512 
60f9a9f643595cdc87598169b8b66cc1e445445a530cad88d2957e90ca99e7c77be9d3576c7fa3a0e7051166f2a960a1c3bf4103f902d1da122825d41e1154c7
 WHIRLPOOL 
5867ec0c128fe5247c7b874baf05fba9fc9a5663e1c16ecd60bc6ae1e3c411a43f4d8784db5c915fe6c54bc2ec728a01773708738aede30e5abaf1f77072cdcb

diff --git a/www-servers/tomcat/files/tomcat-7.0.63-build.xml.patch 
b/www-servers/tomcat/files/tomcat-7.0.63-build.xml.patch
deleted file mode 100644
index 481591f..000
--- a/www-servers/tomcat/files/tomcat-7.0.63-build.xml.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-diff -Naur apache-tomcat-7.0.63-src.orig/build.xml 
apache-tomcat-7.0.63-src/build.xml
 apache-tomcat-7.0.63-src.orig/build.xml2015-06-30 09:15:44.0 
+0100
-+++ apache-tomcat-7.0.63-src/build.xml 2015-08-22 21:13:12.453038827 +0100
-@@ -660,12 +660,14 @@
-   
- 
- 
-+
- 
-   
- 
-@@ -721,26 +723,32 @@
-   manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
- 
- 
-+
- 
- 
-+
- 
- 
-+
- 
- 
- 
- 
-+
- 
- 
- 
-@@ -1051,14 +1061,15 @@
- 
-   
- 
-+
- 
- 
--
-+
- 
- 
- 
-+  description="Prepare to build web services extras package" 
unless="noget">
- 
- 
-   
-@@ -1886,6 

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[James Le Cuirot]

commit: 15dec77039ea7416bbb647be05a24fde0b0b03fc
Author: Julian Ospald  gentoo  org>
AuthorDate: Wed Oct 21 15:08:12 2015 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Oct 21 15:08:12 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15dec770

www-servers/tomcat: revbump on tomcat-instance-manager script

This bump tweaks the behavior of test_can_deploy(), so that
it does not fail if a target directory exists AND is empty.

This can be extremely useful if the target directories are
mount points, which is very common for e.g. docker setups.

 .../tomcat/files/tomcat-instance-manager-r2.bash   | 270 +
 www-servers/tomcat/tomcat-8.0.28-r1.ebuild | 147 +++
 2 files changed, 417 insertions(+)

diff --git a/www-servers/tomcat/files/tomcat-instance-manager-r2.bash 
b/www-servers/tomcat/files/tomcat-instance-manager-r2.bash
new file mode 100644
index 000..b3b1a02
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-instance-manager-r2.bash
@@ -0,0 +1,270 @@
+#!/bin/bash
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# Author: Ralph Sennhauser 
+
+die() {
+   echo "${@}"
+   exit 1
+}
+
+dir_is_empty() {
+   # usage:
+   #  dir_is_empty 
+   #
+   # returns 2 if the dir does not even exist
+   # returns 1 if the dir is not empty
+   # returns 0 (success) if the dir exists and is empty
+
+   local dir=$1
+   local files
+
+   if [[ ! -e ${dir} ]] ; then
+   return 2
+   fi
+
+   shopt -s nullglob dotglob # To include hidden files
+   files=( "${dir}"/* )
+   shopt -u nullglob dotglob
+
+   if [[ ${#files[@]} -eq 0 ]]; then
+   return 0
+   else
+   return 1
+   fi
+
+}
+
+usage() {
+   cat < [--suffix s][--user 
u][--group g]
+
+  Options:
+--help:
+  show this text.
+--create:
+  create a new instance
+--remove:
+  remove an existing instance.
+--suffix SUFFIX:
+  a suffix for this instance. the suffix may not collide with an already
+  existing instance, defaults to empty.
+--user USER:
+  the user for which to configure this instance for. The user needs to
+  exist already. defaults to tomcat.
+--group GROUP:
+  the group for which to configure this instance for. The group needs to
+  exist already. defaults to tomcat.
+
+  Examples:
+${BASH_SOURCE} --create --suffix testing --user tacmot --group tacmot
+${BASH_SOURCE} --remove --suffix testing
+EOL
+}
+
+parse_argv() {
+   action="not specified"
+   instance_name="tomcat-@SLOT@"
+   instance_user="tomcat"
+   instance_group="tomcat"
+
+   while [[ -n $1 ]]; do
+   case $1 in
+   --help)
+   usage
+   exit 0;;
+   --suffix)
+   instance_name+="-$2"
+   shift; shift;;
+   --user)
+   instance_user="$2"
+   shift; shift;;
+   --group)
+   instance_group="$2"
+   shift; shift;;
+   --create)
+   action=create
+   shift;;
+   --remove)
+   action=remove
+   shift;;
+   --backup)
+   action=backup
+   shift;;
+   --restore)
+   action=restore
+   shift;;
+   --update)
+   action=update
+   shift;;
+   *)
+   echo "Invalid option '$1'"
+   usage
+   exit 2;;
+   esac
+   done
+
+   tomcat_home="/@GENTOO_PORTAGE_EPREFIX@usr/share/tomcat-@SLOT@"
+   instance_base="/@GENTOO_PORTAGE_EPREFIX@var/lib/${instance_name}"
+   instance_conf="/@GENTOO_PORTAGE_EPREFIX@etc/${instance_name}"
+   instance_logs="/@GENTOO_PORTAGE_EPREFIX@var/log/${instance_name}"
+   instance_temp="/@GENTOO_PORTAGE_EPREFIX@var/tmp/${instance_name}"
+
+   all_targets=(
+   "${instance_base}"
+   "${instance_logs}"
+   "${instance_temp}"
+   "/@GENTOO_PORTAGE_EPREFIX@etc/${instance_name}"
+   "/@GENTOO_PORTAGE_EPREFIX@etc/init.d/${instance_name}"
+   "/@GENTOO_PORTAGE_EPREFIX@etc/conf.d/${instance_name}"
+   )
+}
+   
+test_can_deploy() {
+   local no_deploy target
+   for target in "${all_targets[@]}"; do
+   if 

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: 4874b902bc395110c8ee0c19002f0938c5fafe11
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Oct 21 09:46:16 2015 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Oct 21 09:46:16 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4874b902

www-servers/tomcat: version bump

Package-Manager: portage-2.2.23

 www-servers/tomcat/Manifest|   1 +
 .../tomcat/files/tomcat-7.0.65-build.xml.patch | 149 +
 www-servers/tomcat/tomcat-7.0.65.ebuild| 146 
 3 files changed, 296 insertions(+)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index fbb8dff..af697ab 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,6 +1,7 @@
 DIST apache-tomcat-6.0.44-src.tar.gz 3447711 SHA256 
c6f01526d58f2ba7b9da496e959d9e68cc49183006077704ab91c36ebebf5a4a SHA512 
0d6a1539b28fa8ca3442557889d7d21cc523b18136f6998820ba13f41420536aba65ce78bac526002ee1dd86df3cbc80d9f043a3f765d7cf0b79e58e516030be
 WHIRLPOOL 
c65e704466191a0f98ec777e95dda889599ff6a545e7c013fd04bc0b72e0d0edf4491415f243d6a4de60cf76abe5c13ffbcc6d98f78b51490f7b7b43b24ecb97
 DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 
3a1dedda4019db87464fca3aeb4e800a538f0baee96d8b14c9d64967b0d2ea44 SHA512 
acc322eee1446dd1bff72910ae9f40a62f88332ee69d6057b3c684e2abf8f28e6df6ab9505900f0b0cf7a5e2e0e80e64b0a790b3b78594ce595ce897706b4bcb
 WHIRLPOOL 
4948964c1746e6ee912ac72c901ba271793610f402bf082455d104e2e8d6dbfa0bf5371d42d48d8ad7c826271fa60d989119a01e700497099022d0cf3564fdff
 DIST apache-tomcat-7.0.64-src.tar.gz 4592198 SHA256 
d805dec3b387a244c4285ce1f9fc5028bb836716db52f1b1b5036a97dd9ec4dc SHA512 
180479b0f5b5604597f850676235fab1f3e63051b503cfa3b4da1e6820505dece73f502249b6e032cfaaad18c9e2d4c057c9854ae5cbf088b214b51e0687ed8c
 WHIRLPOOL 
a461d7deae890227052bd83ac97c698821b1f6d6ff97c179b124de9b1b7ccdf1498651a391a03008b840fac730c080682f207db4d44e76d15dba63b266ddee51
+DIST apache-tomcat-7.0.65-src.tar.gz 4600718 SHA256 
38c266a21ff27560ba4c213dd64628a1ed35b22289d37b5d7f250010e963cc39 SHA512 
6eb420a3067783a6ffee781c834dc363d6638d6e79182886594249a0ef810b2ab721f2a44f84b4ea90372a7e2e5171caf49697945d359e9c877a2db640fc3da2
 WHIRLPOOL 
db678b899455ef977d893eec01ba50687c7563646321dbe511be6c55f03859a08778e4f6da14021a9ed051c1f3573edf9d0de527383aaf4ee6114f3a027b281d
 DIST apache-tomcat-8.0.23-src.tar.gz 4868650 SHA256 
6293713e78da9bb803060c8ddff982f8f7aef5a2e4b325340088493ce9957ba4 SHA512 
cc83194b2847fc2db5448d548c7e65a1198cda02726b070f913a762d324152315886fba09532b879e26d15ec57e04057cc30b3a686b2a2307d6447d17f84e16c
 WHIRLPOOL 
b0559a4ef1b4c1f0683e4cce976d31db175d3c4f4d2b809b127e1074d49a6bf764366cc3e91f9a0818afd6de35e662a7aab89866dfd2e61673327c50535bff88
 DIST apache-tomcat-8.0.26-src.tar.gz 4904717 SHA256 
3725621a73501a6e09438f177acfab7ce11fabeb2b0380a909273410f3b50b3b SHA512 
70ef253889916bcca309a8f80675c4c588fef1cc5dc0360c45347107fb56fd546a334ca01e1109775410f7642acf6c75d9887f9403ad4c1d0e30f041f9ce34fb
 WHIRLPOOL 
3c29a5418dfefc12157d8656dfa15a2937668f52d18c21f6dd4a278d2bc4c84d5b6d542daf6244040eabeab57cb759a510b7b1d0e41440a2d9ad62586723dafc
 DIST apache-tomcat-8.0.27-src.tar.gz 4911212 SHA256 
149b203c55c08d3ef1e823e8f0f771362bee75ea95db693757e53ddc9fba8fae SHA512 
dfb504b37bf991c03b58b50af833d2d84d3f36a1eb5c4290a0eb8abee92811e78798ea69ba21ed72e82abbf8e27f9c2e74fe5989a31e49ee8cecb8530ce3c93a
 WHIRLPOOL 
5dbb965aacbe5c178a4d2dcdf9719821498b3694fd909fe276d8dad7fb96b8c402fcf8d21b6e9b125b55d1c39408cbcb2ce85789c0eb3204d1d9aae5ea1cde3d

diff --git a/www-servers/tomcat/files/tomcat-7.0.65-build.xml.patch 
b/www-servers/tomcat/files/tomcat-7.0.65-build.xml.patch
new file mode 100644
index 000..481591f
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-7.0.65-build.xml.patch
@@ -0,0 +1,149 @@
+diff -Naur apache-tomcat-7.0.63-src.orig/build.xml 
apache-tomcat-7.0.63-src/build.xml
+--- apache-tomcat-7.0.63-src.orig/build.xml2015-06-30 09:15:44.0 
+0100
 apache-tomcat-7.0.63-src/build.xml 2015-08-22 21:13:12.453038827 +0100
+@@ -660,12 +660,14 @@
+   
+ 
+ 
++
+ 
+   
+ 
+@@ -721,26 +723,32 @@
+   manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+ 
++
+ 
+ 
++
+ 
+ 
++
+ 
+ 
+ 
+ 
++
+ 
+ 
+ 
+@@ -1051,14 +1061,15 @@
+ 
+   
+ 
++
+ 
+ 
+-
++
+ 
+ 
+ 
++  description="Prepare to build web services extras package" 
unless="noget">
+ 
+ 
+   
+@@ -1886,6 +1897,7 @@
+ description="Create the Tomcat javadoc" >
+ 
++
+ 
+ 
+   
++
+   
+   http://docs.oracle.com/javase/7/docs/api/"/>
+   http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2642,7 +2657,7 @@
+   
+ 
+   
++  description="Download (and build) components necessary to compile" 
unless="noget">
+ 
+ 
+   
+@@ -2699,7 +2714,7 @@
+   
+ 
+   
++  

[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/

[Miroslav Šulc]

commit: 2ac41e1e261320e2436dff0f929dada02f7f50fd
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Sep  3 16:55:00 2015 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Sep  3 16:55:24 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ac41e1e

www-servers/tomcat: version bump

Package-Manager: portage-2.2.20.1

 www-servers/tomcat/Manifest|   1 +
 .../tomcat/files/tomcat-8.0.26-build.xml.patch | 265 +
 www-servers/tomcat/tomcat-8.0.26.ebuild| 147 
 3 files changed, 413 insertions(+)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index c486b11..ce0df3b 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -4,3 +4,4 @@ DIST apache-tomcat-7.0.63-src.tar.gz 4577737 SHA256 
443aa92f2668906fb24cc43ba952
 DIST apache-tomcat-7.0.64-src.tar.gz 4592198 SHA256 
d805dec3b387a244c4285ce1f9fc5028bb836716db52f1b1b5036a97dd9ec4dc SHA512 
180479b0f5b5604597f850676235fab1f3e63051b503cfa3b4da1e6820505dece73f502249b6e032cfaaad18c9e2d4c057c9854ae5cbf088b214b51e0687ed8c
 WHIRLPOOL 
a461d7deae890227052bd83ac97c698821b1f6d6ff97c179b124de9b1b7ccdf1498651a391a03008b840fac730c080682f207db4d44e76d15dba63b266ddee51
 DIST apache-tomcat-8.0.23-src.tar.gz 4868650 SHA256 
6293713e78da9bb803060c8ddff982f8f7aef5a2e4b325340088493ce9957ba4 SHA512 
cc83194b2847fc2db5448d548c7e65a1198cda02726b070f913a762d324152315886fba09532b879e26d15ec57e04057cc30b3a686b2a2307d6447d17f84e16c
 WHIRLPOOL 
b0559a4ef1b4c1f0683e4cce976d31db175d3c4f4d2b809b127e1074d49a6bf764366cc3e91f9a0818afd6de35e662a7aab89866dfd2e61673327c50535bff88
 DIST apache-tomcat-8.0.24-src.tar.gz 4888751 SHA256 
184b0d8bda512204a2e565f9175a13f9772a9d13185e1aa228394b45c641474c SHA512 
af5619a63db3d1f6d39eb0290c83a38272c31803ee39a40aebfba5f7a0cf67d830ffcbebe518aff8de4a1f8eb44021975d7e43d45b4bd9804e8ca9cfbfc4904a
 WHIRLPOOL 
4d37f4d1fe3ee138252813bd4a65025d0ccceea8aec57aa0c9474ad4902f85938627277f6e4ece30793326c31d7790b0ca0b8d99d7b21857519d7c22c28794e8
+DIST apache-tomcat-8.0.26-src.tar.gz 4904717 SHA256 
3725621a73501a6e09438f177acfab7ce11fabeb2b0380a909273410f3b50b3b SHA512 
70ef253889916bcca309a8f80675c4c588fef1cc5dc0360c45347107fb56fd546a334ca01e1109775410f7642acf6c75d9887f9403ad4c1d0e30f041f9ce34fb
 WHIRLPOOL 
3c29a5418dfefc12157d8656dfa15a2937668f52d18c21f6dd4a278d2bc4c84d5b6d542daf6244040eabeab57cb759a510b7b1d0e41440a2d9ad62586723dafc

diff --git a/www-servers/tomcat/files/tomcat-8.0.26-build.xml.patch 
b/www-servers/tomcat/files/tomcat-8.0.26-build.xml.patch
new file mode 100644
index 000..1923d23
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.0.26-build.xml.patch
@@ -0,0 +1,265 @@
+diff -Naur apache-tomcat-8.0.24-src.orig/build.xml 
apache-tomcat-8.0.24-src/build.xml
+--- apache-tomcat-8.0.24-src.orig/build.xml2015-07-01 21:25:21.0 
+0100
 apache-tomcat-8.0.24-src/build.xml 2015-08-22 21:17:05.825564599 +0100
+@@ -697,24 +697,29 @@
+   manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+ 
++
+ 
++
+ 
+ 
++
+ 
+ 
+ 
+-
++
+ 
+ 
+   
+@@ -1049,7 +1054,7 @@
+ 
+   
+ 
+-
++
+ 
+ 
+ 
+@@ -1083,7 +1088,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+ 
++
+ 
+@@ -1542,7 +1548,7 @@
+ 
+   
++  description="Prepare to build web services extras package" 
unless="noget">
+ 
+ 
+   
+@@ -1681,7 +1687,7 @@
+ 
+   
++  description="Prepare to build web services extras package" 
unless="noget">
+ 
+ 
+   
+@@ -1882,6 +1888,7 @@
+ 
+   
++
+ 
++  maxmemory="512m" >
+   
+ 
+ 
+ 
+   
++
+   
+   http://docs.oracle.com/javase/7/docs/api/"/>
+   http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2739,7 +2749,7 @@
+   
+ 
+   
++  description="Download (and build) components necessary to compile" 
unless="noget">
+ 
+ 
+   
+@@ -2773,7 +2783,7 @@
+   
+ 
+   
++  description="Download additional components for the tests" 
unless="noget">
+ 
+ 
+   
+@@ -2819,7 +2829,7 @@
+   
+ 
+   
++  description="Download additional components for a distribution" 
unless="noget">
+ 
+ 
+   
+@@ -2845,18 +2855,18 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+@@ -2868,7 +2878,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+@@ -2887,7 +2897,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+@@ -2898,7 +2908,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+@@ -2916,7 +2926,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+@@ -2926,7 +2936,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+@@ -2949,7 +2959,7 @@
+ 
+   
+ 
+-  
++  
+ 
+   
+ 
+@@ -2960,7 +2970,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+   
+@@ -2971,7 +2981,7 @@
+ 
+   
++