Bumped to latest release, unified multiple patch files into two, partly result of having to re-create patches. Dropped ~x86-fbsd keyword due to it missing on a dep per bug #191729.

(Portage version: 2.1.3.7)
 (Unsigned Manifest commit)

1 files changed, 20 insertions, 4 deletions

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 7ec3934323da..b9017d1b10e9 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -14,6 +14,10 @@ AUX 5.5/jsr152_examples_build_xml.patch 403 RMD160 bb9bbb7fe9656ed9b3f4f18bc8e59
 MD5 345c4483f94ba70ccd6170ee50bdabbd files/5.5/jsr152_examples_build_xml.patch 403
 RMD160 bb9bbb7fe9656ed9b3f4f18bc8e59db0360fe56e files/5.5/jsr152_examples_build_xml.patch 403
 SHA256 481da3d09b32a3ed1da938df1e9b2a3273ff84b10dfb9a4467de614ed8dd847d files/5.5/jsr152_examples_build_xml.patch 403
+AUX 5.5/jsr152_jsr154_examples_build_xml.patch 2478 RMD160 39a279b0f64bcf112fdaa26c51e3aaa2c7f7a089 SHA1 15857d3b5eaadd6c11bf271f7e7d4705aface448 SHA256 cdc63acd96a3d13d32c37fcbd975f85d38309a0df87a36bf8f49347dc34a181c
+MD5 e5c235e96b8eb5bd1e9c0b4851774eef files/5.5/jsr152_jsr154_examples_build_xml.patch 2478
+RMD160 39a279b0f64bcf112fdaa26c51e3aaa2c7f7a089 files/5.5/jsr152_jsr154_examples_build_xml.patch 2478
+SHA256 cdc63acd96a3d13d32c37fcbd975f85d38309a0df87a36bf8f49347dc34a181c files/5.5/jsr152_jsr154_examples_build_xml.patch 2478
 AUX 5.5/jsr154_examples_build_xml.patch 406 RMD160 7e2c286db8b0bd4df722507c889f7e2deff65302 SHA1 1bfb15ad4eaec80f16a51f2e1bf0bed31792da38 SHA256 4e98264fb26027fbae39e8c44e44bb1151a84dc3defe6373ded0fd50e6bfd98b
 MD5 4834c2eada7c9c01cf69d9d5637eae62 files/5.5/jsr154_examples_build_xml.patch 406
 RMD160 7e2c286db8b0bd4df722507c889f7e2deff65302 files/5.5/jsr154_examples_build_xml.patch 406
@@ -22,6 +26,10 @@ AUX 5.5/main_build_xml.patch 892 RMD160 597cf8a0322a56543b51951807ec1c266ae8faaa
 MD5 ac639b069df018dc62fa4ca532696102 files/5.5/main_build_xml.patch 892
 RMD160 597cf8a0322a56543b51951807ec1c266ae8faaa files/5.5/main_build_xml.patch 892
 SHA256 f3e13d19c04bd6d27f6d52d4a04cd311892dd334ebfca9c443bc6daf09abcc6e files/5.5/main_build_xml.patch 892
+AUX 5.5/main_tomcat_catalina_jasper_build_xml.patch 16214 RMD160 4e9d678bef6f03698a46704c8044ae7523ec2b65 SHA1 b437e06ddf4713fdc68121c8a60f2cf2492f3bd3 SHA256 fa80692985150f7cf0385415bed8d60905ea4c5a703362ce816609cb3a91da70
+MD5 a731d62930577a5ee0c422b2fb6487c6 files/5.5/main_tomcat_catalina_jasper_build_xml.patch 16214
+RMD160 4e9d678bef6f03698a46704c8044ae7523ec2b65 files/5.5/main_tomcat_catalina_jasper_build_xml.patch 16214
+SHA256 fa80692985150f7cf0385415bed8d60905ea4c5a703362ce816609cb3a91da70 files/5.5/main_tomcat_catalina_jasper_build_xml.patch 16214
 AUX 5.5/tomcat.conf.2 2775 RMD160 9ab105f0e57276c105fb406d5632cc2a47401c26 SHA1 cb00a622c7858a81838292200d36d7901ee9cb2e SHA256 7539da9262abd8f8b04e9589e8a733a64670f641035a1ca8a40a236e486038f2
 MD5 2414998ef3f5b7c89ed3db952803d948 files/5.5/tomcat.conf.2 2775
 RMD160 9ab105f0e57276c105fb406d5632cc2a47401c26 files/5.5/tomcat.conf.2 2775
@@ -51,19 +59,24 @@ MD5 f6b8899fba578a03064c63fce6fcb916 files/6/tomcat.init 3355
 RMD160 169a9af752e814f7cafbfa849fb1dbc433bbbbf3 files/6/tomcat.init 3355
 SHA256 d53e31a221a3e78f6cc8686d7e123da10216a46851e64a2f5819f1f8147b86b8 files/6/tomcat.init 3355
 DIST apache-tomcat-5.5.23-src.tar.gz 4895919 RMD160 fe669f6b864fd7dcf4ad74dad22a0256e5417005 SHA1 59272b5eedde9c32a126679ff9e1d2a5f56265c8 SHA256 e2f7ce250643349507b511a5ea96df7364030a061a8f4d5b71d8b5a099e2b6bd
+DIST apache-tomcat-5.5.25-src.tar.gz 5106363 RMD160 83bb506b3f0fbde75e346e02832645bd6526fa7d SHA1 81ef41e25f805831aa63353f52e5b498c74a3414 SHA256 b7618f0a1e04623bfc9e14bdb51ae54203fa1e80f6c7ee61e2387cb11de8736f
 DIST apache-tomcat-6.0.14-src.tar.gz 3458776 RMD160 24f586d946654edcc70c5ec1ee457022c4a5d070 SHA1 3156b0b853f8f340ef825c58d0281cdda3f5816e SHA256 ef57398cc8e0294fb74d0d76debdaebf51ec47f18c9c927ddc98530dfa93cf88
 EBUILD tomcat-5.5.23-r6.ebuild 11112 RMD160 851ad5099ac493ad620ceb839c26f54946acc5ea SHA1 609a7c30a363d702f1c995ff3b9ca16ef3c0e625 SHA256 c113387935a465be335a3babda495e1d325111d521e62bfd30f6f50ea4ae6c43
 MD5 4c81411d4b4f3836c5f0611d43edcbf5 tomcat-5.5.23-r6.ebuild 11112
 RMD160 851ad5099ac493ad620ceb839c26f54946acc5ea tomcat-5.5.23-r6.ebuild 11112
 SHA256 c113387935a465be335a3babda495e1d325111d521e62bfd30f6f50ea4ae6c43 tomcat-5.5.23-r6.ebuild 11112
+EBUILD tomcat-5.5.25.ebuild 10775 RMD160 3cdeb940bd21cb8f0ad59252924e865899028dd9 SHA1 b9759ad644e05c180b2c516237c02acd00fe7c25 SHA256 125a7d320367f8adf987c14ab2391735a79df64ed7fcacbf6a8df8a94d9a9aff
+MD5 d0afd27940e9f0ec89bd269fe3dc9c66 tomcat-5.5.25.ebuild 10775
+RMD160 3cdeb940bd21cb8f0ad59252924e865899028dd9 tomcat-5.5.25.ebuild 10775
+SHA256 125a7d320367f8adf987c14ab2391735a79df64ed7fcacbf6a8df8a94d9a9aff tomcat-5.5.25.ebuild 10775
 EBUILD tomcat-6.0.14.ebuild 6203 RMD160 9493504efc84f173d074344111e948d64ca4ab9c SHA1 45518287c4cbf78120402b5822a301281632e4a7 SHA256 c3bb69fa2b1556477f8390631aa899e4d430246a1f3c5186bc32c87c5858bdd0
 MD5 a401e5173b19ff5f9ed992c25342f416 tomcat-6.0.14.ebuild 6203
 RMD160 9493504efc84f173d074344111e948d64ca4ab9c tomcat-6.0.14.ebuild 6203
 SHA256 c3bb69fa2b1556477f8390631aa899e4d430246a1f3c5186bc32c87c5858bdd0 tomcat-6.0.14.ebuild 6203
-MISC ChangeLog 48908 RMD160 cfcc20c70d712f064fadfe41dd60195057e11d36 SHA1 06bc908c57b6d0bf688e3b6d9f1e51bdc95f623b SHA256 f71a02727ff45ccd42aed36bbc1306c605f094c631d7b79ec5b512d7263757fd
-MD5 6ba210caffc63c0778ff799e258465a4 ChangeLog 48908
-RMD160 cfcc20c70d712f064fadfe41dd60195057e11d36 ChangeLog 48908
-SHA256 f71a02727ff45ccd42aed36bbc1306c605f094c631d7b79ec5b512d7263757fd ChangeLog 48908
+MISC ChangeLog 49319 RMD160 e4d2afa40030ad84a15b9a2a6246d29590708c3c SHA1 494e2e22aa87f5a213a41fc215e5f748dd3466e4 SHA256 823f2bb6b2475b684328a6a20ec37786d54bee689bda824e800b393a9b404d30
+MD5 106877dd24ada8465a0de5f465ec2921 ChangeLog 49319
+RMD160 e4d2afa40030ad84a15b9a2a6246d29590708c3c ChangeLog 49319
+SHA256 823f2bb6b2475b684328a6a20ec37786d54bee689bda824e800b393a9b404d30 ChangeLog 49319
 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79
 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556
 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556
@@ -71,6 +84,9 @@ SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79 metadata
 MD5 6947c731df35ce2149f4a2f8009b575f files/digest-tomcat-5.5.23-r6 277
 RMD160 c7a3b4f7dd1b085332606c3d6a68cc21f0ff78e2 files/digest-tomcat-5.5.23-r6 277
 SHA256 7c1430575374307e6337ec7f22b7822c2093deb36bb3e9fffaa4cf8b23f34051 files/digest-tomcat-5.5.23-r6 277
+MD5 f45055e32dc243804c4240a2ab984673 files/digest-tomcat-5.5.25 277
+RMD160 81361671958b982e7c3b93e7abead7beebb748a8 files/digest-tomcat-5.5.25 277
+SHA256 62a62e662e5449578b99f58640a48aa3f35383ef644f130064503b469689212b files/digest-tomcat-5.5.25 277
 MD5 40b1111393676c7daa27f18d8959234e files/digest-tomcat-6.0.14 277
 RMD160 473b4b9d359d3cdbff1e3cf049766a860bf358f2 files/digest-tomcat-6.0.14 277
 SHA256 11687ab86da3ae9d5b5f6a655e0a315ab2bc30285221a64716f3ea7b120739e5 files/digest-tomcat-6.0.14 277