Finally stopped building jsp/servlet-api.jars despite not using them after being built. Updated compilation of examples to use system jsp/servlet-api.jars. Switched from soon to be deprecated servletapi to tomcat-servlet-api. Dropped dep on ant in 6.0.x in order to use new split ant.

(Portage version: 2.1.2-r1)
 (Unsigned Manifest commit)

1 files changed, 31 insertions, 12 deletions

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index ff83ab208a4f..cfb2a29b7b23 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -70,10 +70,18 @@ AUX 5.5.20/jasperbuild-xml.patch 463 RMD160 d042043acbaafa7b2be42f071846d5fbe970
 MD5 0139160e01d9f8c37007e700adc14edd files/5.5.20/jasperbuild-xml.patch 463
 RMD160 d042043acbaafa7b2be42f071846d5fbe970fa62 files/5.5.20/jasperbuild-xml.patch 463
 SHA256 8c0758f6f2e556d317087389b7649bc709d738679be7965a50329b724c6e8714 files/5.5.20/jasperbuild-xml.patch 463
+AUX 5.5.20/jsr152_examples_build-xml.patch 403 RMD160 bb9bbb7fe9656ed9b3f4f18bc8e59db0360fe56e SHA1 d8d596ce643a30429194f0003d1847c9565059c5 SHA256 481da3d09b32a3ed1da938df1e9b2a3273ff84b10dfb9a4467de614ed8dd847d
+MD5 345c4483f94ba70ccd6170ee50bdabbd files/5.5.20/jsr152_examples_build-xml.patch 403
+RMD160 bb9bbb7fe9656ed9b3f4f18bc8e59db0360fe56e files/5.5.20/jsr152_examples_build-xml.patch 403
+SHA256 481da3d09b32a3ed1da938df1e9b2a3273ff84b10dfb9a4467de614ed8dd847d files/5.5.20/jsr152_examples_build-xml.patch 403
 AUX 5.5.20/jsr152build-xml-examples.patch 812 RMD160 e9449414ef88de3e2b54c094c898d75f13e4c74e SHA1 5455201aba4cca42b000477375516a45c380c766 SHA256 36b91bb7ccb67ca31db41a8217c6762b1aff88b0611319aded08421401d7f9b0
 MD5 4c33bf7e8bd654980a11408211768a2e files/5.5.20/jsr152build-xml-examples.patch 812
 RMD160 e9449414ef88de3e2b54c094c898d75f13e4c74e files/5.5.20/jsr152build-xml-examples.patch 812
 SHA256 36b91bb7ccb67ca31db41a8217c6762b1aff88b0611319aded08421401d7f9b0 files/5.5.20/jsr152build-xml-examples.patch 812
+AUX 5.5.20/jsr154_examples_build-xml.patch 406 RMD160 7e2c286db8b0bd4df722507c889f7e2deff65302 SHA1 1bfb15ad4eaec80f16a51f2e1bf0bed31792da38 SHA256 4e98264fb26027fbae39e8c44e44bb1151a84dc3defe6373ded0fd50e6bfd98b
+MD5 4834c2eada7c9c01cf69d9d5637eae62 files/5.5.20/jsr154_examples_build-xml.patch 406
+RMD160 7e2c286db8b0bd4df722507c889f7e2deff65302 files/5.5.20/jsr154_examples_build-xml.patch 406
+SHA256 4e98264fb26027fbae39e8c44e44bb1151a84dc3defe6373ded0fd50e6bfd98b files/5.5.20/jsr154_examples_build-xml.patch 406
 AUX 5.5.20/jsr154build-xml-examples.patch 836 RMD160 5a0cf4831345c904b5f9b3f89bcbbc0243e676e6 SHA1 29a59f40743784327d8be9307c40c291141fa5bf SHA256 84a82ef51e8cd0470ea3f388c16f3323024e87b74212ffab65977b5d9792a191
 MD5 e715be19acef459dbe33804fc0d8b35c files/5.5.20/jsr154build-xml-examples.patch 836
 RMD160 5a0cf4831345c904b5f9b3f89bcbbc0243e676e6 files/5.5.20/jsr154build-xml-examples.patch 836
@@ -90,6 +98,10 @@ AUX 5.5.20/tomcat.init 3402 RMD160 e5a519f5ceaf1ce2bda3a5b3c498371839dbd7a8 SHA1
 MD5 0721156789c9c4e8a8dba6a0bbbac990 files/5.5.20/tomcat.init 3402
 RMD160 e5a519f5ceaf1ce2bda3a5b3c498371839dbd7a8 files/5.5.20/tomcat.init 3402
 SHA256 c0de2947fa3a6f3d5c30a9e283de5aa99914f287b036faa7c509af0533144e52 files/5.5.20/tomcat.init 3402
+AUX 5.5.20/tomcat_build-xml.patch 13828 RMD160 3add8fb7d26bef7df205d3ec43e1a55cd6b739d4 SHA1 3a8ae3d686046f1938c71bd790d6f9ecf4339556 SHA256 9b1b9feb18d6f1dc5c2226c195f88a2f6cb9d68a2144e47e883fb57790c281f9
+MD5 47210f9a3e6b7c1809b34cfdab7fdb9b files/5.5.20/tomcat_build-xml.patch 13828
+RMD160 3add8fb7d26bef7df205d3ec43e1a55cd6b739d4 files/5.5.20/tomcat_build-xml.patch 13828
+SHA256 9b1b9feb18d6f1dc5c2226c195f88a2f6cb9d68a2144e47e883fb57790c281f9 files/5.5.20/tomcat_build-xml.patch 13828
 AUX 5.5.20/tomcatbuild-xml.patch 12470 RMD160 e936baf49d5f1a34b5b3c5787d62fb5a06ea52a2 SHA1 4857962223dc50dbb43e9e362e53f114723ff4d6 SHA256 d76b0dcc3a6d8d60c0305d74ef980e5461bbcaef1059a306e38e5d358c2a01a4
 MD5 83d2b72b5c1c52e80492ee5199eb3625 files/5.5.20/tomcatbuild-xml.patch 12470
 RMD160 e936baf49d5f1a34b5b3c5787d62fb5a06ea52a2 files/5.5.20/tomcatbuild-xml.patch 12470
@@ -127,18 +139,22 @@ EBUILD tomcat-5.5.20-r8.ebuild 10299 RMD160 dd99a6649a603e8262aeb33ae75a13466a3e
 MD5 8af16e1d4381d7656ed93be48867ad03 tomcat-5.5.20-r8.ebuild 10299
 RMD160 dd99a6649a603e8262aeb33ae75a13466a3e36aa tomcat-5.5.20-r8.ebuild 10299
 SHA256 9873ddf7870807f4bf6701a9f00ccc0202ae273c859a7c0c05a0e7c4c59a5601 tomcat-5.5.20-r8.ebuild 10299
-EBUILD tomcat-6.0.7_beta-r4.ebuild 4810 RMD160 3f86d7cc1c645fc4ed2648fb7ea4466caacdd790 SHA1 7c5cc93de40df8dea21efd1f1e4d22c197d6aa0d SHA256 deb61fe72a327f4438208599814c8c64fcd9efd394f3f08cbdb87d3bdb803c18
-MD5 ceb9db771cc0484f85cc49d6b7e171f9 tomcat-6.0.7_beta-r4.ebuild 4810
-RMD160 3f86d7cc1c645fc4ed2648fb7ea4466caacdd790 tomcat-6.0.7_beta-r4.ebuild 4810
-SHA256 deb61fe72a327f4438208599814c8c64fcd9efd394f3f08cbdb87d3bdb803c18 tomcat-6.0.7_beta-r4.ebuild 4810
-EBUILD tomcat-6.0.8_alpha-r1.ebuild 4812 RMD160 1343157691bb0a5a9f2fbec4f381dc17bcc37160 SHA1 9c830a7709f256624e6389f153228706c2f96cac SHA256 8faac466d80750a5f44e9718c7bd4494b09c429d5ad4d6181f9c3b7e15016193
-MD5 4159afb58fe80a7ff5931f7b47cfd6a1 tomcat-6.0.8_alpha-r1.ebuild 4812
-RMD160 1343157691bb0a5a9f2fbec4f381dc17bcc37160 tomcat-6.0.8_alpha-r1.ebuild 4812
-SHA256 8faac466d80750a5f44e9718c7bd4494b09c429d5ad4d6181f9c3b7e15016193 tomcat-6.0.8_alpha-r1.ebuild 4812
-MISC ChangeLog 34972 RMD160 226e3cba19c16a42b34f01648ebe523a8d4b049f SHA1 fca9916bfebc220314632bd23e046065c61cf1cb SHA256 07d6e7e787d81d569394b2adfa89f06e26f56daf51445aacbee1bcebcb3dcfa2
-MD5 537cf1c114fc0694d0086848b90ef04d ChangeLog 34972
-RMD160 226e3cba19c16a42b34f01648ebe523a8d4b049f ChangeLog 34972
-SHA256 07d6e7e787d81d569394b2adfa89f06e26f56daf51445aacbee1bcebcb3dcfa2 ChangeLog 34972
+EBUILD tomcat-5.5.20-r9.ebuild 10684 RMD160 bad5ac8824257cd764ff80b6e04855293c1b3d56 SHA1 232cea50261278bad777be81735997c4db49474e SHA256 91468c5b06ded16921bbedf9e4b3cd4772d180b78f0c361a63bd8adc67778b1b
+MD5 ffd2beb748b95a45f34b63657059f6db tomcat-5.5.20-r9.ebuild 10684
+RMD160 bad5ac8824257cd764ff80b6e04855293c1b3d56 tomcat-5.5.20-r9.ebuild 10684
+SHA256 91468c5b06ded16921bbedf9e4b3cd4772d180b78f0c361a63bd8adc67778b1b tomcat-5.5.20-r9.ebuild 10684
+EBUILD tomcat-6.0.7_beta-r4.ebuild 4808 RMD160 7bf6a14a724fe51a2926a27b517d268a09f9bc68 SHA1 738bb7511d1101af370c925b97e49de8bfdd4f5c SHA256 4f6b583033ffbe5be1f4a21d8dbbb31c76704a71f41481df1955f063f2df1139
+MD5 f05d9679890ac85f616689b20071ff0d tomcat-6.0.7_beta-r4.ebuild 4808
+RMD160 7bf6a14a724fe51a2926a27b517d268a09f9bc68 tomcat-6.0.7_beta-r4.ebuild 4808
+SHA256 4f6b583033ffbe5be1f4a21d8dbbb31c76704a71f41481df1955f063f2df1139 tomcat-6.0.7_beta-r4.ebuild 4808
+EBUILD tomcat-6.0.8_alpha-r1.ebuild 4810 RMD160 b4ffe5308cd1db6d532f11ccab18e3493558e052 SHA1 672ed1f41ce0a029a6830a5ae5dcaaa36195c087 SHA256 888252d67cea0f9a3b0851a46b5cb27d384b3bb36c92c508865e668ae3ab3d9a
+MD5 2ee8317bb2ac19ebdb7091bf9f627539 tomcat-6.0.8_alpha-r1.ebuild 4810
+RMD160 b4ffe5308cd1db6d532f11ccab18e3493558e052 tomcat-6.0.8_alpha-r1.ebuild 4810
+SHA256 888252d67cea0f9a3b0851a46b5cb27d384b3bb36c92c508865e668ae3ab3d9a tomcat-6.0.8_alpha-r1.ebuild 4810
+MISC ChangeLog 35583 RMD160 6865fd930e79fc8495ec730c9d395b0780a5ba5a SHA1 e933518825ed7974c253450f5071790bbc21f1c2 SHA256 c5f36ba216aaaf03edab613a9386e3feb6761f80f19afedee67fde6695fddfec
+MD5 32ac7af50dde4584bebf4e8b800d6133 ChangeLog 35583
+RMD160 6865fd930e79fc8495ec730c9d395b0780a5ba5a ChangeLog 35583
+SHA256 c5f36ba216aaaf03edab613a9386e3feb6761f80f19afedee67fde6695fddfec ChangeLog 35583
 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79
 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556
 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556
@@ -155,6 +171,9 @@ SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/di
 MD5 8adc14a8534e1c6f8d5f96b371e1895f files/digest-tomcat-5.5.20-r8 277
 RMD160 b9c5deac84bf5acd7a65ad80bdfaca9f7e343f3f files/digest-tomcat-5.5.20-r8 277
 SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/digest-tomcat-5.5.20-r8 277
+MD5 8adc14a8534e1c6f8d5f96b371e1895f files/digest-tomcat-5.5.20-r9 277
+RMD160 b9c5deac84bf5acd7a65ad80bdfaca9f7e343f3f files/digest-tomcat-5.5.20-r9 277
+SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/digest-tomcat-5.5.20-r9 277
 MD5 ae090639fc2a4b844084020e9fd68796 files/digest-tomcat-6.0.7_beta-r4 274
 RMD160 887290424c340b8a024770ae6ee2adeb0252b5ea files/digest-tomcat-6.0.7_beta-r4 274
 SHA256 8c88ae20979c83fd4529d2493cf5bfc63d86ff37cb46af296db58166d2e0ad3d files/digest-tomcat-6.0.7_beta-r4 274