From fb5bd91f350f9f70a0e34b224d8807a682d7f181 Mon Sep 17 00:00:00 2001 From: William Thomson Date: Fri, 8 Dec 2006 07:00:55 +0000 Subject: [PATCH] Rev bumped 6.0.x ebuild, consolidated files for the slot instead of per version. Removed obsolete 5.5.17 files. Package-Manager: portage-2.1.2_rc2-r4 --- www-servers/tomcat/Manifest | 92 +++------- .../files/5.5.17/catalinabuild-xml.patch | 30 ---- .../tomcat/files/5.5.17/jasperbuild-xml.patch | 10 -- .../5.5.17/jsr152build-xml-examples.patch | 28 --- .../5.5.17/jsr154build-xml-examples.patch | 28 --- .../tomcat/files/5.5.17/mainbuild-xml.patch | 19 -- www-servers/tomcat/files/5.5.17/tomcat.conf | 72 -------- www-servers/tomcat/files/5.5.17/tomcat.env | 1 - www-servers/tomcat/files/5.5.17/tomcat.init | 86 --------- .../files/5.5.17/tomcatbuild-xml-docs.patch | 120 ------------- .../5.5.17/tomcatbuild-xml-examples.patch | 84 --------- .../tomcat/files/5.5.17/tomcatbuild-xml.patch | 148 ---------------- .../tomcat/files/{6.0.2 => 6}/build-xml.patch | 0 .../tomcat/files/{6.0.2 => 6}/tomcat.conf | 2 +- .../tomcat/files/{6.0.2 => 6}/tomcat.init | 2 +- www-servers/tomcat/files/digest-tomcat-6.0.2 | 3 - www-servers/tomcat/tomcat-6.0.2.ebuild | 164 ------------------ 17 files changed, 26 insertions(+), 863 deletions(-) delete mode 100644 www-servers/tomcat/files/5.5.17/catalinabuild-xml.patch delete mode 100644 www-servers/tomcat/files/5.5.17/jasperbuild-xml.patch delete mode 100644 www-servers/tomcat/files/5.5.17/jsr152build-xml-examples.patch delete mode 100644 www-servers/tomcat/files/5.5.17/jsr154build-xml-examples.patch delete mode 100644 www-servers/tomcat/files/5.5.17/mainbuild-xml.patch delete mode 100644 www-servers/tomcat/files/5.5.17/tomcat.conf delete mode 100644 www-servers/tomcat/files/5.5.17/tomcat.env delete mode 100755 www-servers/tomcat/files/5.5.17/tomcat.init delete mode 100644 www-servers/tomcat/files/5.5.17/tomcatbuild-xml-docs.patch delete mode 100644 www-servers/tomcat/files/5.5.17/tomcatbuild-xml-examples.patch delete mode 100644 www-servers/tomcat/files/5.5.17/tomcatbuild-xml.patch rename www-servers/tomcat/files/{6.0.2 => 6}/build-xml.patch (100%) rename www-servers/tomcat/files/{6.0.2 => 6}/tomcat.conf (95%) rename www-servers/tomcat/files/{6.0.2 => 6}/tomcat.init (96%) delete mode 100644 www-servers/tomcat/files/digest-tomcat-6.0.2 delete mode 100644 www-servers/tomcat/tomcat-6.0.2.ebuild diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 524527c8044d..6640ca2a6224 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -62,50 +62,6 @@ AUX 5.0.28/tomcat.init 3013 RMD160 360df30bb9bf5b78b7ed0bb159e37c5af1898956 SHA1 MD5 197b154fc7a14fcd433e86700f082252 files/5.0.28/tomcat.init 3013 RMD160 360df30bb9bf5b78b7ed0bb159e37c5af1898956 files/5.0.28/tomcat.init 3013 SHA256 083b5bd790a43c4f161dcce01e75bfc8927aa8f293aad26fe0e2cfba1f918815 files/5.0.28/tomcat.init 3013 -AUX 5.5.17/catalinabuild-xml.patch 1149 RMD160 9622ca4f688e2c57e4bc34f08ceebb651f75deb1 SHA1 8eda11132851da5773ceb33f90515f0c8ffabdb6 SHA256 dc2d7255dd990359f765f329a04825aca18888e505b4024bb64e0dc6e348498e -MD5 4b2dbaa2a74776229f4fffa1274d0a13 files/5.5.17/catalinabuild-xml.patch 1149 -RMD160 9622ca4f688e2c57e4bc34f08ceebb651f75deb1 files/5.5.17/catalinabuild-xml.patch 1149 -SHA256 dc2d7255dd990359f765f329a04825aca18888e505b4024bb64e0dc6e348498e files/5.5.17/catalinabuild-xml.patch 1149 -AUX 5.5.17/jasperbuild-xml.patch 463 RMD160 d042043acbaafa7b2be42f071846d5fbe970fa62 SHA1 f168e9ff231e1ccd727367a03f0fdefde3c36a1a SHA256 8c0758f6f2e556d317087389b7649bc709d738679be7965a50329b724c6e8714 -MD5 0139160e01d9f8c37007e700adc14edd files/5.5.17/jasperbuild-xml.patch 463 -RMD160 d042043acbaafa7b2be42f071846d5fbe970fa62 files/5.5.17/jasperbuild-xml.patch 463 -SHA256 8c0758f6f2e556d317087389b7649bc709d738679be7965a50329b724c6e8714 files/5.5.17/jasperbuild-xml.patch 463 -AUX 5.5.17/jsr152build-xml-examples.patch 812 RMD160 e9449414ef88de3e2b54c094c898d75f13e4c74e SHA1 5455201aba4cca42b000477375516a45c380c766 SHA256 36b91bb7ccb67ca31db41a8217c6762b1aff88b0611319aded08421401d7f9b0 -MD5 4c33bf7e8bd654980a11408211768a2e files/5.5.17/jsr152build-xml-examples.patch 812 -RMD160 e9449414ef88de3e2b54c094c898d75f13e4c74e files/5.5.17/jsr152build-xml-examples.patch 812 -SHA256 36b91bb7ccb67ca31db41a8217c6762b1aff88b0611319aded08421401d7f9b0 files/5.5.17/jsr152build-xml-examples.patch 812 -AUX 5.5.17/jsr154build-xml-examples.patch 836 RMD160 5a0cf4831345c904b5f9b3f89bcbbc0243e676e6 SHA1 29a59f40743784327d8be9307c40c291141fa5bf SHA256 84a82ef51e8cd0470ea3f388c16f3323024e87b74212ffab65977b5d9792a191 -MD5 e715be19acef459dbe33804fc0d8b35c files/5.5.17/jsr154build-xml-examples.patch 836 -RMD160 5a0cf4831345c904b5f9b3f89bcbbc0243e676e6 files/5.5.17/jsr154build-xml-examples.patch 836 -SHA256 84a82ef51e8cd0470ea3f388c16f3323024e87b74212ffab65977b5d9792a191 files/5.5.17/jsr154build-xml-examples.patch 836 -AUX 5.5.17/mainbuild-xml.patch 482 RMD160 61e18d765777294144c8f6745cceee5a18d72db4 SHA1 c75ef0ca7b88fb34aacc0ec9f59aeb8f2239b469 SHA256 7a9dbb7d8a0be4399792417b6bdfd04b7a090b8d9a39b1b03050f0066a90b559 -MD5 9f2ec43ff05ee924217e510c65d8150e files/5.5.17/mainbuild-xml.patch 482 -RMD160 61e18d765777294144c8f6745cceee5a18d72db4 files/5.5.17/mainbuild-xml.patch 482 -SHA256 7a9dbb7d8a0be4399792417b6bdfd04b7a090b8d9a39b1b03050f0066a90b559 files/5.5.17/mainbuild-xml.patch 482 -AUX 5.5.17/tomcat.conf 2551 RMD160 b28f65a4488b706f026f561ea983757f7e93b38d SHA1 9f0c76f5e10809e90be8ef085ae80db49700063c SHA256 8e2f98fd2a60a9486627f0a1f344dc9f3b20c35332d1828a13deea5f1b107984 -MD5 e5f62d19088288b71befd9fcbf89f26d files/5.5.17/tomcat.conf 2551 -RMD160 b28f65a4488b706f026f561ea983757f7e93b38d files/5.5.17/tomcat.conf 2551 -SHA256 8e2f98fd2a60a9486627f0a1f344dc9f3b20c35332d1828a13deea5f1b107984 files/5.5.17/tomcat.conf 2551 -AUX 5.5.17/tomcat.env 36 RMD160 2d6488d26696ec0624b7774d3a31cb02afeaeea0 SHA1 1c9ad9ffa7dcaa5f071631d8a1bc65519b2eec15 SHA256 c2aa217a92fb637fb81a77c98cd769932923bbe65e72c25295993f7cf4982fef -MD5 f41b77c0652379c5cfbe0f04bf99b4c2 files/5.5.17/tomcat.env 36 -RMD160 2d6488d26696ec0624b7774d3a31cb02afeaeea0 files/5.5.17/tomcat.env 36 -SHA256 c2aa217a92fb637fb81a77c98cd769932923bbe65e72c25295993f7cf4982fef files/5.5.17/tomcat.env 36 -AUX 5.5.17/tomcat.init 3142 RMD160 ba6892dbcbdaa9f2134f6514459536d9d8667258 SHA1 11182aa28c2abc3c9a5e9ae9c373ca78ad5b243e SHA256 c661a8696ff64eec95d0952ffb09b1166377af3ee2763aa27177a6916fd17c5c -MD5 16405fc26678f5ca2aa15e59f2bd33ee files/5.5.17/tomcat.init 3142 -RMD160 ba6892dbcbdaa9f2134f6514459536d9d8667258 files/5.5.17/tomcat.init 3142 -SHA256 c661a8696ff64eec95d0952ffb09b1166377af3ee2763aa27177a6916fd17c5c files/5.5.17/tomcat.init 3142 -AUX 5.5.17/tomcatbuild-xml-docs.patch 4745 RMD160 ad084d8290dd628a4b1e1a13bfdc3dca7446fa04 SHA1 7c2d036d8931409dab360ed83346a6fc69203cf4 SHA256 ac0248500302ff5bac595296e30008dccc5e901c13a998aff859a36c6c8945ff -MD5 ca2c6c89f893448ccaeebff6255b285f files/5.5.17/tomcatbuild-xml-docs.patch 4745 -RMD160 ad084d8290dd628a4b1e1a13bfdc3dca7446fa04 files/5.5.17/tomcatbuild-xml-docs.patch 4745 -SHA256 ac0248500302ff5bac595296e30008dccc5e901c13a998aff859a36c6c8945ff files/5.5.17/tomcatbuild-xml-docs.patch 4745 -AUX 5.5.17/tomcatbuild-xml-examples.patch 2766 RMD160 2693d0e3c1a61eec4a001332648e21be92741c60 SHA1 0269427e4cc658fbccda30a5f6061a485bdbcd9c SHA256 5f4f8541fd68b71ae659d970e0671c35f3f4edcd54e54e2f9db44876dbeb0824 -MD5 263ec369e78ddd9d4bfc7e60de2b1a9d files/5.5.17/tomcatbuild-xml-examples.patch 2766 -RMD160 2693d0e3c1a61eec4a001332648e21be92741c60 files/5.5.17/tomcatbuild-xml-examples.patch 2766 -SHA256 5f4f8541fd68b71ae659d970e0671c35f3f4edcd54e54e2f9db44876dbeb0824 files/5.5.17/tomcatbuild-xml-examples.patch 2766 -AUX 5.5.17/tomcatbuild-xml.patch 5235 RMD160 b82aae53ac882e5914aea8dfc8f80283bee7f9b1 SHA1 7a97a4e3ab76228c3d6964355dd3b5a9b3bce33a SHA256 d5f621c8d3972a88a057db3c028baedf4affab4333c3f1c6117461d3dd0b6cec -MD5 276495751102b4c1e19aa944043055e6 files/5.5.17/tomcatbuild-xml.patch 5235 -RMD160 b82aae53ac882e5914aea8dfc8f80283bee7f9b1 files/5.5.17/tomcatbuild-xml.patch 5235 -SHA256 d5f621c8d3972a88a057db3c028baedf4affab4333c3f1c6117461d3dd0b6cec files/5.5.17/tomcatbuild-xml.patch 5235 AUX 5.5.20/catalinabuild-xml.patch 1149 RMD160 9622ca4f688e2c57e4bc34f08ceebb651f75deb1 SHA1 8eda11132851da5773ceb33f90515f0c8ffabdb6 SHA256 dc2d7255dd990359f765f329a04825aca18888e505b4024bb64e0dc6e348498e MD5 4b2dbaa2a74776229f4fffa1274d0a13 files/5.5.20/catalinabuild-xml.patch 1149 RMD160 9622ca4f688e2c57e4bc34f08ceebb651f75deb1 files/5.5.20/catalinabuild-xml.patch 1149 @@ -138,20 +94,20 @@ AUX 5.5.20/tomcatbuild-xml.patch 12470 RMD160 e936baf49d5f1a34b5b3c5787d62fb5a06 MD5 83d2b72b5c1c52e80492ee5199eb3625 files/5.5.20/tomcatbuild-xml.patch 12470 RMD160 e936baf49d5f1a34b5b3c5787d62fb5a06ea52a2 files/5.5.20/tomcatbuild-xml.patch 12470 SHA256 d76b0dcc3a6d8d60c0305d74ef980e5461bbcaef1059a306e38e5d358c2a01a4 files/5.5.20/tomcatbuild-xml.patch 12470 -AUX 6.0.2/build-xml.patch 785 RMD160 d5d296009e86e0aec3aaf1ba4d1651dc7358d23c SHA1 085f416f6f68931b5c22f69af993188dea425a99 SHA256 51920be0dce79f1ea562ef46120e866ded371049e54f16a8e064e1b68b3d239c -MD5 23fa5265de5dc6680c3c9e4c7806d382 files/6.0.2/build-xml.patch 785 -RMD160 d5d296009e86e0aec3aaf1ba4d1651dc7358d23c files/6.0.2/build-xml.patch 785 -SHA256 51920be0dce79f1ea562ef46120e866ded371049e54f16a8e064e1b68b3d239c files/6.0.2/build-xml.patch 785 -AUX 6.0.2/tomcat.conf 2673 RMD160 a24b40e17f3b1715133144b8545c664340e9f138 SHA1 02bbf9ea3552cf24669f9d1ff7a7c57e618403ef SHA256 616ced5d8525f58b3d249c5d440d1b91107c2a100b6c1cf2f58891586a0f79da -MD5 c91be163057fbe162534ab72eba7eed2 files/6.0.2/tomcat.conf 2673 -RMD160 a24b40e17f3b1715133144b8545c664340e9f138 files/6.0.2/tomcat.conf 2673 -SHA256 616ced5d8525f58b3d249c5d440d1b91107c2a100b6c1cf2f58891586a0f79da files/6.0.2/tomcat.conf 2673 -AUX 6.0.2/tomcat.init 3081 RMD160 d711863c68c9aa08d3df54fd9a917a667e3345c2 SHA1 2299892e2e0fe6037116e01849a0fa2047f0f695 SHA256 ec298388424ec538a8043cff413bb60d95afe07c2cee20a321d460dc94fa7e20 -MD5 1a100e4db4174d05ce49080d5a6d0845 files/6.0.2/tomcat.init 3081 -RMD160 d711863c68c9aa08d3df54fd9a917a667e3345c2 files/6.0.2/tomcat.init 3081 -SHA256 ec298388424ec538a8043cff413bb60d95afe07c2cee20a321d460dc94fa7e20 files/6.0.2/tomcat.init 3081 +AUX 6/build-xml.patch 785 RMD160 d5d296009e86e0aec3aaf1ba4d1651dc7358d23c SHA1 085f416f6f68931b5c22f69af993188dea425a99 SHA256 51920be0dce79f1ea562ef46120e866ded371049e54f16a8e064e1b68b3d239c +MD5 23fa5265de5dc6680c3c9e4c7806d382 files/6/build-xml.patch 785 +RMD160 d5d296009e86e0aec3aaf1ba4d1651dc7358d23c files/6/build-xml.patch 785 +SHA256 51920be0dce79f1ea562ef46120e866ded371049e54f16a8e064e1b68b3d239c files/6/build-xml.patch 785 +AUX 6/tomcat.conf 2673 RMD160 a24b40e17f3b1715133144b8545c664340e9f138 SHA1 02bbf9ea3552cf24669f9d1ff7a7c57e618403ef SHA256 616ced5d8525f58b3d249c5d440d1b91107c2a100b6c1cf2f58891586a0f79da +MD5 c91be163057fbe162534ab72eba7eed2 files/6/tomcat.conf 2673 +RMD160 a24b40e17f3b1715133144b8545c664340e9f138 files/6/tomcat.conf 2673 +SHA256 616ced5d8525f58b3d249c5d440d1b91107c2a100b6c1cf2f58891586a0f79da files/6/tomcat.conf 2673 +AUX 6/tomcat.init 3081 RMD160 d711863c68c9aa08d3df54fd9a917a667e3345c2 SHA1 2299892e2e0fe6037116e01849a0fa2047f0f695 SHA256 ec298388424ec538a8043cff413bb60d95afe07c2cee20a321d460dc94fa7e20 +MD5 1a100e4db4174d05ce49080d5a6d0845 files/6/tomcat.init 3081 +RMD160 d711863c68c9aa08d3df54fd9a917a667e3345c2 files/6/tomcat.init 3081 +SHA256 ec298388424ec538a8043cff413bb60d95afe07c2cee20a321d460dc94fa7e20 files/6/tomcat.init 3081 DIST apache-tomcat-5.5.20-src.tar.gz 4796377 RMD160 587590d2e272d1ede73501b62933f544cd969822 SHA1 cc416242d8c9e1978702a207e305ca97afe53d4d SHA256 19f24717fb3e2db902c33e21650dfa88bbf98428c15b1ed68ecaf7a9150e4a77 -DIST apache-tomcat-6.0.2-src.tar.gz 3244552 RMD160 9061581c2d43d2368d47570eb5841dffd50bd961 SHA1 19b03dbb65d1784266aee30a15de66d38486426c SHA256 77c7facbaa3460aef31cb7695fe8138f8f82abd03e8273658687a630e756e324 +DIST apache-tomcat-6.0.4-src.tar.gz 3210081 RMD160 67353d8c5a275517e56b2de236bdb19ebebaf7ff SHA1 9afd320c1274ae60d70e763915d6dd0c843df8c2 SHA256 f9383a861e489fcac2a7a98aad753744b48e1c6f52d8eb09e123a304b558244e DIST jakarta-tomcat-5.0.27.tar.gz 10298374 RMD160 a333fcb531bb98af20db6e0a10d3e8b2c72ee1fa SHA1 5f3981ecdd67e2b9774e643b336ad98ebc1bd4e3 SHA256 873fc94b4316235091e69bca926bd66a0fb9fab542016e582a03323ed6777d78 DIST jakarta-tomcat-5.0.28-src.tar.gz 3565766 RMD160 22c5e60b2c5009dc33a62edcefa6760d82da859b SHA1 a4ac2ad52f8b8db8ae8c38979f5f50713e242e36 SHA256 bbf584b3c376d23d92b1a0d306eb8f3729cea244c7a850f81d2527a7df6d20fc EBUILD tomcat-5.0.27-r6.ebuild 3877 RMD160 4efe03ed845aa3781273958de248e63aa7195746 SHA1 717e7d059afd5e0a99647e98f762a8bd8181a765 SHA256 9f1947f2f3ef429125dc9a144d2f0f13fd82103779f9c1eada1f8f3a54ab9c2b @@ -166,14 +122,14 @@ EBUILD tomcat-5.5.20-r2.ebuild 10177 RMD160 33a47ba1a347bc913278eea38a6194051cb8 MD5 8f2de90288b7661deeda91757afb2a10 tomcat-5.5.20-r2.ebuild 10177 RMD160 33a47ba1a347bc913278eea38a6194051cb8094b tomcat-5.5.20-r2.ebuild 10177 SHA256 249959923f28a2a213180cfa69172211f5c0e5eecb8e3d5e755b0f31293efe2d tomcat-5.5.20-r2.ebuild 10177 -EBUILD tomcat-6.0.2.ebuild 4710 RMD160 9cb4194bba00500f1a03f1b5355a5c9fac26637b SHA1 b5c58296f5a115d95fcb21110f0f57ae2ae50020 SHA256 6aa88555628381bf226f9e1321b31ad4b71f87c56b974ffbc0653b7d5db43869 -MD5 694e0ad892fa9963ff56d030127f1858 tomcat-6.0.2.ebuild 4710 -RMD160 9cb4194bba00500f1a03f1b5355a5c9fac26637b tomcat-6.0.2.ebuild 4710 -SHA256 6aa88555628381bf226f9e1321b31ad4b71f87c56b974ffbc0653b7d5db43869 tomcat-6.0.2.ebuild 4710 -MISC ChangeLog 27777 RMD160 672f24ba9facef184d0bdeaf36161276d7144f71 SHA1 2c33a6032a97c63d415b0f61c771910ff5fcef4c SHA256 b0524863fdcb7e2bb7081973e9fa9cbab80eb251a72878bbfc9f8058dd941283 -MD5 53ff2c8e9184fdc88da6f0c3274b7e76 ChangeLog 27777 -RMD160 672f24ba9facef184d0bdeaf36161276d7144f71 ChangeLog 27777 -SHA256 b0524863fdcb7e2bb7081973e9fa9cbab80eb251a72878bbfc9f8058dd941283 ChangeLog 27777 +EBUILD tomcat-6.0.4.ebuild 4716 RMD160 309863239ed515e512a802f0528871adb7206d05 SHA1 621f00869458a4367a67edd61c60aa8e385000b5 SHA256 efffab544c02acf078db3bdeb0b6b67a1c42f2112f9adc4d846bf11ce14e8a5b +MD5 7e1a1931d8c6ce8e6cc9b0f7539b7ac2 tomcat-6.0.4.ebuild 4716 +RMD160 309863239ed515e512a802f0528871adb7206d05 tomcat-6.0.4.ebuild 4716 +SHA256 efffab544c02acf078db3bdeb0b6b67a1c42f2112f9adc4d846bf11ce14e8a5b tomcat-6.0.4.ebuild 4716 +MISC ChangeLog 28606 RMD160 e7897480e12ddfab55efc8a0593bc81621a0f933 SHA1 fde9ed7ae861330e0d02c1cff63f0b7ae5b108bd SHA256 a58cc5185a5d7c72989ac959f31e682a8d27b9da2e53d8ea3d23ff6294d045ef +MD5 348952ee27d8f97974a352082dafe8db ChangeLog 28606 +RMD160 e7897480e12ddfab55efc8a0593bc81621a0f933 ChangeLog 28606 +SHA256 a58cc5185a5d7c72989ac959f31e682a8d27b9da2e53d8ea3d23ff6294d045ef ChangeLog 28606 MISC metadata.xml 558 RMD160 f81f3d20ca526007bbd8f0f88deffb7a097334ea SHA1 6ab9eadb2a8f19b0d4ea1f02ba88315d49e61fb1 SHA256 d5b4cdcd581677edce5b62c586d618f4c95660127fcb2fb7157f83e6d0e35fce MD5 e26537a19167254676bb36654dc01f91 metadata.xml 558 RMD160 f81f3d20ca526007bbd8f0f88deffb7a097334ea metadata.xml 558 @@ -187,6 +143,6 @@ SHA256 2c09d3ad89eb04ab24e5c95a9492d7f461e1935bdb076100010cd3d4f7cb8796 files/di MD5 8adc14a8534e1c6f8d5f96b371e1895f files/digest-tomcat-5.5.20-r2 277 RMD160 b9c5deac84bf5acd7a65ad80bdfaca9f7e343f3f files/digest-tomcat-5.5.20-r2 277 SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/digest-tomcat-5.5.20-r2 277 -MD5 b8faa06ed7ce8aac00eaf7c6cfc18afc files/digest-tomcat-6.0.2 274 -RMD160 46958bfcb35d84de3df9249238b99faa12fb79ae files/digest-tomcat-6.0.2 274 -SHA256 da0e2d6c74a9b909142a5296d92d688ea4b25f1bc21227da983206f5d2b7c924 files/digest-tomcat-6.0.2 274 +MD5 9769185a9c73b3ce5fd94872335f6687 files/digest-tomcat-6.0.4 274 +RMD160 ad9c1e6e82cc663e4e29b6df0c745e908b71b6bf files/digest-tomcat-6.0.4 274 +SHA256 2d408d8f09d648a39784eaf3996957a58487a18ec0df69a2654db18e41089a59 files/digest-tomcat-6.0.4 274 diff --git a/www-servers/tomcat/files/5.5.17/catalinabuild-xml.patch b/www-servers/tomcat/files/5.5.17/catalinabuild-xml.patch deleted file mode 100644 index da6b96901aab..000000000000 --- a/www-servers/tomcat/files/5.5.17/catalinabuild-xml.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- apache-tomcat-5.5.15-src/container/catalina/build.xml 2006-01-03 10:15:07.000000000 -0500 -+++ container/catalina/build.xml 2006-01-28 11:57:25.000000000 -0500 -@@ -60,6 +60,7 @@ - - - -+ - - - -@@ -91,6 +92,7 @@ - - - -+ - - - -@@ -548,9 +550,10 @@ - -+ - - - diff --git a/www-servers/tomcat/files/5.5.17/jasperbuild-xml.patch b/www-servers/tomcat/files/5.5.17/jasperbuild-xml.patch deleted file mode 100644 index 1f0de5f8a04f..000000000000 --- a/www-servers/tomcat/files/5.5.17/jasperbuild-xml.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- jasper/build.xml 2005-02-13 19:28:36.000000000 +0100 -+++ jasper/build.xml 2005-02-13 20:46:15.554972064 +0100 -@@ -30,6 +30,7 @@ - - - -+ - - - diff --git a/www-servers/tomcat/files/5.5.17/jsr152build-xml-examples.patch b/www-servers/tomcat/files/5.5.17/jsr152build-xml-examples.patch deleted file mode 100644 index 933e2aa48242..000000000000 --- a/www-servers/tomcat/files/5.5.17/jsr152build-xml-examples.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- apache-tomcat-5.5.17-src/servletapi/jsr152/build.xml 2006-07-29 14:13:41.000000000 -0400 -+++ servletapi/jsr152/build.xml 2006-07-29 14:13:17.000000000 -0400 -@@ -119,6 +119,7 @@ - classpath="${jsp-anttask.jar}" /> - - -+ - - - - -- - - diff --git a/www-servers/tomcat/files/5.5.17/jsr154build-xml-examples.patch b/www-servers/tomcat/files/5.5.17/jsr154build-xml-examples.patch deleted file mode 100644 index 4dac35390f1d..000000000000 --- a/www-servers/tomcat/files/5.5.17/jsr154build-xml-examples.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- apache-tomcat-5.5.17-src/servletapi/jsr154/build.xml 2006-04-14 14:12:10.000000000 -0400 -+++ servletapi/jsr154/build.xml 2006-07-29 14:41:05.000000000 -0400 -@@ -99,6 +99,7 @@ - - - -+ - - - - -- - - diff --git a/www-servers/tomcat/files/5.5.17/mainbuild-xml.patch b/www-servers/tomcat/files/5.5.17/mainbuild-xml.patch deleted file mode 100644 index 7ef15860cb5c..000000000000 --- a/www-servers/tomcat/files/5.5.17/mainbuild-xml.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- apache-tomcat-5.5.15-src/build.xml -+++ build.xml -@@ -64,13 +64,14 @@ - - -+ - - - - diff --git a/www-servers/tomcat/files/5.5.17/tomcat.conf b/www-servers/tomcat/files/5.5.17/tomcat.conf deleted file mode 100644 index 04b5705bb7e2..000000000000 --- a/www-servers/tomcat/files/5.5.17/tomcat.conf +++ /dev/null @@ -1,72 +0,0 @@ -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.5.17/tomcat.conf,v 1.2 2006/09/04 01:18:50 wltjr Exp $ - -# JVM Runtime -# Using the default setting, it will determine your JVM from the system-vm -# set using java-config. -# See java-config(1) manual page for assistance in determining this value. -# -# You can override this value with whatever path you wish. -# Example: JAVA_HOME=/opt/sun-jdk-1.4.2.05 - -JAVA_HOME=`java-config --jre-home` - -# (Optional) Java runtime options used when the "start", "stop", or "run" -# commands are executed. -# JAVA_OPTS="" - -# Where your web applications are located -CATALINA_HOME=/usr/share/tomcat-5.5/ -CATALINA_BASE=/var/lib/tomcat-5.5/ - -# Tomcat's User -CATALINA_USER=tomcat - -# Location of the Tomcat JARs and classes -CATALINA_LIBDIR=/usr/share/tomcat-5.5/server/lib/ - -# The CLASSPATH for Tomcat to use, plus any others you need. -CLASSPATH=${CATALINA_LIBDIR} - -# (Optional) Directory path location of temporary directory the JVM should -# use (java.io.tmpdir). Defaults to $CATALINA_BASE/temp. -CATALINA_TMPDIR="/var/tmp/tomcat-5.5/" - -# TOMCAT STARTUP/SHUTDOWN -# debug Start Catalina in a debugger -# debug -security Debug Catalina with a security manager -# jpda start Start Catalina under JPDA debugger -# start Start Catalina in a separate window -# start -security Start in a separate window with security manager -# stop Stop Catalina" -# -# NOTE: -security requires JSSE (see below) -# NOTE: jpda requires JPDA (see below) -TOMCAT_START="start" -TOMCAT_STOP="stop" - -# (Optional) Java runtime options used when the "start", "stop", or "run" -# commands are executed. -# CATALINA_OPTS="" - -# Java Platform Debugger Architecture (JPDA) -# http://java.sun.com/products/jpda/ -# Included with Java SDK 1.3 and later. No need to specify location. -# -# JPDA_TRANSPORT (Optional) JPDA transport used when the "jpda start" -# command is executed. The default is "dt_socket". -# -# JPDA_ADDRESS (Optional) Java runtime options used when the "jpda start" -# command is executed. The default is 8000. -# -# JPDA_TRANSPORT="dt_socket" -# JPDA_ADDRESS="8000" - -# Java Secure Socket Extension (JSSE) -# http://java.sun.com/products/jsse/ -# Included with Java SDK 1.4 and later. -# -# JSSE_HOME (Optional) May point at your Java Secure Sockets Extension -# (JSSE) installation, whose JAR files will be added to the -# system class path used to start Tomcat. -# -# JSSE_HOME="/opt/sun-jdk-1.4.1.02/jre/lib/" diff --git a/www-servers/tomcat/files/5.5.17/tomcat.env b/www-servers/tomcat/files/5.5.17/tomcat.env deleted file mode 100644 index 8afb01ff1d8e..000000000000 --- a/www-servers/tomcat/files/5.5.17/tomcat.env +++ /dev/null @@ -1 +0,0 @@ -CATALINA_HOME=/usr/share/tomcat-5.5 diff --git a/www-servers/tomcat/files/5.5.17/tomcat.init b/www-servers/tomcat/files/5.5.17/tomcat.init deleted file mode 100755 index 8c16ced6fbf7..000000000000 --- a/www-servers/tomcat/files/5.5.17/tomcat.init +++ /dev/null @@ -1,86 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.5.17/tomcat.init,v 1.6 2006/09/26 19:48:17 wltjr Exp $ - -init_env_vars() { - # Set some sane defaults - if [ -z "${CATALINA_TMPDIR}" ] ; then - CATALINA_TMPDIR="${CATALINA_BASE}"/temp - fi - JPDA_TRANSPORT=${JPDA_TRANSPORT:="dt_socket"} - JPDA_ADDRESS=${JPDA_ADDRESS:="8000"} - JPDA_OPTS=${JPDA_OPTS="-Xdebug -Xrunjdwp:transport=${JPDA_TRANSPORT},address=${JPDA_ADDRESS},server=y,suspend=n"} - - # Activate Logging - if [[ -r "${CATALINA_HOME}"/bin/tomcat-juli.jar ]]; then - JAVA_OPTS="${JAVA_OPTS} -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager \ - -Djava.util.logging.config.file=${CATALINA_BASE}/conf/logging.properties" - fi - - # Populate the classpath - CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/server/lib:${JAVA_HOME}/lib/tools.jar" - if [[ -n "${JSSE_HOME}" ]]; then - CLASSPATH="${CLASSPATH}:${JSSE_HOME}/lib/jcert.jar:${JSSE_HOME}/lib/jnet.jar:${JSSE_HOME}/lib/jsse.jar" - fi - CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar:${CATALINA_HOME}/bin/commons-logging-api.jar" - - OPTS_CP="${JAVA_OPTS} ${CATALINA_OPTS} \ - -Djava.endorsed.dirs=${CATALINA_HOME}/common/endorsed \ - -classpath ${CLASSPATH}" - - CATALINA_ARGS="-Dcatalina.base=${CATALINA_BASE} \ - -Dcatalina.home=${CATALINA_HOME} \ - -Djava.io.tmpdir=${CATALINA_TMPDIR} \ - org.apache.catalina.startup.Bootstrap " -} - -start-helper() { - local executor=${1} - shift - local arguments="--start --quiet --background --chuid tomcat:tomcat \ - --make-pidfile --pidfile /var/run/tomcat.pid" - start-stop-daemon ${arguments} --exec ${executor} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${TOMCAT_START} - return $? -} - -depend() { - use dns logger net -} - -start() { - ebegin "Starting Tomcat" - init_env_vars - # Figure out what arguments to pass start-helper based on TOMCAT_START - if [[ "${TOMCAT_START}" == "debug" ]] ; then - start-helper ${JAVA_HOME}/bin/jdb \ - -sourcepath ${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share - elif [[ "${TOMCAT_START}" == "debug -security" ]] ; then - start-helper ${JAVA_HOME}/bin/jdb \ - -sourcepath ${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share \ - -Djava.security.manager \ - -Djava.security.policy=${CATALINA_BASE}/conf/catalina.policy - elif [[ "${TOMCAT_START}" == "jpda start" ]] ; then - start-helper ${JAVA_HOME}/bin/java ${JPDA_OPTS} - elif [[ "${TOMCAT_START}" == "start" ]] ; then - start-helper ${JAVA_HOME}/bin/java - elif [[ "${TOMCAT_START}" == "start -security" ]] ; then - start-helper ${JAVA_HOME}/bin/java \ - -Djava.security.manager \ - -Djava.security.policy=${CATALINA_BASE}/conf/catalina.policy - else - eerror "Invalid TOMCAT_START variable value, or one is not set" - eerror "Please see /etc/conf.d/tomcat-5.5 for more information" - eend 1 - fi - eend $? -} - -stop() { - ebegin "Stopping Tomcat" - init_env_vars - start-stop-daemon --stop --quiet \ - --make-pidfile --pidfile /var/run/tomcat.pid \ - --exec ${JAVA_HOME}/bin/java -- ${OPTS_CP} ${CATALINA_ARGS} stop - eend $? -} diff --git a/www-servers/tomcat/files/5.5.17/tomcatbuild-xml-docs.patch b/www-servers/tomcat/files/5.5.17/tomcatbuild-xml-docs.patch deleted file mode 100644 index 513eeefe5d34..000000000000 --- a/www-servers/tomcat/files/5.5.17/tomcatbuild-xml-docs.patch +++ /dev/null @@ -1,120 +0,0 @@ ---- apache-tomcat-5.5.17-src/build/build.xml 2006-04-14 14:11:26.000000000 -0400 -+++ build.xml 2006-07-29 14:58:08.000000000 -0400 -@@ -788,6 +788,7 @@ - - - -+ - - - -@@ -843,11 +845,13 @@ - filtering="true" /> - - -+ - - - -@@ -1027,6 +1031,7 @@ - - - -+ -+ - - - -@@ -1344,8 +1350,8 @@ - - - -- - - - - -@@ -1366,6 +1371,7 @@ - - - -+ --> - - - -@@ -1441,7 +1447,7 @@ - - - -- - - -@@ -1479,7 +1485,7 @@ - - - -- - - -@@ -1772,8 +1778,8 @@ - - - -+ - - - -@@ -1785,7 +1791,6 @@ - - - -- - - - - -+ --> - - - diff --git a/www-servers/tomcat/files/5.5.17/tomcatbuild-xml-examples.patch b/www-servers/tomcat/files/5.5.17/tomcatbuild-xml-examples.patch deleted file mode 100644 index c2cae9e208b8..000000000000 --- a/www-servers/tomcat/files/5.5.17/tomcatbuild-xml-examples.patch +++ /dev/null @@ -1,84 +0,0 @@ ---- apache-tomcat-5.5.17-src/build/build.xml 2006-04-14 14:11:26.000000000 -0400 -+++ build/build.xml 2006-07-29 13:02:50.000000000 -0400 -@@ -398,12 +398,16 @@ - - - -+ - - - - -+ - - - -@@ -437,6 +441,7 @@ - addWebXmlMappings="true" - outputDir="${ROOT.base}/WEB-INF/src" /> - -+ - - - - -+ - - - - -- -+ - - - -@@ -1082,12 +1090,14 @@ - - - -+ - - - - -+ -+ - -+ --> - - - -@@ -650,28 +651,8 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+ - - - -@@ -824,9 +805,10 @@ - - - -+ - - - -@@ -1038,11 +1020,11 @@ - - - -- -+ - - - -@@ -1089,8 +1071,9 @@ - - -+ - Target: Webapps precompilation ... - - -@@ -1185,10 +1168,11 @@ - description="Catalina Tests" depends="dist-tester"> - - -+ - - - -@@ -1827,10 +1811,10 @@ - - - -+ - - - -@@ -1872,7 +1856,6 @@ - - - -- - - - -@@ -1893,7 +1876,6 @@ - - - -- - - - -@@ -1932,7 +1913,7 @@ - - - -- -+ --> - - - diff --git a/www-servers/tomcat/files/6.0.2/build-xml.patch b/www-servers/tomcat/files/6/build-xml.patch similarity index 100% rename from www-servers/tomcat/files/6.0.2/build-xml.patch rename to www-servers/tomcat/files/6/build-xml.patch diff --git a/www-servers/tomcat/files/6.0.2/tomcat.conf b/www-servers/tomcat/files/6/tomcat.conf similarity index 95% rename from www-servers/tomcat/files/6.0.2/tomcat.conf rename to www-servers/tomcat/files/6/tomcat.conf index f6121492a018..becfac654717 100644 --- a/www-servers/tomcat/files/6.0.2/tomcat.conf +++ b/www-servers/tomcat/files/6/tomcat.conf @@ -1,4 +1,4 @@ -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6.0.2/tomcat.conf,v 1.1 2006/11/20 04:32:22 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.conf,v 1.1 2006/12/08 07:00:55 wltjr Exp $ # JVM Runtime # Using the default setting, it will determine your JVM from the system-vm diff --git a/www-servers/tomcat/files/6.0.2/tomcat.init b/www-servers/tomcat/files/6/tomcat.init similarity index 96% rename from www-servers/tomcat/files/6.0.2/tomcat.init rename to www-servers/tomcat/files/6/tomcat.init index a6bbeca8736b..02b559431bd6 100755 --- a/www-servers/tomcat/files/6.0.2/tomcat.init +++ b/www-servers/tomcat/files/6/tomcat.init @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6.0.2/tomcat.init,v 1.1 2006/11/20 04:32:22 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.init,v 1.1 2006/12/08 07:00:55 wltjr Exp $ init_env_vars() { # Set some sane defaults diff --git a/www-servers/tomcat/files/digest-tomcat-6.0.2 b/www-servers/tomcat/files/digest-tomcat-6.0.2 deleted file mode 100644 index 97af87b00b4b..000000000000 --- a/www-servers/tomcat/files/digest-tomcat-6.0.2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 2f9fad7642013a5e4ccba3d763e6d479 apache-tomcat-6.0.2-src.tar.gz 3244552 -RMD160 9061581c2d43d2368d47570eb5841dffd50bd961 apache-tomcat-6.0.2-src.tar.gz 3244552 -SHA256 77c7facbaa3460aef31cb7695fe8138f8f82abd03e8273658687a630e756e324 apache-tomcat-6.0.2-src.tar.gz 3244552 diff --git a/www-servers/tomcat/tomcat-6.0.2.ebuild b/www-servers/tomcat/tomcat-6.0.2.ebuild deleted file mode 100644 index 884ad7081ff5..000000000000 --- a/www-servers/tomcat/tomcat-6.0.2.ebuild +++ /dev/null @@ -1,164 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.2.ebuild,v 1.2 2006/12/05 00:07:04 wltjr Exp $ - -inherit eutils java-pkg-2 java-ant-2 - -DESCRIPTION="Apache Servlet-2.4/JSP-2.0 Container" - -MY_P="apache-${P}-src" -SLOT="6" -SRC_URI="mirror://apache/${PN}/${PN}-6/v${PV}/src/${MY_P}.tar.gz" -HOMEPAGE="http://jakarta.apache.org/tomcat" -KEYWORDS="~amd64 ~x86 -ppc -ppc64" -LICENSE="Apache-2.0" - -IUSE="doc examples jni source test" - -RDEPEND=">=virtual/jre-1.5 - =dev-java/eclipse-ecj-3.2* - >=dev-java/commons-daemon-1.0.1 - >=dev-java/commons-dbcp-1.2.1 - >=dev-java/commons-logging-1.1 - >=dev-java/commons-pool-1.2 - jni? ( dev-libs/apr - dev-libs/openssl )" - -DEPEND=">=virtual/jdk-1.5 - ${RDEPEND} - test? ( - dev-java/junit - dev-java/ant - ) - !test? ( dev-java/ant-core )" - -JAVA_PKG_NV_DEPEND="=virtual/jdk-1.5*" - -S=${WORKDIR}/${MY_P} - -TOMCAT_NAME="${PN}-${SLOT}" -TOMCAT_HOME="/usr/share/${TOMCAT_NAME}" -WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps" - -pkg_setup() { - enewgroup tomcat 265 - enewuser tomcat 265 -1 /dev/null tomcat - - JAVA_PKG_WANT_SOURCE="1.5" - JAVA_PKG_WANT_TARGET="1.5" -} - -src_unpack() { - unpack ${A} - cd ${S} - - epatch "${FILESDIR}/${PV}/build-xml.patch" - - cd ${S}/bin - java-pkg_jar-from commons-daemon -} - -src_compile(){ - # Prevent out of memory/heap space errors - java-pkg_force-compiler ecj-3.2 - - local antflags="build-jasper-jdt build-only -Dbase.path=${T}" - antflags="${antflags} -Dant.jar=$(java-pkg_getjar ant-core ant.jar)" - antflags="${antflags} -Dcommons-daemon.jar=$(java-pkg_getjar commons-daemon commons-daemon.jar)" - antflags="${antflags} -Djdt.jar=$(java-pkg_getjar eclipse-ecj-3.2 ecj.jar)" - eant ${antflags} - - if use jni; then - cd ${S}/native/connector - sh buildconf --with-apr=/usr || die - econf --with-apr=/usr --with-ssl=/usr || die - make || die - fi -} - -src_install() { - local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/ - - # init.d, conf.d - newinitd ${FILESDIR}/${PV}/tomcat.init ${TOMCAT_NAME} - newconfd ${FILESDIR}/${PV}/tomcat.conf ${TOMCAT_NAME} - - # create dir structure - diropts -m755 -o tomcat -g tomcat - dodir /etc/${TOMCAT_NAME} - fperms 750 /etc/${TOMCAT_NAME} - dodir /usr/share/${TOMCAT_NAME} - keepdir /var/log/${TOMCAT_NAME}/ - keepdir /var/tmp/${TOMCAT_NAME}/ - keepdir /var/run/${TOMCAT_NAME}/ - dodir ${CATALINA_BASE} - diropts -m0755 - - cd ${S} - # we don't need dos scripts - rm -f bin/*.bat - - # fix context's since upstream is slackin - sed -i -e 's:}/server/:}/:' ${S}/webapps/host-manager/host-manager.xml - sed -i -e 's:}/server/:}/:' ${S}/webapps/manager/manager.xml - - # copy the manager's context to the right position - mkdir -p conf/Catalina/localhost - cp ${S}/webapps/host-manager/host-manager.xml conf/Catalina/localhost - cp ${S}/webapps/manager/manager.xml conf/Catalina/localhost - - # replace the default pw with a random one, see #92281 - local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15) - sed -e s:SHUTDOWN:${randpw}: -i conf/server.xml - - # copy over the directories - chown -R tomcat:tomcat webapps/* conf/* - cp -pR conf/* ${D}/etc/${TOMCAT_NAME} || die "failed to copy conf" - cp -R bin output/build/bin output/build/lib ${D}/usr/share/${TOMCAT_NAME} \ - || die "failed to copy" - - cp ${T}/tomcat6-deps/jdt/jasper-jdt.jar ${D}/usr/share/${TOMCAT_NAME}/lib \ - || die "failed to copy" - - keepdir ${WEBAPPS_DIR} - chown tomcat:tomcat ${D}/${WEBAPPS_DIR} || die "Failed to change owner off ${1}." - chmod 750 ${D}/${WEBAPPS_DIR} || die "Failed to change permissions off ${1}." - - cd ${S} - - # Copy over webapps, some controlled by use flags - cp -p RELEASE-NOTES webapps/ROOT/RELEASE-NOTES.txt - cp -pr webapps/ROOT ${D}${CATALINA_BASE}/webapps - - mkdir ${D}${TOMCAT_HOME}/webapps - chown tomcat:tomcat ${D}${TOMCAT_HOME}/webapps - cp -pr webapps/host-manager ${D}${TOMCAT_HOME}/webapps - cp -pr webapps/manager ${D}${TOMCAT_HOME}/webapps - - if use doc; then - cp -pr webapps/docs ${D}${CATALINA_BASE}/webapps - fi - if use examples; then - cp -pr webapps/examples \ - ${D}${CATALINA_BASE}/webapps - fi - - # symlink the directories to make CATALINA_BASE possible - dosym /etc/${TOMCAT_NAME} ${CATALINA_BASE}/conf - dosym /var/log/${TOMCAT_NAME} ${CATALINA_BASE}/logs - dosym /var/tmp/${TOMCAT_NAME} ${CATALINA_BASE}/temp - dosym /var/run/${TOMCAT_NAME} ${CATALINA_BASE}/work - - dodoc ${S}/{RELEASE-NOTES,RUNNING.txt} - fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml -} - -pkg_postinst() { - einfo - einfo " This ebuild implements a FHS compliant layout for tomcat" - einfo " Please read http://www.gentoo.org/proj/en/java/tomcat-guide.xml" - einfo " for more information." - einfo - einfo " Please report any bugs to http://bugs.gentoo.org/" - einfo -} -- 2.26.2